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,6 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/thm.ML
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Every TLA+ type variable has the empty sort, so the kernel drops the sort hypotheses and
|
|
5
|
-
// constraints. Proof terms and certificates are not recorded either.
|
|
1
|
+
// Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
6
2
|
|
|
7
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
3
|
+
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
8
4
|
import {
|
|
9
5
|
betaNorm,
|
|
10
6
|
emptyEnvir,
|
|
@@ -24,6 +20,7 @@ import {
|
|
|
24
20
|
liftAll,
|
|
25
21
|
listAll,
|
|
26
22
|
listImplies,
|
|
23
|
+
isImplies,
|
|
27
24
|
mkEquals,
|
|
28
25
|
mkImplies,
|
|
29
26
|
occs,
|
|
@@ -68,12 +65,11 @@ import {
|
|
|
68
65
|
type Var,
|
|
69
66
|
} from "./term";
|
|
70
67
|
import type { Limits } from "./interrupt";
|
|
71
|
-
import { smashUnifiers, unifiers, type Tpair } from "./unify";
|
|
68
|
+
import { smashUnifiers, unifiers, type Tpair, type Unifier } from "./unify";
|
|
72
69
|
import { normTermSkip, renameBvars, stripApply, stripAssums2, unifyVarTypes } from "./bicompose";
|
|
73
70
|
|
|
74
71
|
declare const kernel: unique symbol;
|
|
75
72
|
|
|
76
|
-
// A theorem. Only this module builds one, so every Thm follows from the axioms by the rules here.
|
|
77
73
|
export interface Thm {
|
|
78
74
|
readonly maxidx: number;
|
|
79
75
|
readonly hyps: readonly Term[];
|
|
@@ -109,7 +105,6 @@ const unionTpairs = (left: readonly Tpair[], right: readonly Tpair[]) =>
|
|
|
109
105
|
const maxidxTpairs = (tpairs: readonly Tpair[], maxidx: number) =>
|
|
110
106
|
tpairs.reduce((result, pair) => maxidxOfTerm(pair[1], maxidxOfTerm(pair[0], result)), maxidx);
|
|
111
107
|
|
|
112
|
-
// An axiom or a theorem that the reference theories prove, taken on trust.
|
|
113
108
|
export const axiomThm = (prop: Term): Thm => makeThm(maxidxOfTerm(prop), [], [], prop);
|
|
114
109
|
|
|
115
110
|
export const nprems = (thm: Thm) => countPrems(thm.prop);
|
|
@@ -148,13 +143,7 @@ export const impliesIntr = (premise: Term, thm: Thm): Thm => {
|
|
|
148
143
|
|
|
149
144
|
export const impliesElim = (major: Thm, minor: Thm): Thm => {
|
|
150
145
|
const prop = major.prop;
|
|
151
|
-
if (
|
|
152
|
-
prop.kind !== "App" ||
|
|
153
|
-
prop.fun.kind !== "App" ||
|
|
154
|
-
prop.fun.fun.kind !== "Const" ||
|
|
155
|
-
prop.fun.fun.name !== "Pure.imp" ||
|
|
156
|
-
!aconv(prop.fun.arg, minor.prop)
|
|
157
|
-
)
|
|
146
|
+
if (!isImplies(prop) || !aconv(prop.fun.arg, minor.prop))
|
|
158
147
|
throw new TlaIsabelleError("THM", "implies_elim: major premise");
|
|
159
148
|
return makeThm(
|
|
160
149
|
Math.max(major.maxidx, minor.maxidx),
|
|
@@ -240,11 +229,11 @@ export const transitive = (first: Thm, second: Thm): Thm => {
|
|
|
240
229
|
);
|
|
241
230
|
};
|
|
242
231
|
|
|
243
|
-
export const betaConversion = (
|
|
244
|
-
if (!
|
|
232
|
+
export const betaConversion = (isFull: boolean, term: Term): Thm => {
|
|
233
|
+
if (!isFull && (term.kind !== "App" || term.fun.kind !== "Abs"))
|
|
245
234
|
throw new TlaIsabelleError("THM", "beta_conversion: not a redex");
|
|
246
235
|
const reduced =
|
|
247
|
-
|
|
236
|
+
isFull || term.kind !== "App" || term.fun.kind !== "Abs"
|
|
248
237
|
? betaNorm(term)
|
|
249
238
|
: substBound(term.arg, term.fun.body);
|
|
250
239
|
return makeThm(maxidxOfTerm(term), [], [], mkEquals(term, reduced));
|
|
@@ -318,7 +307,6 @@ export const flexflexRule = (limits: Limits | undefined, thm: Thm): Seq<Thm> =>
|
|
|
318
307
|
smashUnifiers(limits, thm.tpairs, emptyEnvir(thm.maxidx)),
|
|
319
308
|
);
|
|
320
309
|
|
|
321
|
-
// Thm.generalize: turns the named free variables into schematic ones with the given index.
|
|
322
310
|
export const generalize = (frees: readonly string[], index: number, thm: Thm): Thm => {
|
|
323
311
|
if (frees.length === 0) return thm;
|
|
324
312
|
if (index <= thm.maxidx) throw new TlaIsabelleError("THM", "generalize: bad index");
|
|
@@ -381,7 +369,6 @@ const instantiateTerm = (insts: readonly Instantiation[], term: Term): Term => {
|
|
|
381
369
|
return subst(term);
|
|
382
370
|
};
|
|
383
371
|
|
|
384
|
-
// Thm.instantiate for term variables. Every instance must have the type of its variable.
|
|
385
372
|
export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
386
373
|
if (insts.length === 0) return thm;
|
|
387
374
|
for (const inst of insts)
|
|
@@ -395,7 +382,6 @@ export const instantiate = (insts: readonly Instantiation[], thm: Thm): Thm => {
|
|
|
395
382
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
396
383
|
};
|
|
397
384
|
|
|
398
|
-
// Thm.instantiate for type variables.
|
|
399
385
|
const instantiateTypesTerm = (tyenv: TyEnv, term: Term): Term => {
|
|
400
386
|
if (maxidxOfTerm(term) < 0) return term;
|
|
401
387
|
switch (term.kind) {
|
|
@@ -423,7 +409,6 @@ export const instantiateTypes = (tyenv: TyEnv, thm: Thm): Thm => {
|
|
|
423
409
|
return makeThm(maxidxTpairs(tpairs, maxidxOfTerm(prop)), thm.hyps, tpairs, prop);
|
|
424
410
|
};
|
|
425
411
|
|
|
426
|
-
// Thm.renamed_prop: the same theorem with an alpha-equivalent proposition.
|
|
427
412
|
export const renamedProp = (prop: Term, thm: Thm): Thm => {
|
|
428
413
|
if (!aconv(prop, thm.prop)) throw new TlaIsabelleError("TERM", "renamed_prop: props disagree");
|
|
429
414
|
return makeThm(thm.maxidx, thm.hyps, thm.tpairs, prop);
|
|
@@ -454,7 +439,6 @@ const destState = (state: Thm, index: number): State => {
|
|
|
454
439
|
};
|
|
455
440
|
};
|
|
456
441
|
|
|
457
|
-
// Thm.lift_rule: lifts a rule over the parameters and premises of a goal of a state.
|
|
458
442
|
export const liftRule = (goal: Term, goalMaxidx: number, rule: Thm): Thm => {
|
|
459
443
|
const increment = goalMaxidx + 1;
|
|
460
444
|
const premises = stripImpPrems(rule.prop).map((premise) => liftAll(increment, goal, premise));
|
|
@@ -483,10 +467,9 @@ export const incrIndexesThm = (increment: number, thm: Thm): Thm => {
|
|
|
483
467
|
);
|
|
484
468
|
};
|
|
485
469
|
|
|
486
|
-
// Thm.assumption: solves goal index by any of its assumptions, with unification.
|
|
487
470
|
export const assumption = (limits: Limits | undefined, index: number, state: Thm): Seq<Thm> => {
|
|
488
471
|
const parts = destState(state, index);
|
|
489
|
-
const newThm = (unifier:
|
|
472
|
+
const newThm = (unifier: Unifier): Thm => {
|
|
490
473
|
const envir = unifier.envir;
|
|
491
474
|
const isEmpty = isEmptyEnvir(envir);
|
|
492
475
|
const prop = listImplies(parts.before, parts.conclusion);
|
|
@@ -520,11 +503,9 @@ export const assumption = (limits: Limits | undefined, index: number, state: Thm
|
|
|
520
503
|
return addprfs(0);
|
|
521
504
|
};
|
|
522
505
|
|
|
523
|
-
// Thm.eq_assumption: solves goal index by an assumption equal to its conclusion up to alpha and eta.
|
|
524
506
|
export const eqAssumption = (index: number, state: Thm): Thm => {
|
|
525
507
|
const parts = destState(state, index);
|
|
526
508
|
const problems = assumProblems(-1, parts.goal);
|
|
527
|
-
// Envir.aeconv against each assumption, contracting the conclusion only once.
|
|
528
509
|
const conclusion = etaContract(problems.conclusion);
|
|
529
510
|
const isFound = problems.hyps.some(
|
|
530
511
|
(hyp) => aconv(hyp, problems.conclusion) || aconv(etaContract(hyp), conclusion),
|
|
@@ -604,17 +585,13 @@ const bicomposeAux = (
|
|
|
604
585
|
): Seq<Thm> => {
|
|
605
586
|
const orule = compose.rule;
|
|
606
587
|
const lift = countPrems(stripAllBody(parts.goal)) + (compose.isElim ? -1 : 0);
|
|
607
|
-
const addth = (
|
|
608
|
-
newAs: { premises: Term[] },
|
|
609
|
-
unifier: { envir: Envir; tpairs: readonly Tpair[] },
|
|
610
|
-
rest: Seq<Thm>,
|
|
611
|
-
): Seq<Thm> => {
|
|
588
|
+
const addth = (newPremises: readonly Term[], unifier: Unifier, rest: Seq<Thm>): Seq<Thm> => {
|
|
612
589
|
try {
|
|
613
590
|
const envir = unifier.envir;
|
|
614
591
|
const normt = (term: Term) => normTerm(envir, term);
|
|
615
592
|
const computed = (): [readonly Tpair[], Term[], Term] => {
|
|
616
593
|
if (isEmptyEnvir(envir))
|
|
617
|
-
return [unifier.tpairs, [...parts.before, ...
|
|
594
|
+
return [unifier.tpairs, [...parts.before, ...newPremises], parts.conclusion];
|
|
618
595
|
const tpairs = unifier.tpairs.map((pair): Tpair => [normt(pair[0]), normt(pair[1])]);
|
|
619
596
|
if (above(envir, state.maxidx))
|
|
620
597
|
return isLifted
|
|
@@ -622,13 +599,13 @@ const bicomposeAux = (
|
|
|
622
599
|
tpairs,
|
|
623
600
|
[
|
|
624
601
|
...parts.before,
|
|
625
|
-
...
|
|
602
|
+
...newPremises.map((premise) => normTermSkip(envir, lift, premise)),
|
|
626
603
|
],
|
|
627
604
|
parts.conclusion,
|
|
628
605
|
]
|
|
629
|
-
: [tpairs, [...parts.before, ...
|
|
606
|
+
: [tpairs, [...parts.before, ...newPremises.map(normt)], parts.conclusion];
|
|
630
607
|
if (flags.match) throw new Compose();
|
|
631
|
-
return [tpairs, [...parts.before, ...
|
|
608
|
+
return [tpairs, [...parts.before, ...newPremises].map(normt), normt(parts.conclusion)];
|
|
632
609
|
};
|
|
633
610
|
const [tpairs, premises, conclusion] = computed();
|
|
634
611
|
return consSeq(
|
|
@@ -649,8 +626,7 @@ const bicomposeAux = (
|
|
|
649
626
|
try {
|
|
650
627
|
return stripPrems(compose.subgoals, [], orule.prop);
|
|
651
628
|
} catch (error) {
|
|
652
|
-
if (error
|
|
653
|
-
throw new TlaIsabelleError("THM", "bicompose: rule");
|
|
629
|
+
if (isIsabelleError(error, "TERM")) throw new TlaIsabelleError("THM", "bicompose: rule");
|
|
654
630
|
throw error;
|
|
655
631
|
}
|
|
656
632
|
})();
|
|
@@ -668,16 +644,14 @@ const bicomposeAux = (
|
|
|
668
644
|
? [...premises]
|
|
669
645
|
: premises.map((premise) => stripApply(rename, conclusion, premise));
|
|
670
646
|
try {
|
|
671
|
-
return
|
|
672
|
-
premises: flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed,
|
|
673
|
-
};
|
|
647
|
+
return flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed;
|
|
674
648
|
} catch (error) {
|
|
675
|
-
if (error
|
|
649
|
+
if (isIsabelleError(error, "TERM"))
|
|
676
650
|
throw new TlaIsabelleError("THM", "bicompose: 1st premise");
|
|
677
651
|
throw error;
|
|
678
652
|
}
|
|
679
653
|
};
|
|
680
|
-
const bbi = isLifted ? stripAssums2(conclusion, parts.goal) :
|
|
654
|
+
const bbi: Tpair = isLifted ? stripAssums2(conclusion, parts.goal) : [conclusion, parts.goal];
|
|
681
655
|
const dpairs: Tpair[] = [bbi, ...orule.tpairs, ...parts.tpairs];
|
|
682
656
|
const eres = (envir: Envir, premises: readonly Term[]): Seq<Thm> => {
|
|
683
657
|
if (premises.length === 0) throw new TlaIsabelleError("THM", "bicompose: no premises");
|
|
@@ -739,8 +713,6 @@ export interface BiresRule {
|
|
|
739
713
|
readonly rule: Thm;
|
|
740
714
|
}
|
|
741
715
|
|
|
742
|
-
// Thm.biresolution: resolves goal index with each rule, the elimination rules also solving their
|
|
743
|
-
// first premise by an assumption.
|
|
744
716
|
export const biresolution = (
|
|
745
717
|
limits: Limits | undefined,
|
|
746
718
|
match: boolean,
|
|
@@ -769,7 +741,6 @@ export const biresolution = (
|
|
|
769
741
|
return flatSeq(res(0));
|
|
770
742
|
};
|
|
771
743
|
|
|
772
|
-
// Thm.RSN: resolution that must produce exactly one resolvent.
|
|
773
744
|
export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
|
|
774
745
|
const [results] = chopSeq(
|
|
775
746
|
2,
|
|
@@ -781,3 +752,12 @@ export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
|
|
|
781
752
|
};
|
|
782
753
|
|
|
783
754
|
export const rs = (rule: Thm, state: Thm) => rsn(rule, 1, state);
|
|
755
|
+
|
|
756
|
+
export const catchThm = <Result>(derive: () => Result): Result | undefined => {
|
|
757
|
+
try {
|
|
758
|
+
return derive();
|
|
759
|
+
} catch (error) {
|
|
760
|
+
if (isIsabelleError(error, "THM")) return undefined;
|
|
761
|
+
throw error;
|
|
762
|
+
}
|
|
763
|
+
};
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/type.ML,
|
|
2
|
-
// 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see
|
|
3
|
-
// LICENSE.
|
|
4
|
-
//
|
|
5
|
-
// Every type variable of Isabelle/TLA+ has the empty sort, so the order-sorted unification of
|
|
6
|
-
// Type.unify never meets a sort constraint and coincides with Type.raw_unify.
|
|
1
|
+
// Ported from Isabelle2025's Pure/type.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
7
2
|
|
|
8
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
9
4
|
import {
|
|
@@ -22,9 +17,6 @@ export type TyEnv = Table<IndexKey, Typ>;
|
|
|
22
17
|
|
|
23
18
|
export const emptyTyEnv: TyEnv = emptyTable(fastIndexnameOrd);
|
|
24
19
|
|
|
25
|
-
export const lookupTyEnv = (tyenv: TyEnv, name: IndexKey) => lookupTable(tyenv, name);
|
|
26
|
-
|
|
27
|
-
// Type.devar: chases the assignments of a type variable.
|
|
28
20
|
export const devar = (tyenv: TyEnv, type: Typ): Typ => {
|
|
29
21
|
let current = type;
|
|
30
22
|
while (current.kind === "TVar") {
|
|
@@ -48,7 +40,6 @@ const updateNew = (tyenv: TyEnv, name: IndexKey, type: Typ): TyEnv => {
|
|
|
48
40
|
return updateTable(tyenv, { name: name.name, index: name.index }, type);
|
|
49
41
|
};
|
|
50
42
|
|
|
51
|
-
// Type.unify: undefined where Isabelle raises TUNIFY.
|
|
52
43
|
export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
53
44
|
const leftType = devar(tyenv, left);
|
|
54
45
|
const rightType = devar(tyenv, right);
|
|
@@ -71,7 +62,6 @@ export const unifyTypes = (left: Typ, right: Typ, tyenv: TyEnv): TyEnv | undefin
|
|
|
71
62
|
return eqTyp(leftType, rightType) ? tyenv : undefined;
|
|
72
63
|
};
|
|
73
64
|
|
|
74
|
-
// Type.raw_match: undefined where Isabelle raises TYPE_MATCH.
|
|
75
65
|
export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | undefined => {
|
|
76
66
|
if (pattern.kind === "TVar") {
|
|
77
67
|
const assigned = lookupTable(tyenv, pattern);
|
|
@@ -90,7 +80,6 @@ export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | und
|
|
|
90
80
|
return object.kind === "TFree" && object.name === pattern.name ? tyenv : undefined;
|
|
91
81
|
};
|
|
92
82
|
|
|
93
|
-
// Envir.norm_type: instantiates the assigned type variables, chasing chains.
|
|
94
83
|
export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
95
84
|
if (type.kind === "TFree") return type;
|
|
96
85
|
if (type.kind === "TVar") {
|
|
@@ -101,7 +90,6 @@ export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
101
90
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
102
91
|
};
|
|
103
92
|
|
|
104
|
-
// Envir.subst_type: instantiates without chasing.
|
|
105
93
|
export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
106
94
|
if (type.kind === "TFree") return type;
|
|
107
95
|
if (type.kind === "TVar") return lookupTable(tyenv, type) ?? type;
|
|
@@ -109,8 +97,7 @@ export const substType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
|
109
97
|
return args.every((arg, index) => arg === type.args[index]) ? type : mkType(type.name, args);
|
|
110
98
|
};
|
|
111
99
|
|
|
112
|
-
// Type.unified
|
|
113
|
-
// so arguments never differ.
|
|
100
|
+
// Isabelle2025's Type.unified compares each argument with itself, so arguments never differ.
|
|
114
101
|
export const unifiedTypes = (tyenv: TyEnv, left: Typ, right: Typ): boolean => {
|
|
115
102
|
if (isEmptyTable(tyenv)) return eqTyp(left, right);
|
|
116
103
|
const leftType = devar(tyenv, left);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/unify.ML
|
|
2
|
-
// bound of 60. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen,
|
|
3
|
-
// and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/unify.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
6
4
|
import { TlaIsabelleError } from "../../../errors";
|
|
@@ -29,8 +27,7 @@ import {
|
|
|
29
27
|
singleSeq,
|
|
30
28
|
type Seq,
|
|
31
29
|
} from "./seq";
|
|
32
|
-
import { indexnameOrd } from "./table";
|
|
33
|
-
import { lookupTyEnv } from "./type";
|
|
30
|
+
import { indexnameOrd, lookupTable, type IndexKey } from "./table";
|
|
34
31
|
import {
|
|
35
32
|
aconv,
|
|
36
33
|
eqTyp,
|
|
@@ -78,7 +75,7 @@ const etaNorm = (envir: Envir, binders: readonly Binder[], term: Term): Term =>
|
|
|
78
75
|
etif(type.args[1], mkApp(incrBoundvars(1, current), mkBound(0))),
|
|
79
76
|
);
|
|
80
77
|
if (type.kind === "TVar") {
|
|
81
|
-
const assigned =
|
|
78
|
+
const assigned = lookupTable(envir.tyenv, type);
|
|
82
79
|
return assigned === undefined ? current : etif(assigned, current);
|
|
83
80
|
}
|
|
84
81
|
return current;
|
|
@@ -94,10 +91,8 @@ const etaNorm = (envir: Envir, binders: readonly Binder[], term: Term): Term =>
|
|
|
94
91
|
return etaNm(binders, term);
|
|
95
92
|
};
|
|
96
93
|
|
|
97
|
-
const sameIndexname = (
|
|
98
|
-
left
|
|
99
|
-
right: { name: string; index: number },
|
|
100
|
-
) => left.name === right.name && left.index === right.index;
|
|
94
|
+
const sameIndexname = (left: IndexKey, right: IndexKey) =>
|
|
95
|
+
left.name === right.name && left.index === right.index;
|
|
101
96
|
|
|
102
97
|
const occursTerms = (seen: Var[], envir: Envir, variable: Var, terms: readonly Term[]): boolean => {
|
|
103
98
|
const occur = (term: Term): boolean => {
|
|
@@ -176,7 +171,6 @@ const unifyTypes = (left: Typ, right: Typ, envir: Envir) => {
|
|
|
176
171
|
return result;
|
|
177
172
|
};
|
|
178
173
|
|
|
179
|
-
// get_eta_var: the variable a term eta-contracts to over the binders, or undefined for ASSIGN.
|
|
180
174
|
const getEtaVar = (binders: readonly Binder[], level: number, term: Term): Var | undefined => {
|
|
181
175
|
if (binders.length === 0) return term.kind === "Var" ? term : undefined;
|
|
182
176
|
if (term.kind === "App" && term.arg.kind === "Bound" && term.arg.index === level)
|
|
@@ -184,7 +178,6 @@ const getEtaVar = (binders: readonly Binder[], level: number, term: Term): Var |
|
|
|
184
178
|
return undefined;
|
|
185
179
|
};
|
|
186
180
|
|
|
187
|
-
// assignment: undefined where Isabelle raises ASSIGN.
|
|
188
181
|
const assignment = (
|
|
189
182
|
binders: readonly Binder[],
|
|
190
183
|
left: Term,
|
|
@@ -340,6 +333,12 @@ interface Copy {
|
|
|
340
333
|
readonly dpairs: readonly Dpair[];
|
|
341
334
|
}
|
|
342
335
|
|
|
336
|
+
interface CopiedArgs {
|
|
337
|
+
args: Term[];
|
|
338
|
+
envir: Envir;
|
|
339
|
+
dpairs: readonly Dpair[];
|
|
340
|
+
}
|
|
341
|
+
|
|
343
342
|
const matchcopy = (name: string) => {
|
|
344
343
|
const copy = (
|
|
345
344
|
binders: readonly Binder[],
|
|
@@ -348,12 +347,9 @@ const matchcopy = (name: string) => {
|
|
|
348
347
|
envir: Envir,
|
|
349
348
|
dpairs: readonly Dpair[],
|
|
350
349
|
): Seq<Copy> => {
|
|
351
|
-
const copycons = (
|
|
352
|
-
uarg: Term,
|
|
353
|
-
prefix: { args: Term[]; envir: Envir; dpairs: readonly Dpair[] },
|
|
354
|
-
) =>
|
|
350
|
+
const copycons = (uarg: Term, prefix: CopiedArgs) =>
|
|
355
351
|
mapSeq(
|
|
356
|
-
(result: Copy) => ({
|
|
352
|
+
(result: Copy): CopiedArgs => ({
|
|
357
353
|
args: [result.term, ...prefix.args],
|
|
358
354
|
envir: result.envir,
|
|
359
355
|
dpairs: result.dpairs,
|
|
@@ -366,9 +362,7 @@ const matchcopy = (name: string) => {
|
|
|
366
362
|
prefix.dpairs,
|
|
367
363
|
),
|
|
368
364
|
);
|
|
369
|
-
const copyargs = (
|
|
370
|
-
uargs: readonly Term[],
|
|
371
|
-
): Seq<{ args: Term[]; envir: Envir; dpairs: readonly Dpair[] }> =>
|
|
365
|
+
const copyargs = (uargs: readonly Term[]): Seq<CopiedArgs> =>
|
|
372
366
|
uargs.length === 0
|
|
373
367
|
? consSeq({ args: [], envir, dpairs }, emptySeq)
|
|
374
368
|
: mapsSeq((prefix) => copycons(uargs[0], prefix), copyargs(uargs.slice(1)));
|
|
@@ -404,7 +398,7 @@ const matchcopy = (name: string) => {
|
|
|
404
398
|
}
|
|
405
399
|
});
|
|
406
400
|
};
|
|
407
|
-
const joinargs = (result:
|
|
401
|
+
const joinargs = (result: CopiedArgs): Copy => ({
|
|
408
402
|
term: listComb(uhead, result.args),
|
|
409
403
|
envir: result.envir,
|
|
410
404
|
dpairs: result.dpairs,
|
|
@@ -473,7 +467,6 @@ const match = (
|
|
|
473
467
|
);
|
|
474
468
|
};
|
|
475
469
|
|
|
476
|
-
// ff_assign: undefined where Isabelle raises ASSIGN.
|
|
477
470
|
const ffAssign = (
|
|
478
471
|
envir: Envir,
|
|
479
472
|
binders: readonly Binder[],
|
|
@@ -653,7 +646,7 @@ const addFfpair = (dpair: Dpair, envir: Envir, tpairs: readonly Tpair[]): [Envir
|
|
|
653
646
|
: cleanFfpair({ binders: dpair.binders, left, right }, envir, tpairs);
|
|
654
647
|
};
|
|
655
648
|
|
|
656
|
-
interface Unifier {
|
|
649
|
+
export interface Unifier {
|
|
657
650
|
readonly envir: Envir;
|
|
658
651
|
readonly tpairs: readonly Tpair[];
|
|
659
652
|
}
|
|
@@ -670,8 +663,6 @@ const hounifiers = (
|
|
|
670
663
|
dpairs: readonly Dpair[],
|
|
671
664
|
rest: Seq<Unifier>,
|
|
672
665
|
): Seq<Unifier> =>
|
|
673
|
-
// Isabelle pulls the alternatives inside its handler for CANTUNIFY, but each alternative
|
|
674
|
-
// handles its own, so handing them over to the caller's loop changes nothing.
|
|
675
666
|
deferSeq(() => {
|
|
676
667
|
if (limits !== undefined) checkInterrupt(limits);
|
|
677
668
|
try {
|
|
@@ -684,11 +675,13 @@ const hounifiers = (
|
|
|
684
675
|
return [{ envir: result[0], tpairs: result[1] }, rest];
|
|
685
676
|
}
|
|
686
677
|
if (depth > SEARCH_BOUND) return rest;
|
|
687
|
-
const [first, ...others] = simplified.flexrigid;
|
|
688
678
|
return itRightSeq(
|
|
689
679
|
(item: [Envir, readonly Dpair[]], tail: Seq<Unifier>) =>
|
|
690
680
|
addUnify(depth + 1, item[0], item[1], tail),
|
|
691
|
-
match(simplified.envir,
|
|
681
|
+
match(simplified.envir, simplified.flexrigid[0], [
|
|
682
|
+
...simplified.flexrigid.slice(1),
|
|
683
|
+
...simplified.flexflex,
|
|
684
|
+
]),
|
|
692
685
|
rest,
|
|
693
686
|
);
|
|
694
687
|
} catch (error) {
|
|
@@ -704,7 +697,6 @@ const hounifiers = (
|
|
|
704
697
|
);
|
|
705
698
|
};
|
|
706
699
|
|
|
707
|
-
// Unify.unifiers: pattern unification first, Huet's procedure outside the pattern fragment.
|
|
708
700
|
export const unifiers = (
|
|
709
701
|
limits: Limits | undefined,
|
|
710
702
|
envir: Envir,
|
|
@@ -739,8 +731,6 @@ const smashFlexflex1 = (pair: Tpair, envir: Envir): Envir => {
|
|
|
739
731
|
: vupdate(left, typeAbs(withVar, left.type, fresh), updated);
|
|
740
732
|
};
|
|
741
733
|
|
|
742
|
-
// Unify.smash_unifiers: unifiers with no remaining flex-flex pairs. A pair whose side is not
|
|
743
|
-
// flexible stops the sequence, as CANTUNIFY escapes Seq.map in Isabelle.
|
|
744
734
|
export const smashUnifiers = (
|
|
745
735
|
limits: Limits | undefined,
|
|
746
736
|
pairs: readonly Tpair[],
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/variable.ML,
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/variable.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { variantList } from "./name";
|
|
6
|
-
import { addFreeNames, addVars, mkFree
|
|
4
|
+
import { addFreeNames, addVars, mkFree } from "./term";
|
|
7
5
|
import { generalize, instantiate, type Thm } from "./thm";
|
|
8
6
|
|
|
9
|
-
// Variable.trade with import true: fixes the schematic variables of a theorem as fresh free ones,
|
|
10
|
-
// derives theorems from it, and makes those variables schematic again.
|
|
11
7
|
export const trade = (derive: (thm: Thm) => readonly Thm[], thm: Thm): Thm[] => {
|
|
12
|
-
const vars = addVars(thm.prop, []
|
|
8
|
+
const vars = addVars(thm.prop, []);
|
|
13
9
|
const names = variantList(
|
|
14
10
|
thm.hyps.reduce((used, hyp) => addFreeNames(hyp, used), addFreeNames(thm.prop, [])),
|
|
15
11
|
vars.map((variable) => variable.name),
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
//
|
|
2
|
-
// instantiate them (BSD licensed, see LICENSE): the Hypsubst and Classical functor arguments, the
|
|
3
|
-
// claset with its nets as the reference heap orders them, and SetTheory's bspec wrapper.
|
|
1
|
+
// Ported from Isabelle/TLA+'s PredicateLogic.thy and SetTheory.thy, BSD licensed, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { emptyNet } from "../pure/net";
|
|
7
|
-
import { thenGoal
|
|
5
|
+
import { thenGoal } from "../pure/tactical";
|
|
8
6
|
import type { Limits } from "../pure/interrupt";
|
|
9
7
|
import {
|
|
10
8
|
assumeTac,
|
|
@@ -17,7 +15,7 @@ import type { Term } from "../pure/term";
|
|
|
17
15
|
import type { Thm } from "../pure/thm";
|
|
18
16
|
import { addbefore, type Claset, type ClassicalData } from "../provers/classical";
|
|
19
17
|
import { hypSubstTac, type HypsubstData } from "../provers/hypsubst";
|
|
20
|
-
import type {
|
|
18
|
+
import type { LogicNetPair, TlaLogic } from "./logic";
|
|
21
19
|
|
|
22
20
|
export const getFact = (logic: TlaLogic, name: string): Thm => {
|
|
23
21
|
const thms = logic.facts.get(name);
|
|
@@ -60,21 +58,17 @@ export const getHypsubstData = (logic: TlaLogic): HypsubstData => ({
|
|
|
60
58
|
thinRefl: getFact(logic, "PredicateLogic.thin_refl"),
|
|
61
59
|
});
|
|
62
60
|
|
|
63
|
-
export const getClassicalData = (logic: TlaLogic): ClassicalData => {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
hypSubstTacs: [(limits: Limits) => hypSubstTac({ limits, data: hypsubst })],
|
|
72
|
-
};
|
|
73
|
-
};
|
|
61
|
+
export const getClassicalData = (logic: TlaLogic, hypsubst: HypsubstData): ClassicalData => ({
|
|
62
|
+
impElim: getFact(logic, "PredicateLogic.impCE'"),
|
|
63
|
+
notElim: getFact(logic, "PredicateLogic.notE"),
|
|
64
|
+
swap: getFact(logic, "PredicateLogic.swap"),
|
|
65
|
+
classical: getFact(logic, "PredicateLogic.classical"),
|
|
66
|
+
judgment: "PredicateLogic.Trueprop",
|
|
67
|
+
hypSubstTacs: [(limits: Limits) => hypSubstTac({ limits, data: hypsubst })],
|
|
68
|
+
});
|
|
74
69
|
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
const insertAll = (items: readonly LogicNetItem[], netpair: NetPair<TaggedRule>) =>
|
|
70
|
+
export const toNetPair = <Item extends TaggedRule>(pair: LogicNetPair<Item>): NetPair<Item> => {
|
|
71
|
+
const insertAll = (items: readonly Item[], netpair: NetPair<Item>) =>
|
|
78
72
|
items.reduceRight((result, item) => insertTaggedBrl(item, result), netpair);
|
|
79
73
|
return insertAll(pair.elim, insertAll(pair.intro, { intro: emptyNet, elim: emptyNet }));
|
|
80
74
|
};
|
|
@@ -92,10 +86,9 @@ export const getClaset = (logic: TlaLogic, limits: Limits): Claset => {
|
|
|
92
86
|
unsafe: toNetPair(logic.claset.unsafe),
|
|
93
87
|
dup: toNetPair(logic.claset.dup),
|
|
94
88
|
};
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
assumeTac(limits),
|
|
89
|
+
return addbefore(
|
|
90
|
+
claset,
|
|
91
|
+
"bspec",
|
|
92
|
+
thenGoal(dresolveTac(limits, [getFact(logic, "SetTheory.bspec")]), assumeTac(limits)),
|
|
99
93
|
);
|
|
100
|
-
return addbefore(claset, "bspec", bspec);
|
|
101
94
|
};
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
// The proof context of a theory tlapm writes, as the Isabelle/TLA+ heap sets it up: its simpset,
|
|
2
|
-
// claset, context rules and atomize rules, and Blast instantiated as PredicateLogic.thy does.
|
|
3
|
-
|
|
4
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
5
2
|
import type { ProofContext } from "../isar/method";
|
|
6
|
-
import { emptyNet } from "../pure/net";
|
|
7
3
|
import type { Limits } from "../pure/interrupt";
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
4
|
+
import { blastDepthTac, blastTac } from "../provers/blast/blast";
|
|
5
|
+
import type { BlastContext } from "../provers/blast/state";
|
|
10
6
|
import type { ClassicalContext } from "../provers/classical";
|
|
11
7
|
import { blastHypSubstTac } from "../provers/hypsubst";
|
|
12
|
-
import
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
import {
|
|
9
|
+
getClaset,
|
|
10
|
+
getClassicalData,
|
|
11
|
+
getFact,
|
|
12
|
+
getHypsubstData,
|
|
13
|
+
toNetPair,
|
|
14
|
+
} from "./classical-setup";
|
|
15
|
+
import type { TlaLogic } from "./logic";
|
|
15
16
|
import { getSimpset } from "./simpdata";
|
|
16
17
|
|
|
17
|
-
// The atomize rules, newest first as Object_Logic keeps them.
|
|
18
18
|
const ATOMIZE_RULES = [
|
|
19
19
|
"Zenon.atomize_object_bAll",
|
|
20
20
|
"Zenon.atomize_meta_bAll",
|
|
@@ -25,17 +25,14 @@ const ATOMIZE_RULES = [
|
|
|
25
25
|
"PredicateLogic.atomize_all",
|
|
26
26
|
];
|
|
27
27
|
|
|
28
|
-
// Net.content lists a leaf's items newest first, so inserting them in reverse rebuilds the leaf.
|
|
29
|
-
const toNetPair = (pair: LogicNetPair<LogicExtraNetItem>): NetPair<ContextRule> => {
|
|
30
|
-
const insertAll = (items: readonly LogicExtraNetItem[], netpair: NetPair<ContextRule>) =>
|
|
31
|
-
items.reduceRight((result, item) => insertTaggedBrl(item, result), netpair);
|
|
32
|
-
return insertAll(pair.elim, insertAll(pair.intro, { intro: emptyNet, elim: emptyNet }));
|
|
33
|
-
};
|
|
34
|
-
|
|
35
28
|
export const getProofContext = (logic: TlaLogic, limits: Limits): ProofContext => {
|
|
36
29
|
const atomizeRules = ATOMIZE_RULES.map((name) => getFact(logic, name));
|
|
37
|
-
const classical = { limits, claset: getClaset(logic, limits), data: getClassicalData(logic) };
|
|
38
30
|
const hypsubst = getHypsubstData(logic);
|
|
31
|
+
const classical = {
|
|
32
|
+
limits,
|
|
33
|
+
claset: getClaset(logic, limits),
|
|
34
|
+
data: getClassicalData(logic, hypsubst),
|
|
35
|
+
};
|
|
39
36
|
const toBlastContext = (context: ClassicalContext): BlastContext => ({
|
|
40
37
|
limits: context.limits,
|
|
41
38
|
claset: context.claset,
|