tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- 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 +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- 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 +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- 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 +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- 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 +27 -47
- 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 +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- 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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- 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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -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 +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- 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 +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- 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 +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -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 +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 +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/simplifier.ML and
|
|
2
|
-
// simplification tactics. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
|
|
3
|
-
// Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/simplifier.ML and Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { genAll, isNormHhf, normHhfEq } from "./drule";
|
|
6
4
|
import { preferGoal } from "./goal";
|
|
7
|
-
import {
|
|
5
|
+
import { makeSimpContext, type SimpContext, type Solver } from "./raw-simplifier";
|
|
8
6
|
import { fconvRule } from "./conv";
|
|
9
7
|
import {
|
|
10
8
|
genericRewriteGoalTac,
|
|
@@ -32,7 +30,6 @@ const withSolvers = (context: SimpContext, solvers: readonly Solver[]): SimpCont
|
|
|
32
30
|
simpset: { ...context.simpset, unsafeSolvers: solvers, safeSolvers: solvers },
|
|
33
31
|
});
|
|
34
32
|
|
|
35
|
-
// solve_all_tac: solves goal 1 completely with the subgoaler.
|
|
36
33
|
const solveAllTac = (solvers: readonly Solver[], context: SimpContext): Tactic => {
|
|
37
34
|
const inner = withSolvers(context, solvers);
|
|
38
35
|
const solveTac = thenAllNew(inner.simpset.subgoalTac(inner), () => noTac);
|
|
@@ -47,7 +44,6 @@ const singleProver =
|
|
|
47
44
|
(context, thm) =>
|
|
48
45
|
solveAllTac(solvers, context)(thm).pull()?.[0];
|
|
49
46
|
|
|
50
|
-
// generic_simp_tac
|
|
51
47
|
const genericSimpTac =
|
|
52
48
|
(isSafe: boolean, mode: RewriteMode) =>
|
|
53
49
|
(context: SimpContext): GoalTactic =>
|
|
@@ -62,6 +58,7 @@ const genericSimpTac =
|
|
|
62
58
|
);
|
|
63
59
|
return preferGoal(simpLoopTac(1))(index);
|
|
64
60
|
};
|
|
61
|
+
|
|
65
62
|
export const asmSimpTac = genericSimpTac(false, { simprem: false, useprem: true, mutsimp: false });
|
|
66
63
|
export const asmLrSimpTac = genericSimpTac(false, { simprem: true, useprem: true, mutsimp: false });
|
|
67
64
|
export const asmFullSimpTac = genericSimpTac(false, {
|
|
@@ -75,7 +72,6 @@ export const safeAsmFullSimpTac = genericSimpTac(true, {
|
|
|
75
72
|
mutsimp: true,
|
|
76
73
|
});
|
|
77
74
|
|
|
78
|
-
// Simplifier.simp_thm: simplifies a theorem's proposition.
|
|
79
75
|
const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
80
76
|
const prover = singleProver([...context.simpset.unsafeSolvers].reverse());
|
|
81
77
|
return fconvRule((term) => rewriteCterm(mode, prover, context, term), thm);
|
|
@@ -84,13 +80,9 @@ const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
|
84
80
|
export const simplify = (context: SimpContext, thm: Thm) =>
|
|
85
81
|
simpThm({ simprem: false, useprem: false, mutsimp: false }, context, thm);
|
|
86
82
|
|
|
87
|
-
// Raw_Simplifier.norm_hhf: moves the quantifiers of a theorem left of its implications, then makes
|
|
88
|
-
// the outermost ones schematic. Drule.sort_constraint_eq, the other rule of hhf_ss, never applies:
|
|
89
|
-
// tlapm's terms carry no sort constraints.
|
|
90
83
|
export const normHhf = (limits: Limits, thm: Thm): Thm => {
|
|
91
84
|
if (isNormHhf(false, thm.prop)) return genAll(thm);
|
|
92
|
-
const
|
|
93
|
-
const context = { ...empty, simpset: addSimps(empty, [normHhfEq]) };
|
|
85
|
+
const context = makeSimpContext(limits, [normHhfEq]);
|
|
94
86
|
return genAll(
|
|
95
87
|
fconvRule(
|
|
96
88
|
(term) =>
|
|
@@ -1,8 +1,4 @@
|
|
|
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.
|
|
1
|
+
// Ported from Isabelle2025's Pure/General/table.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
6
2
|
|
|
7
3
|
export type Compare<Key> = (left: Key, right: Key) => number;
|
|
8
4
|
|
|
@@ -120,27 +116,6 @@ export const updateTable = <Key, Value>(
|
|
|
120
116
|
root: insertNode(table.compare, key, value, table.root),
|
|
121
117
|
});
|
|
122
118
|
|
|
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
119
|
export const minTable = <Key, Value>(table: Table<Key, Value>): [Key, Value] | undefined => {
|
|
145
120
|
let node = table.root;
|
|
146
121
|
if (!node) return undefined;
|
|
@@ -157,14 +132,12 @@ const foldNode = <Key, Value, State>(
|
|
|
157
132
|
? foldNode(visit, node.right, visit(node.key, node.value, foldNode(visit, node.left, state)))
|
|
158
133
|
: state;
|
|
159
134
|
|
|
160
|
-
// Table.fold: visits the entries in key order.
|
|
161
135
|
export const foldTable = <Key, Value, State>(
|
|
162
136
|
visit: (key: Key, value: Value, state: State) => State,
|
|
163
137
|
table: Table<Key, Value>,
|
|
164
138
|
state: State,
|
|
165
139
|
) => foldNode(visit, table.root, state);
|
|
166
140
|
|
|
167
|
-
// The entries in key order, as Table.dest lists them.
|
|
168
141
|
export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
169
142
|
foldTable<Key, Value, [Key, Value][]>(
|
|
170
143
|
(key, value, entries) => {
|
|
@@ -175,7 +148,6 @@ export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
|
175
148
|
[],
|
|
176
149
|
);
|
|
177
150
|
|
|
178
|
-
// fast_string_ord: shorter strings first, then by code units.
|
|
179
151
|
export const fastStringOrd = (left: string, right: string) =>
|
|
180
152
|
left === right
|
|
181
153
|
? 0
|
|
@@ -185,17 +157,16 @@ export const fastStringOrd = (left: string, right: string) =>
|
|
|
185
157
|
? -1
|
|
186
158
|
: 1;
|
|
187
159
|
|
|
188
|
-
const stringOrd = (left: string, right: string) =>
|
|
160
|
+
export const stringOrd = (left: string, right: string) =>
|
|
161
|
+
left === right ? 0 : left < right ? -1 : 1;
|
|
189
162
|
|
|
190
163
|
export interface IndexKey {
|
|
191
164
|
readonly name: string;
|
|
192
165
|
readonly index: number;
|
|
193
166
|
}
|
|
194
167
|
|
|
195
|
-
// Term_Ord.fast_indexname_ord: by index, then by fast_string_ord on the name.
|
|
196
168
|
export const fastIndexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
197
169
|
left.index !== right.index ? left.index - right.index : fastStringOrd(left.name, right.name);
|
|
198
170
|
|
|
199
|
-
// Term_Ord.indexname_ord: by index, then by string_ord on the name.
|
|
200
171
|
export const indexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
201
172
|
left.index !== right.index ? left.index - right.index : stringOrd(left.name, right.name);
|
|
@@ -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,7 +1,6 @@
|
|
|
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
|
-
import {
|
|
3
|
+
import { isIsabelleError } from "../../../errors";
|
|
5
4
|
import {
|
|
6
5
|
appendSeq,
|
|
7
6
|
emptySeq,
|
|
@@ -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,45 +86,57 @@ 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 {
|
|
94
95
|
readonly state: Thm;
|
|
95
96
|
readonly rest: Seq<Thm>;
|
|
96
|
-
readonly
|
|
97
|
+
readonly position: number;
|
|
98
|
+
readonly next: Trail | undefined;
|
|
97
99
|
}
|
|
98
100
|
|
|
99
|
-
//
|
|
100
|
-
export const every =
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
101
|
+
// EVY and evyBack as one loop: blast replays thousands of tactics, too deep for mutual recursion.
|
|
102
|
+
export const every =
|
|
103
|
+
(tactics: readonly Tactic[]): Tactic =>
|
|
104
|
+
(start) => {
|
|
105
|
+
const evy = (
|
|
106
|
+
initialTrail: Trail | undefined,
|
|
107
|
+
initialPosition: number,
|
|
108
|
+
initialState: Thm | undefined,
|
|
109
|
+
): Cell<Thm> => {
|
|
110
|
+
let trail = initialTrail;
|
|
111
|
+
let position = initialPosition;
|
|
112
|
+
let state = initialState;
|
|
113
|
+
for (;;) {
|
|
114
|
+
if (state === undefined) {
|
|
115
|
+
if (trail === undefined) return undefined;
|
|
116
|
+
const cell = trail.rest.pull();
|
|
117
|
+
if (cell === undefined) trail = trail.next;
|
|
118
|
+
else if (eqThm(trail.state, cell[0])) trail = { ...trail, rest: cell[1] };
|
|
119
|
+
else {
|
|
120
|
+
trail = { state: cell[0], rest: cell[1], position: trail.position, next: trail.next };
|
|
121
|
+
position = trail.position;
|
|
122
|
+
state = cell[0];
|
|
123
|
+
}
|
|
124
|
+
} else if (position === tactics.length) {
|
|
125
|
+
const saved = trail;
|
|
126
|
+
return [state, makeSeq(() => evy(saved, 0, undefined))];
|
|
127
|
+
} else {
|
|
128
|
+
const cell = tactics[position](state).pull();
|
|
129
|
+
if (cell === undefined) state = undefined;
|
|
130
|
+
else {
|
|
131
|
+
trail = { state: cell[0], rest: cell[1], position: position + 1, next: trail };
|
|
132
|
+
position += 1;
|
|
133
|
+
state = cell[0];
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
return ofCell(evy(undefined, 0, start));
|
|
127
139
|
};
|
|
128
|
-
return (state) => evy([], tactics, state);
|
|
129
|
-
};
|
|
130
140
|
|
|
131
141
|
export const first = (tactics: readonly Tactic[]): Tactic =>
|
|
132
142
|
tactics.reduceRight((rest, tactic) => orElse(tactic, rest), noTac);
|
|
@@ -182,19 +192,14 @@ export const firstGoalTac =
|
|
|
182
192
|
return find(1)(state);
|
|
183
193
|
};
|
|
184
194
|
|
|
185
|
-
const isThmError = (error: unknown) =>
|
|
186
|
-
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
187
|
-
|
|
188
|
-
// SUBGOAL: a tactic built from goal index of the state, failing if there is no such goal.
|
|
189
195
|
export const subgoal =
|
|
190
|
-
(build: (goal:
|
|
196
|
+
(build: (goal: Term, index: number) => Tactic): GoalTactic =>
|
|
191
197
|
(index) =>
|
|
192
198
|
(state) => {
|
|
193
199
|
if (index < 1 || index > nprems(state)) return emptySeq;
|
|
194
200
|
return build(premOf(state, index), index)(state);
|
|
195
201
|
};
|
|
196
202
|
|
|
197
|
-
// Seq.INTERVAL: applies tactic to goals last down to first.
|
|
198
203
|
const interval = (tactic: GoalTactic, firstIndex: number, lastIndex: number): Tactic =>
|
|
199
204
|
lastIndex < firstIndex
|
|
200
205
|
? allTac
|
|
@@ -217,7 +222,7 @@ export const primSeq =
|
|
|
217
222
|
try {
|
|
218
223
|
return apply(state);
|
|
219
224
|
} catch (error) {
|
|
220
|
-
if (
|
|
225
|
+
if (isIsabelleError(error, "THM")) return emptySeq;
|
|
221
226
|
throw error;
|
|
222
227
|
}
|
|
223
228
|
};
|
|
@@ -230,9 +235,6 @@ export const condTac =
|
|
|
230
235
|
(state) =>
|
|
231
236
|
test(state) ? onTrue(state) : onFalse(state);
|
|
232
237
|
|
|
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
238
|
const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
237
239
|
const isUsed = (used: List<Thm> | undefined, state: Thm) => {
|
|
238
240
|
for (let current = used; current !== undefined; current = current.tail)
|
|
@@ -260,5 +262,4 @@ const depthFirst = (test: (state: Thm) => boolean, tactic: Tactic): Tactic => {
|
|
|
260
262
|
|
|
261
263
|
export const hasFewerPrems = (count: number) => (state: Thm) => nprems(state) < count;
|
|
262
264
|
|
|
263
|
-
// Search.DEPTH_SOLVE: depth-first search until no goals remain.
|
|
264
265
|
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]) => {
|