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,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 { syntaxError, type OuterToken } from "./theory";
|
|
48
|
+
import { innerText, syntaxError, type OuterToken } from "./theory";
|
|
53
49
|
|
|
54
50
|
export interface NamedCasesRule {
|
|
55
51
|
readonly name: string;
|
|
@@ -203,10 +199,7 @@ const parseCasesArgs = (isar: IsarContext, tokens: readonly OuterToken[]): Cases
|
|
|
203
199
|
isar,
|
|
204
200
|
[
|
|
205
201
|
{
|
|
206
|
-
text:
|
|
207
|
-
token.kind === "cartouche"
|
|
208
|
-
? token.text.slice("\\<open>".length, -"\\<close>".length)
|
|
209
|
-
: token.text,
|
|
202
|
+
text: innerText(token),
|
|
210
203
|
type: mkTVar("'a", 0),
|
|
211
204
|
},
|
|
212
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,
|
|
@@ -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,10 +34,11 @@ 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);
|
|
@@ -162,7 +161,7 @@ const theResult = <Item>(seq: Seq<Item>, message: string): Item => {
|
|
|
162
161
|
};
|
|
163
162
|
|
|
164
163
|
// Proof.end_proof: the closing method, then the goal must have no subgoals.
|
|
165
|
-
const endProof = (state: State, text: MethodText | undefined
|
|
164
|
+
const endProof = (state: State, text: MethodText | undefined): Seq<State> => {
|
|
166
165
|
assertMode(state, ["forward"]);
|
|
167
166
|
const closed = usingFacts(closeBlock(state), []);
|
|
168
167
|
if (top(closed).goal === undefined) throw error("No goal in this block");
|
|
@@ -173,7 +172,7 @@ const endProof = (state: State, text: MethodText | undefined, isImmediate: boole
|
|
|
173
172
|
(result: State) =>
|
|
174
173
|
mapSeq(
|
|
175
174
|
(thm: Thm) => provideGoal(result, thm),
|
|
176
|
-
finishTac(contextOf(result).tactics.limits
|
|
175
|
+
finishTac(contextOf(result).tactics.limits)(findGoal(result)[2].goal),
|
|
177
176
|
),
|
|
178
177
|
finish,
|
|
179
178
|
),
|
|
@@ -199,7 +198,7 @@ const genericQed = (state: State): State => {
|
|
|
199
198
|
};
|
|
200
199
|
|
|
201
200
|
export const qed = (state: State, text: MethodText | undefined): State =>
|
|
202
|
-
genericQed(theResult(endProof(state, text
|
|
201
|
+
genericQed(theResult(endProof(state, text), "Failed to finish proof"));
|
|
203
202
|
|
|
204
203
|
// Proof.terminal_proof, as by: the first initial result that the terminal method finishes.
|
|
205
204
|
export const terminalProof = (
|
|
@@ -209,7 +208,7 @@ export const terminalProof = (
|
|
|
209
208
|
): State =>
|
|
210
209
|
genericQed(
|
|
211
210
|
theResult(
|
|
212
|
-
mapsSeq((result: State) => endProof(result, terminal
|
|
211
|
+
mapsSeq((result: State) => endProof(result, terminal), proof(state, initial)),
|
|
213
212
|
"Failed to finish proof",
|
|
214
213
|
),
|
|
215
214
|
);
|
|
@@ -294,14 +293,15 @@ const localResults = (
|
|
|
294
293
|
parts: readonly StatementPart[],
|
|
295
294
|
results: readonly (readonly Thm[])[],
|
|
296
295
|
): State => {
|
|
297
|
-
const
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
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));
|
|
302
302
|
return putFactsOf(
|
|
303
303
|
mapContext(state, () => named),
|
|
304
|
-
|
|
304
|
+
noted,
|
|
305
305
|
);
|
|
306
306
|
};
|
|
307
307
|
|
|
@@ -421,23 +421,33 @@ export const collect = (state: State, isFinal: boolean): State => {
|
|
|
421
421
|
// Proof.assume: each group of propositions becomes hypotheses, which a named group names.
|
|
422
422
|
const assumeProps = (
|
|
423
423
|
state: State,
|
|
424
|
-
groups: readonly {
|
|
424
|
+
groups: readonly {
|
|
425
|
+
readonly name: string | undefined;
|
|
426
|
+
readonly attributes: readonly AttributeSource[];
|
|
427
|
+
readonly props: readonly Term[];
|
|
428
|
+
}[],
|
|
425
429
|
): State => {
|
|
426
430
|
assertMode(state, ["forward"]);
|
|
427
431
|
const props = groups.flatMap((group) => group.props);
|
|
428
432
|
const [thms, context] = addAssumptions(contextOf(state), false, props);
|
|
429
433
|
let offset = 0;
|
|
434
|
+
const noted: Thm[] = [];
|
|
430
435
|
const named = groups.reduce(
|
|
431
436
|
(current, group) => {
|
|
432
|
-
const slice =
|
|
437
|
+
const [declared, slice] = applyAttributes(
|
|
438
|
+
current,
|
|
439
|
+
group.attributes,
|
|
440
|
+
thms.slice(offset, offset + group.props.length),
|
|
441
|
+
);
|
|
433
442
|
offset += group.props.length;
|
|
434
|
-
|
|
443
|
+
noted.push(...slice);
|
|
444
|
+
return group.name === undefined ? declared : putFacts(declared, group.name, slice);
|
|
435
445
|
},
|
|
436
446
|
props.reduce(declareTerm, context),
|
|
437
447
|
);
|
|
438
448
|
return putFactsOf(
|
|
439
449
|
mapContext(state, () => named),
|
|
440
|
-
|
|
450
|
+
noted,
|
|
441
451
|
);
|
|
442
452
|
};
|
|
443
453
|
|
|
@@ -446,7 +456,11 @@ export const assume = (state: State, parts: readonly StatementPart[]): State =>
|
|
|
446
456
|
const statement = readStatement(contextOf(state), parts, "default");
|
|
447
457
|
return assumeProps(
|
|
448
458
|
mapContext(state, (context) => bindAll(context, statement.binds)),
|
|
449
|
-
parts.map((part, index) => ({
|
|
459
|
+
parts.map((part, index) => ({
|
|
460
|
+
name: part.name,
|
|
461
|
+
attributes: part.attributes,
|
|
462
|
+
props: statement.props[index],
|
|
463
|
+
})),
|
|
450
464
|
);
|
|
451
465
|
};
|
|
452
466
|
|
|
@@ -491,6 +505,7 @@ export const invokeCase = (
|
|
|
491
505
|
mapContext(state, () => updateCases(bound, applied.cases)),
|
|
492
506
|
applied.assumes.map((assumption) => ({
|
|
493
507
|
name: assumption.name === "" ? undefined : `${caseName}.${assumption.name}`,
|
|
508
|
+
attributes: [],
|
|
494
509
|
props: assumption.props,
|
|
495
510
|
})),
|
|
496
511
|
);
|
|
@@ -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
|
};
|
|
@@ -41,10 +41,9 @@ export type StatementElement =
|
|
|
41
41
|
export type MethodText =
|
|
42
42
|
| { readonly kind: "source"; readonly name: string; readonly args: readonly OuterToken[] }
|
|
43
43
|
| {
|
|
44
|
-
readonly kind: "then" | "
|
|
44
|
+
readonly kind: "then" | "orelse" | "try" | "repeat1";
|
|
45
45
|
readonly texts: readonly MethodText[];
|
|
46
|
-
}
|
|
47
|
-
| { readonly kind: "select"; readonly count: number; readonly text: MethodText };
|
|
46
|
+
};
|
|
48
47
|
|
|
49
48
|
export type Command =
|
|
50
49
|
| {
|
|
@@ -100,6 +99,11 @@ export const syntaxError = (token: OuterToken | undefined) =>
|
|
|
100
99
|
`Outer syntax error at: ${token === undefined ? "end of input" : token.text}`,
|
|
101
100
|
);
|
|
102
101
|
|
|
102
|
+
export const innerText = (token: OuterToken) =>
|
|
103
|
+
token.kind === "cartouche"
|
|
104
|
+
? token.text.slice("\\<open>".length, -"\\<close>".length)
|
|
105
|
+
: token.text;
|
|
106
|
+
|
|
103
107
|
const isWordChar = (char: string) => /[A-Za-z0-9_'.]/.test(char);
|
|
104
108
|
|
|
105
109
|
const readString = (text: string, start: number): [string, number] => {
|
|
@@ -294,13 +298,9 @@ export const parseTheory = (text: string): TheoryText => {
|
|
|
294
298
|
peek()?.kind === "string" || peek()?.kind === "cartouche" || peek()?.kind === "var" || isName();
|
|
295
299
|
const inner = () => {
|
|
296
300
|
const token = peek();
|
|
297
|
-
if (token?.kind === "cartouche") {
|
|
301
|
+
if (token?.kind === "cartouche" || token?.kind === "var") {
|
|
298
302
|
position += 1;
|
|
299
|
-
return token
|
|
300
|
-
}
|
|
301
|
-
if (token?.kind === "var") {
|
|
302
|
-
position += 1;
|
|
303
|
-
return token.text;
|
|
303
|
+
return innerText(token);
|
|
304
304
|
}
|
|
305
305
|
return token?.kind === "string" ? expectString() : expectName();
|
|
306
306
|
};
|
|
@@ -432,12 +432,7 @@ export const parseTheory = (text: string): TheoryText => {
|
|
|
432
432
|
position += 1;
|
|
433
433
|
return { kind: "repeat1", texts: [text] };
|
|
434
434
|
}
|
|
435
|
-
if (isSymbol("["))
|
|
436
|
-
position += 1;
|
|
437
|
-
const count = isSymbol("]") ? 1 : Number(expectName());
|
|
438
|
-
expectSymbol("]");
|
|
439
|
-
return { kind: "select", count, text };
|
|
440
|
-
}
|
|
435
|
+
if (isSymbol("[")) throw new TlaIsabelleError("ERROR", "Unsupported method combinator: [");
|
|
441
436
|
return text;
|
|
442
437
|
};
|
|
443
438
|
const method3 = (): MethodText => {
|
|
@@ -453,7 +448,7 @@ export const parseTheory = (text: string): TheoryText => {
|
|
|
453
448
|
};
|
|
454
449
|
const enumeration = (
|
|
455
450
|
separator: string,
|
|
456
|
-
kind: "then" | "
|
|
451
|
+
kind: "then" | "orelse",
|
|
457
452
|
read: () => MethodText,
|
|
458
453
|
): MethodText => {
|
|
459
454
|
const texts = [read()];
|
|
@@ -464,7 +459,11 @@ export const parseTheory = (text: string): TheoryText => {
|
|
|
464
459
|
return texts.length === 1 ? texts[0] : { kind, texts };
|
|
465
460
|
};
|
|
466
461
|
const method2 = () => enumeration(",", "then", method3);
|
|
467
|
-
const method1 = () =>
|
|
462
|
+
const method1 = () => {
|
|
463
|
+
const text = method2();
|
|
464
|
+
if (isSymbol(";")) throw new TlaIsabelleError("ERROR", "Unsupported method combinator: ;");
|
|
465
|
+
return text;
|
|
466
|
+
};
|
|
468
467
|
const method0 = (): MethodText => enumeration("|", "orelse", method1);
|
|
469
468
|
const isMethodStart = () =>
|
|
470
469
|
isSymbol("(") ||
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Runs a theory's commands one after the other, as Isabelle's Pure/Isar/toplevel.ML does, with the
|
|
2
|
-
// theory commands of Pure/Isar/specification.ML. Copyright (c) 1986-2025 University of Cambridge,
|
|
3
|
-
// Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
|
-
|
|
5
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
2
|
import { typargsOf } from "../pure/consts";
|
|
7
3
|
import { zeroVarIndexes } from "../pure/drule";
|
|
@@ -29,10 +25,9 @@ import {
|
|
|
29
25
|
transitive,
|
|
30
26
|
type Thm,
|
|
31
27
|
} from "../pure/thm";
|
|
32
|
-
import { addUnsafeDest, withClaset } from "../provers/classical";
|
|
33
28
|
import { getLogicFact, getProofContext } from "../tla/context";
|
|
34
29
|
import type { ConstInfo, TlaLogic } from "../tla/logic";
|
|
35
|
-
import {
|
|
30
|
+
import { applyAttributes, getThms } from "./attrib";
|
|
36
31
|
import {
|
|
37
32
|
addAssumptions,
|
|
38
33
|
addFixes,
|
|
@@ -103,6 +98,11 @@ const addConst = (theory: Theory, base: string, type: Typ): Theory => {
|
|
|
103
98
|
};
|
|
104
99
|
};
|
|
105
100
|
|
|
101
|
+
interface NamedFact {
|
|
102
|
+
readonly name: string;
|
|
103
|
+
readonly thms: readonly Thm[];
|
|
104
|
+
}
|
|
105
|
+
|
|
106
106
|
const putTheoryFacts = (theory: Theory, name: string, thms: readonly Thm[]): Theory => ({
|
|
107
107
|
...theory,
|
|
108
108
|
facts: new Map([...theory.facts, [name, thms]]),
|
|
@@ -134,7 +134,16 @@ const define = (
|
|
|
134
134
|
context: IsarContext,
|
|
135
135
|
command: Extract<Command, { kind: "definition" }>,
|
|
136
136
|
): Theory => {
|
|
137
|
-
const [prop] = readStatement(
|
|
137
|
+
const [prop] = readStatement(
|
|
138
|
+
command.name === undefined || command.type === undefined
|
|
139
|
+
? context
|
|
140
|
+
: {
|
|
141
|
+
...context,
|
|
142
|
+
types: new Map([...context.types, [command.name, parseType(command.type)]]),
|
|
143
|
+
},
|
|
144
|
+
[command.part],
|
|
145
|
+
"default",
|
|
146
|
+
).props.flat();
|
|
138
147
|
const [head, args, rhs] = destDef(destEquals(metaRewriteConv(theory.tactics, prop).prop)[1]);
|
|
139
148
|
if (command.name !== undefined && command.name !== head.name)
|
|
140
149
|
throw error(`Head of definition ${head.name} differs from declaration ${command.name}`);
|
|
@@ -153,52 +162,29 @@ const define = (
|
|
|
153
162
|
applied.maxidx + 1,
|
|
154
163
|
applied,
|
|
155
164
|
);
|
|
165
|
+
const [declared, thms] = applyAttributes(context, command.part.attributes, [
|
|
166
|
+
zeroVarIndexes(generalized),
|
|
167
|
+
]);
|
|
156
168
|
return putTheoryFacts(
|
|
157
|
-
addConst(theory, head.name, head.type),
|
|
169
|
+
{ ...addConst(theory, head.name, head.type), tactics: declared.tactics },
|
|
158
170
|
command.part.name ?? `${head.name}_def`,
|
|
159
|
-
|
|
171
|
+
thms,
|
|
160
172
|
);
|
|
161
173
|
};
|
|
162
174
|
|
|
163
|
-
//
|
|
164
|
-
const declare = (
|
|
165
|
-
tactics: ProofContext,
|
|
166
|
-
context: IsarContext,
|
|
167
|
-
references: readonly FactReference[],
|
|
168
|
-
): ProofContext =>
|
|
175
|
+
// Specification.theorems: the declarations of each fact's attributes, whose results it drops.
|
|
176
|
+
const declare = (context: IsarContext, references: readonly FactReference[]): ProofContext =>
|
|
169
177
|
references.reduce(
|
|
170
178
|
(current, reference) =>
|
|
171
|
-
getFact(
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
([declared, thm], attribute) => {
|
|
175
|
-
if (attribute.name !== "dest")
|
|
176
|
-
return [declared, applyAttribute(context, attribute, thm)];
|
|
177
|
-
if (attribute.args.length > 0) throw error("Unsupported dest attribute arguments");
|
|
178
|
-
const classical = declared.classical;
|
|
179
|
-
return [
|
|
180
|
-
{
|
|
181
|
-
...declared,
|
|
182
|
-
classical: withClaset(
|
|
183
|
-
classical,
|
|
184
|
-
addUnsafeDest(classical, thm, declared.atomizeRules),
|
|
185
|
-
),
|
|
186
|
-
},
|
|
187
|
-
thm,
|
|
188
|
-
];
|
|
189
|
-
},
|
|
190
|
-
[inner, fact],
|
|
191
|
-
)[0],
|
|
192
|
-
current,
|
|
193
|
-
),
|
|
194
|
-
tactics,
|
|
195
|
-
);
|
|
179
|
+
applyAttributes(current, reference.attributes, getFact(current, reference.name))[0],
|
|
180
|
+
context,
|
|
181
|
+
).tactics;
|
|
196
182
|
|
|
197
183
|
// Specification.theorem: the statement's elements, then the goal whose results the theory keeps.
|
|
198
184
|
const startTheorem = (
|
|
199
185
|
outer: IsarContext,
|
|
200
186
|
command: Extract<Command, { kind: "theorem" }>,
|
|
201
|
-
store: (
|
|
187
|
+
store: (tactics: ProofContext, facts: readonly NamedFact[]) => void,
|
|
202
188
|
): State => {
|
|
203
189
|
const fixed = command.elements.reduce((context, element) => {
|
|
204
190
|
if (element.kind !== "fixes") return context;
|
|
@@ -223,9 +209,13 @@ const startTheorem = (
|
|
|
223
209
|
);
|
|
224
210
|
let offset = 0;
|
|
225
211
|
const named = assumes.reduce((context, part, index) => {
|
|
226
|
-
const group =
|
|
212
|
+
const [declared, group] = applyAttributes(
|
|
213
|
+
context,
|
|
214
|
+
part.attributes,
|
|
215
|
+
prems.slice(offset, offset + assumeProps[index].length),
|
|
216
|
+
);
|
|
227
217
|
offset += assumeProps[index].length;
|
|
228
|
-
return part.name === undefined ?
|
|
218
|
+
return part.name === undefined ? declared : putFacts(declared, part.name, group);
|
|
229
219
|
}, assumed);
|
|
230
220
|
const elementsContext =
|
|
231
221
|
prems.length === 0 ? named : putFacts(named, command.isLong ? "assms" : "that", prems);
|
|
@@ -237,13 +227,13 @@ const startTheorem = (
|
|
|
237
227
|
normHhfProtect(outer.tactics.limits, exportThm(resultContext, outer, false, result)),
|
|
238
228
|
),
|
|
239
229
|
);
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
],
|
|
245
|
-
|
|
246
|
-
);
|
|
230
|
+
const part = command.shows[0];
|
|
231
|
+
const [notedContext, noted] = applyAttributes(outer, part.attributes, normalized);
|
|
232
|
+
const [namedContext, named] = applyAttributes(notedContext, command.attributes, noted);
|
|
233
|
+
store(namedContext.tactics, [
|
|
234
|
+
...(part.name === undefined ? [] : [{ name: part.name, thms: noted }]),
|
|
235
|
+
...(command.name === undefined ? [] : [{ name: command.name, thms: named }]),
|
|
236
|
+
]);
|
|
247
237
|
});
|
|
248
238
|
};
|
|
249
239
|
|
|
@@ -323,14 +313,14 @@ export const runTheory = (logic: TlaLogic, text: TheoryText, limits: Limits) =>
|
|
|
323
313
|
theory = define(theory, initContext(logic, theory), command);
|
|
324
314
|
break;
|
|
325
315
|
case "declare":
|
|
326
|
-
theory = {
|
|
327
|
-
...theory,
|
|
328
|
-
tactics: declare(theory.tactics, initContext(logic, theory), command.facts),
|
|
329
|
-
};
|
|
316
|
+
theory = { ...theory, tactics: declare(initContext(logic, theory), command.facts) };
|
|
330
317
|
break;
|
|
331
318
|
case "theorem":
|
|
332
|
-
state = startTheorem(initContext(logic, theory), command, (
|
|
333
|
-
theory =
|
|
319
|
+
state = startTheorem(initContext(logic, theory), command, (tactics, facts) => {
|
|
320
|
+
theory = facts.reduce((current, fact) => putTheoryFacts(current, fact.name, fact.thms), {
|
|
321
|
+
...theory,
|
|
322
|
+
tactics,
|
|
323
|
+
});
|
|
334
324
|
});
|
|
335
325
|
break;
|
|
336
326
|
default:
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/type_infer_context.ML, Pure/type_infer.ML and Pure/consts.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 { bumpString } from "../pure/name";
|
|
5
3
|
import {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/blast.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 { selectGoal } from "../../pure/goal";
|
|
5
3
|
import { destImplies, isAllAbs, stripParams } from "../../pure/logic";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/blast.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { orElseGoal, thenGoal, type GoalTactic } from "../../pure/tactical";
|
|
4
2
|
import { assumeTac, eqAssumeTac, ematchTac } from "../../pure/tactic";
|
|
5
3
|
import {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/blast.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Seq } from "../../pure/seq";
|
|
4
2
|
import type { GoalTactic } from "../../pure/tactical";
|
|
5
3
|
import { checkInterrupt } from "../../pure/interrupt";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/blast.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, zeroVarIndexes } from "../../pure/drule";
|
|
5
3
|
import { unifyTermNet } from "../../pure/net";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/blast.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { bumpInit, bumpString } from "../../pure/name";
|
|
4
2
|
import type { GoalTactic } from "../../pure/tactical";
|
|
5
3
|
import type { Limits } from "../../pure/interrupt";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/clasimp.ML and Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { trivForallEquality } from "../pure/drule";
|
|
4
2
|
import { selectGoal } from "../pure/goal";
|
|
5
3
|
import { addSimps, emptySimpset, type SimpContext } from "../pure/raw-simplifier";
|
|
@@ -93,7 +91,7 @@ const pruneParamsTac = (simp: SimpContext): Tactic => {
|
|
|
93
91
|
const empty = { ...simp, simpset: emptySimpset };
|
|
94
92
|
const context = { ...empty, simpset: addSimps(empty, [trivForallEquality]) };
|
|
95
93
|
return primitive((state) =>
|
|
96
|
-
Array.from({ length: nprems(state) }, (
|
|
94
|
+
Array.from({ length: nprems(state) }, (_value, offset) => offset + 1).reduce(
|
|
97
95
|
(current, index) =>
|
|
98
96
|
gconvRule(
|
|
99
97
|
(term) =>
|