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,12 +1,8 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/pattern.ML and Pure/more_pattern.ML. Copyright (c) 1986-2025
|
|
2
|
-
// University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Unification and matching of higher-order patterns. Isabelle signals failure with the
|
|
5
|
-
// exceptions Unif, Pattern and MATCH; here they stay inside this module and the exported
|
|
6
|
-
// functions return undefined instead.
|
|
1
|
+
// Ported from Isabelle2025's Pure/pattern.ML and Pure/more_pattern.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 { aeconv, genvar, headNorm, lookup, lookup1, update, type Envir, type TEnv } from "./envir";
|
|
5
|
+
import type { Binder } from "./logic";
|
|
10
6
|
import { hasKey, indexnameOrd, updateTable } from "./table";
|
|
11
7
|
import {
|
|
12
8
|
eqTyp,
|
|
@@ -32,11 +28,6 @@ class Unif {}
|
|
|
32
28
|
class NotPattern {}
|
|
33
29
|
class Match {}
|
|
34
30
|
|
|
35
|
-
interface Binder {
|
|
36
|
-
name: string;
|
|
37
|
-
type: Typ;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
31
|
const occurs = (variable: Var, term: Term, envir: Envir): boolean => {
|
|
41
32
|
const visit = (current: Term): boolean => {
|
|
42
33
|
if ((flagsOf(current) & HAS_VAR) === 0) return false;
|
|
@@ -156,7 +147,6 @@ const mkNewHnf = (
|
|
|
156
147
|
return update(variable, mkHnf(binders, indexes, fresh, args), updated);
|
|
157
148
|
};
|
|
158
149
|
|
|
159
|
-
// downto0 (is, n): whether is is [n, n - 1, ..., 0].
|
|
160
150
|
const isDownto0 = (indexes: readonly number[], count: number) =>
|
|
161
151
|
indexes.length === count + 1 && indexes.every((index, position) => index === count - position);
|
|
162
152
|
|
|
@@ -306,7 +296,6 @@ const flexflex2 = (
|
|
|
306
296
|
: assign(rightVar, rightIndexes, leftVar, leftIndexes);
|
|
307
297
|
};
|
|
308
298
|
|
|
309
|
-
// Pattern.unify_types: undefined where Isabelle raises Unif.
|
|
310
299
|
export const unifyTypesEnvir = (left: Typ, right: Typ, envir: Envir): Envir | undefined => {
|
|
311
300
|
if (eqTyp(left, right)) return envir;
|
|
312
301
|
const tyenv = unifyTypes(right, left, envir.tyenv);
|
|
@@ -420,7 +409,6 @@ type PatternUnifyResult =
|
|
|
420
409
|
| { kind: "clash" }
|
|
421
410
|
| { kind: "not a pattern" };
|
|
422
411
|
|
|
423
|
-
// Pattern.unify: distinguishes a clash (Unif) from terms outside the pattern fragment (Pattern).
|
|
424
412
|
export const unifyPattern = (left: Term, right: Term, envir: Envir): PatternUnifyResult => {
|
|
425
413
|
try {
|
|
426
414
|
return { kind: "unified", envir: unif([], left, right, envir) };
|
|
@@ -595,22 +583,18 @@ const catchMatch = (run: () => MatchEnv): MatchEnv | undefined => {
|
|
|
595
583
|
}
|
|
596
584
|
};
|
|
597
585
|
|
|
598
|
-
// Pattern.match: undefined where Isabelle raises MATCH.
|
|
599
586
|
export const matchPattern = (pattern: Term, object: Term, env: MatchEnv): MatchEnv | undefined =>
|
|
600
587
|
catchMatch(() => higherOrderMatch(pattern, object, env));
|
|
601
588
|
|
|
602
|
-
// Pattern.first_order_match
|
|
603
589
|
export const firstOrderMatchPattern = (
|
|
604
590
|
pattern: Term,
|
|
605
591
|
object: Term,
|
|
606
592
|
env: MatchEnv,
|
|
607
593
|
): MatchEnv | undefined => catchMatch(() => firstOrderMatch(pattern, object, env));
|
|
608
594
|
|
|
609
|
-
// Pattern.matches
|
|
610
595
|
export const matches = (pattern: Term, object: Term, tyenv: TyEnv, tenv: TEnv) =>
|
|
611
596
|
matchPattern(pattern, object, { tyenv, tenv }) !== undefined;
|
|
612
597
|
|
|
613
|
-
// Pattern.pattern
|
|
614
598
|
export const isPattern = (term: Term): boolean => {
|
|
615
599
|
if (term.kind === "Abs") return isPattern(term.body);
|
|
616
600
|
const [head, args] = stripComb(term);
|
|
@@ -622,7 +606,6 @@ export const isPattern = (term: Term): boolean => {
|
|
|
622
606
|
return args.every(isPattern);
|
|
623
607
|
};
|
|
624
608
|
|
|
625
|
-
// Pattern.first_order
|
|
626
609
|
export const isFirstOrder = (term: Term): boolean => {
|
|
627
610
|
if (term.kind === "Abs") return isFirstOrder(term.body);
|
|
628
611
|
if (term.kind === "App")
|
|
@@ -1,30 +1,26 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/raw_simplifier.ML,
|
|
2
|
-
// (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see
|
|
3
|
-
// LICENSE.
|
|
4
|
-
//
|
|
5
|
-
// Isabelle/TLA+ declares no congruence procedures, so the simpset leaves them out.
|
|
1
|
+
// Ported from Isabelle2025's Pure/raw_simplifier.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
6
2
|
|
|
7
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
8
|
-
import { etaContract } from "./envir";
|
|
4
|
+
import { emptyTEnv, etaContract } from "./envir";
|
|
9
5
|
import { symmetricThm } from "./drule";
|
|
10
6
|
import { destEquals, isEquals, occs, stripImpConcl, stripImpPrems } from "./logic";
|
|
11
7
|
import { emptyNet, insertNet, keyOfTerm, type Net } from "./net";
|
|
12
8
|
import { isFirstOrder, isPattern, matches } from "./pattern";
|
|
13
|
-
import { emptyTable, type Table } from "./table";
|
|
14
|
-
import { emptyTEnv } from "./envir";
|
|
9
|
+
import { emptyTable, stringOrd, type Table } from "./table";
|
|
15
10
|
import { emptyTyEnv } from "./type";
|
|
16
11
|
import {
|
|
17
12
|
aconv,
|
|
18
13
|
existsSubterm,
|
|
19
14
|
existsType,
|
|
20
15
|
foldVars,
|
|
16
|
+
eqTerm,
|
|
21
17
|
eqTyp,
|
|
22
18
|
headOf,
|
|
23
19
|
type Term,
|
|
24
20
|
type Typ,
|
|
25
21
|
type Var,
|
|
26
22
|
} from "./term";
|
|
27
|
-
import { rs, type Thm } from "./thm";
|
|
23
|
+
import { catchThm, rs, type Thm } from "./thm";
|
|
28
24
|
import { eqThmProp, noTac, type GoalTactic } from "./tactical";
|
|
29
25
|
import type { Limits } from "./interrupt";
|
|
30
26
|
|
|
@@ -75,8 +71,6 @@ export interface Simpset {
|
|
|
75
71
|
readonly safeSolvers: readonly Solver[];
|
|
76
72
|
}
|
|
77
73
|
|
|
78
|
-
// The part of an Isabelle proof context that the simplifier reads: the simpset, the time limits,
|
|
79
|
-
// and the counter that names the free variables standing for bound ones.
|
|
80
74
|
export interface SimpContext {
|
|
81
75
|
readonly limits: Limits;
|
|
82
76
|
readonly simpset: Simpset;
|
|
@@ -94,9 +88,10 @@ export const congName = (term: Term): CongName | undefined =>
|
|
|
94
88
|
? { isConst: false, name: term.name }
|
|
95
89
|
: undefined;
|
|
96
90
|
|
|
97
|
-
const varsOf = (term: Term)
|
|
91
|
+
export const varsOf = (term: Term): Var[] =>
|
|
92
|
+
foldVars((atom, result: Var[]) => [...result, atom], term, []);
|
|
98
93
|
|
|
99
|
-
const hasVar = (vars: readonly Var[], variable: Var) =>
|
|
94
|
+
export const hasVar = (vars: readonly Var[], variable: Var) =>
|
|
100
95
|
vars.some(
|
|
101
96
|
(other) =>
|
|
102
97
|
other.name === variable.name &&
|
|
@@ -116,8 +111,6 @@ const hasNewTVar = (type: Typ, keys: ReadonlySet<string>): boolean => {
|
|
|
116
111
|
return false;
|
|
117
112
|
};
|
|
118
113
|
|
|
119
|
-
// rewrite_rule_extra_vars: whether the right-hand sides have variables outside the left-hand side
|
|
120
|
-
// and the premises.
|
|
121
114
|
const rewriteRuleExtraVars = (prems: readonly Term[], elhs: Term, erhss: readonly Term[]) => {
|
|
122
115
|
const terms = [elhs, ...prems];
|
|
123
116
|
const vars = terms.flatMap(varsOf);
|
|
@@ -151,36 +144,7 @@ const vperm = (left: Term, right: Term): boolean => {
|
|
|
151
144
|
if (left.kind === "Abs" && right.kind === "Abs") return vperm(left.body, right.body);
|
|
152
145
|
if (left.kind === "App" && right.kind === "App")
|
|
153
146
|
return vperm(left.fun, right.fun) && vperm(left.arg, right.arg);
|
|
154
|
-
return
|
|
155
|
-
};
|
|
156
|
-
|
|
157
|
-
const aconvExact = (left: Term, right: Term): boolean => {
|
|
158
|
-
if (left.kind !== right.kind) return false;
|
|
159
|
-
switch (left.kind) {
|
|
160
|
-
case "Const":
|
|
161
|
-
case "Free":
|
|
162
|
-
return right.kind === left.kind && left.name === right.name && eqTyp(left.type, right.type);
|
|
163
|
-
case "Var":
|
|
164
|
-
return (
|
|
165
|
-
right.kind === "Var" &&
|
|
166
|
-
left.name === right.name &&
|
|
167
|
-
left.index === right.index &&
|
|
168
|
-
eqTyp(left.type, right.type)
|
|
169
|
-
);
|
|
170
|
-
case "Bound":
|
|
171
|
-
return right.kind === "Bound" && left.index === right.index;
|
|
172
|
-
case "Abs":
|
|
173
|
-
return (
|
|
174
|
-
right.kind === "Abs" &&
|
|
175
|
-
left.name === right.name &&
|
|
176
|
-
eqTyp(left.type, right.type) &&
|
|
177
|
-
aconvExact(left.body, right.body)
|
|
178
|
-
);
|
|
179
|
-
case "App":
|
|
180
|
-
return (
|
|
181
|
-
right.kind === "App" && aconvExact(left.fun, right.fun) && aconvExact(left.arg, right.arg)
|
|
182
|
-
);
|
|
183
|
-
}
|
|
147
|
+
return eqTerm(left, right);
|
|
184
148
|
};
|
|
185
149
|
|
|
186
150
|
const isVarPerm = (left: Term, right: Term) => {
|
|
@@ -212,7 +176,7 @@ const decompSimp = (thm: Thm): Decomposed => {
|
|
|
212
176
|
return { prems, lhs, elhs, rhs, perm };
|
|
213
177
|
};
|
|
214
178
|
|
|
215
|
-
interface RawRrule {
|
|
179
|
+
export interface RawRrule {
|
|
216
180
|
readonly thm: Thm;
|
|
217
181
|
readonly lhs: Term;
|
|
218
182
|
readonly elhs: Term;
|
|
@@ -249,7 +213,6 @@ const mkRrule = (context: SimpContext, thm: Thm): RawRrule[] => {
|
|
|
249
213
|
return rruleEqTrue(context, thm, decomposed.lhs, decomposed.elhs, decomposed.rhs, thm);
|
|
250
214
|
};
|
|
251
215
|
|
|
252
|
-
// default_reorient: catches looping rules and stupid orientations.
|
|
253
216
|
const defaultReorient = (prems: readonly Term[], lhs: Term, rhs: Term) =>
|
|
254
217
|
rewriteRuleExtraVars(prems, lhs, [rhs]) ||
|
|
255
218
|
headOf(lhs).kind === "Var" ||
|
|
@@ -264,20 +227,12 @@ const orientRrule = (context: SimpContext, thm: Thm): RawRrule[] => {
|
|
|
264
227
|
return rruleEqTrue(context, thm, decomposed.lhs, decomposed.elhs, decomposed.rhs, thm);
|
|
265
228
|
if (defaultReorient(decomposed.prems, decomposed.rhs, decomposed.lhs))
|
|
266
229
|
return mkEqTrue(context, thm);
|
|
267
|
-
const symmetric = (() =>
|
|
268
|
-
try {
|
|
269
|
-
return rs(thm, symmetricThm);
|
|
270
|
-
} catch (error) {
|
|
271
|
-
if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
|
|
272
|
-
throw error;
|
|
273
|
-
}
|
|
274
|
-
})();
|
|
230
|
+
const symmetric = catchThm(() => rs(thm, symmetricThm));
|
|
275
231
|
if (symmetric === undefined) return [];
|
|
276
232
|
const flipped = decompSimp(symmetric);
|
|
277
233
|
return rruleEqTrue(context, symmetric, flipped.lhs, flipped.elhs, flipped.rhs, thm);
|
|
278
234
|
};
|
|
279
235
|
|
|
280
|
-
// extract_safe_rrules: the rewrite rules of an assumption, oriented to avoid loops.
|
|
281
236
|
export const extractSafeRrules = (context: SimpContext, thm: Thm): RawRrule[] =>
|
|
282
237
|
context.simpset.mkRews.mk(thm, context).flatMap((rew) => orientRrule(context, rew));
|
|
283
238
|
|
|
@@ -295,7 +250,6 @@ export const addSimps = (context: SimpContext, thms: readonly Thm[]): Simpset =>
|
|
|
295
250
|
.flatMap((rew) => mkRrule(context, rew))
|
|
296
251
|
.reduce((simpset, raw) => insertRrule(raw, simpset), context.simpset);
|
|
297
252
|
|
|
298
|
-
// mk_procrule: the rewrite rule a simplification procedure proves.
|
|
299
253
|
export const mkProcrule = (thm: Thm): Rrule[] => {
|
|
300
254
|
const decomposed = decompSimp(thm);
|
|
301
255
|
if (rewriteRuleExtraVars(decomposed.prems, decomposed.lhs, [decomposed.rhs])) return [];
|
|
@@ -307,7 +261,6 @@ export const addPrems = (thms: readonly Thm[], simpset: Simpset): Simpset => ({
|
|
|
307
261
|
prems: [...thms, ...simpset.prems],
|
|
308
262
|
});
|
|
309
263
|
|
|
310
|
-
// Rebuilds a rule net from Net.entries, as the reference simpset lists them.
|
|
311
264
|
export const rulesFromEntries = (thms: readonly Thm[]): Net<Rrule> =>
|
|
312
265
|
thms.reduceRight<Net<Rrule>>((net, thm) => {
|
|
313
266
|
const decomposed = decompSimp(thm);
|
|
@@ -315,11 +268,8 @@ export const rulesFromEntries = (thms: readonly Thm[]): Net<Rrule> =>
|
|
|
315
268
|
return insertNet(() => false, keyOfTerm(rrule.elhs), rrule, net) ?? net;
|
|
316
269
|
}, emptyNet);
|
|
317
270
|
|
|
318
|
-
export const emptyCongs: Table<string, Thm> = emptyTable(
|
|
319
|
-
left === right ? 0 : left < right ? -1 : 1,
|
|
320
|
-
);
|
|
271
|
+
export const emptyCongs: Table<string, Thm> = emptyTable(stringOrd);
|
|
321
272
|
|
|
322
|
-
// empty_ss: rewrites with meta-equalities only, and solves no subgoal.
|
|
323
273
|
export const emptySimpset: Simpset = {
|
|
324
274
|
rules: emptyNet,
|
|
325
275
|
prems: [],
|
|
@@ -336,3 +286,8 @@ export const emptySimpset: Simpset = {
|
|
|
336
286
|
unsafeSolvers: [],
|
|
337
287
|
safeSolvers: [],
|
|
338
288
|
};
|
|
289
|
+
|
|
290
|
+
export const makeSimpContext = (limits: Limits, rules: readonly Thm[]): SimpContext => {
|
|
291
|
+
const empty = { limits, simpset: emptySimpset, bounds: 0 };
|
|
292
|
+
return { ...empty, simpset: addSimps(empty, rules) };
|
|
293
|
+
};
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/raw_simplifier.ML
|
|
2
|
-
// goal conversions of Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische
|
|
3
|
-
// Universitaet Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/raw_simplifier.ML and Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
3
|
+
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { gconvRule, impCongRule } from "./conv";
|
|
7
5
|
import { impCong, swapPremsEq } from "./drule";
|
|
8
6
|
import { emptyTEnv } from "./envir";
|
|
@@ -17,17 +15,19 @@ import {
|
|
|
17
15
|
stripImpPrems,
|
|
18
16
|
} from "./logic";
|
|
19
17
|
import { boundName } from "./name";
|
|
20
|
-
import { matchTermNet
|
|
18
|
+
import { matchTermNet } from "./net";
|
|
21
19
|
import { firstOrderMatchPattern, matchPattern, matches, type MatchEnv } from "./pattern";
|
|
22
20
|
import {
|
|
23
21
|
addPrems,
|
|
24
22
|
congKey,
|
|
25
23
|
congName,
|
|
26
24
|
extractSafeRrules,
|
|
25
|
+
hasVar,
|
|
27
26
|
insertRrule,
|
|
28
27
|
mkProcrule,
|
|
29
28
|
SIMP_DEPTH_LIMIT,
|
|
30
|
-
|
|
29
|
+
varsOf,
|
|
30
|
+
type RawRrule,
|
|
31
31
|
type Rrule,
|
|
32
32
|
type SimpContext,
|
|
33
33
|
} from "./raw-simplifier";
|
|
@@ -36,8 +36,6 @@ import { emptyTyEnv, substType } from "./type";
|
|
|
36
36
|
import {
|
|
37
37
|
aconv,
|
|
38
38
|
existsSubterm,
|
|
39
|
-
eqTyp,
|
|
40
|
-
foldVars,
|
|
41
39
|
listComb,
|
|
42
40
|
maxidxOfTerm,
|
|
43
41
|
mkBound,
|
|
@@ -50,7 +48,6 @@ import {
|
|
|
50
48
|
dummyT,
|
|
51
49
|
type App,
|
|
52
50
|
type Term,
|
|
53
|
-
type Var,
|
|
54
51
|
} from "./term";
|
|
55
52
|
import { termOrd } from "./term-ord";
|
|
56
53
|
import {
|
|
@@ -76,17 +73,13 @@ import {
|
|
|
76
73
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
77
74
|
import { resolveTac } from "./tactic";
|
|
78
75
|
import { listOfSeq, seqHead, singleSeq, emptySeq, type Seq } from "./seq";
|
|
79
|
-
import { allGoals,
|
|
76
|
+
import { allGoals, distinctThms } from "./tactical";
|
|
80
77
|
|
|
81
78
|
export type Prover = (context: SimpContext, thm: Thm) => Thm | undefined;
|
|
82
79
|
|
|
83
|
-
// simple_prover: proves the premises of a rewrite rule with the premises of the simpset.
|
|
84
80
|
export const simpleProver: Prover = (context, thm) =>
|
|
85
81
|
seqHead(allGoals(resolveTac(context.limits, context.simpset.prems))(thm));
|
|
86
82
|
|
|
87
|
-
const isThmError = (error: unknown) =>
|
|
88
|
-
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
89
|
-
|
|
90
83
|
const lhsOf = (thm: Thm) => destEquals(thm.prop)[0];
|
|
91
84
|
const rhsOf = (thm: Thm) => destEquals(thm.prop)[1];
|
|
92
85
|
|
|
@@ -95,7 +88,6 @@ const betaEtaConversion = (term: Term) => {
|
|
|
95
88
|
return transitive(beta, etaConversion(rhsOf(beta)));
|
|
96
89
|
};
|
|
97
90
|
|
|
98
|
-
// Thm.match and Thm.instantiate: instantiates rule so that pattern becomes object.
|
|
99
91
|
const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
|
|
100
92
|
const typed = instantiateTypes(env.tyenv, rule);
|
|
101
93
|
const insts: Instantiation[] = tableEntries(env.tenv).map(([key, binding]) => ({
|
|
@@ -110,23 +102,22 @@ const renameBoundvars = (pattern: Term, object: Term, thm: Thm) => {
|
|
|
110
102
|
return renamed === undefined ? thm : renamedProp(renamed, thm);
|
|
111
103
|
};
|
|
112
104
|
|
|
113
|
-
// check_conv: joins thm and next, allowing for beta and eta differences in the middle term.
|
|
114
105
|
const checkConv = (thm: Thm, next: Thm): Thm | undefined => {
|
|
115
106
|
try {
|
|
116
107
|
return transitive(thm, next);
|
|
117
108
|
} catch (error) {
|
|
118
|
-
if (!
|
|
109
|
+
if (!isIsabelleError(error, "THM")) throw error;
|
|
119
110
|
}
|
|
120
111
|
try {
|
|
121
112
|
const normalized = transitive(symmetric(betaEtaConversion(lhsOf(next))), next);
|
|
122
113
|
try {
|
|
123
114
|
return transitive(thm, normalized);
|
|
124
115
|
} catch (error) {
|
|
125
|
-
if (!
|
|
116
|
+
if (!isIsabelleError(error, "THM")) throw error;
|
|
126
117
|
return transitive(transitive(thm, betaEtaConversion(rhsOf(thm))), normalized);
|
|
127
118
|
}
|
|
128
119
|
} catch (error) {
|
|
129
|
-
if (
|
|
120
|
+
if (isIsabelleError(error, "THM")) return undefined;
|
|
130
121
|
throw error;
|
|
131
122
|
}
|
|
132
123
|
};
|
|
@@ -150,18 +141,9 @@ const isWeakCong = (context: SimpContext, lhs: Term) => {
|
|
|
150
141
|
const uncondSkel = (context: SimpContext, lhs: Term, rhs: Term) =>
|
|
151
142
|
isWeakCong(context, lhs) ? SKEL0 : rhs;
|
|
152
143
|
|
|
153
|
-
const varsOf = (term: Term) => foldVars((atom, result: Var[]) => [...result, atom], term, []);
|
|
154
|
-
|
|
155
144
|
const condSkel = (context: SimpContext, lhs: Term, rhs: Term) => {
|
|
156
145
|
const lhsVars = varsOf(lhs);
|
|
157
|
-
return varsOf(rhs).every((variable) =>
|
|
158
|
-
lhsVars.some(
|
|
159
|
-
(other) =>
|
|
160
|
-
other.name === variable.name &&
|
|
161
|
-
other.index === variable.index &&
|
|
162
|
-
eqTyp(other.type, variable.type),
|
|
163
|
-
),
|
|
164
|
-
)
|
|
146
|
+
return varsOf(rhs).every((variable) => hasVar(lhsVars, variable))
|
|
165
147
|
? uncondSkel(context, lhs, rhs)
|
|
166
148
|
: SKEL0;
|
|
167
149
|
};
|
|
@@ -187,7 +169,6 @@ const sortRrules = (rrules: readonly Rrule[]) => {
|
|
|
187
169
|
return [...simple, ...conditional];
|
|
188
170
|
};
|
|
189
171
|
|
|
190
|
-
// rewritec's rew: rewrites the eta-contracted term with one rule.
|
|
191
172
|
const rew = (
|
|
192
173
|
prover: Prover,
|
|
193
174
|
maxt: number,
|
|
@@ -199,7 +180,7 @@ const rew = (
|
|
|
199
180
|
const [rthm, elhs] =
|
|
200
181
|
maxt === -1 || !rrule.extra
|
|
201
182
|
? [rrule.thm, rrule.elhs]
|
|
202
|
-
: [incrIndexesThm(maxt + 1, rrule.thm),
|
|
183
|
+
: [incrIndexesThm(maxt + 1, rrule.thm), incrIndexes([], maxt + 1, rrule.elhs)];
|
|
203
184
|
const env = rrule.fo
|
|
204
185
|
? firstOrderMatchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv })
|
|
205
186
|
: matchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv });
|
|
@@ -224,7 +205,6 @@ const rew = (
|
|
|
224
205
|
return { thm: joined, skel: condSkel(context, ruleLhs, ruleRhs) };
|
|
225
206
|
};
|
|
226
207
|
|
|
227
|
-
// rewritec's rews: the first rule that rewrites the term.
|
|
228
208
|
const rews = (
|
|
229
209
|
prover: Prover,
|
|
230
210
|
maxt: number,
|
|
@@ -239,7 +219,6 @@ const rews = (
|
|
|
239
219
|
return undefined;
|
|
240
220
|
};
|
|
241
221
|
|
|
242
|
-
// rewritec: one rewrite step at the root of a term.
|
|
243
222
|
const rewritec = (
|
|
244
223
|
prover: Prover,
|
|
245
224
|
maxt: number,
|
|
@@ -259,7 +238,7 @@ const rewritec = (
|
|
|
259
238
|
sortRrules(matchTermNet(context.simpset.rules, etaTerm)),
|
|
260
239
|
);
|
|
261
240
|
if (rewritten !== undefined) return rewritten;
|
|
262
|
-
for (const proc of matchTermNet(context.simpset.simprocs
|
|
241
|
+
for (const proc of matchTermNet(context.simpset.simprocs, etaTerm)) {
|
|
263
242
|
if (!matches(proc.lhs, term, emptyTyEnv, emptyTEnv)) continue;
|
|
264
243
|
const raw = proc.proc(context, etaTerm);
|
|
265
244
|
if (raw === undefined) continue;
|
|
@@ -269,9 +248,6 @@ const rewritec = (
|
|
|
269
248
|
return undefined;
|
|
270
249
|
};
|
|
271
250
|
|
|
272
|
-
const incrementTerm = (increment: number, term: Term) => incrIndexes([], increment, term);
|
|
273
|
-
|
|
274
|
-
// congc: applies a congruence rule to a term.
|
|
275
251
|
const congc = (
|
|
276
252
|
prover: (thm: Thm) => Thm | undefined,
|
|
277
253
|
maxt: number,
|
|
@@ -313,16 +289,12 @@ export interface RewriteMode {
|
|
|
313
289
|
}
|
|
314
290
|
|
|
315
291
|
interface PremRules {
|
|
316
|
-
readonly rules:
|
|
292
|
+
readonly rules: readonly RawRrule[];
|
|
317
293
|
readonly asm: Thm | undefined;
|
|
318
294
|
}
|
|
319
295
|
|
|
320
|
-
// bottomc: bottom-up rewriting with the simpset of the context.
|
|
321
296
|
const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
322
|
-
// Isabelle
|
|
323
|
-
// so a simpset that rewrites forever keeps every step until Isabelle runs out of memory. This
|
|
324
|
-
// loops and chains each step as it goes, which gives the same theorem, so such a simpset runs
|
|
325
|
-
// into the time limit holding only the latest one.
|
|
297
|
+
// Deviation from Isabelle: botc loops instead of recursing, so an endless simpset hits the time limit, not the memory limit.
|
|
326
298
|
const botc = (skel: Term, context: SimpContext, term: Term): Thm | undefined => {
|
|
327
299
|
let chained: Thm | undefined;
|
|
328
300
|
let currentSkel = skel;
|
|
@@ -353,9 +325,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
353
325
|
return inner === undefined ? undefined : abstractRule(term.name, variable, inner);
|
|
354
326
|
}
|
|
355
327
|
if (term.kind !== "App") return undefined;
|
|
328
|
+
if (isImplies(term)) return impc(term, context);
|
|
356
329
|
const head = term.fun;
|
|
357
|
-
if (head.kind === "App" && head.fun.kind === "Const" && head.fun.name === "Pure.imp")
|
|
358
|
-
return impc(term, context);
|
|
359
330
|
if (head.kind === "Abs") {
|
|
360
331
|
const beta = betaConversion(false, term);
|
|
361
332
|
const rest = subc(SKEL0, context, rhsOf(beta));
|
|
@@ -382,10 +353,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
382
353
|
};
|
|
383
354
|
const impc = (term: Term, context: SimpContext) =>
|
|
384
355
|
mode.mutsimp ? mutImpc0([], term, [], context) : nonmutImpc(term, context);
|
|
385
|
-
const rulesOfPrem = (prem: Term, context: SimpContext):
|
|
386
|
-
if (maxidxOfTerm(prem) !== -1) return
|
|
356
|
+
const rulesOfPrem = (prem: Term, context: SimpContext): PremRules => {
|
|
357
|
+
if (maxidxOfTerm(prem) !== -1) return { rules: [], asm: undefined };
|
|
387
358
|
const asm = assume(prem);
|
|
388
|
-
return
|
|
359
|
+
return { rules: extractSafeRrules(context, asm), asm };
|
|
389
360
|
};
|
|
390
361
|
const addRrules = (rules: readonly PremRules[], context: SimpContext): SimpContext => {
|
|
391
362
|
const simpset = rules.reduce(
|
|
@@ -419,7 +390,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
419
390
|
eq: Thm | undefined,
|
|
420
391
|
): Thm | undefined => {
|
|
421
392
|
if (prems.length === 0) return eq;
|
|
422
|
-
const
|
|
393
|
+
const prem = prems[0];
|
|
394
|
+
const rest = prems.slice(1);
|
|
423
395
|
const inner = addRrules(rules.slice(1).reverse(), context);
|
|
424
396
|
const nextConcl = mkImplies(prem, eq === undefined ? concl : rhsOf(eq));
|
|
425
397
|
const dprem = eq === undefined ? undefined : disch(false, prem, eq);
|
|
@@ -439,13 +411,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
439
411
|
context: SimpContext,
|
|
440
412
|
): Thm | undefined => {
|
|
441
413
|
const newPrems = stripImpPrems(concl);
|
|
442
|
-
let current = context;
|
|
443
414
|
const newRules: PremRules[] = [];
|
|
444
|
-
for (const prem of newPrems)
|
|
445
|
-
const [rule, next] = rulesOfPrem(prem, current);
|
|
446
|
-
newRules.push(rule);
|
|
447
|
-
current = next;
|
|
448
|
-
}
|
|
415
|
+
for (const prem of newPrems) newRules.push(rulesOfPrem(prem, context));
|
|
449
416
|
return mutImpc(
|
|
450
417
|
[...prems, ...newPrems],
|
|
451
418
|
stripImpConcl(concl),
|
|
@@ -453,7 +420,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
453
420
|
[],
|
|
454
421
|
[],
|
|
455
422
|
[],
|
|
456
|
-
|
|
423
|
+
context,
|
|
457
424
|
-1,
|
|
458
425
|
-1,
|
|
459
426
|
);
|
|
@@ -497,8 +464,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
497
464
|
);
|
|
498
465
|
return transitive1(folded, rest);
|
|
499
466
|
}
|
|
500
|
-
const
|
|
501
|
-
const
|
|
467
|
+
const prem = prems[0];
|
|
468
|
+
const otherPrems = prems.slice(1);
|
|
469
|
+
const rule = rules[0];
|
|
470
|
+
const otherRules = rules.slice(1);
|
|
502
471
|
const simplified =
|
|
503
472
|
count === 0
|
|
504
473
|
? undefined
|
|
@@ -526,7 +495,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
526
495
|
),
|
|
527
496
|
-1,
|
|
528
497
|
);
|
|
529
|
-
const
|
|
498
|
+
const newRule = rulesOfPrem(newPrem, context);
|
|
530
499
|
const eqn = otherPrems
|
|
531
500
|
.slice(0, index)
|
|
532
501
|
.reduceRight(
|
|
@@ -540,7 +509,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
540
509
|
[newPrem, ...donePrems],
|
|
541
510
|
[newRule, ...doneRules],
|
|
542
511
|
[eqn, ...eqns],
|
|
543
|
-
|
|
512
|
+
context,
|
|
544
513
|
donePrems.length,
|
|
545
514
|
-1,
|
|
546
515
|
);
|
|
@@ -550,7 +519,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
550
519
|
const first = mode.simprem ? botc(SKEL0, context, prem) : undefined;
|
|
551
520
|
const simplifiedPrem = first === undefined ? prem : rhsOf(first);
|
|
552
521
|
const inner = mode.useprem
|
|
553
|
-
? addRrules([rulesOfPrem(simplifiedPrem, context)
|
|
522
|
+
? addRrules([rulesOfPrem(simplifiedPrem, context)], context)
|
|
554
523
|
: context;
|
|
555
524
|
const second = botc(SKEL0, inner, conc);
|
|
556
525
|
if (second === undefined)
|
|
@@ -563,13 +532,9 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
563
532
|
return tryBotc;
|
|
564
533
|
};
|
|
565
534
|
|
|
566
|
-
// Drule.flexflex_unique
|
|
567
535
|
const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
568
536
|
if (thm.tpairs.length === 0) return thm;
|
|
569
|
-
const
|
|
570
|
-
const distinct = results.filter(
|
|
571
|
-
(result, index) => results.findIndex((other) => eqThm(other, result)) === index,
|
|
572
|
-
);
|
|
537
|
+
const distinct = distinctThms(listOfSeq(flexflexRule(limits, thm)));
|
|
573
538
|
if (distinct.length === 1) return distinct[0];
|
|
574
539
|
throw new TlaIsabelleError(
|
|
575
540
|
"THM",
|
|
@@ -579,7 +544,6 @@ const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
|
579
544
|
);
|
|
580
545
|
};
|
|
581
546
|
|
|
582
|
-
// rewrite_cterm: proves term == term' by rewriting.
|
|
583
547
|
export const rewriteCterm = (
|
|
584
548
|
mode: RewriteMode,
|
|
585
549
|
prover: Prover,
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/search.ML,
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/search.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { listOfSeq, makeSeq, seqOfList } from "./seq";
|
|
6
4
|
import { eqThm, hasFewerPrems, noTac, orElse, type GoalTactic, type Tactic } from "./tactical";
|
|
7
5
|
import { termOrd } from "./term-ord";
|
|
8
6
|
import type { Thm } from "./thm";
|
|
9
7
|
|
|
10
|
-
// DEEPEN: tries the tactic with limits from start up to limit in steps of increment.
|
|
11
8
|
export const deepen =
|
|
12
9
|
(
|
|
13
10
|
increment: number,
|
|
@@ -29,18 +26,14 @@ interface Sized {
|
|
|
29
26
|
readonly thm: Thm;
|
|
30
27
|
}
|
|
31
28
|
|
|
32
|
-
// Thm_Heap's order: by size, then by proposition.
|
|
33
29
|
const compareSized = (left: Sized, right: Sized) =>
|
|
34
30
|
left.size - right.size || termOrd(left.thm.prop, right.thm.prop);
|
|
35
31
|
|
|
36
|
-
// BEST_FIRST: searches the states the tactic produces, smallest first, for one that satisfies
|
|
37
|
-
// the predicate. A sorted list stands in for Thm_Heap: both yield the least state under the same
|
|
38
|
-
// total order.
|
|
39
32
|
export const bestFirst =
|
|
40
|
-
(isSatisfied: (state: Thm) => boolean,
|
|
33
|
+
(isSatisfied: (state: Thm) => boolean, getSize: (state: Thm) => number, tactic: Tactic): Tactic =>
|
|
41
34
|
(state) => {
|
|
42
35
|
const insert = (heap: readonly Sized[], thm: Thm): Sized[] => {
|
|
43
|
-
const entry = { size:
|
|
36
|
+
const entry = { size: getSize(thm), thm };
|
|
44
37
|
const position = heap.findIndex((other) => compareSized(entry, other) < 0);
|
|
45
38
|
return position === -1
|
|
46
39
|
? [...heap, entry]
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/General/seq.ML. Copyright (c) 1986-2025 University of
|
|
2
|
-
// Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Lazy sequences. As in Isabelle, pulling a sequence twice computes its head twice.
|
|
1
|
+
// Ported from Isabelle2025's Pure/General/seq.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
5
2
|
|
|
6
3
|
export type Cell<Item> = readonly [Item, Seq<Item>] | undefined;
|
|
7
4
|
|
|
@@ -14,10 +11,6 @@ export interface Seq<Item> {
|
|
|
14
11
|
|
|
15
12
|
export const makeSeq = <Item>(pull: () => Cell<Item>): Seq<Item> => ({ pull });
|
|
16
13
|
|
|
17
|
-
// A sequence whose step may hand over to another sequence where Isabelle would pull it in tail
|
|
18
|
-
// position. Pulling follows the hand-overs in a loop, so a long run of empty alternatives, which
|
|
19
|
-
// Poly/ML's growing stack absorbs, doesn't exhaust this one. A class, so that pull is shared
|
|
20
|
-
// rather than a new closure for every sequence.
|
|
21
14
|
class DeferredSeq<Item> implements Seq<Item> {
|
|
22
15
|
readonly step: () => Step<Item>;
|
|
23
16
|
|
|
@@ -49,7 +42,6 @@ export const seqOfList = <Item>(items: readonly Item[]): Seq<Item> =>
|
|
|
49
42
|
|
|
50
43
|
export const seqHead = <Item>(seq: Seq<Item>): Item | undefined => seq.pull()?.[0];
|
|
51
44
|
|
|
52
|
-
// Seq.chop: the first count elements and the rest of the sequence.
|
|
53
45
|
export const chopSeq = <Item>(count: number, seq: Seq<Item>): [Item[], Seq<Item>] => {
|
|
54
46
|
const items: Item[] = [];
|
|
55
47
|
let current = seq;
|
|
@@ -118,7 +110,6 @@ export const mapsSeq = <Item, Result>(
|
|
|
118
110
|
return cell === undefined ? undefined : appendSeq(map(cell[0]), mapsSeq(map, cell[1]));
|
|
119
111
|
});
|
|
120
112
|
|
|
121
|
-
// Seq.it_right: accumulates lazily from the right.
|
|
122
113
|
export const itRightSeq = <Item, Result>(
|
|
123
114
|
combine: (item: Item, rest: Seq<Result>) => Seq<Result>,
|
|
124
115
|
seq: Seq<Item>,
|