tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -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 +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- 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/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- 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 +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- 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 +1 -3
- 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 +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- 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 +0 -2
- 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 +3 -5
- 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 +0 -2
- 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 +3 -5
- 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 +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- 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 +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -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 +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- 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 +26 -7
- 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 +158 -82
- 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 +144 -108
- 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 +50 -19
- 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 +138 -97
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- 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 +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- 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 +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- 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 +12 -13
- package/src/prover/zenon/parse.ts +0 -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 +0 -2
- 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 +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/var_subst.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, type AstManager, type SmtSymbol } from "./ast";
|
|
3
2
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
4
3
|
import { BetaReducer } from "./rewriter-tpl";
|
|
@@ -75,6 +74,7 @@ export const replaceFreeVars = (
|
|
|
75
74
|
replace: (variable: number, index: number, shift: number) => number,
|
|
76
75
|
) => {
|
|
77
76
|
const cache = new Map<number, number>();
|
|
77
|
+
const numNodes = manager.kinds.length;
|
|
78
78
|
const frames: ReplaceFrame[] = [];
|
|
79
79
|
const results: number[] = [];
|
|
80
80
|
const visit = (current: number, shift: number) => {
|
|
@@ -82,7 +82,7 @@ export const replaceFreeVars = (
|
|
|
82
82
|
results.push(current);
|
|
83
83
|
return;
|
|
84
84
|
}
|
|
85
|
-
const key =
|
|
85
|
+
const key = shift * numNodes + current;
|
|
86
86
|
const cached = cache.get(key);
|
|
87
87
|
if (cached !== undefined) results.push(cached);
|
|
88
88
|
else if (manager.kinds[current] !== KIND_VAR)
|
|
@@ -117,10 +117,10 @@ export const replaceFreeVars = (
|
|
|
117
117
|
...data,
|
|
118
118
|
body: children[0],
|
|
119
119
|
patterns: children.slice(1, 1 + data.patterns.length),
|
|
120
|
-
noPatterns:
|
|
120
|
+
noPatterns: children.slice(1 + data.patterns.length),
|
|
121
121
|
});
|
|
122
122
|
frames.pop();
|
|
123
|
-
cache.set(
|
|
123
|
+
cache.set(frame.shift * numNodes + current, result);
|
|
124
124
|
results.push(result);
|
|
125
125
|
}
|
|
126
126
|
return results[0];
|
|
@@ -135,7 +135,7 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
135
135
|
const delta = deltas.pop() ?? 0;
|
|
136
136
|
if (manager.freeVarBounds[current] <= delta) continue;
|
|
137
137
|
if (manager.getRefCount(current) > 1) {
|
|
138
|
-
const key =
|
|
138
|
+
const key = delta * manager.kinds.length + current;
|
|
139
139
|
if (visited.has(key)) continue;
|
|
140
140
|
visited.add(key);
|
|
141
141
|
}
|
|
@@ -176,7 +176,7 @@ export class UnusedVarsEliminator {
|
|
|
176
176
|
manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)
|
|
177
177
|
? manager.getQuantifier(expr)
|
|
178
178
|
: null;
|
|
179
|
-
const kept = data === null ? expr : manager.
|
|
179
|
+
const kept = data === null ? expr : manager.isGroundApp(data.body) ? data.body : -1;
|
|
180
180
|
if (kept !== -1 || data === null) {
|
|
181
181
|
manager.incRef(kept);
|
|
182
182
|
return kept;
|
package/src/prover/smt/table.ts
CHANGED
|
@@ -130,7 +130,7 @@ export const TYPED_SYMBOLS = [
|
|
|
130
130
|
"TIntLteq",
|
|
131
131
|
];
|
|
132
132
|
|
|
133
|
-
export type AxiomArgument = number | string | AxiomArgument[];
|
|
133
|
+
export type AxiomArgument = number | bigint | string | AxiomArgument[];
|
|
134
134
|
|
|
135
135
|
export interface Axiom {
|
|
136
136
|
name: string;
|
|
@@ -151,7 +151,8 @@ export const axiom = (
|
|
|
151
151
|
formula,
|
|
152
152
|
});
|
|
153
153
|
|
|
154
|
-
export const getAxiomKey = (entry: Axiom) =>
|
|
154
|
+
export const getAxiomKey = (entry: Axiom) =>
|
|
155
|
+
`${entry.name} ${JSON.stringify(entry.args, (_key, value: unknown) => (typeof value === "bigint" ? `${value}n` : value))}`;
|
|
155
156
|
|
|
156
157
|
const getAxiomRank = (entry: Axiom) => {
|
|
157
158
|
const constant = CONSTANT_AXIOMS.indexOf(entry.name);
|
|
@@ -113,12 +113,12 @@ export const loadFingerprints = (table: FingerprintTable, path: string, isSafe:
|
|
|
113
113
|
table.clear();
|
|
114
114
|
(buckets !== undefined && isBlock(buckets) ? buckets.fields : [])
|
|
115
115
|
.flatMap((bucket) => readBucket(bucket).toReversed())
|
|
116
|
-
.forEach((
|
|
117
|
-
if (typeof
|
|
116
|
+
.forEach((entry) => {
|
|
117
|
+
if (typeof entry[0] !== "string" || !isBlock(entry[1]))
|
|
118
118
|
throw new TlaProofError("corrupted fingerprint file");
|
|
119
119
|
table.set(
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
entry[0],
|
|
121
|
+
entry[1].fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
|
|
122
122
|
);
|
|
123
123
|
});
|
|
124
124
|
};
|
|
@@ -226,18 +226,18 @@ export const getKnownResults = (table: FingerprintTable) => {
|
|
|
226
226
|
const storedResults = new Map<ProofAttempt, OcamlValue>();
|
|
227
227
|
const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
|
|
228
228
|
const results = new Map(
|
|
229
|
-
[...table].map((
|
|
229
|
+
[...table].map((entry) => {
|
|
230
230
|
const attempts = new Map(
|
|
231
231
|
STORED_PROVERS.flatMap((prover) => {
|
|
232
|
-
const stored =
|
|
232
|
+
const stored = entry[1][PROVERS[prover].field];
|
|
233
233
|
const result = decodeResult(prover, getField(stored, 0));
|
|
234
234
|
if (!result) return [];
|
|
235
235
|
storedResults.set(result, stored);
|
|
236
236
|
return [[prover, result]];
|
|
237
237
|
}),
|
|
238
238
|
);
|
|
239
|
-
storedRecords.set(attempts,
|
|
240
|
-
return [
|
|
239
|
+
storedRecords.set(attempts, entry[1]);
|
|
240
|
+
return [entry[0], attempts];
|
|
241
241
|
}),
|
|
242
242
|
);
|
|
243
243
|
const save = (path: string) => {
|
|
@@ -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,16 +85,14 @@ export const runZenon = (text: string, options: DecideOptions): ZenonRun => {
|
|
|
87
85
|
};
|
|
88
86
|
};
|
|
89
87
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
"memory limit": "Zenon error: could not find a proof within the memory size limit\n",
|
|
95
|
-
};
|
|
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
|
+
]);
|
|
96
92
|
|
|
97
|
-
export const decideZenon = (text: string, options: DecideOptions):
|
|
93
|
+
export const decideZenon = (text: string, options: DecideOptions): Omit<Decision, "timeUsedMs"> => {
|
|
98
94
|
const run = runZenon(text, options);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
return run.isar === undefined
|
|
96
|
+
? { verdict: "unknown", errorOutput: FAILURE_ERRORS.get(run.failure) }
|
|
97
|
+
: { verdict: "unsat", output: run.isar };
|
|
102
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
|
|
|
@@ -158,18 +156,19 @@ const canInstantiate = (meta: Expr, expression: Expr): boolean => {
|
|
|
158
156
|
};
|
|
159
157
|
|
|
160
158
|
// A list cell and a node record take 3 and 6 words, and each block has a header word.
|
|
161
|
-
const getNodeWords = (node: Node) =>
|
|
162
|
-
|
|
163
|
-
(words, branch) => words + 3 * branch.length,
|
|
159
|
+
const getNodeWords = (node: Node) => {
|
|
160
|
+
let words =
|
|
164
161
|
3 +
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
);
|
|
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
|
+
};
|
|
173
172
|
|
|
174
173
|
export const insertNode = (previous: Queue, node: Node): Queue => {
|
|
175
174
|
const queue = { ...previous, nodeWords: previous.nodeWords + getNodeWords(node) };
|
|
@@ -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";
|
|
@@ -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,7 +314,7 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
316
314
|
]);
|
|
317
315
|
}
|
|
318
316
|
if (isApp(right, "TLA.cap", 2)) {
|
|
319
|
-
//
|
|
317
|
+
// Deviation from Zenon: ext_tla.ml builds both subsets from the second set, which is unsound.
|
|
320
318
|
const first = exprs.eapp("TLA.subseteq", [left, right.args[0]]);
|
|
321
319
|
const second = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
322
320
|
return isNegated
|
|
@@ -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";
|