tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
|
|
4
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
1
|
+
import { isIsabelleError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
appendSeq,
|
|
7
4
|
emptySeq,
|
|
@@ -15,7 +12,7 @@ import {
|
|
|
15
12
|
type Seq,
|
|
16
13
|
} from "./seq";
|
|
17
14
|
import { cons, type List } from "./list";
|
|
18
|
-
import { aconv } from "./term";
|
|
15
|
+
import { aconv, type Term } from "./term";
|
|
19
16
|
import { nprems, premOf, type Thm } from "./thm";
|
|
20
17
|
|
|
21
18
|
export type Tactic = (state: Thm) => Seq<Thm>;
|
|
@@ -76,7 +73,6 @@ export const determ =
|
|
|
76
73
|
|
|
77
74
|
export const tryTac = (tactic: Tactic) => orElse(tactic, allTac);
|
|
78
75
|
|
|
79
|
-
// Thm.eq_thm: equal hypotheses, flex-flex pairs and propositions.
|
|
80
76
|
export const eqThm = (left: Thm, right: Thm) =>
|
|
81
77
|
left === right ||
|
|
82
78
|
(aconv(left.prop, right.prop) &&
|
|
@@ -88,45 +84,57 @@ export const eqThm = (left: Thm, right: Thm) =>
|
|
|
88
84
|
aconv(pair[0], right.tpairs[index][0]) && aconv(pair[1], right.tpairs[index][1]),
|
|
89
85
|
));
|
|
90
86
|
|
|
87
|
+
export const distinctThms = (thms: readonly Thm[]) =>
|
|
88
|
+
thms.filter((thm, position) => thms.findIndex((other) => eqThm(other, thm)) === position);
|
|
89
|
+
|
|
91
90
|
export const eqThmProp = (left: Thm, right: Thm) => aconv(left.prop, right.prop);
|
|
92
91
|
|
|
93
92
|
interface Trail {
|
|
94
93
|
readonly state: Thm;
|
|
95
94
|
readonly rest: Seq<Thm>;
|
|
96
|
-
readonly
|
|
95
|
+
readonly position: number;
|
|
96
|
+
readonly next: Trail | undefined;
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
//
|
|
100
|
-
export const every =
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
99
|
+
// EVY and evyBack as one loop: blast replays thousands of tactics, too deep for mutual recursion.
|
|
100
|
+
export const every =
|
|
101
|
+
(tactics: readonly Tactic[]): Tactic =>
|
|
102
|
+
(start) => {
|
|
103
|
+
const evy = (
|
|
104
|
+
initialTrail: Trail | undefined,
|
|
105
|
+
initialPosition: number,
|
|
106
|
+
initialState: Thm | undefined,
|
|
107
|
+
): Cell<Thm> => {
|
|
108
|
+
let trail = initialTrail;
|
|
109
|
+
let position = initialPosition;
|
|
110
|
+
let state = initialState;
|
|
111
|
+
for (;;) {
|
|
112
|
+
if (state === undefined) {
|
|
113
|
+
if (trail === undefined) return undefined;
|
|
114
|
+
const cell = trail.rest.pull();
|
|
115
|
+
if (cell === undefined) trail = trail.next;
|
|
116
|
+
else if (eqThm(trail.state, cell[0])) trail = { ...trail, rest: cell[1] };
|
|
117
|
+
else {
|
|
118
|
+
trail = { state: cell[0], rest: cell[1], position: trail.position, next: trail.next };
|
|
119
|
+
position = trail.position;
|
|
120
|
+
state = cell[0];
|
|
121
|
+
}
|
|
122
|
+
} else if (position === tactics.length) {
|
|
123
|
+
const saved = trail;
|
|
124
|
+
return [state, makeSeq(() => evy(saved, 0, undefined))];
|
|
125
|
+
} else {
|
|
126
|
+
const cell = tactics[position](state).pull();
|
|
127
|
+
if (cell === undefined) state = undefined;
|
|
128
|
+
else {
|
|
129
|
+
trail = { state: cell[0], rest: cell[1], position: position + 1, next: trail };
|
|
130
|
+
position += 1;
|
|
131
|
+
state = cell[0];
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
};
|
|
136
|
+
return ofCell(evy(undefined, 0, start));
|
|
127
137
|
};
|
|
128
|
-
return (state) => evy([], tactics, state);
|
|
129
|
-
};
|
|
130
138
|
|
|
131
139
|
export const first = (tactics: readonly Tactic[]): Tactic =>
|
|
132
140
|
tactics.reduceRight((rest, tactic) => orElse(tactic, rest), noTac);
|
|
@@ -182,19 +190,14 @@ export const firstGoalTac =
|
|
|
182
190
|
return find(1)(state);
|
|
183
191
|
};
|
|
184
192
|
|
|
185
|
-
const isThmError = (error: unknown) =>
|
|
186
|
-
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
187
|
-
|
|
188
|
-
// SUBGOAL: a tactic built from goal index of the state, failing if there is no such goal.
|
|
189
193
|
export const subgoal =
|
|
190
|
-
(build: (goal:
|
|
194
|
+
(build: (goal: Term, index: number) => Tactic): GoalTactic =>
|
|
191
195
|
(index) =>
|
|
192
196
|
(state) => {
|
|
193
197
|
if (index < 1 || index > nprems(state)) return emptySeq;
|
|
194
198
|
return build(premOf(state, index), index)(state);
|
|
195
199
|
};
|
|
196
200
|
|
|
197
|
-
// Seq.INTERVAL: applies tactic to goals last down to first.
|
|
198
201
|
const interval = (tactic: GoalTactic, firstIndex: number, lastIndex: number): Tactic =>
|
|
199
202
|
lastIndex < firstIndex
|
|
200
203
|
? allTac
|
|
@@ -217,7 +220,7 @@ export const primSeq =
|
|
|
217
220
|
try {
|
|
218
221
|
return apply(state);
|
|
219
222
|
} catch (error) {
|
|
220
|
-
if (
|
|
223
|
+
if (isIsabelleError(error, "THM")) return emptySeq;
|
|
221
224
|
throw error;
|
|
222
225
|
}
|
|
223
226
|
};
|
|
@@ -230,9 +233,6 @@ export const condTac =
|
|
|
230
233
|
(state) =>
|
|
231
234
|
test(state) ? onTrue(state) : onFalse(state);
|
|
232
235
|
|
|
233
|
-
// Search.DEPTH_FIRST: depth-first search for a state satisfying the test. The stack of
|
|
234
|
-
// alternatives and the states already returned are lists, as in Isabelle, since the stack can grow
|
|
235
|
-
// as deep as the search goes.
|
|
236
236
|
const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
237
237
|
const isUsed = (used: List<Thm> | undefined, state: Thm) => {
|
|
238
238
|
for (let current = used; current !== undefined; current = current.tail)
|
|
@@ -260,5 +260,4 @@ const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
|
260
260
|
|
|
261
261
|
export const hasFewerPrems = (count: number) => (state: Thm) => nprems(state) < count;
|
|
262
262
|
|
|
263
|
-
// Search.DEPTH_SOLVE: depth-first search until no goals remain.
|
|
264
263
|
export const depthSolve = (tactic: Tactic) => depthFirst(hasFewerPrems(1), tactic);
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/term_ord.ML. Copyright (c) 1986-2025 University of Cambridge,
|
|
2
|
-
// Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
|
|
4
1
|
import { fastIndexnameOrd, fastStringOrd, indexnameOrd } from "./table";
|
|
5
|
-
import {
|
|
2
|
+
import { dummyT, sizeOfTerm, type Term, type Typ } from "./term";
|
|
6
3
|
|
|
7
4
|
const intOrd = (left: number, right: number) => (left < right ? -1 : left > right ? 1 : 0);
|
|
8
5
|
|
|
@@ -51,8 +48,6 @@ const hdDepth = (term: Term): [Term, number] => {
|
|
|
51
48
|
return [current, depth];
|
|
52
49
|
};
|
|
53
50
|
|
|
54
|
-
const dummyT = mkType("dummy");
|
|
55
|
-
|
|
56
51
|
const destHd = (term: Term): [{ name: string; index: number }, Typ, number] => {
|
|
57
52
|
switch (term.kind) {
|
|
58
53
|
case "Const":
|
|
@@ -87,7 +82,6 @@ const argsOrd = (left: Term, right: Term): number => {
|
|
|
87
82
|
return 0;
|
|
88
83
|
};
|
|
89
84
|
|
|
90
|
-
// Term_Ord.term_ord: a linear well-founded AC-compatible order for ordered rewriting.
|
|
91
85
|
export const termOrd = (left: Term, right: Term): number => {
|
|
92
86
|
if (left === right) return 0;
|
|
93
87
|
if (left.kind === "Abs" && right.kind === "Abs") {
|
|
@@ -1,17 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/term.ML. Copyright (c) 1986-2025 University of Cambridge,
|
|
2
|
-
// Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Simply typed lambda terms with de Bruijn indices. Functions that rebuild a term return the
|
|
5
|
-
// very same object when nothing changes, as Isabelle's Same.SAME does, so pointer equality stays a
|
|
6
|
-
// fast path.
|
|
7
|
-
//
|
|
8
|
-
// Unlike Isabelle, applications, abstractions and compound types record what their subterms
|
|
9
|
-
// contain when built: the largest index (maxidx), a bound above every loose bound variable (loose),
|
|
10
|
-
// whether a schematic variable, a beta redex or an eta redex occurs, and a bit for the name of each
|
|
11
|
-
// free variable (flags). A term has every flag of its subterms. Traversals use this to skip
|
|
12
|
-
// subterms they would return unchanged, which gives the same results while touching only the parts
|
|
13
|
-
// that change.
|
|
14
|
-
|
|
15
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
16
2
|
|
|
17
3
|
export type Sort = readonly string[];
|
|
@@ -26,9 +12,7 @@ export type Typ =
|
|
|
26
12
|
| { readonly kind: "TFree"; readonly name: string; readonly sort: Sort }
|
|
27
13
|
| { readonly kind: "TVar"; readonly name: string; readonly index: number; readonly sort: Sort };
|
|
28
14
|
|
|
29
|
-
//
|
|
30
|
-
// undefined, and the constructors below list them in this order. So all terms share one object
|
|
31
|
-
// layout, and V8 compiles the many switches on kind to monomorphic loads.
|
|
15
|
+
// Every term lists every field in this order, unused ones undefined, so V8 sees one object layout.
|
|
32
16
|
interface TermFields {
|
|
33
17
|
readonly name: string;
|
|
34
18
|
readonly type: Typ;
|
|
@@ -79,7 +63,6 @@ export const maxidxOfTerm = (term: Term, maxidx = -1): number => {
|
|
|
79
63
|
}
|
|
80
64
|
};
|
|
81
65
|
|
|
82
|
-
// The bound on loose bound variables: every one is below it.
|
|
83
66
|
const looseOf = (term: Term) =>
|
|
84
67
|
term.kind === "Bound"
|
|
85
68
|
? term.index + 1
|
|
@@ -87,7 +70,6 @@ const looseOf = (term: Term) =>
|
|
|
87
70
|
? term.loose
|
|
88
71
|
: 0;
|
|
89
72
|
|
|
90
|
-
// One of the 28 bits above the others, picked by a cheap hash of the name.
|
|
91
73
|
const freeBit = (name: string) =>
|
|
92
74
|
8 <<
|
|
93
75
|
((name.length * 31 + (name.charCodeAt(0) | 0) * 7 + (name.charCodeAt(name.length - 1) | 0)) % 28);
|
|
@@ -101,7 +83,6 @@ export const flagsOf = (term: Term) =>
|
|
|
101
83
|
? term.flags
|
|
102
84
|
: 0;
|
|
103
85
|
|
|
104
|
-
// Whether a subterm aconv to pattern could occur in term.
|
|
105
86
|
export const mayOccur = (pattern: Term, term: Term) => (flagsOf(pattern) & ~flagsOf(term)) === 0;
|
|
106
87
|
|
|
107
88
|
export const mkType = (name: string, args: readonly Typ[] = []): Typ => ({
|
|
@@ -198,7 +179,6 @@ export const propT = mkType("prop");
|
|
|
198
179
|
|
|
199
180
|
export const funT = (domain: Typ, range: Typ) => mkType("fun", [domain, range]);
|
|
200
181
|
|
|
201
|
-
// op --->
|
|
202
182
|
export const funTs = (domains: readonly Typ[], range: Typ) =>
|
|
203
183
|
domains.reduceRight((result, domain) => funT(domain, result), range);
|
|
204
184
|
|
|
@@ -238,8 +218,6 @@ export const eqTyp = (left: Typ, right: Typ): boolean => {
|
|
|
238
218
|
);
|
|
239
219
|
};
|
|
240
220
|
|
|
241
|
-
// fastype_of1: the type of a term, with minimal checking. Types holds the types of the loose
|
|
242
|
-
// bound variables, innermost first.
|
|
243
221
|
export const fastypeOf1 = (types: readonly Typ[], term: Term): Typ => {
|
|
244
222
|
switch (term.kind) {
|
|
245
223
|
case "Const":
|
|
@@ -309,14 +287,12 @@ export const stripAllVars = (term: Term): { name: string; type: Typ }[] =>
|
|
|
309
287
|
? [{ name: term.arg.name, type: term.arg.type }, ...stripAllVars(term.arg.body)]
|
|
310
288
|
: [];
|
|
311
289
|
|
|
312
|
-
// Rebuilds an application, keeping the original object when neither part changed.
|
|
313
290
|
export const updateApp = (term: App, fun: Term, arg: Term): Term =>
|
|
314
291
|
fun === term.fun && arg === term.arg ? term : mkApp(fun, arg);
|
|
315
292
|
|
|
316
293
|
export const updateAbs = (term: Abs, body: Term, type: Typ = term.type): Term =>
|
|
317
294
|
body === term.body && type === term.type ? term : mkAbs(term.name, type, body);
|
|
318
295
|
|
|
319
|
-
// incr_bv: increments the bound variables at or above level by increment.
|
|
320
296
|
const incrBvAt = (increment: number, level: number, term: Term): Term => {
|
|
321
297
|
if (looseOf(term) <= level) return term;
|
|
322
298
|
switch (term.kind) {
|
|
@@ -340,7 +316,6 @@ const incrBv = (increment: number, level: number, term: Term) =>
|
|
|
340
316
|
|
|
341
317
|
export const incrBoundvars = (increment: number, term: Term) => incrBv(increment, 0, term);
|
|
342
318
|
|
|
343
|
-
// loose_bvar: whether term has a loose bound variable at level or beyond.
|
|
344
319
|
const looseBvar = (term: Term, level: number) => looseOf(term) > level;
|
|
345
320
|
|
|
346
321
|
export const looseBvar1 = (term: Term, level: number): boolean => {
|
|
@@ -360,7 +335,6 @@ export const looseBvar1 = (term: Term, level: number): boolean => {
|
|
|
360
335
|
export const isOpen = (term: Term) => looseBvar(term, 0);
|
|
361
336
|
export const isDependent = (term: Term) => looseBvar1(term, 0);
|
|
362
337
|
|
|
363
|
-
// loose_bnos: the loose bound variables, in Isabelle's insertion order.
|
|
364
338
|
export const looseBnos = (term: Term): number[] => {
|
|
365
339
|
const numbers: number[] = [];
|
|
366
340
|
const add = (current: Term, level: number) => {
|
|
@@ -384,7 +358,6 @@ export const looseBnos = (term: Term): number[] => {
|
|
|
384
358
|
return numbers;
|
|
385
359
|
};
|
|
386
360
|
|
|
387
|
-
// subst_bounds: Bound i becomes args[i]; loose bound variables beyond shift down.
|
|
388
361
|
const substBoundsAt = (args: readonly Term[], level: number, term: Term): Term => {
|
|
389
362
|
if (looseOf(term) <= level) return term;
|
|
390
363
|
switch (term.kind) {
|
|
@@ -438,7 +411,6 @@ export const aconv = (left: Term, right: Term): boolean => {
|
|
|
438
411
|
}
|
|
439
412
|
};
|
|
440
413
|
|
|
441
|
-
// Structural equality including the names of abstractions, ML's (op =) on terms.
|
|
442
414
|
export const eqTerm = (left: Term, right: Term): boolean => {
|
|
443
415
|
if (left === right) return true;
|
|
444
416
|
switch (left.kind) {
|
|
@@ -456,7 +428,6 @@ export const eqTerm = (left: Term, right: Term): boolean => {
|
|
|
456
428
|
}
|
|
457
429
|
};
|
|
458
430
|
|
|
459
|
-
// could_unify: a fast filter, false only if the normal terms can't unify.
|
|
460
431
|
const matchRands = (left: Term, right: Term): boolean => {
|
|
461
432
|
let currentLeft = left;
|
|
462
433
|
let currentRight = right;
|
|
@@ -482,7 +453,6 @@ export const couldUnify = (left: Term, right: Term): boolean => {
|
|
|
482
453
|
return false;
|
|
483
454
|
};
|
|
484
455
|
|
|
485
|
-
// abstract_over: replaces the occurrences of pattern with Bound, ready to become an Abs body.
|
|
486
456
|
const abstractAt = (pattern: Term, level: number, term: Term): Term => {
|
|
487
457
|
if (!mayOccur(pattern, term)) return term;
|
|
488
458
|
if (aconv(pattern, term)) return mkBound(level);
|
|
@@ -502,15 +472,6 @@ const abstractAt = (pattern: Term, level: number, term: Term): Term => {
|
|
|
502
472
|
|
|
503
473
|
export const abstractOver = (pattern: Term, body: Term) => abstractAt(pattern, 0, body);
|
|
504
474
|
|
|
505
|
-
const baseName = (name: string) => name.slice(name.lastIndexOf(".") + 1);
|
|
506
|
-
|
|
507
|
-
export const termName = (term: Term) =>
|
|
508
|
-
term.kind === "Const"
|
|
509
|
-
? baseName(term.name)
|
|
510
|
-
: term.kind === "Free" || term.kind === "Var"
|
|
511
|
-
? term.name
|
|
512
|
-
: "uu";
|
|
513
|
-
|
|
514
475
|
export const mapTypes = (mapType: (type: Typ) => Typ, term: Term): Term => {
|
|
515
476
|
const visit = (current: Term): Term => {
|
|
516
477
|
switch (current.kind) {
|
|
@@ -555,7 +516,6 @@ const foldAterms = <State>(
|
|
|
555
516
|
}
|
|
556
517
|
};
|
|
557
518
|
|
|
558
|
-
// fold_aterms over the schematic variables only, skipping the subterms without one.
|
|
559
519
|
export const foldVars = <State>(
|
|
560
520
|
visit: (variable: Var, state: State) => State,
|
|
561
521
|
term: Term,
|
|
@@ -628,7 +588,6 @@ export const existsType = (predicate: (type: Typ) => boolean, term: Term): boole
|
|
|
628
588
|
const sameVar = (left: Var, right: Var) =>
|
|
629
589
|
left.name === right.name && left.index === right.index && eqTyp(left.type, right.type);
|
|
630
590
|
|
|
631
|
-
// add_vars: the schematic variables, latest first, as Isabelle's insert builds the list.
|
|
632
591
|
export const addVars = (term: Term, vars: Var[]): Var[] =>
|
|
633
592
|
foldVars(
|
|
634
593
|
(current, result: Var[]) =>
|
|
@@ -647,7 +606,6 @@ export const addFreeNames = (term: Term, names: string[]): string[] =>
|
|
|
647
606
|
names,
|
|
648
607
|
);
|
|
649
608
|
|
|
650
|
-
// match_bvs: the pairs of corresponding abstraction names while two terms look alike.
|
|
651
609
|
const matchBvs = (left: Term, right: Term, pairs: [string, string][]): [string, string][] => {
|
|
652
610
|
if (left.kind === "Abs" && right.kind === "Abs") {
|
|
653
611
|
const added: [string, string][] =
|
|
@@ -676,13 +634,12 @@ const mapAbsVars = (rename: (name: string) => string, term: Term): Term => {
|
|
|
676
634
|
}
|
|
677
635
|
};
|
|
678
636
|
|
|
679
|
-
// rename_abs: renames the abstractions of term after those of obj where pat matches obj.
|
|
680
637
|
export const renameAbs = (pattern: Term, object: Term, term: Term): Term | undefined => {
|
|
681
638
|
const renaming = new Map<string, string>();
|
|
682
|
-
matchBvs(pattern, object, []).forEach((
|
|
683
|
-
if (!renaming.has(
|
|
639
|
+
matchBvs(pattern, object, []).forEach((pair) => {
|
|
640
|
+
if (!renaming.has(pair[0])) renaming.set(pair[0], pair[1]);
|
|
684
641
|
});
|
|
685
|
-
if ([...renaming].every((
|
|
642
|
+
if ([...renaming].every((pair) => pair[0] === pair[1])) return undefined;
|
|
686
643
|
const renamed = mapAbsVars((name) => renaming.get(name) ?? name, term);
|
|
687
644
|
return renamed === term ? undefined : renamed;
|
|
688
645
|
};
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Every TLA+ type variable has the empty sort, so the kernel drops the sort hypotheses and
|
|
5
|
-
// constraints. Proof terms and certificates are not recorded either.
|
|
6
|
-
|
|
7
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
1
|
+
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
8
2
|
import {
|
|
9
3
|
betaNorm,
|
|
10
4
|
emptyEnvir,
|
|
@@ -24,6 +18,7 @@ import {
|
|
|
24
18
|
liftAll,
|
|
25
19
|
listAll,
|
|
26
20
|
listImplies,
|
|
21
|
+
isImplies,
|
|
27
22
|
mkEquals,
|
|
28
23
|
mkImplies,
|
|
29
24
|
occs,
|
|
@@ -68,12 +63,11 @@ import {
|
|
|
68
63
|
type Var,
|
|
69
64
|
} from "./term";
|
|
70
65
|
import type { Limits } from "./interrupt";
|
|
71
|
-
import { smashUnifiers, unifiers, type Tpair } from "./unify";
|
|
66
|
+
import { smashUnifiers, unifiers, type Tpair, type Unifier } from "./unify";
|
|
72
67
|
import { normTermSkip, renameBvars, stripApply, stripAssums2, unifyVarTypes } from "./bicompose";
|
|
73
68
|
|
|
74
69
|
declare const kernel: unique symbol;
|
|
75
70
|
|
|
76
|
-
// A theorem. Only this module builds one, so every Thm follows from the axioms by the rules here.
|
|
77
71
|
export interface Thm {
|
|
78
72
|
readonly maxidx: number;
|
|
79
73
|
readonly hyps: readonly Term[];
|
|
@@ -109,7 +103,6 @@ const unionTpairs = (left: readonly Tpair[], right: readonly Tpair[]) =>
|
|
|
109
103
|
const maxidxTpairs = (tpairs: readonly Tpair[], maxidx: number) =>
|
|
110
104
|
tpairs.reduce((result, pair) => maxidxOfTerm(pair[1], maxidxOfTerm(pair[0], result)), maxidx);
|
|
111
105
|
|
|
112
|
-
// An axiom or a theorem that the reference theories prove, taken on trust.
|
|
113
106
|
export const axiomThm = (prop: Term): Thm => makeThm(maxidxOfTerm(prop), [], [], prop);
|
|
114
107
|
|
|
115
108
|
export const nprems = (thm: Thm) => countPrems(thm.prop);
|
|
@@ -148,13 +141,7 @@ export const impliesIntr = (premise: Term, thm: Thm): Thm => {
|
|
|
148
141
|
|
|
149
142
|
export const impliesElim = (major: Thm, minor: Thm): Thm => {
|
|
150
143
|
const prop = major.prop;
|
|
151
|
-
if (
|
|
152
|
-
prop.kind !== "App" ||
|
|
153
|
-
prop.fun.kind !== "App" ||
|
|
154
|
-
prop.fun.fun.kind !== "Const" ||
|
|
155
|
-
prop.fun.fun.name !== "Pure.imp" ||
|
|
156
|
-
!aconv(prop.fun.arg, minor.prop)
|
|
157
|
-
)
|
|
144
|
+
if (!isImplies(prop) || !aconv(prop.fun.arg, minor.prop))
|
|
158
145
|
throw new TlaIsabelleError("THM", "implies_elim: major premise");
|
|
159
146
|
return makeThm(
|
|
160
147
|
Math.max(major.maxidx, minor.maxidx),
|
|
@@ -240,11 +227,11 @@ export const transitive = (first: Thm, second: Thm): Thm => {
|
|
|
240
227
|
);
|
|
241
228
|
};
|
|
242
229
|
|
|
243
|
-
export const betaConversion = (
|
|
244
|
-
if (!
|
|
230
|
+
export const betaConversion = (isFull: boolean, term: Term): Thm => {
|
|
231
|
+
if (!isFull && (term.kind !== "App" || term.fun.kind !== "Abs"))
|
|
245
232
|
throw new TlaIsabelleError("THM", "beta_conversion: not a redex");
|
|
246
233
|
const reduced =
|
|
247
|
-
|
|
234
|
+
isFull || term.kind !== "App" || term.fun.kind !== "Abs"
|
|
248
235
|
? betaNorm(term)
|
|
249
236
|
: substBound(term.arg, term.fun.body);
|
|
250
237
|
return makeThm(maxidxOfTerm(term), [], [], mkEquals(term, reduced));
|
|
@@ -318,7 +305,6 @@ export const flexflexRule = (limits: Limits | undefined, thm: Thm): Seq<Thm> =>
|
|
|
318
305
|
smashUnifiers(limits, thm.tpairs, emptyEnvir(thm.maxidx)),
|
|
319
306
|
);
|
|
320
307
|
|
|
321
|
-
// Thm.generalize: turns the named free variables into schematic ones with the given index.
|
|
322
308
|
export const generalize = (frees: readonly string[], index: number, thm: Thm): Thm => {
|
|
323
309
|
if (frees.length === 0) return thm;
|
|
324
310
|
if (index <= thm.maxidx) throw new TlaIsabelleError("THM", "generalize: bad index");
|
|
@@ -381,7 +367,6 @@ const instantiateTerm = (insts: readonly Instantiation[], term: Term): Term => {
|
|
|
381
367
|
return subst(term);
|
|
382
368
|
};
|
|
383
369
|
|
|
384
|
-
// Thm.instantiate for term variables. Every instance must have the type of its variable.
|
|
385
370
|
export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
386
371
|
if (insts.length === 0) return thm;
|
|
387
372
|
for (const inst of insts)
|
|
@@ -395,7 +380,6 @@ export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
|
395
380
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
396
381
|
};
|
|
397
382
|
|
|
398
|
-
// Thm.instantiate for type variables.
|
|
399
383
|
const instantiateTypesTerm = (tyenv: TyEnv, term: Term): Term => {
|
|
400
384
|
if (maxidxOfTerm(term) < 0) return term;
|
|
401
385
|
switch (term.kind) {
|
|
@@ -423,7 +407,6 @@ export const instantiateTypes = (tyenv: TyEnv, thm: Thm): Thm => {
|
|
|
423
407
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
424
408
|
};
|
|
425
409
|
|
|
426
|
-
// Thm.renamed_prop: the same theorem with an alpha-equivalent proposition.
|
|
427
410
|
export const renamedProp = (prop: Term, thm: Thm): Thm => {
|
|
428
411
|
if (!aconv(prop, thm.prop)) throw new TlaIsabelleError("TERM", "renamed_prop: props disagree");
|
|
429
412
|
return makeThm(thm.maxidx, thm.hyps, thm.tpairs, prop);
|
|
@@ -454,7 +437,6 @@ const destState = (state: Thm, index: number): State => {
|
|
|
454
437
|
};
|
|
455
438
|
};
|
|
456
439
|
|
|
457
|
-
// Thm.lift_rule: lifts a rule over the parameters and premises of a goal of a state.
|
|
458
440
|
export const liftRule = (goal: Term, goalMaxidx: number, rule: Thm): Thm => {
|
|
459
441
|
const increment = goalMaxidx + 1;
|
|
460
442
|
const premises = stripImpPrems(rule.prop).map((premise) => liftAll(increment, goal, premise));
|
|
@@ -483,10 +465,9 @@ export const incrIndexesThm = (increment: number, thm: Thm): Thm => {
|
|
|
483
465
|
);
|
|
484
466
|
};
|
|
485
467
|
|
|
486
|
-
// Thm.assumption: solves goal index by any of its assumptions, with unification.
|
|
487
468
|
export const assumption = (limits: Limits | undefined, index: number, state: Thm): Seq<Thm> => {
|
|
488
469
|
const parts = destState(state, index);
|
|
489
|
-
const newThm = (unifier:
|
|
470
|
+
const newThm = (unifier: Unifier): Thm => {
|
|
490
471
|
const envir = unifier.envir;
|
|
491
472
|
const isEmpty = isEmptyEnvir(envir);
|
|
492
473
|
const prop = listImplies(parts.before, parts.conclusion);
|
|
@@ -520,11 +501,9 @@ export const assumption = (limits: Limits | undefined, index: number, state: Thm
|
|
|
520
501
|
return addprfs(0);
|
|
521
502
|
};
|
|
522
503
|
|
|
523
|
-
// Thm.eq_assumption: solves goal index by an assumption equal to its conclusion up to alpha and eta.
|
|
524
504
|
export const eqAssumption = (index: number, state: Thm): Thm => {
|
|
525
505
|
const parts = destState(state, index);
|
|
526
506
|
const problems = assumProblems(-1, parts.goal);
|
|
527
|
-
// Envir.aeconv against each assumption, contracting the conclusion only once.
|
|
528
507
|
const conclusion = etaContract(problems.conclusion);
|
|
529
508
|
const isFound = problems.hyps.some(
|
|
530
509
|
(hyp) => aconv(hyp, problems.conclusion) || aconv(etaContract(hyp), conclusion),
|
|
@@ -604,17 +583,13 @@ const bicomposeAux = (
|
|
|
604
583
|
): Seq<Thm> => {
|
|
605
584
|
const orule = compose.rule;
|
|
606
585
|
const lift = countPrems(stripAllBody(parts.goal)) + (compose.isElim ? -1 : 0);
|
|
607
|
-
const addth = (
|
|
608
|
-
newAs: { premises: Term[] },
|
|
609
|
-
unifier: { envir: Envir; tpairs: readonly Tpair[] },
|
|
610
|
-
rest: Seq<Thm>,
|
|
611
|
-
): Seq<Thm> => {
|
|
586
|
+
const addth = (newPremises: readonly Term[], unifier: Unifier, rest: Seq<Thm>): Seq<Thm> => {
|
|
612
587
|
try {
|
|
613
588
|
const envir = unifier.envir;
|
|
614
589
|
const normt = (term: Term) => normTerm(envir, term);
|
|
615
590
|
const computed = (): [readonly Tpair[], Term[], Term] => {
|
|
616
591
|
if (isEmptyEnvir(envir))
|
|
617
|
-
return [unifier.tpairs, [...parts.before, ...
|
|
592
|
+
return [unifier.tpairs, [...parts.before, ...newPremises], parts.conclusion];
|
|
618
593
|
const tpairs = unifier.tpairs.map((pair): Tpair => [normt(pair[0]), normt(pair[1])]);
|
|
619
594
|
if (above(envir, state.maxidx))
|
|
620
595
|
return isLifted
|
|
@@ -622,13 +597,13 @@ const bicomposeAux = (
|
|
|
622
597
|
tpairs,
|
|
623
598
|
[
|
|
624
599
|
...parts.before,
|
|
625
|
-
...
|
|
600
|
+
...newPremises.map((premise) => normTermSkip(envir, lift, premise)),
|
|
626
601
|
],
|
|
627
602
|
parts.conclusion,
|
|
628
603
|
]
|
|
629
|
-
: [tpairs, [...parts.before, ...
|
|
604
|
+
: [tpairs, [...parts.before, ...newPremises.map(normt)], parts.conclusion];
|
|
630
605
|
if (flags.match) throw new Compose();
|
|
631
|
-
return [tpairs, [...parts.before, ...
|
|
606
|
+
return [tpairs, [...parts.before, ...newPremises].map(normt), normt(parts.conclusion)];
|
|
632
607
|
};
|
|
633
608
|
const [tpairs, premises, conclusion] = computed();
|
|
634
609
|
return consSeq(
|
|
@@ -649,8 +624,7 @@ const bicomposeAux = (
|
|
|
649
624
|
try {
|
|
650
625
|
return stripPrems(compose.subgoals, [], orule.prop);
|
|
651
626
|
} catch (error) {
|
|
652
|
-
if (error
|
|
653
|
-
throw new TlaIsabelleError("THM", "bicompose: rule");
|
|
627
|
+
if (isIsabelleError(error, "TERM")) throw new TlaIsabelleError("THM", "bicompose: rule");
|
|
654
628
|
throw error;
|
|
655
629
|
}
|
|
656
630
|
})();
|
|
@@ -668,16 +642,14 @@ const bicomposeAux = (
|
|
|
668
642
|
? [...premises]
|
|
669
643
|
: premises.map((premise) => stripApply(rename, conclusion, premise));
|
|
670
644
|
try {
|
|
671
|
-
return
|
|
672
|
-
premises: flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed,
|
|
673
|
-
};
|
|
645
|
+
return flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed;
|
|
674
646
|
} catch (error) {
|
|
675
|
-
if (error
|
|
647
|
+
if (isIsabelleError(error, "TERM"))
|
|
676
648
|
throw new TlaIsabelleError("THM", "bicompose: 1st premise");
|
|
677
649
|
throw error;
|
|
678
650
|
}
|
|
679
651
|
};
|
|
680
|
-
const bbi = isLifted ? stripAssums2(conclusion, parts.goal) :
|
|
652
|
+
const bbi: Tpair = isLifted ? stripAssums2(conclusion, parts.goal) : [conclusion, parts.goal];
|
|
681
653
|
const dpairs: Tpair[] = [bbi, ...orule.tpairs, ...parts.tpairs];
|
|
682
654
|
const eres = (envir: Envir, premises: readonly Term[]): Seq<Thm> => {
|
|
683
655
|
if (premises.length === 0) throw new TlaIsabelleError("THM", "bicompose: no premises");
|
|
@@ -739,8 +711,6 @@ export interface BiresRule {
|
|
|
739
711
|
readonly rule: Thm;
|
|
740
712
|
}
|
|
741
713
|
|
|
742
|
-
// Thm.biresolution: resolves goal index with each rule, the elimination rules also solving their
|
|
743
|
-
// first premise by an assumption.
|
|
744
714
|
export const biresolution = (
|
|
745
715
|
limits: Limits | undefined,
|
|
746
716
|
match: boolean,
|
|
@@ -769,7 +739,6 @@ export const biresolution = (
|
|
|
769
739
|
return flatSeq(res(0));
|
|
770
740
|
};
|
|
771
741
|
|
|
772
|
-
// Thm.RSN: resolution that must produce exactly one resolvent.
|
|
773
742
|
export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
|
|
774
743
|
const [results] = chopSeq(
|
|
775
744
|
2,
|
|
@@ -781,3 +750,12 @@ export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
|
|
|
781
750
|
};
|
|
782
751
|
|
|
783
752
|
export const rs = (rule: Thm, state: Thm) => rsn(rule, 1, state);
|
|
753
|
+
|
|
754
|
+
export const catchThm = <Result>(derive: () => Result): Result | undefined => {
|
|
755
|
+
try {
|
|
756
|
+
return derive();
|
|
757
|
+
} catch (error) {
|
|
758
|
+
if (isIsabelleError(error, "THM")) return undefined;
|
|
759
|
+
throw error;
|
|
760
|
+
}
|
|
761
|
+
};
|
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/type.ML, the matching and unification of types. Copyright (c)
|
|
2
|
-
// 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see
|
|
3
|
-
// LICENSE.
|
|
4
|
-
//
|
|
5
|
-
// Every type variable of Isabelle/TLA+ has the empty sort, so the order-sorted unification of
|
|
6
|
-
// Type.unify never meets a sort constraint and coincides with Type.raw_unify.
|
|
7
|
-
|
|
8
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
9
2
|
import {
|
|
10
3
|
emptyTable,
|
|
@@ -22,9 +15,6 @@ export type TyEnv = Table<IndexKey, Typ>;
|
|
|
22
15
|
|
|
23
16
|
export const emptyTyEnv: TyEnv = emptyTable(fastIndexnameOrd);
|
|
24
17
|
|
|
25
|
-
export const lookupTyEnv = (tyenv: TyEnv, name: IndexKey) => lookupTable(tyenv, name);
|
|
26
|
-
|
|
27
|
-
// Type.devar: chases the assignments of a type variable.
|
|
28
18
|
export const devar = (tyenv: TyEnv, type: Typ): Typ => {
|
|
29
19
|
let current = type;
|
|
30
20
|
while (current.kind === "TVar") {
|
|
@@ -48,7 +38,6 @@ const updateNew = (tyenv: TyEnv, name: IndexKey, type: Typ): TyEnv => {
|
|
|
48
38
|
return updateTable(tyenv, { name: name.name, index: name.index }, type);
|
|
49
39
|
};
|
|
50
40
|
|
|
51
|
-
// Type.unify: undefined where Isabelle raises TUNIFY.
|
|
52
41
|
export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
53
42
|
const leftType = devar(tyenv, left);
|
|
54
43
|
const rightType = devar(tyenv, right);
|
|
@@ -71,7 +60,6 @@ export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefin
|
|
|
71
60
|
return eqTyp(leftType, rightType) ? tyenv : undefined;
|
|
72
61
|
};
|
|
73
62
|
|
|
74
|
-
// Type.raw_match: undefined where Isabelle raises TYPE_MATCH.
|
|
75
63
|
export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
76
64
|
if (pattern.kind === "TVar") {
|
|
77
65
|
const assigned = lookupTable(tyenv, pattern);
|
|
@@ -90,7 +78,6 @@ export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | und
|
|
|
90
78
|
return object.kind === "TFree" && object.name === pattern.name ? tyenv : undefined;
|
|
91
79
|
};
|
|
92
80
|
|
|
93
|
-
// Envir.norm_type: instantiates the assigned type variables, chasing chains.
|
|
94
81
|
export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
95
82
|
if (type.kind === "TFree") return type;
|
|
96
83
|
if (type.kind === "TVar") {
|
|
@@ -101,7 +88,6 @@ export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
101
88
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
102
89
|
};
|
|
103
90
|
|
|
104
|
-
// Envir.subst_type: instantiates without chasing.
|
|
105
91
|
export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
106
92
|
if (type.kind === "TFree") return type;
|
|
107
93
|
if (type.kind === "TVar") return lookupTable(tyenv, type) ?? type;
|
|
@@ -109,8 +95,7 @@ export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
109
95
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
110
96
|
};
|
|
111
97
|
|
|
112
|
-
// Type.unified
|
|
113
|
-
// so arguments never differ.
|
|
98
|
+
// Isabelle2025's Type.unified compares each argument with itself, so arguments never differ.
|
|
114
99
|
export const unifiedTypes = (tyenv: TyEnv, left: Typ, right: Typ): boolean => {
|
|
115
100
|
if (isEmptyTable(tyenv)) return eqTyp(left, right);
|
|
116
101
|
const leftType = devar(tyenv, left);
|