tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.7a3bb1545
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +58 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +30 -3
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +3 -2
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +36 -6
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +24 -13
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +633 -186
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +1 -8
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1448 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3154 -326
- package/src/prover/smt/solver/smtlib-script.ts +1702 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1995 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +29 -8
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +72 -36
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +1 -1
- package/src/sany/generator-expressions.ts +9 -17
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +1 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +4 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/prover/verdict.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Zenon's main.ml, as shipped in tlapm. Copyright 1997 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
|
-
import type { DecideOptions } from "../verdict";
|
|
2
|
+
import type { DecideOptions, Decision } from "../verdict";
|
|
5
3
|
import { checkProof } from "./check/check";
|
|
6
4
|
import { createRelations } from "./eqrel";
|
|
7
5
|
import { createExpressions } from "./expr";
|
|
@@ -87,9 +85,14 @@ export const runZenon = (text: string, options: DecideOptions): ZenonRun => {
|
|
|
87
85
|
};
|
|
88
86
|
};
|
|
89
87
|
|
|
90
|
-
|
|
88
|
+
const FAILURE_ERRORS = new Map<ZenonRun["failure"], string>([
|
|
89
|
+
["exhausted", "Zenon error: exhausted search space without finding a proof\n"],
|
|
90
|
+
["memory limit", "Zenon error: could not find a proof within the memory size limit\n"],
|
|
91
|
+
]);
|
|
91
92
|
|
|
92
|
-
export const decideZenon = (text: string, options: DecideOptions):
|
|
93
|
-
const
|
|
94
|
-
return isar === undefined
|
|
93
|
+
export const decideZenon = (text: string, options: DecideOptions): Omit<Decision, "timeUsedMs"> => {
|
|
94
|
+
const run = runZenon(text, options);
|
|
95
|
+
return run.isar === undefined
|
|
96
|
+
? { verdict: "unknown", errorOutput: FAILURE_ERRORS.get(run.failure) }
|
|
97
|
+
: { verdict: "unsat", output: run.isar };
|
|
95
98
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Backend.Zenon.
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
|
|
4
2
|
import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
|
|
5
3
|
import type { Bound, Builtin, Expr, Hyp, Sequent } from "../../obligations/expression";
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import {
|
|
5
3
|
isApp,
|
|
6
4
|
isNegatedRelation,
|
|
7
5
|
isRelation,
|
|
8
6
|
isMeta,
|
|
7
|
+
preunify,
|
|
9
8
|
type Expr,
|
|
10
9
|
type NegatedRelationExpr,
|
|
11
10
|
type NotExpr,
|
|
@@ -206,6 +205,29 @@ export const addReflexivity: SearchRule = (context, queue, formula, goalness) =>
|
|
|
206
205
|
return [queue, false];
|
|
207
206
|
};
|
|
208
207
|
|
|
208
|
+
export const addPreunification: SearchRule = (context, queue, formula, goalness) => {
|
|
209
|
+
const matches =
|
|
210
|
+
formula.kind === "not" && formula.args[0].kind === "app"
|
|
211
|
+
? context.index.getPositive(formula.args[0].symbol)
|
|
212
|
+
: formula.kind === "app"
|
|
213
|
+
? context.index.getNegative(formula.symbol)
|
|
214
|
+
: undefined;
|
|
215
|
+
if (matches === undefined) return [queue, false];
|
|
216
|
+
let current = queue;
|
|
217
|
+
for (let matchIndex = matches.length - 1; matchIndex >= 0; matchIndex--) {
|
|
218
|
+
const pairs = preunify(matches[matchIndex], formula);
|
|
219
|
+
for (let pairIndex = 0; pairIndex < pairs.length; pairIndex++)
|
|
220
|
+
current = makeInstance(
|
|
221
|
+
context.exprs,
|
|
222
|
+
current,
|
|
223
|
+
pairs[pairIndex][0],
|
|
224
|
+
pairs[pairIndex][1],
|
|
225
|
+
Math.min(goalness, context.index.getGoalness(matches[matchIndex])),
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
return [current, false];
|
|
229
|
+
};
|
|
230
|
+
|
|
209
231
|
export const addCongruence: SearchRule = (context, queue, formula, goalness) => {
|
|
210
232
|
const exprs = context.exprs;
|
|
211
233
|
if (formula.kind !== "not" || !isApp(formula.args[0], "=", 2)) return [queue, false];
|
package/src/prover/zenon/expr.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's expr.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import { combine, createHasher, toInt63, type Int63 } from "./ocaml";
|
|
5
3
|
|
|
@@ -243,6 +241,27 @@ export const compareExprs = (left: Expr, right: Expr): number => {
|
|
|
243
241
|
return 0;
|
|
244
242
|
};
|
|
245
243
|
|
|
244
|
+
const NO_PAIRS: readonly [Expr, Expr][] = [];
|
|
245
|
+
|
|
246
|
+
const xpreunify = (
|
|
247
|
+
accu: readonly [Expr, Expr][],
|
|
248
|
+
left: Expr,
|
|
249
|
+
right: Expr,
|
|
250
|
+
): readonly [Expr, Expr][] | undefined => {
|
|
251
|
+
if (left === right) return accu;
|
|
252
|
+
if (left.kind === "app" && right.kind === "app" && left.symbol === right.symbol) {
|
|
253
|
+
let current: readonly [Expr, Expr][] | undefined = accu;
|
|
254
|
+
for (let index = 0; index < left.args.length && current !== undefined; index++)
|
|
255
|
+
current = xpreunify(current, left.args[index], right.args[index]);
|
|
256
|
+
return current;
|
|
257
|
+
}
|
|
258
|
+
if (left.kind === "meta") return [[left.args[0], right], ...accu];
|
|
259
|
+
if (right.kind === "meta") return [[right.args[0], left], ...accu];
|
|
260
|
+
return undefined;
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
export const preunify = (left: Expr, right: Expr) => xpreunify(NO_PAIRS, left, right) ?? NO_PAIRS;
|
|
264
|
+
|
|
246
265
|
type Substitution = [Expr, Expr][];
|
|
247
266
|
|
|
248
267
|
const lookup = (map: Substitution, variable: Expr) => map.find((pair) => pair[0] === variable)?.[1];
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's index.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
getStringName,
|
|
5
3
|
isApp,
|
|
@@ -264,8 +262,11 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
264
262
|
const suspect = group[0];
|
|
265
263
|
const count = suspect.records.length;
|
|
266
264
|
const missing = [
|
|
267
|
-
...Array.from(
|
|
268
|
-
|
|
265
|
+
...Array.from(
|
|
266
|
+
{ length: count - suspect.cursor },
|
|
267
|
+
(_value, offset) => suspect.cursor + offset,
|
|
268
|
+
),
|
|
269
|
+
...Array.from({ length: suspect.cursor }, (_value, offset) => offset),
|
|
269
270
|
].find((index) => !suspect.records[index].isPresent);
|
|
270
271
|
if (missing === undefined) return suspect.proof;
|
|
271
272
|
suspects = [group.slice(1), ...suspects.slice(1)];
|
|
@@ -282,6 +283,8 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
282
283
|
getGoalness,
|
|
283
284
|
findPositive: (symbol: string) => withGoalness(getLatestFirst(positive, symbol)),
|
|
284
285
|
findNegative: (symbol: string) => withGoalness(getLatestFirst(negative, symbol)),
|
|
286
|
+
getPositive: (symbol: string) => positive.get(symbol),
|
|
287
|
+
getNegative: (symbol: string) => negative.get(symbol),
|
|
285
288
|
findEqualRight: (term: Expr) => getLatestFirst(equalLeftRight, term),
|
|
286
289
|
findEqualLeft: (term: Expr) => getLatestFirst(equalRightLeft, term),
|
|
287
290
|
findDisequalities: (term: Expr) => [
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's isar_case.ml and enum.ml, as shipped in tlapm. Copyright 2009 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
|
|
5
3
|
interface Lexeme {
|
|
@@ -131,7 +129,7 @@ const getInstance = (pieces: Piece[], getValue: (piece: Progression) => number)
|
|
|
131
129
|
const expandPattern = (count: number, text: string, isReversed: boolean) => {
|
|
132
130
|
const pattern = parsePattern(text);
|
|
133
131
|
if (pattern === undefined) return undefined;
|
|
134
|
-
const positions = Array.from({ length: count }, (
|
|
132
|
+
const positions = Array.from({ length: count }, (_value, position) =>
|
|
135
133
|
isReversed ? count - 1 - position : position,
|
|
136
134
|
);
|
|
137
135
|
return positions
|
package/src/prover/zenon/isar.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's lltoisar.ml and the -oisar path of main.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import { FALSE, GOAL_NAME, TRUE, type BinderExpr, type Expr, type Expressions } from "./expr";
|
|
5
3
|
import type { Relations } from "./eqrel";
|
|
@@ -58,7 +56,7 @@ const toBase26 = (number: number): string =>
|
|
|
58
56
|
: `${toBase26(Math.floor(number / 26))}${String.fromCharCode(97 + (number % 26))}`;
|
|
59
57
|
|
|
60
58
|
const getPairs = <Item>(items: Item[]): [Item, Item][] =>
|
|
61
|
-
Array.from({ length: Math.floor(items.length / 2) }, (
|
|
59
|
+
Array.from({ length: Math.floor(items.length / 2) }, (_value, position) => [
|
|
62
60
|
items[2 * position],
|
|
63
61
|
items[2 * position + 1],
|
|
64
62
|
]);
|
|
@@ -369,7 +367,7 @@ export const printIsar = (proof: MlProof, context: IsarContext): string | undefi
|
|
|
369
367
|
dict,
|
|
370
368
|
formulas,
|
|
371
369
|
subproof,
|
|
372
|
-
(
|
|
370
|
+
(_value, position) => `by (rule zenon_${lemma}_${position} [OF ${conclusionName}])\n`,
|
|
373
371
|
);
|
|
374
372
|
};
|
|
375
373
|
|
package/src/prover/zenon/node.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's node.ml and heap.ml, as shipped in tlapm. Copyright 2001-2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Expr } from "./expr";
|
|
4
2
|
import type { Rule } from "./proof";
|
|
5
3
|
|
|
@@ -95,7 +93,9 @@ export interface Queue {
|
|
|
95
93
|
instSize: List<[number, Heap]>;
|
|
96
94
|
instFront: List<Node>;
|
|
97
95
|
instBack: List<Node>;
|
|
98
|
-
|
|
96
|
+
// The OCaml words of the nodes inserted so far. Removed nodes still count, because the queues of
|
|
97
|
+
// the branches above keep them.
|
|
98
|
+
nodeWords: number;
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
const SMALL_INSTANCES = 16;
|
|
@@ -116,7 +116,7 @@ export const EMPTY_QUEUE: Queue = {
|
|
|
116
116
|
instSize: undefined,
|
|
117
117
|
instFront: undefined,
|
|
118
118
|
instBack: undefined,
|
|
119
|
-
|
|
119
|
+
nodeWords: 0,
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
const insertByGoalness = (list: List<[number, Heap]>, entry: Entry): List<[number, Heap]> => {
|
|
@@ -155,8 +155,23 @@ const canInstantiate = (meta: Expr, expression: Expr): boolean => {
|
|
|
155
155
|
}
|
|
156
156
|
};
|
|
157
157
|
|
|
158
|
+
// A list cell and a node record take 3 and 6 words, and each block has a header word.
|
|
159
|
+
const getNodeWords = (node: Node) => {
|
|
160
|
+
let words =
|
|
161
|
+
3 +
|
|
162
|
+
6 +
|
|
163
|
+
3 * node.conclusions.length +
|
|
164
|
+
1 +
|
|
165
|
+
node.rule.args.length +
|
|
166
|
+
(typeof node.priority === "object" ? 2 : 0) +
|
|
167
|
+
1 +
|
|
168
|
+
node.branches.length;
|
|
169
|
+
for (const branch of node.branches) words += 3 * branch.length;
|
|
170
|
+
return words;
|
|
171
|
+
};
|
|
172
|
+
|
|
158
173
|
export const insertNode = (previous: Queue, node: Node): Queue => {
|
|
159
|
-
const queue = { ...previous,
|
|
174
|
+
const queue = { ...previous, nodeWords: previous.nodeWords + getNodeWords(node) };
|
|
160
175
|
const priority = node.priority;
|
|
161
176
|
if (priority === "prop")
|
|
162
177
|
return node.branches.length < 2
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's lexzen.mll and parsezen.mly, as shipped in tlapm. Copyright 2005 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import {
|
|
5
3
|
FALSE,
|
|
@@ -233,6 +231,12 @@ export const parseZenon = (exprs: Expressions, text: string): Phrase[] => {
|
|
|
233
231
|
kind: "def",
|
|
234
232
|
definition: { kind: "real", name, symbol, params, body },
|
|
235
233
|
});
|
|
234
|
+
} else if (token.kind === "keyword" && token.text === "$sig") {
|
|
235
|
+
expect("ident");
|
|
236
|
+
expect("open");
|
|
237
|
+
while (isAt("string")) next();
|
|
238
|
+
expect("close");
|
|
239
|
+
expect("string");
|
|
236
240
|
} else throw new TlaZenonError(`Zenon: line ${token.line}: unsupported phrase ${token.text}`);
|
|
237
241
|
}
|
|
238
242
|
return phrases;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's phrase.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Expr } from "./expr";
|
|
4
2
|
import type { Definition, Phrase } from "./parse";
|
|
5
3
|
|
|
@@ -169,7 +167,7 @@ export const separate = (predefined: string[], phrases: Phrase[]) => {
|
|
|
169
167
|
...definitions.slice(previous + 1),
|
|
170
168
|
];
|
|
171
169
|
const dependencyIndex = dependencies.findIndex((candidate) => candidate[0] === symbol);
|
|
172
|
-
dependencies = dependencies.filter((
|
|
170
|
+
dependencies = dependencies.filter((_value, position) => position !== dependencyIndex);
|
|
173
171
|
multiple.unshift(symbol);
|
|
174
172
|
hypotheses.unshift(hypothesis, { formula: removed.origin, goalness: removed.goalness });
|
|
175
173
|
} else {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Relations } from "./eqrel";
|
|
4
2
|
import {
|
|
5
3
|
addCongruence,
|
|
6
4
|
addMatches,
|
|
5
|
+
addPreunification,
|
|
7
6
|
addReflexivity,
|
|
8
7
|
addStringEqualities,
|
|
9
8
|
addSymmetricMatches,
|
|
@@ -59,7 +58,6 @@ const addExtensions: SearchRule = (context, queue, formula, goalness) => {
|
|
|
59
58
|
return [insertAll(queue, result.nodes), result.isStopped];
|
|
60
59
|
};
|
|
61
60
|
|
|
62
|
-
// Deviation from Zenon: newnodes_preunif is left out because it never adds a node.
|
|
63
61
|
const RULES: SearchRule[] = [
|
|
64
62
|
addAbsurd,
|
|
65
63
|
addClosure,
|
|
@@ -72,6 +70,7 @@ const RULES: SearchRule[] = [
|
|
|
72
70
|
addGamma,
|
|
73
71
|
addUnfold,
|
|
74
72
|
addReflexivity,
|
|
73
|
+
addPreunification,
|
|
75
74
|
addCongruence,
|
|
76
75
|
addTransitivity,
|
|
77
76
|
addSymmetricMatches,
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import { difference, isApp, isDisjoint, isMeta, isRelation, union, type Expr } from "./expr";
|
|
5
3
|
import { getLimitFailure, type Limits } from "./limits";
|
|
@@ -127,8 +125,12 @@ interface SearchStatistics {
|
|
|
127
125
|
|
|
128
126
|
export type SearchFailure = "exhausted" | "time limit" | "memory limit" | "aborted";
|
|
129
127
|
|
|
130
|
-
//
|
|
131
|
-
|
|
128
|
+
// Zenon gives up once its heap passes 1 GB. Modeled as a 2M-word formula table, 20 words per formula
|
|
129
|
+
// created and 1.1 per word of queued nodes, the heap is within 8% of Zenon's past 600 MB on the corpus.
|
|
130
|
+
const getHeapWords = (context: SearchContext, queue: Queue) =>
|
|
131
|
+
2_000_000 + 20 * context.exprs.getCreatedCount() + 1.1 * queue.nodeWords;
|
|
132
|
+
|
|
133
|
+
const MAX_HEAP_WORDS = 1_000_000_000 / 8;
|
|
132
134
|
|
|
133
135
|
export const search = (
|
|
134
136
|
context: SearchContext,
|
|
@@ -221,7 +223,7 @@ export const search = (
|
|
|
221
223
|
for (;;) {
|
|
222
224
|
const limitFailure = getLimitFailure(limits);
|
|
223
225
|
if (limitFailure !== undefined) return limitFailure;
|
|
224
|
-
if (queue
|
|
226
|
+
if (getHeapWords(context, queue) > MAX_HEAP_WORDS) return "memory limit";
|
|
225
227
|
if (formIndex < forms.length) {
|
|
226
228
|
const entry = forms[formIndex++];
|
|
227
229
|
const formula = entry[0];
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../../errors";
|
|
4
2
|
import { difference, union, type Expr, type Expressions } from "../expr";
|
|
5
3
|
import type { Lemma, LlProof, LlRule } from "../llproof";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { isApp, type Expr } from "../expr";
|
|
4
2
|
import { makeRule } from "../proof";
|
|
5
3
|
import {
|
|
@@ -316,17 +314,18 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
316
314
|
]);
|
|
317
315
|
}
|
|
318
316
|
if (isApp(right, "TLA.cap", 2)) {
|
|
319
|
-
//
|
|
320
|
-
const
|
|
317
|
+
// Deviation from Zenon: ext_tla.ml builds both subsets from the second set, which is unsound.
|
|
318
|
+
const first = exprs.eapp("TLA.subseteq", [left, right.args[0]]);
|
|
319
|
+
const second = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
321
320
|
return isNegated
|
|
322
321
|
? makeExtensionNode(
|
|
323
322
|
literal,
|
|
324
323
|
"arity",
|
|
325
|
-
makeRule("not_subseteq_cap", [formula, exprs.enot(
|
|
326
|
-
[[exprs.enot(
|
|
324
|
+
makeRule("not_subseteq_cap", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
325
|
+
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
327
326
|
)
|
|
328
|
-
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula,
|
|
329
|
-
[
|
|
327
|
+
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula, first, second]), [
|
|
328
|
+
[first, second],
|
|
330
329
|
]);
|
|
331
330
|
}
|
|
332
331
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../../errors";
|
|
4
2
|
import { isApp, isRelation, type Expr, type Expressions, type RelationExpr } from "../expr";
|
|
5
3
|
import type { Index } from "../index-table";
|