tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b
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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -10
- 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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +564 -366
- package/src/cli/options.ts +10 -5
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +525 -216
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +77 -117
- package/src/liveness.ts +106 -62
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +24 -33
- package/src/parallel.ts +48 -40
- package/src/parser.ts +565 -282
- 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 +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- 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 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +1 -16
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- 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 +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +260 -91
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- 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 +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- 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 +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- package/src/worker.ts +7 -8
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/tactic.ML
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
2
|
|
|
4
3
|
import { makeElim } from "./drule";
|
|
5
4
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
@@ -44,45 +43,41 @@ export const composeTac =
|
|
|
44
43
|
);
|
|
45
44
|
|
|
46
45
|
const biresolveTac =
|
|
47
|
-
(limits: Limits, rules: readonly BiresRule[]): GoalTactic =>
|
|
46
|
+
(limits: Limits, match: boolean, rules: readonly BiresRule[]): GoalTactic =>
|
|
48
47
|
(index) =>
|
|
49
48
|
primSeq((state) => {
|
|
50
49
|
checkInterrupt(limits);
|
|
51
|
-
return biresolution(limits,
|
|
50
|
+
return biresolution(limits, match, rules, index, state);
|
|
52
51
|
});
|
|
53
52
|
|
|
54
53
|
export const resolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
55
54
|
biresolveTac(
|
|
56
55
|
limits,
|
|
56
|
+
false,
|
|
57
57
|
rules.map((rule) => ({ isElim: false, rule })),
|
|
58
58
|
);
|
|
59
59
|
|
|
60
60
|
export const eresolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
61
61
|
biresolveTac(
|
|
62
62
|
limits,
|
|
63
|
+
false,
|
|
63
64
|
rules.map((rule) => ({ isElim: true, rule })),
|
|
64
65
|
);
|
|
65
66
|
|
|
66
67
|
export const dresolveTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
67
68
|
eresolveTac(limits, rules.map(makeElim));
|
|
68
69
|
|
|
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
70
|
export const matchTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
78
|
-
|
|
71
|
+
biresolveTac(
|
|
79
72
|
limits,
|
|
73
|
+
true,
|
|
80
74
|
rules.map((rule) => ({ isElim: false, rule })),
|
|
81
75
|
);
|
|
82
76
|
|
|
83
77
|
export const ematchTac = (limits: Limits, rules: readonly Thm[]) =>
|
|
84
|
-
|
|
78
|
+
biresolveTac(
|
|
85
79
|
limits,
|
|
80
|
+
true,
|
|
86
81
|
rules.map((rule) => ({ isElim: true, rule })),
|
|
87
82
|
);
|
|
88
83
|
|
|
@@ -100,8 +95,7 @@ export interface NetPair<Tagged> {
|
|
|
100
95
|
readonly elim: Net<Tagged>;
|
|
101
96
|
}
|
|
102
97
|
|
|
103
|
-
|
|
104
|
-
export const insertTaggedBrl = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
98
|
+
export const insertTaggedBrl = <Tagged extends BiresRule>(
|
|
105
99
|
tagged: Tagged,
|
|
106
100
|
netpair: NetPair<Tagged>,
|
|
107
101
|
): NetPair<Tagged> =>
|
|
@@ -109,8 +103,6 @@ export const insertTaggedBrl = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
|
109
103
|
? { intro: netpair.intro, elim: insertTermNet(majorPremOf(tagged.rule), tagged, netpair.elim) }
|
|
110
104
|
: { intro: insertTermNet(conclOf(tagged.rule), tagged, netpair.intro), elim: netpair.elim };
|
|
111
105
|
|
|
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
106
|
export const orderList = <Item>(items: readonly { tag: number; item: Item }[]): Item[] => {
|
|
115
107
|
const sorted = [...items];
|
|
116
108
|
for (let index = 1; index < sorted.length; index += 1) {
|
|
@@ -127,8 +119,7 @@ export const orderList = <Item>(items: readonly { tag: number; item: Item }[]):
|
|
|
127
119
|
return result;
|
|
128
120
|
};
|
|
129
121
|
|
|
130
|
-
|
|
131
|
-
export const biresolutionFromNetsTac = <Tagged extends { isElim: boolean; rule: Thm }>(
|
|
122
|
+
export const biresolutionFromNetsTac = <Tagged extends BiresRule>(
|
|
132
123
|
limits: Limits,
|
|
133
124
|
order: (rules: Tagged[]) => BiresRule[],
|
|
134
125
|
match: boolean,
|
|
@@ -158,8 +149,7 @@ export const biresolveFromNetsTac = (limits: Limits, netpair: NetPair<TaggedRule
|
|
|
158
149
|
export const bimatchFromNetsTac = (limits: Limits, netpair: NetPair<TaggedRule>) =>
|
|
159
150
|
biresolutionFromNetsTac(limits, orderTagged, true, netpair);
|
|
160
151
|
|
|
161
|
-
|
|
162
|
-
export const subgoalsOfBrl = (brule: { isElim: boolean; rule: Thm }) =>
|
|
152
|
+
export const subgoalsOfBrl = (brule: BiresRule) =>
|
|
163
153
|
brule.isElim ? nprems(brule.rule) - 1 : nprems(brule.rule);
|
|
164
154
|
|
|
165
155
|
export const rotateTac =
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/tactical.ML and Pure/search.ML. Copyright (c) 1986-2025
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/tactical.ML and Pure/search.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
2
|
|
|
4
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
5
4
|
import {
|
|
@@ -15,7 +14,7 @@ import {
|
|
|
15
14
|
type Seq,
|
|
16
15
|
} from "./seq";
|
|
17
16
|
import { cons, type List } from "./list";
|
|
18
|
-
import { aconv } from "./term";
|
|
17
|
+
import { aconv, type Term } from "./term";
|
|
19
18
|
import { nprems, premOf, type Thm } from "./thm";
|
|
20
19
|
|
|
21
20
|
export type Tactic = (state: Thm) => Seq<Thm>;
|
|
@@ -76,7 +75,6 @@ export const determ =
|
|
|
76
75
|
|
|
77
76
|
export const tryTac = (tactic: Tactic) => orElse(tactic, allTac);
|
|
78
77
|
|
|
79
|
-
// Thm.eq_thm: equal hypotheses, flex-flex pairs and propositions.
|
|
80
78
|
export const eqThm = (left: Thm, right: Thm) =>
|
|
81
79
|
left === right ||
|
|
82
80
|
(aconv(left.prop, right.prop) &&
|
|
@@ -88,6 +86,9 @@ export const eqThm = (left: Thm, right: Thm) =>
|
|
|
88
86
|
aconv(pair[0], right.tpairs[index][0]) && aconv(pair[1], right.tpairs[index][1]),
|
|
89
87
|
));
|
|
90
88
|
|
|
89
|
+
export const distinctThms = (thms: readonly Thm[]) =>
|
|
90
|
+
thms.filter((thm, position) => thms.findIndex((other) => eqThm(other, thm)) === position);
|
|
91
|
+
|
|
91
92
|
export const eqThmProp = (left: Thm, right: Thm) => aconv(left.prop, right.prop);
|
|
92
93
|
|
|
93
94
|
interface Trail {
|
|
@@ -96,7 +97,6 @@ interface Trail {
|
|
|
96
97
|
readonly tactics: readonly Tactic[];
|
|
97
98
|
}
|
|
98
99
|
|
|
99
|
-
// EVERY: tac1 THEN ... THEN tacn, without backtracking over repeated states.
|
|
100
100
|
export const every = (tactics: readonly Tactic[]): Tactic => {
|
|
101
101
|
const evy = (trail: readonly Trail[], remaining: readonly Tactic[], state: Thm): Seq<Thm> => {
|
|
102
102
|
if (remaining.length === 0) return makeSeq(() => [state, makeSeq(() => evyBack(trail).pull())]);
|
|
@@ -185,16 +185,14 @@ export const firstGoalTac =
|
|
|
185
185
|
const isThmError = (error: unknown) =>
|
|
186
186
|
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
187
187
|
|
|
188
|
-
// SUBGOAL: a tactic built from goal index of the state, failing if there is no such goal.
|
|
189
188
|
export const subgoal =
|
|
190
|
-
(build: (goal:
|
|
189
|
+
(build: (goal: Term, index: number) => Tactic): GoalTactic =>
|
|
191
190
|
(index) =>
|
|
192
191
|
(state) => {
|
|
193
192
|
if (index < 1 || index > nprems(state)) return emptySeq;
|
|
194
193
|
return build(premOf(state, index), index)(state);
|
|
195
194
|
};
|
|
196
195
|
|
|
197
|
-
// Seq.INTERVAL: applies tactic to goals last down to first.
|
|
198
196
|
const interval = (tactic: GoalTactic, firstIndex: number, lastIndex: number): Tactic =>
|
|
199
197
|
lastIndex < firstIndex
|
|
200
198
|
? allTac
|
|
@@ -230,9 +228,6 @@ export const condTac =
|
|
|
230
228
|
(state) =>
|
|
231
229
|
test(state) ? onTrue(state) : onFalse(state);
|
|
232
230
|
|
|
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
231
|
const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
237
232
|
const isUsed = (used: List<Thm> | undefined, state: Thm) => {
|
|
238
233
|
for (let current = used; current !== undefined; current = current.tail)
|
|
@@ -260,5 +255,4 @@ const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
|
260
255
|
|
|
261
256
|
export const hasFewerPrems = (count: number) => (state: Thm) => nprems(state) < count;
|
|
262
257
|
|
|
263
|
-
// Search.DEPTH_SOLVE: depth-first search until no goals remain.
|
|
264
258
|
export const depthSolve = (tactic: Tactic) => depthFirst(hasFewerPrems(1), tactic);
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/term_ord.ML. Copyright (c) 1986-2025 University of Cambridge,
|
|
2
|
-
// Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/term_ord.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
2
|
|
|
4
3
|
import { fastIndexnameOrd, fastStringOrd, indexnameOrd } from "./table";
|
|
5
|
-
import {
|
|
4
|
+
import { dummyT, sizeOfTerm, type Term, type Typ } from "./term";
|
|
6
5
|
|
|
7
6
|
const intOrd = (left: number, right: number) => (left < right ? -1 : left > right ? 1 : 0);
|
|
8
7
|
|
|
@@ -51,8 +50,6 @@ const hdDepth = (term: Term): [Term, number] => {
|
|
|
51
50
|
return [current, depth];
|
|
52
51
|
};
|
|
53
52
|
|
|
54
|
-
const dummyT = mkType("dummy");
|
|
55
|
-
|
|
56
53
|
const destHd = (term: Term): [{ name: string; index: number }, Typ, number] => {
|
|
57
54
|
switch (term.kind) {
|
|
58
55
|
case "Const":
|
|
@@ -87,7 +84,6 @@ const argsOrd = (left: Term, right: Term): number => {
|
|
|
87
84
|
return 0;
|
|
88
85
|
};
|
|
89
86
|
|
|
90
|
-
// Term_Ord.term_ord: a linear well-founded AC-compatible order for ordered rewriting.
|
|
91
87
|
export const termOrd = (left: Term, right: Term): number => {
|
|
92
88
|
if (left === right) return 0;
|
|
93
89
|
if (left.kind === "Abs" && right.kind === "Abs") {
|
|
@@ -1,16 +1,4 @@
|
|
|
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.
|
|
1
|
+
// Ported from Isabelle2025's Pure/term.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
14
2
|
|
|
15
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
16
4
|
|
|
@@ -26,9 +14,7 @@ export type Typ =
|
|
|
26
14
|
| { readonly kind: "TFree"; readonly name: string; readonly sort: Sort }
|
|
27
15
|
| { readonly kind: "TVar"; readonly name: string; readonly index: number; readonly sort: Sort };
|
|
28
16
|
|
|
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.
|
|
17
|
+
// Every term lists every field in this order, unused ones undefined, so V8 sees one object layout.
|
|
32
18
|
interface TermFields {
|
|
33
19
|
readonly name: string;
|
|
34
20
|
readonly type: Typ;
|
|
@@ -79,7 +65,6 @@ export const maxidxOfTerm = (term: Term, maxidx = -1): number => {
|
|
|
79
65
|
}
|
|
80
66
|
};
|
|
81
67
|
|
|
82
|
-
// The bound on loose bound variables: every one is below it.
|
|
83
68
|
const looseOf = (term: Term) =>
|
|
84
69
|
term.kind === "Bound"
|
|
85
70
|
? term.index + 1
|
|
@@ -87,7 +72,6 @@ const looseOf = (term: Term) =>
|
|
|
87
72
|
? term.loose
|
|
88
73
|
: 0;
|
|
89
74
|
|
|
90
|
-
// One of the 28 bits above the others, picked by a cheap hash of the name.
|
|
91
75
|
const freeBit = (name: string) =>
|
|
92
76
|
8 <<
|
|
93
77
|
((name.length * 31 + (name.charCodeAt(0) | 0) * 7 + (name.charCodeAt(name.length - 1) | 0)) % 28);
|
|
@@ -101,7 +85,6 @@ export const flagsOf = (term: Term) =>
|
|
|
101
85
|
? term.flags
|
|
102
86
|
: 0;
|
|
103
87
|
|
|
104
|
-
// Whether a subterm aconv to pattern could occur in term.
|
|
105
88
|
export const mayOccur = (pattern: Term, term: Term) => (flagsOf(pattern) & ~flagsOf(term)) === 0;
|
|
106
89
|
|
|
107
90
|
export const mkType = (name: string, args: readonly Typ[] = []): Typ => ({
|
|
@@ -198,7 +181,6 @@ export const propT = mkType("prop");
|
|
|
198
181
|
|
|
199
182
|
export const funT = (domain: Typ, range: Typ) => mkType("fun", [domain, range]);
|
|
200
183
|
|
|
201
|
-
// op --->
|
|
202
184
|
export const funTs = (domains: readonly Typ[], range: Typ) =>
|
|
203
185
|
domains.reduceRight((result, domain) => funT(domain, result), range);
|
|
204
186
|
|
|
@@ -238,8 +220,6 @@ export const eqTyp = (left: Typ, right: Typ): boolean => {
|
|
|
238
220
|
);
|
|
239
221
|
};
|
|
240
222
|
|
|
241
|
-
// fastype_of1: the type of a term, with minimal checking. Types holds the types of the loose
|
|
242
|
-
// bound variables, innermost first.
|
|
243
223
|
export const fastypeOf1 = (types: readonly Typ[], term: Term): Typ => {
|
|
244
224
|
switch (term.kind) {
|
|
245
225
|
case "Const":
|
|
@@ -309,14 +289,12 @@ export const stripAllVars = (term: Term): { name: string; type: Typ }[] =>
|
|
|
309
289
|
? [{ name: term.arg.name, type: term.arg.type }, ...stripAllVars(term.arg.body)]
|
|
310
290
|
: [];
|
|
311
291
|
|
|
312
|
-
// Rebuilds an application, keeping the original object when neither part changed.
|
|
313
292
|
export const updateApp = (term: App, fun: Term, arg: Term): Term =>
|
|
314
293
|
fun === term.fun && arg === term.arg ? term : mkApp(fun, arg);
|
|
315
294
|
|
|
316
295
|
export const updateAbs = (term: Abs, body: Term, type: Typ = term.type): Term =>
|
|
317
296
|
body === term.body && type === term.type ? term : mkAbs(term.name, type, body);
|
|
318
297
|
|
|
319
|
-
// incr_bv: increments the bound variables at or above level by increment.
|
|
320
298
|
const incrBvAt = (increment: number, level: number, term: Term): Term => {
|
|
321
299
|
if (looseOf(term) <= level) return term;
|
|
322
300
|
switch (term.kind) {
|
|
@@ -340,7 +318,6 @@ const incrBv = (increment: number, level: number, term: Term) =>
|
|
|
340
318
|
|
|
341
319
|
export const incrBoundvars = (increment: number, term: Term) => incrBv(increment, 0, term);
|
|
342
320
|
|
|
343
|
-
// loose_bvar: whether term has a loose bound variable at level or beyond.
|
|
344
321
|
const looseBvar = (term: Term, level: number) => looseOf(term) > level;
|
|
345
322
|
|
|
346
323
|
export const looseBvar1 = (term: Term, level: number): boolean => {
|
|
@@ -360,7 +337,6 @@ export const looseBvar1 = (term: Term, level: number): boolean => {
|
|
|
360
337
|
export const isOpen = (term: Term) => looseBvar(term, 0);
|
|
361
338
|
export const isDependent = (term: Term) => looseBvar1(term, 0);
|
|
362
339
|
|
|
363
|
-
// loose_bnos: the loose bound variables, in Isabelle's insertion order.
|
|
364
340
|
export const looseBnos = (term: Term): number[] => {
|
|
365
341
|
const numbers: number[] = [];
|
|
366
342
|
const add = (current: Term, level: number) => {
|
|
@@ -384,7 +360,6 @@ export const looseBnos = (term: Term): number[] => {
|
|
|
384
360
|
return numbers;
|
|
385
361
|
};
|
|
386
362
|
|
|
387
|
-
// subst_bounds: Bound i becomes args[i]; loose bound variables beyond shift down.
|
|
388
363
|
const substBoundsAt = (args: readonly Term[], level: number, term: Term): Term => {
|
|
389
364
|
if (looseOf(term) <= level) return term;
|
|
390
365
|
switch (term.kind) {
|
|
@@ -438,7 +413,6 @@ export const aconv = (left: Term, right: Term): boolean => {
|
|
|
438
413
|
}
|
|
439
414
|
};
|
|
440
415
|
|
|
441
|
-
// Structural equality including the names of abstractions, ML's (op =) on terms.
|
|
442
416
|
export const eqTerm = (left: Term, right: Term): boolean => {
|
|
443
417
|
if (left === right) return true;
|
|
444
418
|
switch (left.kind) {
|
|
@@ -456,7 +430,6 @@ export const eqTerm = (left: Term, right: Term): boolean => {
|
|
|
456
430
|
}
|
|
457
431
|
};
|
|
458
432
|
|
|
459
|
-
// could_unify: a fast filter, false only if the normal terms can't unify.
|
|
460
433
|
const matchRands = (left: Term, right: Term): boolean => {
|
|
461
434
|
let currentLeft = left;
|
|
462
435
|
let currentRight = right;
|
|
@@ -482,7 +455,6 @@ export const couldUnify = (left: Term, right: Term): boolean => {
|
|
|
482
455
|
return false;
|
|
483
456
|
};
|
|
484
457
|
|
|
485
|
-
// abstract_over: replaces the occurrences of pattern with Bound, ready to become an Abs body.
|
|
486
458
|
const abstractAt = (pattern: Term, level: number, term: Term): Term => {
|
|
487
459
|
if (!mayOccur(pattern, term)) return term;
|
|
488
460
|
if (aconv(pattern, term)) return mkBound(level);
|
|
@@ -502,15 +474,6 @@ const abstractAt = (pattern: Term, level: number, term: Term): Term => {
|
|
|
502
474
|
|
|
503
475
|
export const abstractOver = (pattern: Term, body: Term) => abstractAt(pattern, 0, body);
|
|
504
476
|
|
|
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
477
|
export const mapTypes = (mapType: (type: Typ) => Typ, term: Term): Term => {
|
|
515
478
|
const visit = (current: Term): Term => {
|
|
516
479
|
switch (current.kind) {
|
|
@@ -555,7 +518,6 @@ const foldAterms = <State>(
|
|
|
555
518
|
}
|
|
556
519
|
};
|
|
557
520
|
|
|
558
|
-
// fold_aterms over the schematic variables only, skipping the subterms without one.
|
|
559
521
|
export const foldVars = <State>(
|
|
560
522
|
visit: (variable: Var, state: State) => State,
|
|
561
523
|
term: Term,
|
|
@@ -628,7 +590,6 @@ export const existsType = (predicate: (type: Typ) => boolean, term: Term): boole
|
|
|
628
590
|
const sameVar = (left: Var, right: Var) =>
|
|
629
591
|
left.name === right.name && left.index === right.index && eqTyp(left.type, right.type);
|
|
630
592
|
|
|
631
|
-
// add_vars: the schematic variables, latest first, as Isabelle's insert builds the list.
|
|
632
593
|
export const addVars = (term: Term, vars: Var[]): Var[] =>
|
|
633
594
|
foldVars(
|
|
634
595
|
(current, result: Var[]) =>
|
|
@@ -647,7 +608,6 @@ export const addFreeNames = (term: Term, names: string[]): string[] =>
|
|
|
647
608
|
names,
|
|
648
609
|
);
|
|
649
610
|
|
|
650
|
-
// match_bvs: the pairs of corresponding abstraction names while two terms look alike.
|
|
651
611
|
const matchBvs = (left: Term, right: Term, pairs: [string, string][]): [string, string][] => {
|
|
652
612
|
if (left.kind === "Abs" && right.kind === "Abs") {
|
|
653
613
|
const added: [string, string][] =
|
|
@@ -676,7 +636,6 @@ const mapAbsVars = (rename: (name: string) => string, term: Term): Term => {
|
|
|
676
636
|
}
|
|
677
637
|
};
|
|
678
638
|
|
|
679
|
-
// rename_abs: renames the abstractions of term after those of obj where pat matches obj.
|
|
680
639
|
export const renameAbs = (pattern: Term, object: Term, term: Term): Term | undefined => {
|
|
681
640
|
const renaming = new Map<string, string>();
|
|
682
641
|
matchBvs(pattern, object, []).forEach(([from, to]) => {
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/thm.ML
|
|
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.
|
|
1
|
+
// Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
6
2
|
|
|
7
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
8
4
|
import {
|
|
@@ -68,12 +64,11 @@ import {
|
|
|
68
64
|
type Var,
|
|
69
65
|
} from "./term";
|
|
70
66
|
import type { Limits } from "./interrupt";
|
|
71
|
-
import { smashUnifiers, unifiers, type Tpair } from "./unify";
|
|
67
|
+
import { smashUnifiers, unifiers, type Tpair, type Unifier } from "./unify";
|
|
72
68
|
import { normTermSkip, renameBvars, stripApply, stripAssums2, unifyVarTypes } from "./bicompose";
|
|
73
69
|
|
|
74
70
|
declare const kernel: unique symbol;
|
|
75
71
|
|
|
76
|
-
// A theorem. Only this module builds one, so every Thm follows from the axioms by the rules here.
|
|
77
72
|
export interface Thm {
|
|
78
73
|
readonly maxidx: number;
|
|
79
74
|
readonly hyps: readonly Term[];
|
|
@@ -109,7 +104,6 @@ const unionTpairs = (left: readonly Tpair[], right: readonly Tpair[]) =>
|
|
|
109
104
|
const maxidxTpairs = (tpairs: readonly Tpair[], maxidx: number) =>
|
|
110
105
|
tpairs.reduce((result, pair) => maxidxOfTerm(pair[1], maxidxOfTerm(pair[0], result)), maxidx);
|
|
111
106
|
|
|
112
|
-
// An axiom or a theorem that the reference theories prove, taken on trust.
|
|
113
107
|
export const axiomThm = (prop: Term): Thm => makeThm(maxidxOfTerm(prop), [], [], prop);
|
|
114
108
|
|
|
115
109
|
export const nprems = (thm: Thm) => countPrems(thm.prop);
|
|
@@ -240,11 +234,11 @@ export const transitive = (first: Thm, second: Thm): Thm => {
|
|
|
240
234
|
);
|
|
241
235
|
};
|
|
242
236
|
|
|
243
|
-
export const betaConversion = (
|
|
244
|
-
if (!
|
|
237
|
+
export const betaConversion = (isFull: boolean, term: Term): Thm => {
|
|
238
|
+
if (!isFull && (term.kind !== "App" || term.fun.kind !== "Abs"))
|
|
245
239
|
throw new TlaIsabelleError("THM", "beta_conversion: not a redex");
|
|
246
240
|
const reduced =
|
|
247
|
-
|
|
241
|
+
isFull || term.kind !== "App" || term.fun.kind !== "Abs"
|
|
248
242
|
? betaNorm(term)
|
|
249
243
|
: substBound(term.arg, term.fun.body);
|
|
250
244
|
return makeThm(maxidxOfTerm(term), [], [], mkEquals(term, reduced));
|
|
@@ -318,7 +312,6 @@ export const flexflexRule = (limits: Limits | undefined, thm: Thm): Seq<Thm> =>
|
|
|
318
312
|
smashUnifiers(limits, thm.tpairs, emptyEnvir(thm.maxidx)),
|
|
319
313
|
);
|
|
320
314
|
|
|
321
|
-
// Thm.generalize: turns the named free variables into schematic ones with the given index.
|
|
322
315
|
export const generalize = (frees: readonly string[], index: number, thm: Thm): Thm => {
|
|
323
316
|
if (frees.length === 0) return thm;
|
|
324
317
|
if (index <= thm.maxidx) throw new TlaIsabelleError("THM", "generalize: bad index");
|
|
@@ -381,7 +374,6 @@ const instantiateTerm = (insts: readonly Instantiation[], term: Term): Term => {
|
|
|
381
374
|
return subst(term);
|
|
382
375
|
};
|
|
383
376
|
|
|
384
|
-
// Thm.instantiate for term variables. Every instance must have the type of its variable.
|
|
385
377
|
export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
386
378
|
if (insts.length === 0) return thm;
|
|
387
379
|
for (const inst of insts)
|
|
@@ -395,7 +387,6 @@ export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
|
395
387
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
396
388
|
};
|
|
397
389
|
|
|
398
|
-
// Thm.instantiate for type variables.
|
|
399
390
|
const instantiateTypesTerm = (tyenv: TyEnv, term: Term): Term => {
|
|
400
391
|
if (maxidxOfTerm(term) < 0) return term;
|
|
401
392
|
switch (term.kind) {
|
|
@@ -423,7 +414,6 @@ export const instantiateTypes = (tyenv: TyEnv, thm: Thm): Thm => {
|
|
|
423
414
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
424
415
|
};
|
|
425
416
|
|
|
426
|
-
// Thm.renamed_prop: the same theorem with an alpha-equivalent proposition.
|
|
427
417
|
export const renamedProp = (prop: Term, thm: Thm): Thm => {
|
|
428
418
|
if (!aconv(prop, thm.prop)) throw new TlaIsabelleError("TERM", "renamed_prop: props disagree");
|
|
429
419
|
return makeThm(thm.maxidx, thm.hyps, thm.tpairs, prop);
|
|
@@ -454,7 +444,6 @@ const destState = (state: Thm, index: number): State => {
|
|
|
454
444
|
};
|
|
455
445
|
};
|
|
456
446
|
|
|
457
|
-
// Thm.lift_rule: lifts a rule over the parameters and premises of a goal of a state.
|
|
458
447
|
export const liftRule = (goal: Term, goalMaxidx: number, rule: Thm): Thm => {
|
|
459
448
|
const increment = goalMaxidx + 1;
|
|
460
449
|
const premises = stripImpPrems(rule.prop).map((premise) => liftAll(increment, goal, premise));
|
|
@@ -483,10 +472,9 @@ export const incrIndexesThm = (increment: number, thm: Thm): Thm => {
|
|
|
483
472
|
);
|
|
484
473
|
};
|
|
485
474
|
|
|
486
|
-
// Thm.assumption: solves goal index by any of its assumptions, with unification.
|
|
487
475
|
export const assumption = (limits: Limits | undefined, index: number, state: Thm): Seq<Thm> => {
|
|
488
476
|
const parts = destState(state, index);
|
|
489
|
-
const newThm = (unifier:
|
|
477
|
+
const newThm = (unifier: Unifier): Thm => {
|
|
490
478
|
const envir = unifier.envir;
|
|
491
479
|
const isEmpty = isEmptyEnvir(envir);
|
|
492
480
|
const prop = listImplies(parts.before, parts.conclusion);
|
|
@@ -520,11 +508,9 @@ export const assumption = (limits: Limits | undefined, index: number, state: Thm
|
|
|
520
508
|
return addprfs(0);
|
|
521
509
|
};
|
|
522
510
|
|
|
523
|
-
// Thm.eq_assumption: solves goal index by an assumption equal to its conclusion up to alpha and eta.
|
|
524
511
|
export const eqAssumption = (index: number, state: Thm): Thm => {
|
|
525
512
|
const parts = destState(state, index);
|
|
526
513
|
const problems = assumProblems(-1, parts.goal);
|
|
527
|
-
// Envir.aeconv against each assumption, contracting the conclusion only once.
|
|
528
514
|
const conclusion = etaContract(problems.conclusion);
|
|
529
515
|
const isFound = problems.hyps.some(
|
|
530
516
|
(hyp) => aconv(hyp, problems.conclusion) || aconv(etaContract(hyp), conclusion),
|
|
@@ -604,17 +590,13 @@ const bicomposeAux = (
|
|
|
604
590
|
): Seq<Thm> => {
|
|
605
591
|
const orule = compose.rule;
|
|
606
592
|
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> => {
|
|
593
|
+
const addth = (newPremises: readonly Term[], unifier: Unifier, rest: Seq<Thm>): Seq<Thm> => {
|
|
612
594
|
try {
|
|
613
595
|
const envir = unifier.envir;
|
|
614
596
|
const normt = (term: Term) => normTerm(envir, term);
|
|
615
597
|
const computed = (): [readonly Tpair[], Term[], Term] => {
|
|
616
598
|
if (isEmptyEnvir(envir))
|
|
617
|
-
return [unifier.tpairs, [...parts.before, ...
|
|
599
|
+
return [unifier.tpairs, [...parts.before, ...newPremises], parts.conclusion];
|
|
618
600
|
const tpairs = unifier.tpairs.map((pair): Tpair => [normt(pair[0]), normt(pair[1])]);
|
|
619
601
|
if (above(envir, state.maxidx))
|
|
620
602
|
return isLifted
|
|
@@ -622,13 +604,13 @@ const bicomposeAux = (
|
|
|
622
604
|
tpairs,
|
|
623
605
|
[
|
|
624
606
|
...parts.before,
|
|
625
|
-
...
|
|
607
|
+
...newPremises.map((premise) => normTermSkip(envir, lift, premise)),
|
|
626
608
|
],
|
|
627
609
|
parts.conclusion,
|
|
628
610
|
]
|
|
629
|
-
: [tpairs, [...parts.before, ...
|
|
611
|
+
: [tpairs, [...parts.before, ...newPremises.map(normt)], parts.conclusion];
|
|
630
612
|
if (flags.match) throw new Compose();
|
|
631
|
-
return [tpairs, [...parts.before, ...
|
|
613
|
+
return [tpairs, [...parts.before, ...newPremises].map(normt), normt(parts.conclusion)];
|
|
632
614
|
};
|
|
633
615
|
const [tpairs, premises, conclusion] = computed();
|
|
634
616
|
return consSeq(
|
|
@@ -668,16 +650,14 @@ const bicomposeAux = (
|
|
|
668
650
|
? [...premises]
|
|
669
651
|
: premises.map((premise) => stripApply(rename, conclusion, premise));
|
|
670
652
|
try {
|
|
671
|
-
return
|
|
672
|
-
premises: flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed,
|
|
673
|
-
};
|
|
653
|
+
return flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed;
|
|
674
654
|
} catch (error) {
|
|
675
655
|
if (error instanceof TlaIsabelleError && error.exception === "TERM")
|
|
676
656
|
throw new TlaIsabelleError("THM", "bicompose: 1st premise");
|
|
677
657
|
throw error;
|
|
678
658
|
}
|
|
679
659
|
};
|
|
680
|
-
const bbi = isLifted ? stripAssums2(conclusion, parts.goal) :
|
|
660
|
+
const bbi: Tpair = isLifted ? stripAssums2(conclusion, parts.goal) : [conclusion, parts.goal];
|
|
681
661
|
const dpairs: Tpair[] = [bbi, ...orule.tpairs, ...parts.tpairs];
|
|
682
662
|
const eres = (envir: Envir, premises: readonly Term[]): Seq<Thm> => {
|
|
683
663
|
if (premises.length === 0) throw new TlaIsabelleError("THM", "bicompose: no premises");
|
|
@@ -739,8 +719,6 @@ export interface BiresRule {
|
|
|
739
719
|
readonly rule: Thm;
|
|
740
720
|
}
|
|
741
721
|
|
|
742
|
-
// Thm.biresolution: resolves goal index with each rule, the elimination rules also solving their
|
|
743
|
-
// first premise by an assumption.
|
|
744
722
|
export const biresolution = (
|
|
745
723
|
limits: Limits | undefined,
|
|
746
724
|
match: boolean,
|
|
@@ -769,7 +747,6 @@ export const biresolution = (
|
|
|
769
747
|
return flatSeq(res(0));
|
|
770
748
|
};
|
|
771
749
|
|
|
772
|
-
// Thm.RSN: resolution that must produce exactly one resolvent.
|
|
773
750
|
export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
|
|
774
751
|
const [results] = chopSeq(
|
|
775
752
|
2,
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/type.ML,
|
|
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.
|
|
1
|
+
// Ported from Isabelle2025's Pure/type.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
7
2
|
|
|
8
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
9
4
|
import {
|
|
@@ -22,9 +17,6 @@ export type TyEnv = Table<IndexKey, Typ>;
|
|
|
22
17
|
|
|
23
18
|
export const emptyTyEnv: TyEnv = emptyTable(fastIndexnameOrd);
|
|
24
19
|
|
|
25
|
-
export const lookupTyEnv = (tyenv: TyEnv, name: IndexKey) => lookupTable(tyenv, name);
|
|
26
|
-
|
|
27
|
-
// Type.devar: chases the assignments of a type variable.
|
|
28
20
|
export const devar = (tyenv: TyEnv, type: Typ): Typ => {
|
|
29
21
|
let current = type;
|
|
30
22
|
while (current.kind === "TVar") {
|
|
@@ -48,7 +40,6 @@ const updateNew = (tyenv: TyEnv, name: IndexKey, type: Typ): TyEnv => {
|
|
|
48
40
|
return updateTable(tyenv, { name: name.name, index: name.index }, type);
|
|
49
41
|
};
|
|
50
42
|
|
|
51
|
-
// Type.unify: undefined where Isabelle raises TUNIFY.
|
|
52
43
|
export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
53
44
|
const leftType = devar(tyenv, left);
|
|
54
45
|
const rightType = devar(tyenv, right);
|
|
@@ -71,7 +62,6 @@ export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefin
|
|
|
71
62
|
return eqTyp(leftType, rightType) ? tyenv : undefined;
|
|
72
63
|
};
|
|
73
64
|
|
|
74
|
-
// Type.raw_match: undefined where Isabelle raises TYPE_MATCH.
|
|
75
65
|
export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
76
66
|
if (pattern.kind === "TVar") {
|
|
77
67
|
const assigned = lookupTable(tyenv, pattern);
|
|
@@ -90,7 +80,6 @@ export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | und
|
|
|
90
80
|
return object.kind === "TFree" && object.name === pattern.name ? tyenv : undefined;
|
|
91
81
|
};
|
|
92
82
|
|
|
93
|
-
// Envir.norm_type: instantiates the assigned type variables, chasing chains.
|
|
94
83
|
export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
95
84
|
if (type.kind === "TFree") return type;
|
|
96
85
|
if (type.kind === "TVar") {
|
|
@@ -101,7 +90,6 @@ export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
101
90
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
102
91
|
};
|
|
103
92
|
|
|
104
|
-
// Envir.subst_type: instantiates without chasing.
|
|
105
93
|
export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
106
94
|
if (type.kind === "TFree") return type;
|
|
107
95
|
if (type.kind === "TVar") return lookupTable(tyenv, type) ?? type;
|
|
@@ -109,8 +97,7 @@ export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
109
97
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
110
98
|
};
|
|
111
99
|
|
|
112
|
-
// Type.unified
|
|
113
|
-
// so arguments never differ.
|
|
100
|
+
// Isabelle2025's Type.unified compares each argument with itself, so arguments never differ.
|
|
114
101
|
export const unifiedTypes = (tyenv: TyEnv, left: Typ, right: Typ): boolean => {
|
|
115
102
|
if (isEmptyTable(tyenv)) return eqTyp(left, right);
|
|
116
103
|
const leftType = devar(tyenv, left);
|