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,8 +1,13 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/drule.ML, Pure/term_subst.ML and
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/drule.ML, Pure/term_subst.ML and Pure/Pure.thy. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
cleanName,
|
|
5
|
+
emptyNameContext,
|
|
6
|
+
isBoundName,
|
|
7
|
+
variantList,
|
|
8
|
+
variantName,
|
|
9
|
+
type NameContext,
|
|
10
|
+
} from "./name";
|
|
6
11
|
import {
|
|
7
12
|
emptyTable,
|
|
8
13
|
fastIndexnameOrd,
|
|
@@ -14,7 +19,7 @@ import {
|
|
|
14
19
|
import { TlaIsabelleError } from "../../../errors";
|
|
15
20
|
import { allConst, isProtected, mkEquals, mkImplies, mkTerm, protect } from "./logic";
|
|
16
21
|
import { listOfSeq } from "./seq";
|
|
17
|
-
import {
|
|
22
|
+
import { distinctThms } from "./tactical";
|
|
18
23
|
import {
|
|
19
24
|
foldVars,
|
|
20
25
|
foldAtyps,
|
|
@@ -47,13 +52,6 @@ import {
|
|
|
47
52
|
|
|
48
53
|
const propVar = (name: string) => mkVar(name, 0, propT);
|
|
49
54
|
|
|
50
|
-
// The basic rules of Pure.thy, with the variable names Isabelle gives them.
|
|
51
|
-
export const cutRl = axiomThm(
|
|
52
|
-
mkImplies(
|
|
53
|
-
mkImplies(propVar("psi"), propVar("theta")),
|
|
54
|
-
mkImplies(propVar("psi"), propVar("theta")),
|
|
55
|
-
),
|
|
56
|
-
);
|
|
57
55
|
export const revcutRl = axiomThm(
|
|
58
56
|
mkImplies(propVar("V"), mkImplies(mkImplies(propVar("V"), propVar("W")), propVar("W"))),
|
|
59
57
|
);
|
|
@@ -94,7 +92,6 @@ export const trivForallEquality = axiomThm(
|
|
|
94
92
|
mkEquals(mkApp(allConst(typeA), mkAbs("x", typeA, propVar("V"))), propVar("V")),
|
|
95
93
|
);
|
|
96
94
|
|
|
97
|
-
// Drule.norm_hhf_eq: (PROP ?phi ==> (!!x. PROP ?psi x)) == (!!x. PROP ?phi ==> PROP ?psi x).
|
|
98
95
|
export const normHhfEq = axiomThm(
|
|
99
96
|
mkEquals(
|
|
100
97
|
mkImplies(
|
|
@@ -115,7 +112,6 @@ export const normHhfEq = axiomThm(
|
|
|
115
112
|
),
|
|
116
113
|
);
|
|
117
114
|
|
|
118
|
-
// Drule.is_norm_hhf: no quantifier right of an implication and no beta redex.
|
|
119
115
|
export const isNormHhf = (isProtecting: boolean, term: Term): boolean => {
|
|
120
116
|
if (term.kind === "Const") return term.name !== "Pure.sort_constraint";
|
|
121
117
|
if (term.kind === "Abs") return isNormHhf(isProtecting, term.body);
|
|
@@ -134,7 +130,6 @@ export const isNormHhf = (isProtecting: boolean, term: Term): boolean => {
|
|
|
134
130
|
return isNormHhf(isProtecting, term.fun) && isNormHhf(isProtecting, term.arg);
|
|
135
131
|
};
|
|
136
132
|
|
|
137
|
-
// Drule.outer_params: the outermost parameters, named apart.
|
|
138
133
|
const outerParams = (term: Term) => {
|
|
139
134
|
const vars = stripAllVars(term);
|
|
140
135
|
const names = variantList(
|
|
@@ -144,7 +139,6 @@ const outerParams = (term: Term) => {
|
|
|
144
139
|
return vars.map((variable, index) => ({ name: names[index], type: variable.type }));
|
|
145
140
|
};
|
|
146
141
|
|
|
147
|
-
// Variable.gen_all: the outermost parameters become schematic variables.
|
|
148
142
|
export const genAll = (thm: Thm) => {
|
|
149
143
|
const index = Math.max(thm.maxidx, -1) + 1;
|
|
150
144
|
return outerParams(thm.prop).reduce(
|
|
@@ -153,9 +147,8 @@ export const genAll = (thm: Thm) => {
|
|
|
153
147
|
);
|
|
154
148
|
};
|
|
155
149
|
|
|
156
|
-
// Thm.forall_intr_vars: quantifies the schematic variables in order of appearance.
|
|
157
150
|
export const forallIntrVars = (thm: Thm) => {
|
|
158
|
-
const vars = fullProps(thm).reduce(
|
|
151
|
+
const vars = fullProps(thm).reduce<Var[]>(
|
|
159
152
|
(result, term) =>
|
|
160
153
|
foldVars(
|
|
161
154
|
(atom, current: Var[]) =>
|
|
@@ -165,17 +158,16 @@ export const forallIntrVars = (thm: Thm) => {
|
|
|
165
158
|
term,
|
|
166
159
|
result,
|
|
167
160
|
),
|
|
168
|
-
[]
|
|
161
|
+
[],
|
|
169
162
|
);
|
|
170
163
|
return vars.reduceRight((result, variable) => forallIntr(variable, result), thm);
|
|
171
164
|
};
|
|
172
165
|
|
|
173
166
|
const variantBound = (name: string, used: NameContext) =>
|
|
174
|
-
variantName(name
|
|
167
|
+
variantName(isBoundName(name) ? "u" : name, used);
|
|
175
168
|
|
|
176
169
|
const fullProps = (thm: Thm) => [...thm.tpairs.flatMap((pair) => [pair[0], pair[1]]), thm.prop];
|
|
177
170
|
|
|
178
|
-
// Drule.zero_var_indexes: renames the schematic variables apart with index 0.
|
|
179
171
|
export const zeroVarIndexes = (thm: Thm): Thm => {
|
|
180
172
|
const terms = fullProps(thm);
|
|
181
173
|
const tvars = terms.reduce(
|
|
@@ -224,41 +216,40 @@ export const zeroVarIndexes = (thm: Thm): Thm => {
|
|
|
224
216
|
return instantiate(insts, instantiateTypes(tyenv, thm));
|
|
225
217
|
};
|
|
226
218
|
|
|
227
|
-
// Tactic.make_elim: turns a destruction rule into an elimination rule.
|
|
228
219
|
export const makeElim = (rule: Thm) => zeroVarIndexes(rs(rule, revcutRl));
|
|
229
220
|
|
|
230
|
-
// Drule.compose: resolves tha into premise index of thb without lifting, with a unique result.
|
|
231
221
|
const compose = (tha: Thm, index: number, thb: Thm): Thm => {
|
|
232
|
-
const results =
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
222
|
+
const results = distinctThms(
|
|
223
|
+
listOfSeq(
|
|
224
|
+
bicompose(
|
|
225
|
+
undefined,
|
|
226
|
+
{ flatten: true, match: false, incremented: true },
|
|
227
|
+
{ isElim: false, rule: tha, subgoals: 0 },
|
|
228
|
+
index,
|
|
229
|
+
thb,
|
|
230
|
+
),
|
|
239
231
|
),
|
|
240
|
-
)
|
|
232
|
+
);
|
|
241
233
|
if (results.length !== 1)
|
|
242
234
|
throw new TlaIsabelleError("THM", `compose: unique result expected ${index}`);
|
|
243
235
|
return results[0];
|
|
244
236
|
};
|
|
245
237
|
|
|
246
|
-
// COMP_INCR
|
|
247
238
|
export const compIncr = (tha: Thm, thb: Thm) =>
|
|
248
239
|
compose(tha, 1, incrIndexesThm(tha.maxidx + 1, thb));
|
|
249
240
|
|
|
250
|
-
// Drule.comp_no_flatten: composes th, keeping its first count premises, into premise index of
|
|
251
|
-
// rule.
|
|
252
241
|
export const compNoFlatten = (thm: Thm, count: number, index: number, rule: Thm): Thm => {
|
|
253
|
-
const results =
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
242
|
+
const results = distinctThms(
|
|
243
|
+
listOfSeq(
|
|
244
|
+
bicompose(
|
|
245
|
+
undefined,
|
|
246
|
+
{ flatten: false, match: false, incremented: true },
|
|
247
|
+
{ isElim: false, rule: thm, subgoals: count },
|
|
248
|
+
index,
|
|
249
|
+
incrIndexesThm(thm.maxidx + 1, rule),
|
|
250
|
+
),
|
|
260
251
|
),
|
|
261
|
-
)
|
|
252
|
+
);
|
|
262
253
|
if (results.length !== 1) throw new TlaIsabelleError("THM", `comp_no_flatten ${index}`);
|
|
263
254
|
return results[0];
|
|
264
255
|
};
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/envir.ML. Copyright (c) 1986-2025 University of Cambridge,
|
|
2
|
-
// Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Environments of assignments to schematic variables, and beta and eta normalization.
|
|
1
|
+
// Ported from Isabelle2025's Pure/envir.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
5
2
|
|
|
6
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
7
4
|
import {
|
|
@@ -36,7 +33,7 @@ import {
|
|
|
36
33
|
type Typ,
|
|
37
34
|
type Var,
|
|
38
35
|
} from "./term";
|
|
39
|
-
import { devar, emptyTyEnv, normType,
|
|
36
|
+
import { devar, emptyTyEnv, normType, unifiedTypes, type TyEnv } from "./type";
|
|
40
37
|
|
|
41
38
|
export interface Binding {
|
|
42
39
|
readonly type: Typ;
|
|
@@ -63,7 +60,6 @@ const initEnvir = emptyEnvir(-1);
|
|
|
63
60
|
|
|
64
61
|
export const isEmptyEnvir = (envir: Envir) => isEmptyTable(envir.tenv) && isEmptyTable(envir.tyenv);
|
|
65
62
|
|
|
66
|
-
// radixstring (26, "a", n)
|
|
67
63
|
const radixString = (value: number): string => {
|
|
68
64
|
const digits: number[] = [];
|
|
69
65
|
let remaining = value;
|
|
@@ -74,7 +70,6 @@ const radixString = (value: number): string => {
|
|
|
74
70
|
return digits.map((digit) => String.fromCharCode(97 + digit)).join("");
|
|
75
71
|
};
|
|
76
72
|
|
|
77
|
-
// Envir.genvars: fresh variables with an index above every present one.
|
|
78
73
|
export const genvars = (name: string, envir: Envir, types: readonly Typ[]): [Envir, Var[]] => {
|
|
79
74
|
const index = envir.maxidx + 1;
|
|
80
75
|
const vars = types.map((type, position) =>
|
|
@@ -88,17 +83,14 @@ export const genvar = (name: string, envir: Envir, type: Typ): [Envir, Var] => {
|
|
|
88
83
|
return [updated, vars[0]];
|
|
89
84
|
};
|
|
90
85
|
|
|
91
|
-
// Envir.lookup1: lookup without chasing type assignments, for environments from matching.
|
|
92
86
|
export const lookup1 = (tenv: TEnv, variable: Var): Term | undefined => {
|
|
93
87
|
const binding = lookupTable(tenv, variable);
|
|
94
88
|
if (binding === undefined) return undefined;
|
|
95
|
-
if (!
|
|
89
|
+
if (!unifiedTypes(emptyTyEnv, variable.type, binding.type))
|
|
96
90
|
throw new TlaIsabelleError("TYPE", "Variable has two distinct types");
|
|
97
91
|
return binding.term;
|
|
98
92
|
};
|
|
99
93
|
|
|
100
|
-
const eqTypExact = (left: Typ, right: Typ) => unifiedTypes(emptyTyEnv, left, right);
|
|
101
|
-
|
|
102
94
|
export const lookup = (envir: Envir, variable: Var): Term | undefined => {
|
|
103
95
|
const binding = lookupTable(envir.tenv, variable);
|
|
104
96
|
if (binding === undefined) return undefined;
|
|
@@ -120,7 +112,6 @@ export const update = (variable: Var, term: Term, envir: Envir): Envir => {
|
|
|
120
112
|
};
|
|
121
113
|
};
|
|
122
114
|
|
|
123
|
-
// Envir.above: whether the least index updated exceeds limit.
|
|
124
115
|
export const above = (envir: Envir, limit: number) => {
|
|
125
116
|
const term = minTable(envir.tenv);
|
|
126
117
|
const type = minTable(envir.tyenv);
|
|
@@ -129,7 +120,6 @@ export const above = (envir: Envir, limit: number) => {
|
|
|
129
120
|
);
|
|
130
121
|
};
|
|
131
122
|
|
|
132
|
-
// Envir.vupdate: an assignment that suppresses higher indexes between variables.
|
|
133
123
|
export const vupdate = (variable: Var, term: Term, envir: Envir): Envir => {
|
|
134
124
|
if (term.kind !== "Var") return update(variable, term, envir);
|
|
135
125
|
if (variable.name === term.name && variable.index === term.index) return envir;
|
|
@@ -191,7 +181,6 @@ const normTerm2 = (envir: Envir, term: Term): Term => {
|
|
|
191
181
|
}
|
|
192
182
|
};
|
|
193
183
|
|
|
194
|
-
// Envir.norm_term: instantiates the environment and beta-normalizes.
|
|
195
184
|
export const normTerm = (envir: Envir, term: Term): Term => {
|
|
196
185
|
if (isEmptyEnvir(envir) && !couldBetaContract(term)) return term;
|
|
197
186
|
return isEmptyTable(envir.tyenv) ? normTerm1(envir.tenv, term) : normTerm2(envir, term);
|
|
@@ -199,7 +188,6 @@ export const normTerm = (envir: Envir, term: Term): Term => {
|
|
|
199
188
|
|
|
200
189
|
export const betaNorm = (term: Term) => normTerm(initEnvir, term);
|
|
201
190
|
|
|
202
|
-
// Envir.head_norm: normalizes the head only, for unification.
|
|
203
191
|
export const headNorm = (envir: Envir, term: Term): Term => {
|
|
204
192
|
if ((flagsOf(term) & (HAS_VAR | HAS_REDEX)) === 0) return term;
|
|
205
193
|
switch (term.kind) {
|
|
@@ -250,7 +238,6 @@ const etaSame = (term: Term): Term => {
|
|
|
250
238
|
return term;
|
|
251
239
|
};
|
|
252
240
|
|
|
253
|
-
// Envir.eta_contract
|
|
254
241
|
export const etaContract = (term: Term) => (couldEtaContract(term) ? etaSame(term) : term);
|
|
255
242
|
|
|
256
243
|
export const aeconv = (left: Term, right: Term) =>
|
|
@@ -275,7 +262,6 @@ export const envBinderTypes = (envir: Envir, type: Typ): Typ[] => {
|
|
|
275
262
|
return [];
|
|
276
263
|
};
|
|
277
264
|
|
|
278
|
-
// Envir.fastype: the type of a term, chasing type assignments at applications.
|
|
279
265
|
export const fastype = (envir: Envir, types: readonly Typ[], term: Term): Typ => {
|
|
280
266
|
switch (term.kind) {
|
|
281
267
|
case "App": {
|
|
@@ -294,38 +280,3 @@ export const fastype = (envir: Envir, types: readonly Typ[], term: Term): Typ =>
|
|
|
294
280
|
return term.type;
|
|
295
281
|
}
|
|
296
282
|
};
|
|
297
|
-
|
|
298
|
-
// Envir.subst_term: instantiates without chasing variables.
|
|
299
|
-
const substTermAux = (tyenv: TyEnv, tenv: TEnv, term: Term): Term => {
|
|
300
|
-
if (maxidxOfTerm(term) < 0) return term;
|
|
301
|
-
switch (term.kind) {
|
|
302
|
-
case "Const":
|
|
303
|
-
case "Free": {
|
|
304
|
-
const type = isEmptyTable(tyenv) ? term.type : substType(tyenv, term.type);
|
|
305
|
-
return type === term.type ? term : { ...term, type };
|
|
306
|
-
}
|
|
307
|
-
case "Var": {
|
|
308
|
-
const assigned = lookup1(tenv, term);
|
|
309
|
-
if (assigned !== undefined) return assigned;
|
|
310
|
-
const type = isEmptyTable(tyenv) ? term.type : substType(tyenv, term.type);
|
|
311
|
-
return type === term.type ? term : { ...term, type };
|
|
312
|
-
}
|
|
313
|
-
case "Bound":
|
|
314
|
-
return term;
|
|
315
|
-
case "Abs":
|
|
316
|
-
return updateAbs(
|
|
317
|
-
term,
|
|
318
|
-
substTermAux(tyenv, tenv, term.body),
|
|
319
|
-
isEmptyTable(tyenv) ? term.type : substType(tyenv, term.type),
|
|
320
|
-
);
|
|
321
|
-
case "App":
|
|
322
|
-
return updateApp(
|
|
323
|
-
term,
|
|
324
|
-
substTermAux(tyenv, tenv, term.fun),
|
|
325
|
-
substTermAux(tyenv, tenv, term.arg),
|
|
326
|
-
);
|
|
327
|
-
}
|
|
328
|
-
};
|
|
329
|
-
|
|
330
|
-
export const substTerm = (tyenv: TyEnv, tenv: TEnv, term: Term) =>
|
|
331
|
-
isEmptyTable(tenv) && isEmptyTable(tyenv) ? term : substTermAux(tyenv, tenv, term);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/goal.ML
|
|
2
|
-
// 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see
|
|
3
|
-
// LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { compNoFlatten, protectD, protectI } from "./drule";
|
|
@@ -8,10 +6,8 @@ import { emptySeq } from "./seq";
|
|
|
8
6
|
import { primitive, thenTac, type GoalTactic, type Tactic } from "./tactical";
|
|
9
7
|
import { nprems, permutePrems, type Thm } from "./thm";
|
|
10
8
|
|
|
11
|
-
// A ==> ... ==> C becomes A ==> #(... ==> C), keeping count premises.
|
|
12
9
|
const protect = (count: number, thm: Thm) => compNoFlatten(thm, count, 1, protectI);
|
|
13
10
|
|
|
14
|
-
// A ==> ... ==> #C becomes A ==> ... ==> C.
|
|
15
11
|
const conclude = (thm: Thm) => compNoFlatten(thm, nprems(thm), 1, protectD);
|
|
16
12
|
|
|
17
13
|
const restrict = (index: number, count: number, state: Thm) => {
|
|
@@ -22,7 +18,6 @@ const restrict = (index: number, count: number, state: Thm) => {
|
|
|
22
18
|
|
|
23
19
|
const unrestrict = (index: number, state: Thm) => permutePrems(0, 1 - index, conclude(state));
|
|
24
20
|
|
|
25
|
-
// SELECT_GOAL: runs the tactic on goal index alone.
|
|
26
21
|
export const selectGoal =
|
|
27
22
|
(tactic: Tactic): GoalTactic =>
|
|
28
23
|
(index) =>
|
|
@@ -37,7 +32,6 @@ export const selectGoal =
|
|
|
37
32
|
)(state);
|
|
38
33
|
};
|
|
39
34
|
|
|
40
|
-
// PREFER_GOAL: runs the tactic with goal index moved to the front.
|
|
41
35
|
export const preferGoal =
|
|
42
36
|
(tactic: Tactic): GoalTactic =>
|
|
43
37
|
(index) =>
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
// Isabelle interrupts a proof that runs out of time, wherever it is; this port checks for that at
|
|
2
|
-
// the points where Isabelle's tactics and unifier spend their time.
|
|
3
|
-
|
|
4
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
5
2
|
|
|
6
|
-
// When a proof gives up: past the deadline, a time from Date.now(), or once the signal aborts.
|
|
7
3
|
export interface Limits {
|
|
8
4
|
readonly deadline: number;
|
|
9
5
|
readonly signal?: AbortSignal;
|
|
10
6
|
}
|
|
11
7
|
|
|
12
|
-
// tlapm reports no success for an interrupted proof.
|
|
13
8
|
export const checkInterrupt = (limits: Limits) => {
|
|
14
9
|
if (Date.now() > limits.deadline || limits.signal?.aborted === true)
|
|
15
10
|
throw new TlaIsabelleError("Interrupt", "Interrupt");
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/logic.ML
|
|
2
|
-
// 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see
|
|
3
|
-
// LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/logic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { variantList } from "./name";
|
|
@@ -25,7 +23,6 @@ import {
|
|
|
25
23
|
type Typ,
|
|
26
24
|
} from "./term";
|
|
27
25
|
|
|
28
|
-
// Logic.occs: whether a subterm of other is aconv to term.
|
|
29
26
|
export const occs = (term: Term, other: Term): boolean =>
|
|
30
27
|
mayOccur(term, other) &&
|
|
31
28
|
(aconv(term, other) ||
|
|
@@ -52,7 +49,6 @@ export const mkEquals = (left: Term, right: Term) => {
|
|
|
52
49
|
return mkApp(mkApp(mkConst("Pure.eq", funTs([type, type], propT)), left), right);
|
|
53
50
|
};
|
|
54
51
|
|
|
55
|
-
// A term c $ x $ y.
|
|
56
52
|
interface ConstApp2 extends App {
|
|
57
53
|
readonly fun: App;
|
|
58
54
|
}
|
|
@@ -101,7 +97,6 @@ export const stripImpConcl = (term: Term): Term => {
|
|
|
101
97
|
return current;
|
|
102
98
|
};
|
|
103
99
|
|
|
104
|
-
// Logic.strip_prems: removes count premises, returning them reversed onto premises.
|
|
105
100
|
export const stripPrems = (
|
|
106
101
|
count: number,
|
|
107
102
|
premises: readonly Term[],
|
|
@@ -124,11 +119,9 @@ export const isProtected = (term: Term) =>
|
|
|
124
119
|
export const mkTerm = (term: Term) =>
|
|
125
120
|
mkApp(mkConst("Pure.term", funT(fastypeOf(term), propT)), term);
|
|
126
121
|
|
|
127
|
-
// Logic.combound: term(Bound (start+count-1), ..., Bound start).
|
|
128
122
|
export const combound = (term: Term, start: number, count: number): Term =>
|
|
129
123
|
count > 0 ? mkApp(combound(term, start + 1, count - 1), mkBound(start)) : term;
|
|
130
124
|
|
|
131
|
-
// Logic.rlist_abs: ([xn, ..., x1], body) to %x1 ... xn. body.
|
|
132
125
|
export const rlistAbs = (binders: readonly Binder[], body: Term) =>
|
|
133
126
|
binders.reduce((result, binder) => mkAbs(binder.name, binder.type, result), body);
|
|
134
127
|
|
|
@@ -141,7 +134,6 @@ const incrTVar = (increment: number, type: Typ) =>
|
|
|
141
134
|
type,
|
|
142
135
|
);
|
|
143
136
|
|
|
144
|
-
// Logic.incr_indexes_operation: lifts the variables over the types and increments their indexes.
|
|
145
137
|
const incrIndexesFixed = (
|
|
146
138
|
fixed: readonly string[],
|
|
147
139
|
types: readonly Typ[],
|
|
@@ -191,7 +183,7 @@ const incrIndexesFixed = (
|
|
|
191
183
|
export const incrIndexes = (types: readonly Typ[], increment: number, term: Term) =>
|
|
192
184
|
incrIndexesFixed([], types, increment, 0, term);
|
|
193
185
|
|
|
194
|
-
const isAllAbs = (
|
|
186
|
+
export const isAllAbs = (
|
|
195
187
|
term: Term,
|
|
196
188
|
): term is Extract<Term, { kind: "App" }> & {
|
|
197
189
|
arg: Extract<Term, { kind: "Abs" }>;
|
|
@@ -201,7 +193,6 @@ const isAllAbs = (
|
|
|
201
193
|
term.fun.name === "Pure.all" &&
|
|
202
194
|
term.arg.kind === "Abs";
|
|
203
195
|
|
|
204
|
-
// Logic.lift_abs: lifts a term over the parameters of a goal.
|
|
205
196
|
export const liftAbs = (increment: number, goal: Term, term: Term): Term => {
|
|
206
197
|
const lift = (types: Typ[], current: Term): Term => {
|
|
207
198
|
if (isConstApp2(current, "Pure.imp")) return lift(types, current.arg);
|
|
@@ -216,7 +207,6 @@ export const liftAbs = (increment: number, goal: Term, term: Term): Term => {
|
|
|
216
207
|
return lift([], goal);
|
|
217
208
|
};
|
|
218
209
|
|
|
219
|
-
// Logic.lift_all: lifts a proposition over the parameters and premises of a goal.
|
|
220
210
|
export const liftAll = (increment: number, goal: Term, term: Term): Term => {
|
|
221
211
|
const lift = (types: Typ[], current: Term): Term => {
|
|
222
212
|
if (isConstApp2(current, "Pure.imp"))
|
|
@@ -281,7 +271,6 @@ export const hasMetaPrems = (term: Term): boolean => {
|
|
|
281
271
|
return false;
|
|
282
272
|
};
|
|
283
273
|
|
|
284
|
-
// Logic.remove_params: drops count parameters and premise number index.
|
|
285
274
|
const removeParams = (count: number, index: number, term: Term): Term => {
|
|
286
275
|
if (count === 0 && index <= 0) return term;
|
|
287
276
|
if (isConstApp2(term, "Pure.imp"))
|
|
@@ -293,7 +282,6 @@ const removeParams = (count: number, index: number, term: Term): Term => {
|
|
|
293
282
|
return term;
|
|
294
283
|
};
|
|
295
284
|
|
|
296
|
-
// Logic.flatten_params: moves all parameters to the front, renaming them apart.
|
|
297
285
|
export const flattenParams = (index: number, term: Term) => {
|
|
298
286
|
const params = stripParams(term);
|
|
299
287
|
const names = variantList(
|
|
@@ -304,7 +292,6 @@ export const flattenParams = (index: number, term: Term) => {
|
|
|
304
292
|
return listAll(vars, removeParams(vars.length, index, term));
|
|
305
293
|
};
|
|
306
294
|
|
|
307
|
-
// Logic.strip_assums_imp: strips at most count premises.
|
|
308
295
|
const stripAssumsImp = (count: number, hyps: Term[], term: Term): [Term[], Term] => {
|
|
309
296
|
if (count === 0) return [hyps, term];
|
|
310
297
|
if (isConstApp2(term, "Pure.imp"))
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/name.ML and
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/name.ML and Pure/General/symbol.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
|
-
// Symbol.explode: \<name> symbols count as one symbol.
|
|
6
3
|
const explodeSymbols = (text: string): string[] => text.match(/\\<\^?[A-Za-z0-9_']*>|[^]/gu) ?? [];
|
|
7
4
|
|
|
8
5
|
const isRawSymbolic = (symbol: string) => symbol.startsWith("\\<") && !symbol.startsWith("\\<^");
|
|
@@ -48,7 +45,6 @@ const cleanIndex = (name: string): [string, number] => {
|
|
|
48
45
|
|
|
49
46
|
export const cleanName = (name: string) => cleanIndex(name)[0];
|
|
50
47
|
|
|
51
|
-
// Name.context: the declared names with their latest renaming.
|
|
52
48
|
export type NameContext = ReadonlyMap<string, string | undefined>;
|
|
53
49
|
|
|
54
50
|
export const declareName = (name: string, context: NameContext): NameContext => {
|
|
@@ -65,7 +61,6 @@ export const emptyNameContext: NameContext = new Map([
|
|
|
65
61
|
export const makeNameContext = (names: readonly string[]) =>
|
|
66
62
|
names.reduce((context, name) => declareName(name, context), emptyNameContext);
|
|
67
63
|
|
|
68
|
-
// Name.variant: a name distinct from the declared ones, keeping a suffix of underscores.
|
|
69
64
|
export const variantName = (name: string, context: NameContext): [string, NameContext] => {
|
|
70
65
|
const [base, count] = cleanIndex(name);
|
|
71
66
|
if (!context.has(base)) return [base + "_".repeat(count), declareName(base, context)];
|
|
@@ -79,7 +74,7 @@ export const variantName = (name: string, context: NameContext): [string, NameCo
|
|
|
79
74
|
return [current + "_".repeat(count), declareName(current, renamed)];
|
|
80
75
|
};
|
|
81
76
|
|
|
82
|
-
|
|
77
|
+
const variantNames = (names: readonly string[], context: NameContext) => {
|
|
83
78
|
let current = context;
|
|
84
79
|
return names.map((name) => {
|
|
85
80
|
const [variant, next] = variantName(name, current);
|
|
@@ -91,8 +86,6 @@ export const variantNames = (names: readonly string[], context: NameContext) =>
|
|
|
91
86
|
export const variantList = (used: readonly string[], names: readonly string[]) =>
|
|
92
87
|
variantNames(names, makeNameContext(used));
|
|
93
88
|
|
|
94
|
-
// Name.is_bound and Name.bound: the names of loose bound variables in nets and printing.
|
|
95
|
-
// Name.is_bound: the names the simplifier gives the free variables standing for bound ones.
|
|
96
89
|
export const isBoundName = (name: string) => name.startsWith(":");
|
|
97
90
|
|
|
98
91
|
export const boundName = (index: number) => `:${String(index).padStart(3, "0")}`;
|
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/net.ML
|
|
2
|
-
// of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/net.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
2
|
|
|
3
|
+
import type { List } from "./list";
|
|
4
4
|
import { boundName } from "./name";
|
|
5
5
|
import {
|
|
6
6
|
emptyTable,
|
|
7
7
|
fastStringOrd,
|
|
8
8
|
foldTable,
|
|
9
|
-
isEmptyTable,
|
|
10
9
|
lookupTable,
|
|
11
10
|
updateTable,
|
|
12
|
-
deleteTable,
|
|
13
11
|
type Table,
|
|
14
12
|
} from "./table";
|
|
15
13
|
import { headOf, type Term } from "./term";
|
|
@@ -33,8 +31,6 @@ export type Net<Item> =
|
|
|
33
31
|
|
|
34
32
|
export const emptyNet: Net<never> = { kind: "Leaf", items: [] };
|
|
35
33
|
|
|
36
|
-
const isEmptyNet = <Item>(net: Net<Item>) => net.kind === "Leaf" && net.items.length === 0;
|
|
37
|
-
|
|
38
34
|
const makeNode = <Item>(): Extract<Net<Item>, { kind: "Net" }> => ({
|
|
39
35
|
kind: "Net",
|
|
40
36
|
comb: emptyNet,
|
|
@@ -42,7 +38,6 @@ const makeNode = <Item>(): Extract<Net<Item>, { kind: "Net" }> => ({
|
|
|
42
38
|
atoms: emptyTable(fastStringOrd),
|
|
43
39
|
});
|
|
44
40
|
|
|
45
|
-
// Net.key_of_term: preorder keys, with any term headed by a variable or an abstraction as a Var.
|
|
46
41
|
export const keyOfTerm = (term: Term): NetKey[] => {
|
|
47
42
|
const keys: NetKey[] = [];
|
|
48
43
|
const add = (current: Term) => {
|
|
@@ -68,8 +63,6 @@ export const keyOfTerm = (term: Term): NetKey[] => {
|
|
|
68
63
|
return keys;
|
|
69
64
|
};
|
|
70
65
|
|
|
71
|
-
// Net.insert: raises nothing on a duplicate here; insert_safe semantics with eq. It walks down
|
|
72
|
-
// the keys and rebuilds the path bottom-up, so a long key list can't exhaust the stack.
|
|
73
66
|
export const insertNet = <Item>(
|
|
74
67
|
isEqual: (left: Item, right: Item) => boolean,
|
|
75
68
|
keys: readonly NetKey[],
|
|
@@ -104,56 +97,7 @@ export const insertNet = <Item>(
|
|
|
104
97
|
export const insertTermNet = <Item>(term: Term, item: Item, net: Net<Item>) =>
|
|
105
98
|
insertNet(() => false, keyOfTerm(term), item, net) ?? net;
|
|
106
99
|
|
|
107
|
-
|
|
108
|
-
isEmptyNet(node.comb) && isEmptyNet(node.var) && isEmptyTable(node.atoms) ? emptyNet : node;
|
|
109
|
-
|
|
110
|
-
// Net.delete: undefined where Isabelle raises DELETE.
|
|
111
|
-
const deleteNet = <Item>(
|
|
112
|
-
isEqual: (left: Item, right: Item) => boolean,
|
|
113
|
-
keys: readonly NetKey[],
|
|
114
|
-
item: Item,
|
|
115
|
-
net: Net<Item>,
|
|
116
|
-
): Net<Item> | undefined => {
|
|
117
|
-
const del = (position: number, node: Net<Item>): Net<Item> | undefined => {
|
|
118
|
-
if (node.kind === "Leaf") {
|
|
119
|
-
if (position < keys.length) return undefined;
|
|
120
|
-
const index = node.items.findIndex((other) => isEqual(other, item));
|
|
121
|
-
if (index === -1) return undefined;
|
|
122
|
-
return { kind: "Leaf", items: node.items.filter((other) => !isEqual(other, item)) };
|
|
123
|
-
}
|
|
124
|
-
if (position === keys.length) return undefined;
|
|
125
|
-
const key = keys[position];
|
|
126
|
-
if (key.kind === "Comb") {
|
|
127
|
-
const comb = del(position + 1, node.comb);
|
|
128
|
-
return comb && newNet({ ...node, comb });
|
|
129
|
-
}
|
|
130
|
-
if (key.kind === "Var") {
|
|
131
|
-
const child = del(position + 1, node.var);
|
|
132
|
-
return child && newNet({ ...node, var: child });
|
|
133
|
-
}
|
|
134
|
-
const existing = lookupTable(node.atoms, key.name);
|
|
135
|
-
if (existing === undefined) return undefined;
|
|
136
|
-
const child = del(position + 1, existing);
|
|
137
|
-
if (child === undefined) return undefined;
|
|
138
|
-
return newNet({
|
|
139
|
-
...node,
|
|
140
|
-
atoms: isEmptyNet(child)
|
|
141
|
-
? deleteTable(node.atoms, key.name)
|
|
142
|
-
: updateTable(node.atoms, key.name, child),
|
|
143
|
-
});
|
|
144
|
-
};
|
|
145
|
-
return del(0, net);
|
|
146
|
-
};
|
|
147
|
-
|
|
148
|
-
export const deleteTermSafe = <Item>(
|
|
149
|
-
isEqual: (left: Item, right: Item) => boolean,
|
|
150
|
-
term: Term,
|
|
151
|
-
item: Item,
|
|
152
|
-
net: Net<Item>,
|
|
153
|
-
) => deleteNet(isEqual, keyOfTerm(term), item, net) ?? net;
|
|
154
|
-
|
|
155
|
-
// The lists of nets that matching conses up, as Isabelle's lists.
|
|
156
|
-
type Nets<Item> = { readonly head: Net<Item>; readonly tail: Nets<Item> } | undefined;
|
|
100
|
+
type Nets<Item> = List<Net<Item>> | undefined;
|
|
157
101
|
|
|
158
102
|
const toArray = <Item>(nets: Nets<Item>) => {
|
|
159
103
|
const array: Net<Item>[] = [];
|
|
@@ -1,23 +1,17 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/object_logic.ML,
|
|
2
|
-
// Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
|
|
3
|
-
// Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/Isar/object_logic.ML and Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { gconvRule, paramsConv, premsConv } from "./conv";
|
|
7
5
|
import { hasMetaPrems } from "./logic";
|
|
8
|
-
import {
|
|
6
|
+
import { makeSimpContext } from "./raw-simplifier";
|
|
9
7
|
import { rewriteCterm, simpleProver } from "./rewriter";
|
|
10
8
|
import { emptySeq, singleSeq } from "./seq";
|
|
11
9
|
import type { Limits } from "./interrupt";
|
|
12
10
|
import type { GoalTactic } from "./tactical";
|
|
13
11
|
import { reflexive, type Thm } from "./thm";
|
|
14
12
|
|
|
15
|
-
// Object_Logic.atomize_prems_tac: rewrites the premises of a goal with the atomize rules, newest
|
|
16
|
-
// first as Object_Logic keeps them, which turns meta-level premises into object-level formulas.
|
|
17
13
|
export const atomizePremsTac = (limits: Limits, rules: readonly Thm[]): GoalTactic => {
|
|
18
|
-
const
|
|
19
|
-
const context = { ...empty, simpset: addSimps(empty, rules) };
|
|
20
|
-
// Raw_Simplifier.rewrite ctxt true: full rewriting, with a prover that proves no premises.
|
|
14
|
+
const context = makeSimpContext(limits, rules);
|
|
21
15
|
const atomize = paramsConv(
|
|
22
16
|
premsConv((term) =>
|
|
23
17
|
rewriteCterm({ simprem: true, useprem: false, mutsimp: false }, simpleProver, context, term),
|
|
@@ -29,7 +23,6 @@ export const atomizePremsTac = (limits: Limits, rules: readonly Thm[]): GoalTact
|
|
|
29
23
|
gconvRule((term) => (hasMetaPrems(term) ? atomize(term) : reflexive(term)), index, state),
|
|
30
24
|
);
|
|
31
25
|
} catch (error) {
|
|
32
|
-
// CONVERSION fails on THM, CTERM, TERM and TYPE.
|
|
33
26
|
if (
|
|
34
27
|
error instanceof TlaIsabelleError &&
|
|
35
28
|
(error.exception === "THM" || error.exception === "TERM" || error.exception === "TYPE")
|