tla-ts 0.0.9 → 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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -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 +3 -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 +1156 -888
- 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 +330 -659
- package/src/cli/typescript.ts +23 -0
- 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 +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- 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 -322
- package/src/liveness.ts +230 -133
- 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 +36 -60
- package/src/parallel.ts +64 -73
- 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 +135 -40
- 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 +299 -108
- 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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- 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,10 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
// goal conversions of Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische
|
|
3
|
-
// Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
|
-
|
|
5
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
1
|
+
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
6
2
|
import { gconvRule, impCongRule } from "./conv";
|
|
7
|
-
import { impCong, swapPremsEq } from "./drule";
|
|
3
|
+
import { betaEtaConversion, impCong, swapPremsEq } from "./drule";
|
|
8
4
|
import { emptyTEnv } from "./envir";
|
|
9
5
|
import {
|
|
10
6
|
destEquals,
|
|
@@ -17,17 +13,19 @@ import {
|
|
|
17
13
|
stripImpPrems,
|
|
18
14
|
} from "./logic";
|
|
19
15
|
import { boundName } from "./name";
|
|
20
|
-
import { matchTermNet
|
|
16
|
+
import { matchTermNet } from "./net";
|
|
21
17
|
import { firstOrderMatchPattern, matchPattern, matches, type MatchEnv } from "./pattern";
|
|
22
18
|
import {
|
|
23
19
|
addPrems,
|
|
24
20
|
congKey,
|
|
25
21
|
congName,
|
|
26
22
|
extractSafeRrules,
|
|
23
|
+
hasVar,
|
|
27
24
|
insertRrule,
|
|
28
25
|
mkProcrule,
|
|
29
26
|
SIMP_DEPTH_LIMIT,
|
|
30
|
-
|
|
27
|
+
varsOf,
|
|
28
|
+
type RawRrule,
|
|
31
29
|
type Rrule,
|
|
32
30
|
type SimpContext,
|
|
33
31
|
} from "./raw-simplifier";
|
|
@@ -36,8 +34,6 @@ import { emptyTyEnv, substType } from "./type";
|
|
|
36
34
|
import {
|
|
37
35
|
aconv,
|
|
38
36
|
existsSubterm,
|
|
39
|
-
eqTyp,
|
|
40
|
-
foldVars,
|
|
41
37
|
listComb,
|
|
42
38
|
maxidxOfTerm,
|
|
43
39
|
mkBound,
|
|
@@ -50,7 +46,6 @@ import {
|
|
|
50
46
|
dummyT,
|
|
51
47
|
type App,
|
|
52
48
|
type Term,
|
|
53
|
-
type Var,
|
|
54
49
|
} from "./term";
|
|
55
50
|
import { termOrd } from "./term-ord";
|
|
56
51
|
import {
|
|
@@ -76,31 +71,21 @@ import {
|
|
|
76
71
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
77
72
|
import { resolveTac } from "./tactic";
|
|
78
73
|
import { listOfSeq, seqHead, singleSeq, emptySeq, type Seq } from "./seq";
|
|
79
|
-
import { allGoals,
|
|
74
|
+
import { allGoals, distinctThms } from "./tactical";
|
|
80
75
|
|
|
81
76
|
export type Prover = (context: SimpContext, thm: Thm) => Thm | undefined;
|
|
82
77
|
|
|
83
|
-
// simple_prover: proves the premises of a rewrite rule with the premises of the simpset.
|
|
84
78
|
export const simpleProver: Prover = (context, thm) =>
|
|
85
79
|
seqHead(allGoals(resolveTac(context.limits, context.simpset.prems))(thm));
|
|
86
80
|
|
|
87
|
-
const isThmError = (error: unknown) =>
|
|
88
|
-
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
89
|
-
|
|
90
81
|
const lhsOf = (thm: Thm) => destEquals(thm.prop)[0];
|
|
91
82
|
const rhsOf = (thm: Thm) => destEquals(thm.prop)[1];
|
|
92
83
|
|
|
93
|
-
const betaEtaConversion = (term: Term) => {
|
|
94
|
-
const beta = betaConversion(true, term);
|
|
95
|
-
return transitive(beta, etaConversion(rhsOf(beta)));
|
|
96
|
-
};
|
|
97
|
-
|
|
98
|
-
// Thm.match and Thm.instantiate: instantiates rule so that pattern becomes object.
|
|
99
84
|
const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
|
|
100
85
|
const typed = instantiateTypes(env.tyenv, rule);
|
|
101
|
-
const insts: Instantiation[] = tableEntries(env.tenv).map((
|
|
102
|
-
variable: mkVar(
|
|
103
|
-
term:
|
|
86
|
+
const insts: Instantiation[] = tableEntries(env.tenv).map((entry) => ({
|
|
87
|
+
variable: mkVar(entry[0].name, entry[0].index, substType(env.tyenv, entry[1].type)),
|
|
88
|
+
term: entry[1].term,
|
|
104
89
|
}));
|
|
105
90
|
return instantiate(insts, typed);
|
|
106
91
|
};
|
|
@@ -110,23 +95,22 @@ const renameBoundvars = (pattern: Term, object: Term, thm: Thm) => {
|
|
|
110
95
|
return renamed === undefined ? thm : renamedProp(renamed, thm);
|
|
111
96
|
};
|
|
112
97
|
|
|
113
|
-
// check_conv: joins thm and next, allowing for beta and eta differences in the middle term.
|
|
114
98
|
const checkConv = (thm: Thm, next: Thm): Thm | undefined => {
|
|
115
99
|
try {
|
|
116
100
|
return transitive(thm, next);
|
|
117
101
|
} catch (error) {
|
|
118
|
-
if (!
|
|
102
|
+
if (!isIsabelleError(error, "THM")) throw error;
|
|
119
103
|
}
|
|
120
104
|
try {
|
|
121
105
|
const normalized = transitive(symmetric(betaEtaConversion(lhsOf(next))), next);
|
|
122
106
|
try {
|
|
123
107
|
return transitive(thm, normalized);
|
|
124
108
|
} catch (error) {
|
|
125
|
-
if (!
|
|
109
|
+
if (!isIsabelleError(error, "THM")) throw error;
|
|
126
110
|
return transitive(transitive(thm, betaEtaConversion(rhsOf(thm))), normalized);
|
|
127
111
|
}
|
|
128
112
|
} catch (error) {
|
|
129
|
-
if (
|
|
113
|
+
if (isIsabelleError(error, "THM")) return undefined;
|
|
130
114
|
throw error;
|
|
131
115
|
}
|
|
132
116
|
};
|
|
@@ -150,18 +134,9 @@ const isWeakCong = (context: SimpContext, lhs: Term) => {
|
|
|
150
134
|
const uncondSkel = (context: SimpContext, lhs: Term, rhs: Term) =>
|
|
151
135
|
isWeakCong(context, lhs) ? SKEL0 : rhs;
|
|
152
136
|
|
|
153
|
-
const varsOf = (term: Term) => foldVars((atom, result: Var[]) => [...result, atom], term, []);
|
|
154
|
-
|
|
155
137
|
const condSkel = (context: SimpContext, lhs: Term, rhs: Term) => {
|
|
156
138
|
const lhsVars = varsOf(lhs);
|
|
157
|
-
return varsOf(rhs).every((variable) =>
|
|
158
|
-
lhsVars.some(
|
|
159
|
-
(other) =>
|
|
160
|
-
other.name === variable.name &&
|
|
161
|
-
other.index === variable.index &&
|
|
162
|
-
eqTyp(other.type, variable.type),
|
|
163
|
-
),
|
|
164
|
-
)
|
|
139
|
+
return varsOf(rhs).every((variable) => hasVar(lhsVars, variable))
|
|
165
140
|
? uncondSkel(context, lhs, rhs)
|
|
166
141
|
: SKEL0;
|
|
167
142
|
};
|
|
@@ -187,7 +162,6 @@ const sortRrules = (rrules: readonly Rrule[]) => {
|
|
|
187
162
|
return [...simple, ...conditional];
|
|
188
163
|
};
|
|
189
164
|
|
|
190
|
-
// rewritec's rew: rewrites the eta-contracted term with one rule.
|
|
191
165
|
const rew = (
|
|
192
166
|
prover: Prover,
|
|
193
167
|
maxt: number,
|
|
@@ -199,7 +173,7 @@ const rew = (
|
|
|
199
173
|
const [rthm, elhs] =
|
|
200
174
|
maxt === -1 || !rrule.extra
|
|
201
175
|
? [rrule.thm, rrule.elhs]
|
|
202
|
-
: [incrIndexesThm(maxt + 1, rrule.thm),
|
|
176
|
+
: [incrIndexesThm(maxt + 1, rrule.thm), incrIndexes([], maxt + 1, rrule.elhs)];
|
|
203
177
|
const env = rrule.fo
|
|
204
178
|
? firstOrderMatchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv })
|
|
205
179
|
: matchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv });
|
|
@@ -224,7 +198,6 @@ const rew = (
|
|
|
224
198
|
return { thm: joined, skel: condSkel(context, ruleLhs, ruleRhs) };
|
|
225
199
|
};
|
|
226
200
|
|
|
227
|
-
// rewritec's rews: the first rule that rewrites the term.
|
|
228
201
|
const rews = (
|
|
229
202
|
prover: Prover,
|
|
230
203
|
maxt: number,
|
|
@@ -239,7 +212,6 @@ const rews = (
|
|
|
239
212
|
return undefined;
|
|
240
213
|
};
|
|
241
214
|
|
|
242
|
-
// rewritec: one rewrite step at the root of a term.
|
|
243
215
|
const rewritec = (
|
|
244
216
|
prover: Prover,
|
|
245
217
|
maxt: number,
|
|
@@ -259,7 +231,7 @@ const rewritec = (
|
|
|
259
231
|
sortRrules(matchTermNet(context.simpset.rules, etaTerm)),
|
|
260
232
|
);
|
|
261
233
|
if (rewritten !== undefined) return rewritten;
|
|
262
|
-
for (const proc of matchTermNet(context.simpset.simprocs
|
|
234
|
+
for (const proc of matchTermNet(context.simpset.simprocs, etaTerm)) {
|
|
263
235
|
if (!matches(proc.lhs, term, emptyTyEnv, emptyTEnv)) continue;
|
|
264
236
|
const raw = proc.proc(context, etaTerm);
|
|
265
237
|
if (raw === undefined) continue;
|
|
@@ -269,9 +241,6 @@ const rewritec = (
|
|
|
269
241
|
return undefined;
|
|
270
242
|
};
|
|
271
243
|
|
|
272
|
-
const incrementTerm = (increment: number, term: Term) => incrIndexes([], increment, term);
|
|
273
|
-
|
|
274
|
-
// congc: applies a congruence rule to a term.
|
|
275
244
|
const congc = (
|
|
276
245
|
prover: (thm: Thm) => Thm | undefined,
|
|
277
246
|
maxt: number,
|
|
@@ -313,16 +282,12 @@ export interface RewriteMode {
|
|
|
313
282
|
}
|
|
314
283
|
|
|
315
284
|
interface PremRules {
|
|
316
|
-
readonly rules:
|
|
285
|
+
readonly rules: readonly RawRrule[];
|
|
317
286
|
readonly asm: Thm | undefined;
|
|
318
287
|
}
|
|
319
288
|
|
|
320
|
-
// bottomc: bottom-up rewriting with the simpset of the context.
|
|
321
289
|
const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
322
|
-
// Isabelle
|
|
323
|
-
// so a simpset that rewrites forever keeps every step until Isabelle runs out of memory. This
|
|
324
|
-
// loops and chains each step as it goes, which gives the same theorem, so such a simpset runs
|
|
325
|
-
// into the time limit holding only the latest one.
|
|
290
|
+
// Deviation from Isabelle: botc loops instead of recursing, so an endless simpset hits the time limit, not the memory limit.
|
|
326
291
|
const botc = (skel: Term, context: SimpContext, term: Term): Thm | undefined => {
|
|
327
292
|
let chained: Thm | undefined;
|
|
328
293
|
let currentSkel = skel;
|
|
@@ -353,9 +318,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
353
318
|
return inner === undefined ? undefined : abstractRule(term.name, variable, inner);
|
|
354
319
|
}
|
|
355
320
|
if (term.kind !== "App") return undefined;
|
|
321
|
+
if (isImplies(term)) return impc(term, context);
|
|
356
322
|
const head = term.fun;
|
|
357
|
-
if (head.kind === "App" && head.fun.kind === "Const" && head.fun.name === "Pure.imp")
|
|
358
|
-
return impc(term, context);
|
|
359
323
|
if (head.kind === "Abs") {
|
|
360
324
|
const beta = betaConversion(false, term);
|
|
361
325
|
const rest = subc(SKEL0, context, rhsOf(beta));
|
|
@@ -382,10 +346,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
382
346
|
};
|
|
383
347
|
const impc = (term: Term, context: SimpContext) =>
|
|
384
348
|
mode.mutsimp ? mutImpc0([], term, [], context) : nonmutImpc(term, context);
|
|
385
|
-
const rulesOfPrem = (prem: Term, context: SimpContext):
|
|
386
|
-
if (maxidxOfTerm(prem) !== -1) return
|
|
349
|
+
const rulesOfPrem = (prem: Term, context: SimpContext): PremRules => {
|
|
350
|
+
if (maxidxOfTerm(prem) !== -1) return { rules: [], asm: undefined };
|
|
387
351
|
const asm = assume(prem);
|
|
388
|
-
return
|
|
352
|
+
return { rules: extractSafeRrules(context, asm), asm };
|
|
389
353
|
};
|
|
390
354
|
const addRrules = (rules: readonly PremRules[], context: SimpContext): SimpContext => {
|
|
391
355
|
const simpset = rules.reduce(
|
|
@@ -419,7 +383,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
419
383
|
eq: Thm | undefined,
|
|
420
384
|
): Thm | undefined => {
|
|
421
385
|
if (prems.length === 0) return eq;
|
|
422
|
-
const
|
|
386
|
+
const prem = prems[0];
|
|
387
|
+
const rest = prems.slice(1);
|
|
423
388
|
const inner = addRrules(rules.slice(1).reverse(), context);
|
|
424
389
|
const nextConcl = mkImplies(prem, eq === undefined ? concl : rhsOf(eq));
|
|
425
390
|
const dprem = eq === undefined ? undefined : disch(false, prem, eq);
|
|
@@ -439,13 +404,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
439
404
|
context: SimpContext,
|
|
440
405
|
): Thm | undefined => {
|
|
441
406
|
const newPrems = stripImpPrems(concl);
|
|
442
|
-
let current = context;
|
|
443
407
|
const newRules: PremRules[] = [];
|
|
444
|
-
for (const prem of newPrems)
|
|
445
|
-
const [rule, next] = rulesOfPrem(prem, current);
|
|
446
|
-
newRules.push(rule);
|
|
447
|
-
current = next;
|
|
448
|
-
}
|
|
408
|
+
for (const prem of newPrems) newRules.push(rulesOfPrem(prem, context));
|
|
449
409
|
return mutImpc(
|
|
450
410
|
[...prems, ...newPrems],
|
|
451
411
|
stripImpConcl(concl),
|
|
@@ -453,7 +413,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
453
413
|
[],
|
|
454
414
|
[],
|
|
455
415
|
[],
|
|
456
|
-
|
|
416
|
+
context,
|
|
457
417
|
-1,
|
|
458
418
|
-1,
|
|
459
419
|
);
|
|
@@ -497,8 +457,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
497
457
|
);
|
|
498
458
|
return transitive1(folded, rest);
|
|
499
459
|
}
|
|
500
|
-
const
|
|
501
|
-
const
|
|
460
|
+
const prem = prems[0];
|
|
461
|
+
const otherPrems = prems.slice(1);
|
|
462
|
+
const rule = rules[0];
|
|
463
|
+
const otherRules = rules.slice(1);
|
|
502
464
|
const simplified =
|
|
503
465
|
count === 0
|
|
504
466
|
? undefined
|
|
@@ -526,7 +488,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
526
488
|
),
|
|
527
489
|
-1,
|
|
528
490
|
);
|
|
529
|
-
const
|
|
491
|
+
const newRule = rulesOfPrem(newPrem, context);
|
|
530
492
|
const eqn = otherPrems
|
|
531
493
|
.slice(0, index)
|
|
532
494
|
.reduceRight(
|
|
@@ -540,7 +502,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
540
502
|
[newPrem, ...donePrems],
|
|
541
503
|
[newRule, ...doneRules],
|
|
542
504
|
[eqn, ...eqns],
|
|
543
|
-
|
|
505
|
+
context,
|
|
544
506
|
donePrems.length,
|
|
545
507
|
-1,
|
|
546
508
|
);
|
|
@@ -550,7 +512,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
550
512
|
const first = mode.simprem ? botc(SKEL0, context, prem) : undefined;
|
|
551
513
|
const simplifiedPrem = first === undefined ? prem : rhsOf(first);
|
|
552
514
|
const inner = mode.useprem
|
|
553
|
-
? addRrules([rulesOfPrem(simplifiedPrem, context)
|
|
515
|
+
? addRrules([rulesOfPrem(simplifiedPrem, context)], context)
|
|
554
516
|
: context;
|
|
555
517
|
const second = botc(SKEL0, inner, conc);
|
|
556
518
|
if (second === undefined)
|
|
@@ -563,13 +525,9 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
563
525
|
return tryBotc;
|
|
564
526
|
};
|
|
565
527
|
|
|
566
|
-
// Drule.flexflex_unique
|
|
567
528
|
const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
568
529
|
if (thm.tpairs.length === 0) return thm;
|
|
569
|
-
const
|
|
570
|
-
const distinct = results.filter(
|
|
571
|
-
(result, index) => results.findIndex((other) => eqThm(other, result)) === index,
|
|
572
|
-
);
|
|
530
|
+
const distinct = distinctThms(listOfSeq(flexflexRule(limits, thm)));
|
|
573
531
|
if (distinct.length === 1) return distinct[0];
|
|
574
532
|
throw new TlaIsabelleError(
|
|
575
533
|
"THM",
|
|
@@ -579,7 +537,6 @@ const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
|
579
537
|
);
|
|
580
538
|
};
|
|
581
539
|
|
|
582
|
-
// rewrite_cterm: proves term == term' by rewriting.
|
|
583
540
|
export const rewriteCterm = (
|
|
584
541
|
mode: RewriteMode,
|
|
585
542
|
prover: Prover,
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/search.ML, iterative deepening and best-first search.
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
4
|
-
|
|
5
1
|
import { listOfSeq, makeSeq, seqOfList } from "./seq";
|
|
6
2
|
import { eqThm, hasFewerPrems, noTac, orElse, type GoalTactic, type Tactic } from "./tactical";
|
|
7
3
|
import { termOrd } from "./term-ord";
|
|
8
4
|
import type { Thm } from "./thm";
|
|
9
5
|
|
|
10
|
-
// DEEPEN: tries the tactic with limits from start up to limit in steps of increment.
|
|
11
6
|
export const deepen =
|
|
12
7
|
(
|
|
13
8
|
increment: number,
|
|
@@ -29,18 +24,14 @@ interface Sized {
|
|
|
29
24
|
readonly thm: Thm;
|
|
30
25
|
}
|
|
31
26
|
|
|
32
|
-
// Thm_Heap's order: by size, then by proposition.
|
|
33
27
|
const compareSized = (left: Sized, right: Sized) =>
|
|
34
28
|
left.size - right.size || termOrd(left.thm.prop, right.thm.prop);
|
|
35
29
|
|
|
36
|
-
// BEST_FIRST: searches the states the tactic produces, smallest first, for one that satisfies
|
|
37
|
-
// the predicate. A sorted list stands in for Thm_Heap: both yield the least state under the same
|
|
38
|
-
// total order.
|
|
39
30
|
export const bestFirst =
|
|
40
|
-
(isSatisfied: (state: Thm) => boolean,
|
|
31
|
+
(isSatisfied: (state: Thm) => boolean, getSize: (state: Thm) => number, tactic: Tactic): Tactic =>
|
|
41
32
|
(state) => {
|
|
42
33
|
const insert = (heap: readonly Sized[], thm: Thm): Sized[] => {
|
|
43
|
-
const entry = { size:
|
|
34
|
+
const entry = { size: getSize(thm), thm };
|
|
44
35
|
const position = heap.findIndex((other) => compareSized(entry, other) < 0);
|
|
45
36
|
return position === -1
|
|
46
37
|
? [...heap, entry]
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/General/seq.ML. Copyright (c) 1986-2025 University of
|
|
2
|
-
// Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Lazy sequences. As in Isabelle, pulling a sequence twice computes its head twice.
|
|
5
|
-
|
|
6
1
|
export type Cell<Item> = readonly [Item, Seq<Item>] | undefined;
|
|
7
2
|
|
|
8
3
|
type Step<Item> = Cell<Item> | Seq<Item>;
|
|
@@ -14,10 +9,6 @@ export interface Seq<Item> {
|
|
|
14
9
|
|
|
15
10
|
export const makeSeq = <Item>(pull: () => Cell<Item>): Seq<Item> => ({ pull });
|
|
16
11
|
|
|
17
|
-
// A sequence whose step may hand over to another sequence where Isabelle would pull it in tail
|
|
18
|
-
// position. Pulling follows the hand-overs in a loop, so a long run of empty alternatives, which
|
|
19
|
-
// Poly/ML's growing stack absorbs, doesn't exhaust this one. A class, so that pull is shared
|
|
20
|
-
// rather than a new closure for every sequence.
|
|
21
12
|
class DeferredSeq<Item> implements Seq<Item> {
|
|
22
13
|
readonly step: () => Step<Item>;
|
|
23
14
|
|
|
@@ -49,7 +40,6 @@ export const seqOfList = <Item>(items: readonly Item[]): Seq<Item> =>
|
|
|
49
40
|
|
|
50
41
|
export const seqHead = <Item>(seq: Seq<Item>): Item | undefined => seq.pull()?.[0];
|
|
51
42
|
|
|
52
|
-
// Seq.chop: the first count elements and the rest of the sequence.
|
|
53
43
|
export const chopSeq = <Item>(count: number, seq: Seq<Item>): [Item[], Seq<Item>] => {
|
|
54
44
|
const items: Item[] = [];
|
|
55
45
|
let current = seq;
|
|
@@ -118,7 +108,6 @@ export const mapsSeq = <Item, Result>(
|
|
|
118
108
|
return cell === undefined ? undefined : appendSeq(map(cell[0]), mapsSeq(map, cell[1]));
|
|
119
109
|
});
|
|
120
110
|
|
|
121
|
-
// Seq.it_right: accumulates lazily from the right.
|
|
122
111
|
export const itRightSeq = <Item, Result>(
|
|
123
112
|
combine: (item: Item, rest: Seq<Result>) => Seq<Result>,
|
|
124
113
|
seq: Seq<Item>,
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
// simplification tactics. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
|
|
3
|
-
// Muenchen, and contributors, see LICENSE.
|
|
4
|
-
|
|
5
|
-
import { genAll, isNormHhf, normHhfEq } from "./drule";
|
|
1
|
+
import { genAll, isNormHhf, normHhfEq, protectCong } from "./drule";
|
|
6
2
|
import { preferGoal } from "./goal";
|
|
7
|
-
import {
|
|
3
|
+
import { congKey, makeSimpContext, type SimpContext, type Solver } from "./raw-simplifier";
|
|
4
|
+
import { updateTable } from "./table";
|
|
8
5
|
import { fconvRule } from "./conv";
|
|
9
6
|
import {
|
|
10
7
|
genericRewriteGoalTac,
|
|
@@ -32,7 +29,6 @@ const withSolvers = (context: SimpContext, solvers: readonly Solver[]): SimpCont
|
|
|
32
29
|
simpset: { ...context.simpset, unsafeSolvers: solvers, safeSolvers: solvers },
|
|
33
30
|
});
|
|
34
31
|
|
|
35
|
-
// solve_all_tac: solves goal 1 completely with the subgoaler.
|
|
36
32
|
const solveAllTac = (solvers: readonly Solver[], context: SimpContext): Tactic => {
|
|
37
33
|
const inner = withSolvers(context, solvers);
|
|
38
34
|
const solveTac = thenAllNew(inner.simpset.subgoalTac(inner), () => noTac);
|
|
@@ -47,7 +43,6 @@ const singleProver =
|
|
|
47
43
|
(context, thm) =>
|
|
48
44
|
solveAllTac(solvers, context)(thm).pull()?.[0];
|
|
49
45
|
|
|
50
|
-
// generic_simp_tac
|
|
51
46
|
const genericSimpTac =
|
|
52
47
|
(isSafe: boolean, mode: RewriteMode) =>
|
|
53
48
|
(context: SimpContext): GoalTactic =>
|
|
@@ -62,6 +57,7 @@ const genericSimpTac =
|
|
|
62
57
|
);
|
|
63
58
|
return preferGoal(simpLoopTac(1))(index);
|
|
64
59
|
};
|
|
60
|
+
|
|
65
61
|
export const asmSimpTac = genericSimpTac(false, { simprem: false, useprem: true, mutsimp: false });
|
|
66
62
|
export const asmLrSimpTac = genericSimpTac(false, { simprem: true, useprem: true, mutsimp: false });
|
|
67
63
|
export const asmFullSimpTac = genericSimpTac(false, {
|
|
@@ -75,7 +71,6 @@ export const safeAsmFullSimpTac = genericSimpTac(true, {
|
|
|
75
71
|
mutsimp: true,
|
|
76
72
|
});
|
|
77
73
|
|
|
78
|
-
// Simplifier.simp_thm: simplifies a theorem's proposition.
|
|
79
74
|
const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
80
75
|
const prover = singleProver([...context.simpset.unsafeSolvers].reverse());
|
|
81
76
|
return fconvRule((term) => rewriteCterm(mode, prover, context, term), thm);
|
|
@@ -84,13 +79,24 @@ const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
|
84
79
|
export const simplify = (context: SimpContext, thm: Thm) =>
|
|
85
80
|
simpThm({ simprem: false, useprem: false, mutsimp: false }, context, thm);
|
|
86
81
|
|
|
87
|
-
//
|
|
88
|
-
//
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
const
|
|
93
|
-
|
|
82
|
+
// Drule.sort_constraint_eq, the other rule of hhf_ss, never applies: tlapm's terms carry no sort
|
|
83
|
+
// constraints.
|
|
84
|
+
const genNormHhf = (isProtecting: boolean, limits: Limits, thm: Thm): Thm => {
|
|
85
|
+
if (isNormHhf(isProtecting, thm.prop)) return genAll(thm);
|
|
86
|
+
const hhfContext = makeSimpContext(limits, [normHhfEq]);
|
|
87
|
+
const context = isProtecting
|
|
88
|
+
? {
|
|
89
|
+
...hhfContext,
|
|
90
|
+
simpset: {
|
|
91
|
+
...hhfContext.simpset,
|
|
92
|
+
congs: updateTable(
|
|
93
|
+
hhfContext.simpset.congs,
|
|
94
|
+
congKey({ isConst: true, name: "Pure.prop" }),
|
|
95
|
+
protectCong,
|
|
96
|
+
),
|
|
97
|
+
},
|
|
98
|
+
}
|
|
99
|
+
: hhfContext;
|
|
94
100
|
return genAll(
|
|
95
101
|
fconvRule(
|
|
96
102
|
(term) =>
|
|
@@ -104,3 +110,8 @@ export const normHhf = (limits: Limits, thm: Thm): Thm => {
|
|
|
104
110
|
),
|
|
105
111
|
);
|
|
106
112
|
};
|
|
113
|
+
|
|
114
|
+
export const normHhf = (limits: Limits, thm: Thm) => genNormHhf(false, limits, thm);
|
|
115
|
+
|
|
116
|
+
// Raw_Simplifier.norm_hhf_protect leaves protected propositions alone.
|
|
117
|
+
export const normHhfProtect = (limits: Limits, thm: Thm) => genNormHhf(true, limits, thm);
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/General/table.ML. Copyright (c) 1986-2025 University of
|
|
2
|
-
// Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Persistent tables ordered by a comparison function. Isabelle's tables are 2-3 trees; any
|
|
5
|
-
// balanced search tree visits keys in the same order, which is all that the ports rely on.
|
|
6
|
-
|
|
7
1
|
export type Compare<Key> = (left: Key, right: Key) => number;
|
|
8
2
|
|
|
9
3
|
type Node<Key, Value> =
|
|
@@ -120,27 +114,6 @@ export const updateTable = <Key, Value>(
|
|
|
120
114
|
root: insertNode(table.compare, key, value, table.root),
|
|
121
115
|
});
|
|
122
116
|
|
|
123
|
-
const removeMin = <Key, Value>(
|
|
124
|
-
node: NonNullable<Node<Key, Value>>,
|
|
125
|
-
): [NonNullable<Node<Key, Value>>, Node<Key, Value>] => {
|
|
126
|
-
if (!node.left) return [node, node.right];
|
|
127
|
-
const [minimum, left] = removeMin(node.left);
|
|
128
|
-
return [minimum, balance(node.key, node.value, left, node.right)];
|
|
129
|
-
};
|
|
130
|
-
|
|
131
|
-
export const deleteTable = <Key, Value>(table: Table<Key, Value>, key: Key): Table<Key, Value> => {
|
|
132
|
-
const remove = (node: Node<Key, Value>): Node<Key, Value> => {
|
|
133
|
-
if (!node) return undefined;
|
|
134
|
-
const order = table.compare(key, node.key);
|
|
135
|
-
if (order < 0) return balance(node.key, node.value, remove(node.left), node.right);
|
|
136
|
-
if (order > 0) return balance(node.key, node.value, node.left, remove(node.right));
|
|
137
|
-
if (!node.right) return node.left;
|
|
138
|
-
const [minimum, right] = removeMin(node.right);
|
|
139
|
-
return balance(minimum.key, minimum.value, node.left, right);
|
|
140
|
-
};
|
|
141
|
-
return { compare: table.compare, root: remove(table.root) };
|
|
142
|
-
};
|
|
143
|
-
|
|
144
117
|
export const minTable = <Key, Value>(table: Table<Key, Value>): [Key, Value] | undefined => {
|
|
145
118
|
let node = table.root;
|
|
146
119
|
if (!node) return undefined;
|
|
@@ -157,14 +130,12 @@ const foldNode = <Key, Value, State>(
|
|
|
157
130
|
? foldNode(visit, node.right, visit(node.key, node.value, foldNode(visit, node.left, state)))
|
|
158
131
|
: state;
|
|
159
132
|
|
|
160
|
-
// Table.fold: visits the entries in key order.
|
|
161
133
|
export const foldTable = <Key, Value, State>(
|
|
162
134
|
visit: (key: Key, value: Value, state: State) => State,
|
|
163
135
|
table: Table<Key, Value>,
|
|
164
136
|
state: State,
|
|
165
137
|
) => foldNode(visit, table.root, state);
|
|
166
138
|
|
|
167
|
-
// The entries in key order, as Table.dest lists them.
|
|
168
139
|
export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
169
140
|
foldTable<Key, Value, [Key, Value][]>(
|
|
170
141
|
(key, value, entries) => {
|
|
@@ -175,7 +146,6 @@ export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
|
175
146
|
[],
|
|
176
147
|
);
|
|
177
148
|
|
|
178
|
-
// fast_string_ord: shorter strings first, then by code units.
|
|
179
149
|
export const fastStringOrd = (left: string, right: string) =>
|
|
180
150
|
left === right
|
|
181
151
|
? 0
|
|
@@ -185,17 +155,16 @@ export const fastStringOrd = (left: string, right: string) =>
|
|
|
185
155
|
? -1
|
|
186
156
|
: 1;
|
|
187
157
|
|
|
188
|
-
const stringOrd = (left: string, right: string) =>
|
|
158
|
+
export const stringOrd = (left: string, right: string) =>
|
|
159
|
+
left === right ? 0 : left < right ? -1 : 1;
|
|
189
160
|
|
|
190
161
|
export interface IndexKey {
|
|
191
162
|
readonly name: string;
|
|
192
163
|
readonly index: number;
|
|
193
164
|
}
|
|
194
165
|
|
|
195
|
-
// Term_Ord.fast_indexname_ord: by index, then by fast_string_ord on the name.
|
|
196
166
|
export const fastIndexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
197
167
|
left.index !== right.index ? left.index - right.index : fastStringOrd(left.name, right.name);
|
|
198
168
|
|
|
199
|
-
// Term_Ord.indexname_ord: by index, then by string_ord on the name.
|
|
200
169
|
export const indexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
201
170
|
left.index !== right.index ? left.index - right.index : stringOrd(left.name, right.name);
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/tactic.ML, the basic resolution tactics. Copyright (c) 1986-2025
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
|
|
4
1
|
import { makeElim } from "./drule";
|
|
5
2
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
6
3
|
import { stripAssumsConcl, stripAssumsHyp } from "./logic";
|
|
@@ -44,45 +41,41 @@ export const composeTac =
|
|
|
44
41
|
);
|
|
45
42
|
|
|
46
43
|
const biresolveTac =
|
|
47
|
-
(limits: Limits, rules: readonly BiresRule[]): GoalTactic =>
|
|
44
|
+
(limits: Limits, match: boolean, rules: readonly BiresRule[]): GoalTactic =>
|
|
48
45
|
(index) =>
|
|
49
46
|
primSeq((state) => {
|
|
50
47
|
checkInterrupt(limits);
|
|
51
|
-
return biresolution(limits,
|
|
48
|
+
return biresolution(limits, match, rules, index, state);
|
|
52
49
|
});
|
|
53
50
|
|
|
54
51
|
export const resolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
55
52
|
biresolveTac(
|
|
56
53
|
limits,
|
|
54
|
+
false,
|
|
57
55
|
rules.map((rule) => ({ isElim: false, rule })),
|
|
58
56
|
);
|
|
59
57
|
|
|
60
58
|
export const eresolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
61
59
|
biresolveTac(
|
|
62
60
|
limits,
|
|
61
|
+
false,
|
|
63
62
|
rules.map((rule) => ({ isElim: true, rule })),
|
|
64
63
|
);
|
|
65
64
|
|
|
66
65
|
export const dresolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
67
66
|
eresolveTac(limits, rules.map(makeElim));
|
|
68
67
|
|
|
69
|
-
const bimatchTac =
|
|
70
|
-
(limits: Limits, rules: readonly BiresRule[]): GoalTactic =>
|
|
71
|
-
(index) =>
|
|
72
|
-
primSeq((state) => {
|
|
73
|
-
checkInterrupt(limits);
|
|
74
|
-
return biresolution(limits, true, rules, index, state);
|
|
75
|
-
});
|
|
76
|
-
|
|
77
68
|
export const matchTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
78
|
-
|
|
69
|
+
biresolveTac(
|
|
79
70
|
limits,
|
|
71
|
+
true,
|
|
80
72
|
rules.map((rule) => ({ isElim: false, rule })),
|
|
81
73
|
);
|
|
82
74
|
|
|
83
75
|
export const ematchTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
84
|
-
|
|
76
|
+
biresolveTac(
|
|
85
77
|
limits,
|
|
78
|
+
true,
|
|
86
79
|
rules.map((rule) => ({ isElim: true, rule })),
|
|
87
80
|
);
|
|
88
81
|
|
|
@@ -100,8 +93,7 @@ export interface NetPair<Tagged> {
|
|
|
100
93
|
readonly elim: Net<Tagged>;
|
|
101
94
|
}
|
|
102
95
|
|
|
103
|
-
|
|
104
|
-
export const insertTaggedBrl = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
96
|
+
export const insertTaggedBrl = <Tagged extends BiresRule>(
|
|
105
97
|
tagged: Tagged,
|
|
106
98
|
netpair: NetPair<Tagged>,
|
|
107
99
|
): NetPair<Tagged> =>
|
|
@@ -109,8 +101,6 @@ export const insertTaggedBrl = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
|
109
101
|
? { intro: netpair.intro, elim: insertTermNet(majorPremOf(tagged.rule), tagged, netpair.elim) }
|
|
110
102
|
: { intro: insertTermNet(conclOf(tagged.rule), tagged, netpair.intro), elim: netpair.elim };
|
|
111
103
|
|
|
112
|
-
// Library.order_list: by tag, dropping all but the last item with each tag. The lists are short,
|
|
113
|
-
// so this sorts them by insertion, which keeps items with equal tags in order as Isabelle's sort.
|
|
114
104
|
export const orderList = <Item>(items: readonly { tag: number; item: Item }[]): Item[] => {
|
|
115
105
|
const sorted = [...items];
|
|
116
106
|
for (let index = 1; index < sorted.length; index += 1) {
|
|
@@ -127,8 +117,7 @@ export const orderList = <Item>(items: readonly { tag: number; item: Item }[]):
|
|
|
127
117
|
return result;
|
|
128
118
|
};
|
|
129
119
|
|
|
130
|
-
|
|
131
|
-
export const biresolutionFromNetsTac = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
120
|
+
export const biresolutionFromNetsTac = <Tagged extends BiresRule>(
|
|
132
121
|
limits: Limits,
|
|
133
122
|
order: (rules: Tagged[]) => BiresRule[],
|
|
134
123
|
match: boolean,
|
|
@@ -158,8 +147,7 @@ export const biresolveFromNetsTac = (limits: Limits, netpair: NetPair<TaggedRule
|
|
|
158
147
|
export const bimatchFromNetsTac = (limits: Limits, netpair: NetPair<TaggedRule>) =>
|
|
159
148
|
biresolutionFromNetsTac(limits, orderTagged, true, netpair);
|
|
160
149
|
|
|
161
|
-
|
|
162
|
-
export const subgoalsOfBrl = (brule: { isElim: boolean; rule: Thm }) =>
|
|
150
|
+
export const subgoalsOfBrl = (brule: BiresRule) =>
|
|
163
151
|
brule.isElim ? nprems(brule.rule) - 1 : nprems(brule.rule);
|
|
164
152
|
|
|
165
153
|
export const rotateTac =
|