tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -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.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- 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 +261 -68
- 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 +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- 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 +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- 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 +0 -2
- 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 +224 -82
- 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 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- 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 +0 -2
- 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 +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 +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/methods.ts +50 -3
- 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/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 +0 -1
- 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 +3 -6
- 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 +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- 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 +1 -4
- 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 +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- 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 +0 -1
- 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 +16 -3
- 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-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- 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 +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- 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 +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- 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 +21 -97
- 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 +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- 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 +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- 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 +0 -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 +0 -1
- 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 +0 -4
- 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 +0 -1
- 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 +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- 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 +9 -2
- 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 +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- 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 +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- 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 -2
- 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 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- 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 +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- 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 +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- 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 +112 -99
- 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 +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- 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 +15 -10
- 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 +0 -1
- 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 +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- 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 +0 -1
- 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 +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -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 +13 -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 +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- 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 +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- 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 +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- 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 +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- 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 +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- 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 +31 -34
- 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 +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- 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 +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- 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 -26
- 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 +2 -3
- package/src/prover/smt/table.ts +3 -2
- 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 +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- 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 +165 -78
- 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/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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/classical.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { revcutRl, thinRl, zeroVarIndexes, makeElim } from "../pure/drule";
|
|
5
3
|
import { selectGoal } from "../pure/goal";
|
|
@@ -207,7 +205,7 @@ export const addUnsafeIntro = (
|
|
|
207
205
|
};
|
|
208
206
|
};
|
|
209
207
|
|
|
210
|
-
const addUnsafeElim = (
|
|
208
|
+
export const addUnsafeElim = (
|
|
211
209
|
context: ClassicalContext,
|
|
212
210
|
rule: Thm,
|
|
213
211
|
atomizeRules: readonly Thm[],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/hypsubst.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { asmRl, compIncr, revcutRl, thinRl, zeroVarIndexes } from "../pure/drule";
|
|
5
3
|
import { aeconv, etaContract } from "../pure/envir";
|
|
@@ -247,9 +245,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
|
|
|
247
245
|
chosen.kind === "Bound"
|
|
248
246
|
? substBounds(
|
|
249
247
|
[
|
|
250
|
-
...Array.from({ length: chosen.index }, (
|
|
248
|
+
...Array.from({ length: chosen.index }, (_value, position) => mkBound(position + 1)),
|
|
251
249
|
mkBound(0),
|
|
252
|
-
...Array.from({ length: params.length - chosen.index - 1 }, (
|
|
250
|
+
...Array.from({ length: params.length - chosen.index - 1 }, (_value, position) =>
|
|
253
251
|
mkBound(chosen.index + 2 + position),
|
|
254
252
|
),
|
|
255
253
|
],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { normTerm, type Envir } from "./envir";
|
|
5
3
|
import { allConst, isAllAbs, isImplies, mkImplies } from "./logic";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { destEquals, destImplies, implies, isAllAbs, isImplies } from "./logic";
|
|
5
3
|
import { declareName, makeNameContext, variantName, type NameContext } from "./name";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { compNoFlatten, protectD, protectI } from "./drule";
|
|
5
3
|
import { emptySeq } from "./seq";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/name.ML and Pure/General/symbol.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
const explodeSymbols = (text: string): string[] => text.match(/\\<\^?[A-Za-z0-9_']*>|[^]/gu) ?? [];
|
|
4
2
|
|
|
5
3
|
const isRawSymbolic = (symbol: string) => symbol.startsWith("\\<") && !symbol.startsWith("\\<^");
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/object_logic.ML and Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { fconvRule, gconvRule, paramsConv, premsConv } from "./conv";
|
|
5
3
|
import { hasMetaPrems } from "./logic";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/pattern.ML and Pure/more_pattern.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { aeconv, genvar, headNorm, lookup, lookup1, update, type Envir, type TEnv } from "./envir";
|
|
5
3
|
import type { Binder } from "./logic";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/raw_simplifier.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { emptyTEnv, etaContract } from "./envir";
|
|
5
3
|
import { symmetricThm } from "./drule";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/raw_simplifier.ML and Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { gconvRule, impCongRule } from "./conv";
|
|
5
3
|
import { betaEtaConversion, impCong, swapPremsEq } from "./drule";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/search.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { listOfSeq, makeSeq, seqOfList } from "./seq";
|
|
4
2
|
import { eqThm, hasFewerPrems, noTac, orElse, type GoalTactic, type Tactic } from "./tactical";
|
|
5
3
|
import { termOrd } from "./term-ord";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/General/seq.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
export type Cell<Item> = readonly [Item, Seq<Item>] | undefined;
|
|
4
2
|
|
|
5
3
|
type Step<Item> = Cell<Item> | Seq<Item>;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/simplifier.ML and Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { genAll, isNormHhf, normHhfEq, protectCong } from "./drule";
|
|
4
2
|
import { preferGoal } from "./goal";
|
|
5
3
|
import { congKey, makeSimpContext, type SimpContext, type Solver } from "./raw-simplifier";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { makeElim } from "./drule";
|
|
4
2
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
5
3
|
import { stripAssumsConcl, stripAssumsHyp } from "./logic";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/term_ord.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { fastIndexnameOrd, fastStringOrd, indexnameOrd } from "./table";
|
|
4
2
|
import { dummyT, sizeOfTerm, type Term, type Typ } from "./term";
|
|
5
3
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/unify.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
4
2
|
import { TlaIsabelleError } from "../../../errors";
|
|
5
3
|
import {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/variable.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { variantList } from "./name";
|
|
4
2
|
import { addFreeNames, addVars, mkFree } from "./term";
|
|
5
3
|
import { generalize, instantiate, type Thm } from "./thm";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle/TLA+'s simplifier_setup.ML and PredicateLogic.thy, BSD licensed, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { genAll, reflexiveThm } from "../pure/drule";
|
|
5
3
|
import { emptyNet, insertTermNet, type Net } from "../pure/net";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/intuitionistic.ML and Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { remdupsRl } from "../pure/drule";
|
|
4
2
|
import { selectGoal } from "../pure/goal";
|
|
5
3
|
import { unifyTermNet } from "../pure/net";
|
package/src/prover/ocaml.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
// A bigint is an OCaml int beyond what a number holds exactly.
|
|
2
|
+
type OcamlValue = number | bigint | string | OcamlValue[];
|
|
2
3
|
|
|
3
4
|
export const compareStrings = (left: string, right: string) =>
|
|
4
5
|
left < right ? -1 : left > right ? 1 : 0;
|
|
5
6
|
|
|
6
7
|
export const compareValues = (left: OcamlValue, right: OcamlValue): number => {
|
|
7
8
|
if (typeof left === "number" && typeof right === "number") return left - right;
|
|
9
|
+
if (typeof left === "bigint" && typeof right === "bigint")
|
|
10
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
8
11
|
if (typeof left === "string" && typeof right === "string") return compareStrings(left, right);
|
|
9
12
|
if (!Array.isArray(left) || !Array.isArray(right)) return 0;
|
|
10
13
|
const index = left.findIndex(
|
|
@@ -466,6 +466,7 @@ const commuteSequent = createSequentMap(commuteSymbols, "all");
|
|
|
466
466
|
const coalesceSequent = createSequentMap(coalesceModal, "visible");
|
|
467
467
|
|
|
468
468
|
export const processObligation = (sequent: Sequent): Sequent => {
|
|
469
|
+
// Levels.compute_level, whose levels the passes below read on demand: only its errors matter.
|
|
469
470
|
getLevelInfo(undefined, { kind: "Sequent", sequent });
|
|
470
471
|
const keys = sequent.context;
|
|
471
472
|
const expanded = expandUnchangedSequent(keys, expandActionSequent(keys, sequent));
|
|
@@ -77,6 +77,8 @@ const PROVERS: Record<string, { prover: Prover; seconds: number; isBudgeted?: bo
|
|
|
77
77
|
...Object.fromEntries([...FRONTENDS].map((name) => [name, { prover: name, seconds: 0 }])),
|
|
78
78
|
};
|
|
79
79
|
|
|
80
|
+
const UNTIMED_PROVERS = new Set<Prover>(["cooper", "fail", "trivial", ...FRONTENDS]);
|
|
81
|
+
|
|
80
82
|
const getProverMethod = (
|
|
81
83
|
name: string,
|
|
82
84
|
timeout: number | undefined,
|
|
@@ -87,7 +89,10 @@ const getProverMethod = (
|
|
|
87
89
|
if (!known) throw new TlaProverError(`Unknown prover: ${name}`);
|
|
88
90
|
return {
|
|
89
91
|
prover: known.prover,
|
|
90
|
-
timeLimitMs:
|
|
92
|
+
timeLimitMs:
|
|
93
|
+
rlimit !== undefined
|
|
94
|
+
? Infinity
|
|
95
|
+
: ((UNTIMED_PROVERS.has(known.prover) ? undefined : timeout) ?? known.seconds) * 1000,
|
|
91
96
|
...(rlimit !== undefined && { rlimit }),
|
|
92
97
|
...(known.prover === "isabelle" && { tactic: tactic ?? "auto" }),
|
|
93
98
|
};
|
|
@@ -96,9 +101,51 @@ const getProverMethod = (
|
|
|
96
101
|
const BUDGET_FORMS =
|
|
97
102
|
'a number of seconds (wall-clock timeout), or a deterministic Z3 rlimit budget of the form "rN" (e.g. "r5")';
|
|
98
103
|
|
|
104
|
+
const HEX_FLOAT =
|
|
105
|
+
/^[\t-\r ]*[+-]?0x(?=\.?[\da-f])([\da-f]*)\.?([\da-f]*)(?:p([\t-\r ]*[+-]?\d+))?$/i;
|
|
106
|
+
const DECIMAL_FLOAT = /^[\t-\r ]*[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
|
|
107
|
+
const SPECIAL_FLOAT = /^[\t-\r ]*[+-]?(?:(inf(?:inity)?)|nan(?:\([^)]*\))?)$/i;
|
|
108
|
+
|
|
109
|
+
// OCaml's float_of_string_opt: caml_float_of_string drops underscores, then reads a C99 float.
|
|
110
|
+
export const parseOcamlFloat = (text: string) => {
|
|
111
|
+
const digits = text.replaceAll("_", "");
|
|
112
|
+
const sign = digits.trimStart().startsWith("-") ? -1 : 1;
|
|
113
|
+
const hex = HEX_FLOAT.exec(digits);
|
|
114
|
+
if (hex) {
|
|
115
|
+
const mantissa = Number(BigInt(`0x${hex[1]}${hex[2]}`));
|
|
116
|
+
return mantissa === 0 ? 0 : sign * mantissa * 2 ** (Number(hex[3] ?? 0) - 4 * hex[2].length);
|
|
117
|
+
}
|
|
118
|
+
const special = SPECIAL_FLOAT.exec(digits);
|
|
119
|
+
if (special) return special[1] === undefined ? NaN : sign * Infinity;
|
|
120
|
+
return DECIMAL_FLOAT.test(digits) ? Number(digits) : undefined;
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
const OCAML_INT =
|
|
124
|
+
/^([+-]?)(?:0x([\da-f][\da-f_]*)|0o([0-7][0-7_]*)|0b([01][01_]*)|(0u)?(\d[\d_]*))$/i;
|
|
125
|
+
|
|
126
|
+
// OCaml's int_of_string_opt: only an unprefixed decimal is range-checked as a signed 63-bit integer.
|
|
127
|
+
export const parseOcamlInt = (text: string) => {
|
|
128
|
+
const match = OCAML_INT.exec(text);
|
|
129
|
+
if (!match) return undefined;
|
|
130
|
+
const isNegative = match[1] === "-";
|
|
131
|
+
const prefixed =
|
|
132
|
+
match[2] === undefined
|
|
133
|
+
? match[3] === undefined
|
|
134
|
+
? match[4] === undefined
|
|
135
|
+
? match[6]
|
|
136
|
+
: `0b${match[4]}`
|
|
137
|
+
: `0o${match[3]}`
|
|
138
|
+
: `0x${match[2]}`;
|
|
139
|
+
const magnitude = BigInt(prefixed.replaceAll("_", ""));
|
|
140
|
+
const isSigned = prefixed === match[6] && match[5] === undefined;
|
|
141
|
+
if (magnitude > (isSigned ? 2n ** 62n - (isNegative ? 0n : 1n) : 2n ** 63n - 1n))
|
|
142
|
+
return undefined;
|
|
143
|
+
return Number(BigInt.asIntN(63, isNegative ? -magnitude : magnitude));
|
|
144
|
+
};
|
|
145
|
+
|
|
99
146
|
const getRlimit = (budget: string, locus: Locus | undefined) => {
|
|
100
|
-
const count =
|
|
101
|
-
if (!/^[rR]
|
|
147
|
+
const count = parseOcamlFloat(budget.slice(1));
|
|
148
|
+
if (!/^[rR]./s.test(budget) || count === undefined || !Number.isFinite(count) || count <= 0)
|
|
102
149
|
throw new TlaMethodError(
|
|
103
150
|
`Invalid SMT budget ${JSON.stringify(budget)}: expected ${BUDGET_FORMS}.`,
|
|
104
151
|
locus,
|
|
@@ -201,8 +201,11 @@ const expandEnabledCdot = (
|
|
|
201
201
|
throw new TlaProverError("ENABLEDaxioms depends on assumptions of level > 1 \n\n");
|
|
202
202
|
return implicationToEnabled(sequent, locus, onWarning);
|
|
203
203
|
}
|
|
204
|
+
// An obligation has no proof step to label and no instance to expand.
|
|
204
205
|
const anonymizer = createAnonymizer(
|
|
205
|
-
|
|
206
|
+
() => {
|
|
207
|
+
throw new TlapmBugError();
|
|
208
|
+
},
|
|
206
209
|
() => {
|
|
207
210
|
throw new TlapmBugError();
|
|
208
211
|
},
|
package/src/prover/prove.ts
CHANGED
|
@@ -85,14 +85,10 @@ export type ProofAttempt =
|
|
|
85
85
|
errorOutput?: string;
|
|
86
86
|
}
|
|
87
87
|
| { kind: "error"; method: Method }
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
note?: string;
|
|
93
|
-
warning?: string;
|
|
94
|
-
shipped?: string;
|
|
95
|
-
}
|
|
88
|
+
// A frontend whose soundness check failed, or a backend whose encoding failed.
|
|
89
|
+
| { kind: "refused" | "unencoded"; method: Method; reason: string }
|
|
90
|
+
// Cooper's method, which tlapm warns it no longer has.
|
|
91
|
+
| { kind: "unavailable"; method: Method; warning: string; shipped: string }
|
|
96
92
|
| { kind: "skipped"; method: Method; reason: string }
|
|
97
93
|
| {
|
|
98
94
|
kind: "stored" | "reused";
|
|
@@ -292,6 +288,8 @@ export const getFailureReason = (attempt: ProofAttempt) => {
|
|
|
292
288
|
: "false";
|
|
293
289
|
case "error":
|
|
294
290
|
return "false";
|
|
291
|
+
case "unavailable":
|
|
292
|
+
return undefined;
|
|
295
293
|
default:
|
|
296
294
|
return attempt.reason;
|
|
297
295
|
}
|
|
@@ -315,6 +313,7 @@ export const encodeProofTheory = (
|
|
|
315
313
|
name: string,
|
|
316
314
|
reports: ProofReport[],
|
|
317
315
|
obligations: PrintedObligation[],
|
|
316
|
+
isFlattened: boolean,
|
|
318
317
|
) =>
|
|
319
318
|
encodeIsabelleTheory(
|
|
320
319
|
name,
|
|
@@ -324,7 +323,7 @@ export const encodeProofTheory = (
|
|
|
324
323
|
? [
|
|
325
324
|
{
|
|
326
325
|
id: report.obligation.id,
|
|
327
|
-
sequent: shipFirstOrder(normalizeExpand(obligations[index])),
|
|
326
|
+
sequent: shipFirstOrder(normalizeExpand(obligations[index]), isFlattened),
|
|
328
327
|
proof: attempt.proof,
|
|
329
328
|
},
|
|
330
329
|
]
|
|
@@ -404,13 +403,13 @@ const proveWithBackends = async (
|
|
|
404
403
|
const prior = run.results.get(fingerprint)?.get(method.prover);
|
|
405
404
|
return prior?.method.tactic === method.tactic ? prior : undefined;
|
|
406
405
|
};
|
|
407
|
-
const reuse = (prior: ProofAttempt) =>
|
|
406
|
+
const reuse = (prior: ProofAttempt, shipped = "shipped" in prior ? prior.shipped : undefined) =>
|
|
408
407
|
attempts.push({
|
|
409
408
|
kind: "reused",
|
|
410
409
|
method: prior.method,
|
|
411
410
|
isProved: isProvedAttempt(prior),
|
|
412
411
|
reason: getFailureReason(prior),
|
|
413
|
-
shipped
|
|
412
|
+
shipped,
|
|
414
413
|
});
|
|
415
414
|
const record = (attempt: ProofAttempt) => {
|
|
416
415
|
attempts.push(attempt);
|
|
@@ -440,11 +439,31 @@ const proveWithBackends = async (
|
|
|
440
439
|
const prover = FAILING_FRONTENDS.find((name) => methods.frontends.has(name));
|
|
441
440
|
if (prover === undefined) throw expanded;
|
|
442
441
|
record({
|
|
443
|
-
kind: "
|
|
442
|
+
kind: "refused",
|
|
444
443
|
method: { prover, timeLimitMs: Infinity },
|
|
445
444
|
reason: expanded.message,
|
|
446
|
-
note: `${expanded.message}\nObligation:\n\n`,
|
|
447
445
|
});
|
|
446
|
+
// Prep.ship goes on with the obligation normalize_expand left, whose goal is FALSE: it checks
|
|
447
|
+
// that for triviality, then each method still answers from the fingerprints file. A stored
|
|
448
|
+
// failure prints that obligation when ExpandENABLED is cited.
|
|
449
|
+
const falsified: Sequent = {
|
|
450
|
+
...normalizeSequent(expandDefs(obligation.sequent)),
|
|
451
|
+
active: { kind: "Internal", builtin: "FALSE" },
|
|
452
|
+
};
|
|
453
|
+
if (obligation.kind.kind === "Support" && isTrivial(falsified))
|
|
454
|
+
return { obligation: { ...getObligationBase(obligation), status: "trivial" }, attempts };
|
|
455
|
+
for (const method of methods.provers) {
|
|
456
|
+
const prior = method === methods.provers[0] ? firstPrior : getPrior(method);
|
|
457
|
+
if (prior && isProvedAttempt(prior)) {
|
|
458
|
+
reuse(prior);
|
|
459
|
+
return getProvedReport(method.prover);
|
|
460
|
+
}
|
|
461
|
+
if (prior && getBudget(prior.method) >= getBudget(method))
|
|
462
|
+
reuse(
|
|
463
|
+
prior,
|
|
464
|
+
methods.frontends.has("expandenabled") ? `${formatObligation(falsified)}\n` : undefined,
|
|
465
|
+
);
|
|
466
|
+
}
|
|
448
467
|
return getUnprovedReport(
|
|
449
468
|
obligation,
|
|
450
469
|
"failed",
|
|
@@ -482,10 +501,9 @@ const proveWithBackends = async (
|
|
|
482
501
|
if (method.prover === "cooper") {
|
|
483
502
|
const warning = "Cooper's method is not available any more.\n";
|
|
484
503
|
record({
|
|
485
|
-
kind: "
|
|
504
|
+
kind: "unavailable",
|
|
486
505
|
method,
|
|
487
506
|
warning,
|
|
488
|
-
note: `\n\\* ${warning}\n`,
|
|
489
507
|
shipped: `${formatObligation(shipFirstOrder(sequent, run.settings.isFlattened))}\n`,
|
|
490
508
|
});
|
|
491
509
|
failures.push({ reason: warning.trim(), isDecided: true });
|
|
@@ -504,27 +522,35 @@ const proveWithBackends = async (
|
|
|
504
522
|
const name = getTemporaryName();
|
|
505
523
|
const file = `${name}${encoder.suffix}`;
|
|
506
524
|
const chunks: string[] = [];
|
|
525
|
+
const encodingError = (() => {
|
|
526
|
+
try {
|
|
527
|
+
encoder.encode({
|
|
528
|
+
obligation,
|
|
529
|
+
sequent,
|
|
530
|
+
fingerprint,
|
|
531
|
+
method,
|
|
532
|
+
session,
|
|
533
|
+
name,
|
|
534
|
+
settings: run.settings,
|
|
535
|
+
write: (text) => chunks.push(text),
|
|
536
|
+
});
|
|
537
|
+
return undefined;
|
|
538
|
+
} catch (error: unknown) {
|
|
539
|
+
return error;
|
|
540
|
+
}
|
|
541
|
+
})();
|
|
542
|
+
const text = chunks.join("");
|
|
507
543
|
// A failed encoding leaves the file as far as it got.
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
session,
|
|
515
|
-
name,
|
|
516
|
-
settings: run.settings,
|
|
517
|
-
write: (text) => chunks.push(text),
|
|
544
|
+
run.settings.onInput?.(file, text);
|
|
545
|
+
if (encodingError instanceof TlaProverError) {
|
|
546
|
+
record({ kind: "unencoded", method, reason: encodingError.message });
|
|
547
|
+
failures.push({
|
|
548
|
+
reason: `${method.prover} failed: ${encodingError.message}`,
|
|
549
|
+
isDecided: true,
|
|
518
550
|
});
|
|
519
|
-
} catch (error) {
|
|
520
|
-
if (!(error instanceof TlaProverError)) throw error;
|
|
521
|
-
record({ kind: "failed", method, reason: error.message });
|
|
522
|
-
failures.push({ reason: `${method.prover} failed: ${error.message}`, isDecided: true });
|
|
523
551
|
continue;
|
|
524
|
-
} finally {
|
|
525
|
-
run.settings.onInput?.(file, chunks.join(""));
|
|
526
552
|
}
|
|
527
|
-
|
|
553
|
+
if (encodingError !== undefined) throw encodingError;
|
|
528
554
|
const timeLimitMs = Math.max(method.timeLimitMs, BACKEND_WAIT_MS);
|
|
529
555
|
const decision =
|
|
530
556
|
method.prover === "smt" && run.settings.solveSmt
|