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
package/src/prover/deciders.ts
CHANGED
|
@@ -21,14 +21,7 @@ const DECIDERS: Record<
|
|
|
21
21
|
> = {
|
|
22
22
|
smt: decideZ3,
|
|
23
23
|
z3: decideZ3,
|
|
24
|
-
zenon:
|
|
25
|
-
const decision = decideZenon(text, options);
|
|
26
|
-
return {
|
|
27
|
-
verdict: decision.verdict,
|
|
28
|
-
...("proof" in decision && { output: decision.proof }),
|
|
29
|
-
...("error" in decision && { errorOutput: decision.error }),
|
|
30
|
-
};
|
|
31
|
-
},
|
|
24
|
+
zenon: decideZenon,
|
|
32
25
|
isabelle: (text, options) => ({ verdict: decideIsabelle(text, options) }),
|
|
33
26
|
ls4: (text, options) => ({ verdict: decidePtl(text, options) }),
|
|
34
27
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from tlapm's src/backend/isabelle.ml (BSD licensed, see LICENSE-tlapm).
|
|
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, Sequent } from "../../obligations/expression";
|
|
@@ -1,23 +1,21 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/attrib.ML, Pure/Tools/rule_insts.ML and the rules they use
|
|
2
|
-
// from Pure/drule.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
|
|
3
|
-
// Muenchen, and contributors, see LICENSE.
|
|
4
|
-
|
|
5
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
2
|
+
import { addUnsafeDest, addUnsafeElim, addUnsafeIntro, withClaset } from "../provers/classical";
|
|
6
3
|
import { asmRl, compIncr, genAll, multiResolves, zeroVarIndexes } from "../pure/drule";
|
|
4
|
+
import { addSimps } from "../pure/raw-simplifier";
|
|
7
5
|
import { chopSeq } from "../pure/seq";
|
|
8
6
|
import { stripImpConcl } from "../pure/logic";
|
|
9
|
-
import { fastypeOf, type
|
|
7
|
+
import { fastypeOf, type Var } from "../pure/term";
|
|
10
8
|
import { instantiate, instantiateTypes, type Thm } from "../pure/thm";
|
|
11
9
|
import { emptyTyEnv, matchTypes, substType, type TyEnv } from "../pure/type";
|
|
12
|
-
import { getFact, readTerms, type IsarContext } from "./context";
|
|
13
|
-
import { rewriteRule } from "./method";
|
|
14
|
-
import
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
10
|
+
import { getFact, readTerms, varsOf, type IsarContext } from "./context";
|
|
11
|
+
import { rewriteRule, type ProofContext } from "./method";
|
|
12
|
+
import {
|
|
13
|
+
innerText,
|
|
14
|
+
syntaxError,
|
|
15
|
+
type AttributeSource,
|
|
16
|
+
type FactReference,
|
|
17
|
+
type OuterToken,
|
|
18
|
+
} from "./theory";
|
|
21
19
|
|
|
22
20
|
const isInnerToken = (token: OuterToken | undefined) =>
|
|
23
21
|
token !== undefined &&
|
|
@@ -26,11 +24,6 @@ const isInnerToken = (token: OuterToken | undefined) =>
|
|
|
26
24
|
token.kind === "word" ||
|
|
27
25
|
token.kind === "var");
|
|
28
26
|
|
|
29
|
-
const innerText = (token: OuterToken) =>
|
|
30
|
-
token.kind === "cartouche"
|
|
31
|
-
? token.text.slice("\\<open>".length, -"\\<close>".length)
|
|
32
|
-
: token.text;
|
|
33
|
-
|
|
34
27
|
export const parseFactReferences = (tokens: readonly OuterToken[]): FactReference[] => {
|
|
35
28
|
const references: FactReference[] = [];
|
|
36
29
|
let position = 0;
|
|
@@ -72,25 +65,6 @@ export const parseFactReferences = (tokens: readonly OuterToken[]): FactReferenc
|
|
|
72
65
|
return references;
|
|
73
66
|
};
|
|
74
67
|
|
|
75
|
-
// Vars.add_vars: the variables in the order they occur.
|
|
76
|
-
const varsOf = (terms: readonly Term[]): Var[] => {
|
|
77
|
-
const found: Var[] = [];
|
|
78
|
-
const visit = (term: Term) => {
|
|
79
|
-
if (
|
|
80
|
-
term.kind === "Var" &&
|
|
81
|
-
!found.some((other) => other.name === term.name && other.index === term.index)
|
|
82
|
-
)
|
|
83
|
-
found.push(term);
|
|
84
|
-
if (term.kind === "Abs") visit(term.body);
|
|
85
|
-
if (term.kind === "App") {
|
|
86
|
-
visit(term.fun);
|
|
87
|
-
visit(term.arg);
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
for (const term of terms) visit(term);
|
|
91
|
-
return found;
|
|
92
|
-
};
|
|
93
|
-
|
|
94
68
|
const varsOfThm = (thm: Thm) => varsOf([...thm.tpairs.flat(), thm.prop]);
|
|
95
69
|
|
|
96
70
|
// Rule_Insts.where_rule: the terms are read against the variables' types, whose type variables
|
|
@@ -104,7 +78,10 @@ const whereRule = (
|
|
|
104
78
|
const targets = insts.map((inst) => {
|
|
105
79
|
const variable = vars.find((other) => other.name === inst.name && other.index === inst.index);
|
|
106
80
|
if (variable === undefined)
|
|
107
|
-
throw new TlaIsabelleError(
|
|
81
|
+
throw new TlaIsabelleError(
|
|
82
|
+
"ERROR",
|
|
83
|
+
`No such variable in theorem: "?${inst.name}${inst.index === 0 ? "" : inst.index}"`,
|
|
84
|
+
);
|
|
108
85
|
return variable;
|
|
109
86
|
});
|
|
110
87
|
const terms = readTerms(
|
|
@@ -160,14 +137,17 @@ const parseWhere = (args: readonly OuterToken[]) => {
|
|
|
160
137
|
const insts: { name: string; index: number; text: string }[] = [];
|
|
161
138
|
let position = 0;
|
|
162
139
|
while (position < args.length) {
|
|
163
|
-
if (args[position].kind === "symbol" && args[position].text === "?") position += 1;
|
|
164
140
|
const variable = args[position];
|
|
165
|
-
if (variable
|
|
141
|
+
if ((variable.kind !== "word" && variable.kind !== "var") || variable.text.startsWith("'"))
|
|
142
|
+
throw syntaxError(variable);
|
|
166
143
|
const digits = /\d*$/.exec(variable.text)?.[0] ?? "";
|
|
167
144
|
if (args[position + 1]?.text !== "=" || !isInnerToken(args[position + 2]))
|
|
168
145
|
throw syntaxError(args[position + 1]);
|
|
169
146
|
insts.push({
|
|
170
|
-
name: variable.text.slice(
|
|
147
|
+
name: variable.text.slice(
|
|
148
|
+
variable.kind === "var" ? 1 : 0,
|
|
149
|
+
variable.text.length - digits.length,
|
|
150
|
+
),
|
|
171
151
|
index: Number(digits || 0),
|
|
172
152
|
text: innerText(args[position + 2]),
|
|
173
153
|
});
|
|
@@ -192,28 +172,79 @@ const ofFacts = (context: IsarContext, rule: Thm, facts: readonly Thm[]): Thm =>
|
|
|
192
172
|
const rulify = (context: IsarContext, thm: Thm): Thm =>
|
|
193
173
|
zeroVarIndexes(genAll(rewriteRule(context.tactics.limits, context.tactics.rulifyRules, thm)));
|
|
194
174
|
|
|
195
|
-
|
|
175
|
+
// Simplifier.simp_add and Classical's unsafe_intro, unsafe_elim and unsafe_dest: the declarations
|
|
176
|
+
// that add the theorem to a set the methods read.
|
|
177
|
+
const declareRule = (tactics: ProofContext, name: string, thm: Thm): ProofContext => {
|
|
178
|
+
if (name === "simp")
|
|
179
|
+
return {
|
|
180
|
+
...tactics,
|
|
181
|
+
simpset: addSimps({ limits: tactics.limits, simpset: tactics.simpset, bounds: 0 }, [thm]),
|
|
182
|
+
};
|
|
183
|
+
const classical = tactics.classical;
|
|
184
|
+
const add = name === "intro" ? addUnsafeIntro : name === "elim" ? addUnsafeElim : addUnsafeDest;
|
|
185
|
+
return {
|
|
186
|
+
...tactics,
|
|
187
|
+
classical: withClaset(classical, add(classical, thm, tactics.atomizeRules)),
|
|
188
|
+
};
|
|
189
|
+
};
|
|
190
|
+
|
|
191
|
+
// Thm.apply_attribute: a rule attribute changes the theorem, a declaration the context.
|
|
192
|
+
const applyAttribute = (
|
|
193
|
+
context: IsarContext,
|
|
194
|
+
attribute: AttributeSource,
|
|
195
|
+
thm: Thm,
|
|
196
|
+
): [IsarContext, Thm] => {
|
|
196
197
|
switch (attribute.name) {
|
|
197
198
|
case "of":
|
|
198
|
-
return ofRule(context, attribute.args, thm);
|
|
199
|
+
return [context, ofRule(context, attribute.args, thm)];
|
|
199
200
|
case "where":
|
|
200
|
-
return whereRule(context, parseWhere(attribute.args), thm);
|
|
201
|
+
return [context, whereRule(context, parseWhere(attribute.args), thm)];
|
|
201
202
|
case "rule_format":
|
|
202
203
|
if (attribute.args.length > 0) throw syntaxError(attribute.args[0]);
|
|
203
|
-
return rulify(context, thm);
|
|
204
|
+
return [context, rulify(context, thm)];
|
|
204
205
|
case "OF":
|
|
205
|
-
return
|
|
206
|
+
return [
|
|
207
|
+
context,
|
|
208
|
+
ofFacts(context, thm, getThms(context, parseFactReferences(attribute.args))),
|
|
209
|
+
];
|
|
210
|
+
case "simp":
|
|
211
|
+
case "intro":
|
|
212
|
+
case "elim":
|
|
213
|
+
case "dest":
|
|
214
|
+
if (attribute.args.length > 0)
|
|
215
|
+
throw new TlaIsabelleError("ERROR", `Unsupported ${attribute.name} attribute arguments`);
|
|
216
|
+
return [{ ...context, tactics: declareRule(context.tactics, attribute.name, thm) }, thm];
|
|
206
217
|
default:
|
|
207
218
|
throw new TlaIsabelleError("ERROR", `Unsupported attribute: ${attribute.name}`);
|
|
208
219
|
}
|
|
209
220
|
};
|
|
210
221
|
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
)
|
|
222
|
+
// Thm.proof_attributes over a fact's theorems: each attribute sees what those before it declared.
|
|
223
|
+
export const applyAttributes = (
|
|
224
|
+
context: IsarContext,
|
|
225
|
+
attributes: readonly AttributeSource[],
|
|
226
|
+
thms: readonly Thm[],
|
|
227
|
+
): [IsarContext, Thm[]] =>
|
|
228
|
+
thms.reduce<[IsarContext, Thm[]]>(
|
|
229
|
+
(accumulated, thm) => {
|
|
230
|
+
const [declared, result] = attributes.reduce<[IsarContext, Thm]>(
|
|
231
|
+
(state, attribute) => applyAttribute(state[0], attribute, state[1]),
|
|
232
|
+
[accumulated[0], thm],
|
|
233
|
+
);
|
|
234
|
+
return [declared, [...accumulated[1], result]];
|
|
235
|
+
},
|
|
236
|
+
[context, []],
|
|
219
237
|
);
|
|
238
|
+
|
|
239
|
+
// The facts a command or a method cites, where the port keeps no declaration.
|
|
240
|
+
export const getThms = (context: IsarContext, references: readonly FactReference[]): Thm[] =>
|
|
241
|
+
references.flatMap((reference) => {
|
|
242
|
+
const [declared, thms] = applyAttributes(
|
|
243
|
+
context,
|
|
244
|
+
reference.attributes,
|
|
245
|
+
getFact(context, reference.name),
|
|
246
|
+
);
|
|
247
|
+
if (declared !== context)
|
|
248
|
+
throw new TlaIsabelleError("ERROR", "Unsupported declaration in a fact reference");
|
|
249
|
+
return thms;
|
|
250
|
+
});
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/proof_context.ML, Pure/variable.ML and Pure/assumption.ML.
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
4
|
-
|
|
5
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
2
|
import { protectD } from "../pure/drule";
|
|
7
3
|
import { above, betaNorm, emptyEnvir, normTerm, type Envir } from "../pure/envir";
|
|
@@ -201,7 +197,7 @@ export const readTerms = (
|
|
|
201
197
|
);
|
|
202
198
|
if (mode === "pattern") return checked;
|
|
203
199
|
const expanded = checked.map((term) => expandBinds(context, term));
|
|
204
|
-
if (mode === "default" &&
|
|
200
|
+
if (mode === "default" && varsOf(expanded).length > 0)
|
|
205
201
|
throw new TlaIsabelleError("ERROR", "Unbound schematic variable");
|
|
206
202
|
return expanded;
|
|
207
203
|
};
|
|
@@ -233,17 +229,22 @@ const decrIndexes = (term: Term, maxidx: number, offset: number): Term => {
|
|
|
233
229
|
return decrVars(mapTypes(decrType, term));
|
|
234
230
|
};
|
|
235
231
|
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
232
|
+
// Vars.add_vars: the variables in the order they occur.
|
|
233
|
+
export const varsOf = (terms: readonly Term[]): Var[] => {
|
|
234
|
+
const found: Var[] = [];
|
|
235
|
+
const visit = (term: Term) => {
|
|
236
|
+
if (
|
|
237
|
+
term.kind === "Var" &&
|
|
238
|
+
!found.some((other) => other.name === term.name && other.index === term.index)
|
|
239
|
+
)
|
|
240
|
+
found.push(term);
|
|
241
|
+
if (term.kind === "Abs") visit(term.body);
|
|
242
|
+
if (term.kind === "App") {
|
|
243
|
+
visit(term.fun);
|
|
244
|
+
visit(term.arg);
|
|
245
|
+
}
|
|
246
|
+
};
|
|
247
|
+
for (const term of terms) visit(term);
|
|
247
248
|
return found;
|
|
248
249
|
};
|
|
249
250
|
|
|
@@ -268,16 +269,14 @@ export const simultMatches = (
|
|
|
268
269
|
),
|
|
269
270
|
);
|
|
270
271
|
if (envir === undefined) throw new TlaIsabelleError("ERROR", "Pattern match failed!");
|
|
271
|
-
return pairs
|
|
272
|
-
|
|
273
|
-
.
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
: [[variable.name, variable.index - offset, decrIndexes(normalized, maxidx, offset)]];
|
|
280
|
-
});
|
|
272
|
+
return varsOf(pairs.map((pair) => pair[0])).flatMap((variable): [string, number, Term][] => {
|
|
273
|
+
const normalized = normTerm(envir, variable);
|
|
274
|
+
return normalized.kind === "Var" &&
|
|
275
|
+
normalized.name === variable.name &&
|
|
276
|
+
normalized.index === variable.index
|
|
277
|
+
? []
|
|
278
|
+
: [[variable.name, variable.index - offset, decrIndexes(normalized, maxidx, offset)]];
|
|
279
|
+
});
|
|
281
280
|
};
|
|
282
281
|
|
|
283
282
|
// Assumption.add_assms: each proposition becomes a hypothesis.
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/induct.ML: the cases method, as PredicateLogic.thy instantiates
|
|
2
|
-
// Induct. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
4
|
-
|
|
5
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
2
|
import { fconvRule, premsConv } from "../pure/conv";
|
|
7
3
|
import { asmRl, compIncr, normHhfEq } from "../pure/drule";
|
|
@@ -49,7 +45,7 @@ import {
|
|
|
49
45
|
type CaseInfo,
|
|
50
46
|
type CasesRule,
|
|
51
47
|
} from "./rule-cases";
|
|
52
|
-
import type
|
|
48
|
+
import { innerText, syntaxError, type OuterToken } from "./theory";
|
|
53
49
|
|
|
54
50
|
export interface NamedCasesRule {
|
|
55
51
|
readonly name: string;
|
|
@@ -76,9 +72,6 @@ interface CasesArgs {
|
|
|
76
72
|
|
|
77
73
|
const error = (message: string) => new TlaIsabelleError("ERROR", message);
|
|
78
74
|
|
|
79
|
-
const syntaxError = (token: OuterToken | undefined) =>
|
|
80
|
-
error(`Outer syntax error at: ${token === undefined ? "end of input" : token.text}`);
|
|
81
|
-
|
|
82
75
|
const isInductConst = (term: Term) =>
|
|
83
76
|
term.kind === "Const" && term.name.startsWith("PredicateLogic.cases_");
|
|
84
77
|
|
|
@@ -206,10 +199,7 @@ const parseCasesArgs = (isar: IsarContext, tokens: readonly OuterToken[]): Cases
|
|
|
206
199
|
isar,
|
|
207
200
|
[
|
|
208
201
|
{
|
|
209
|
-
text:
|
|
210
|
-
token.kind === "cartouche"
|
|
211
|
-
? token.text.slice("\\<open>".length, -"\\<close>".length)
|
|
212
|
-
: token.text,
|
|
202
|
+
text: innerText(token),
|
|
213
203
|
type: mkTVar("'a", 0),
|
|
214
204
|
},
|
|
215
205
|
],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/method.ML and 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 {
|
|
5
3
|
absDef,
|
|
@@ -120,7 +118,7 @@ export interface GoalState {
|
|
|
120
118
|
readonly goal: Thm;
|
|
121
119
|
}
|
|
122
120
|
|
|
123
|
-
|
|
121
|
+
type ContextTactic = (state: GoalState) => Seq<GoalState>;
|
|
124
122
|
|
|
125
123
|
export type Method = (facts: readonly Thm[]) => ContextTactic;
|
|
126
124
|
|
|
@@ -482,11 +480,11 @@ const allAssmTac =
|
|
|
482
480
|
allAssmTac(limits)(index + 1),
|
|
483
481
|
)(state);
|
|
484
482
|
|
|
485
|
-
// Method.finish
|
|
486
|
-
export const finishTac =
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
483
|
+
// Method.finish of an immediate proof, as qed and by are: assumptions finish the closing step.
|
|
484
|
+
export const finishTac =
|
|
485
|
+
(limits: Limits): Tactic =>
|
|
486
|
+
(state) =>
|
|
487
|
+
mapsSeq(flexflexTac(limits), allAssmTac(limits)(1)(state));
|
|
490
488
|
|
|
491
489
|
// Seq.REPEAT, depth first.
|
|
492
490
|
const repeat =
|
|
@@ -649,7 +647,5 @@ export const evaluate = (isar: IsarContext, text: MethodText): Method => {
|
|
|
649
647
|
const method = evaluate(isar, text.texts[0]);
|
|
650
648
|
return (facts) => (state) => mapsSeq(repeat(method(facts)), method(facts)(state));
|
|
651
649
|
}
|
|
652
|
-
default:
|
|
653
|
-
throw new TlaIsabelleError("ERROR", `Unsupported method combinator: ${text.kind}`);
|
|
654
650
|
}
|
|
655
651
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/proof.ML, Pure/goal.ML and Pure/Isar/method.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 { compIncr, forallIntrVars, protectD, protectI, revcutRl } from "../pure/drule";
|
|
5
3
|
import { conclude } from "../pure/goal";
|
|
@@ -36,12 +34,13 @@ import {
|
|
|
36
34
|
type IsarContext,
|
|
37
35
|
type ReadMode,
|
|
38
36
|
} from "./context";
|
|
37
|
+
import { applyAttributes } from "./attrib";
|
|
39
38
|
import { evaluate, finishTac, normHhfTac, unfoldGoals, unfoldRule, type GoalState } from "./method";
|
|
40
39
|
import { applyCase, dropJudgment } from "./rule-cases";
|
|
41
40
|
import { parseType } from "./inner-syntax";
|
|
42
|
-
import type { FixedVariable, MethodText, StatementPart } from "./theory";
|
|
41
|
+
import type { AttributeSource, FixedVariable, MethodText, StatementPart } from "./theory";
|
|
43
42
|
|
|
44
|
-
|
|
43
|
+
const initGoal = (prop: Term) =>
|
|
45
44
|
instantiate([{ variable: mkVar("A", 0, propT), term: prop }], protectI);
|
|
46
45
|
|
|
47
46
|
export const insertTac = (limits: Limits, facts: readonly Thm[], index: number): Tactic =>
|
|
@@ -52,7 +51,6 @@ type Mode = "forward" | "chain" | "backward";
|
|
|
52
51
|
type AfterQed = (resultContext: IsarContext, results: readonly Thm[], state: State) => State;
|
|
53
52
|
|
|
54
53
|
interface Goal {
|
|
55
|
-
readonly isGlobal: boolean;
|
|
56
54
|
readonly props: readonly Term[];
|
|
57
55
|
readonly using: readonly Thm[];
|
|
58
56
|
readonly goal: Thm;
|
|
@@ -163,7 +161,7 @@ const theResult = <Item>(seq: Seq<Item>, message: string): Item => {
|
|
|
163
161
|
};
|
|
164
162
|
|
|
165
163
|
// Proof.end_proof: the closing method, then the goal must have no subgoals.
|
|
166
|
-
const endProof = (state: State, text: MethodText | undefined
|
|
164
|
+
const endProof = (state: State, text: MethodText | undefined): Seq<State> => {
|
|
167
165
|
assertMode(state, ["forward"]);
|
|
168
166
|
const closed = usingFacts(closeBlock(state), []);
|
|
169
167
|
if (top(closed).goal === undefined) throw error("No goal in this block");
|
|
@@ -174,7 +172,7 @@ const endProof = (state: State, text: MethodText | undefined, isImmediate: boole
|
|
|
174
172
|
(result: State) =>
|
|
175
173
|
mapSeq(
|
|
176
174
|
(thm: Thm) => provideGoal(result, thm),
|
|
177
|
-
finishTac(contextOf(result).tactics.limits
|
|
175
|
+
finishTac(contextOf(result).tactics.limits)(findGoal(result)[2].goal),
|
|
178
176
|
),
|
|
179
177
|
finish,
|
|
180
178
|
),
|
|
@@ -200,7 +198,7 @@ const genericQed = (state: State): State => {
|
|
|
200
198
|
};
|
|
201
199
|
|
|
202
200
|
export const qed = (state: State, text: MethodText | undefined): State =>
|
|
203
|
-
genericQed(theResult(endProof(state, text
|
|
201
|
+
genericQed(theResult(endProof(state, text), "Failed to finish proof"));
|
|
204
202
|
|
|
205
203
|
// Proof.terminal_proof, as by: the first initial result that the terminal method finishes.
|
|
206
204
|
export const terminalProof = (
|
|
@@ -210,7 +208,7 @@ export const terminalProof = (
|
|
|
210
208
|
): State =>
|
|
211
209
|
genericQed(
|
|
212
210
|
theResult(
|
|
213
|
-
mapsSeq((result: State) => endProof(result, terminal
|
|
211
|
+
mapsSeq((result: State) => endProof(result, terminal), proof(state, initial)),
|
|
214
212
|
"Failed to finish proof",
|
|
215
213
|
),
|
|
216
214
|
);
|
|
@@ -227,7 +225,6 @@ const genericGoal = (
|
|
|
227
225
|
state: State,
|
|
228
226
|
goalContext: IsarContext,
|
|
229
227
|
props: readonly Term[],
|
|
230
|
-
isGlobal: boolean,
|
|
231
228
|
afterQed: AfterQed,
|
|
232
229
|
): State => {
|
|
233
230
|
if (props.length !== 1) throw error("Unsupported goal of several propositions");
|
|
@@ -236,13 +233,8 @@ const genericGoal = (
|
|
|
236
233
|
const opened = putMode(openBlock(putMode(state, "forward")), "backward");
|
|
237
234
|
const goalState = mapTop(opened, (node) => ({
|
|
238
235
|
...node,
|
|
239
|
-
context: maybeBindTerm(
|
|
240
|
-
|
|
241
|
-
"thesis",
|
|
242
|
-
0,
|
|
243
|
-
props.length === 1 ? thesisOf(props[0]) : undefined,
|
|
244
|
-
),
|
|
245
|
-
goal: { isGlobal, props, using: [], goal: initGoal(props[0]), afterQed },
|
|
236
|
+
context: maybeBindTerm({ ...goalContext, isBody: true }, "thesis", 0, thesisOf(props[0])),
|
|
237
|
+
goal: { props, using: [], goal: initGoal(props[0]), afterQed },
|
|
246
238
|
}));
|
|
247
239
|
return putFactsOf(isChaining ? usingFacts(goalState, theFacts(state)) : goalState, undefined);
|
|
248
240
|
};
|
|
@@ -287,7 +279,7 @@ export const readStatement = (
|
|
|
287
279
|
});
|
|
288
280
|
return {
|
|
289
281
|
props: grouped,
|
|
290
|
-
context:
|
|
282
|
+
context: bindAll(propsContext, binds),
|
|
291
283
|
binds,
|
|
292
284
|
};
|
|
293
285
|
};
|
|
@@ -301,27 +293,24 @@ const localResults = (
|
|
|
301
293
|
parts: readonly StatementPart[],
|
|
302
294
|
results: readonly (readonly Thm[])[],
|
|
303
295
|
): State => {
|
|
304
|
-
const
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
296
|
+
const noted: Thm[] = [];
|
|
297
|
+
const named = parts.reduce((context, part, index) => {
|
|
298
|
+
const [declared, thms] = applyAttributes(context, part.attributes, results[index]);
|
|
299
|
+
noted.push(...thms);
|
|
300
|
+
return part.name === undefined ? declared : putFacts(declared, part.name, thms);
|
|
301
|
+
}, contextOf(state));
|
|
309
302
|
return putFactsOf(
|
|
310
303
|
mapContext(state, () => named),
|
|
311
|
-
|
|
304
|
+
noted,
|
|
312
305
|
);
|
|
313
306
|
};
|
|
314
307
|
|
|
315
308
|
// Proof.local_goal for have and show, whose statements are propositions only.
|
|
316
|
-
const localGoal = (
|
|
317
|
-
state: State,
|
|
318
|
-
parts: readonly StatementPart[],
|
|
319
|
-
afterQed: (resultContext: IsarContext, results: readonly Thm[], state: State) => State,
|
|
320
|
-
): State => {
|
|
309
|
+
const localGoal = (state: State, parts: readonly StatementPart[], afterQed: AfterQed): State => {
|
|
321
310
|
const statement = readStatement(contextOf(state), parts, "default");
|
|
322
311
|
const props = statement.props.flat();
|
|
323
312
|
const goalContext = props.reduce(augment, statement.context);
|
|
324
|
-
return genericGoal(state, goalContext, props,
|
|
313
|
+
return genericGoal(state, goalContext, props, (resultContext, results, outer) => {
|
|
325
314
|
const bound = mapContext(outer, (context) => bindAll(context, statement.binds));
|
|
326
315
|
const exported = results.map((result) =>
|
|
327
316
|
exportThm(resultContext, contextOf(bound), false, result),
|
|
@@ -402,9 +391,7 @@ export const have = (state: State, parts: readonly StatementPart[]) =>
|
|
|
402
391
|
localGoal(state, parts, (_context, _results, result) => result);
|
|
403
392
|
|
|
404
393
|
export const show = (state: State, parts: readonly StatementPart[]) =>
|
|
405
|
-
localGoal(state, parts,
|
|
406
|
-
refineGoals(resultContext, results, result),
|
|
407
|
-
);
|
|
394
|
+
localGoal(state, parts, refineGoals);
|
|
408
395
|
|
|
409
396
|
// Proof.chain: the current facts feed the next goal.
|
|
410
397
|
export const chain = (state: State) =>
|
|
@@ -434,23 +421,33 @@ export const collect = (state: State, isFinal: boolean): State => {
|
|
|
434
421
|
// Proof.assume: each group of propositions becomes hypotheses, which a named group names.
|
|
435
422
|
const assumeProps = (
|
|
436
423
|
state: State,
|
|
437
|
-
groups: readonly {
|
|
424
|
+
groups: readonly {
|
|
425
|
+
readonly name: string | undefined;
|
|
426
|
+
readonly attributes: readonly AttributeSource[];
|
|
427
|
+
readonly props: readonly Term[];
|
|
428
|
+
}[],
|
|
438
429
|
): State => {
|
|
439
430
|
assertMode(state, ["forward"]);
|
|
440
431
|
const props = groups.flatMap((group) => group.props);
|
|
441
432
|
const [thms, context] = addAssumptions(contextOf(state), false, props);
|
|
442
433
|
let offset = 0;
|
|
434
|
+
const noted: Thm[] = [];
|
|
443
435
|
const named = groups.reduce(
|
|
444
436
|
(current, group) => {
|
|
445
|
-
const slice =
|
|
437
|
+
const [declared, slice] = applyAttributes(
|
|
438
|
+
current,
|
|
439
|
+
group.attributes,
|
|
440
|
+
thms.slice(offset, offset + group.props.length),
|
|
441
|
+
);
|
|
446
442
|
offset += group.props.length;
|
|
447
|
-
|
|
443
|
+
noted.push(...slice);
|
|
444
|
+
return group.name === undefined ? declared : putFacts(declared, group.name, slice);
|
|
448
445
|
},
|
|
449
446
|
props.reduce(declareTerm, context),
|
|
450
447
|
);
|
|
451
448
|
return putFactsOf(
|
|
452
449
|
mapContext(state, () => named),
|
|
453
|
-
|
|
450
|
+
noted,
|
|
454
451
|
);
|
|
455
452
|
};
|
|
456
453
|
|
|
@@ -459,7 +456,11 @@ export const assume = (state: State, parts: readonly StatementPart[]): State =>
|
|
|
459
456
|
const statement = readStatement(contextOf(state), parts, "default");
|
|
460
457
|
return assumeProps(
|
|
461
458
|
mapContext(state, (context) => bindAll(context, statement.binds)),
|
|
462
|
-
parts.map((part, index) => ({
|
|
459
|
+
parts.map((part, index) => ({
|
|
460
|
+
name: part.name,
|
|
461
|
+
attributes: part.attributes,
|
|
462
|
+
props: statement.props[index],
|
|
463
|
+
})),
|
|
463
464
|
);
|
|
464
465
|
};
|
|
465
466
|
|
|
@@ -504,6 +505,7 @@ export const invokeCase = (
|
|
|
504
505
|
mapContext(state, () => updateCases(bound, applied.cases)),
|
|
505
506
|
applied.assumes.map((assumption) => ({
|
|
506
507
|
name: assumption.name === "" ? undefined : `${caseName}.${assumption.name}`,
|
|
508
|
+
attributes: [],
|
|
507
509
|
props: assumption.props,
|
|
508
510
|
})),
|
|
509
511
|
);
|
|
@@ -564,7 +566,6 @@ export const theorem = (
|
|
|
564
566
|
[{ context, facts: undefined, mode: "forward", goal: undefined }],
|
|
565
567
|
context,
|
|
566
568
|
props,
|
|
567
|
-
true,
|
|
568
569
|
(resultContext, results, state) => {
|
|
569
570
|
afterQed(resultContext, results);
|
|
570
571
|
return state;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/rule_cases.ML. Copyright (c) 1986-2025 University of
|
|
2
|
-
// Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
1
|
// The cases here are common ones: no rule structure outlines nested cases.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
@@ -43,7 +41,6 @@ export type Cases = readonly { readonly name: string; readonly case: RuleCase |
|
|
|
43
41
|
|
|
44
42
|
export type CaseInfo = readonly {
|
|
45
43
|
readonly name: string;
|
|
46
|
-
readonly hyps: readonly string[];
|
|
47
44
|
readonly concls: readonly string[];
|
|
48
45
|
}[];
|
|
49
46
|
|
|
@@ -78,26 +75,19 @@ export const getCases = (rule: CasesRule): [CaseInfo, number] => {
|
|
|
78
75
|
const names = lookupTag(rule.tags, "case_names");
|
|
79
76
|
const cases =
|
|
80
77
|
names === undefined
|
|
81
|
-
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (
|
|
78
|
+
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (_value, index) => ({
|
|
82
79
|
name: String(index + 1),
|
|
83
80
|
concls: [] as string[],
|
|
84
81
|
}))
|
|
85
82
|
: explodeArgs(names).map((name) => ({ name, concls: getCaseConcls(rule.tags, name) }));
|
|
86
83
|
const hypNames = lookupTag(rule.tags, "cases_hyp_names");
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
throw new TlaIsabelleError("ERROR", "Malformed cases_hyp_names tag of theorem");
|
|
93
|
-
return names === "," ? [] : names.slice(0, -1).split(",");
|
|
94
|
-
});
|
|
95
|
-
if (hyps.length !== cases.length)
|
|
84
|
+
const hypGroups = hypNames === undefined ? undefined : explodeArgs(hypNames);
|
|
85
|
+
if (
|
|
86
|
+
hypGroups !== undefined &&
|
|
87
|
+
(hypGroups.length !== cases.length || hypGroups.some((group) => !group.endsWith(",")))
|
|
88
|
+
)
|
|
96
89
|
throw new TlaIsabelleError("ERROR", "Malformed cases_hyp_names tag of theorem");
|
|
97
|
-
return [
|
|
98
|
-
cases.map((entry, index) => ({ name: entry.name, hyps: hyps[index], concls: entry.concls })),
|
|
99
|
-
consumes,
|
|
100
|
-
];
|
|
90
|
+
return [cases, consumes];
|
|
101
91
|
};
|
|
102
92
|
|
|
103
93
|
const destConjunctions = (term: Term): Term[] =>
|
|
@@ -148,11 +138,13 @@ const extractCase = (
|
|
|
148
138
|
return {
|
|
149
139
|
fixes,
|
|
150
140
|
assumes: [{ name: "", props: stripAssumsHyp(prop).flatMap(destConjunctions).map(absFixes) }],
|
|
151
|
-
binds: [[CASE_CONCL, concl]
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
141
|
+
binds: [[CASE_CONCL, concl] satisfies [string, Term], ...destBinops(concls, concl)].map(
|
|
142
|
+
(bind) => ({
|
|
143
|
+
name: bind[0],
|
|
144
|
+
index: 0,
|
|
145
|
+
term: absFixes(bind[1]),
|
|
146
|
+
}),
|
|
147
|
+
),
|
|
156
148
|
cases: [],
|
|
157
149
|
};
|
|
158
150
|
};
|