tla-ts 0.0.8 → 0.0.9-dev.0493be549
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 +30 -0
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +98 -19
- package/dist/index.d.ts +98 -19
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +128 -106
- package/dist/transfer.js +128 -106
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +605 -311
- package/src/cli/options.ts +12 -6
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -0
- package/src/cli/tlc.ts +545 -218
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -69
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +314 -24
- package/src/dfid.ts +618 -0
- package/src/environment.ts +263 -129
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +734 -980
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +150 -70
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +122 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +31 -38
- package/src/parallel.ts +41 -17
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +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 +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +128 -176
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +31 -29
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +536 -180
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +167 -49
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +269 -85
- package/src/symmetry.ts +59 -147
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +226 -151
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +56 -82
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +564 -212
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -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 +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -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 +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +910 -318
- package/src/worker.ts +7 -8
|
@@ -1,23 +1,19 @@
|
|
|
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
9
|
import { emptyTable, type Table } from "./table";
|
|
14
|
-
import { emptyTEnv } from "./envir";
|
|
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,
|
|
@@ -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" ||
|
|
@@ -277,7 +240,6 @@ const orientRrule = (context: SimpContext, thm: Thm): RawRrule[] => {
|
|
|
277
240
|
return rruleEqTrue(context, symmetric, flipped.lhs, flipped.elhs, flipped.rhs, thm);
|
|
278
241
|
};
|
|
279
242
|
|
|
280
|
-
// extract_safe_rrules: the rewrite rules of an assumption, oriented to avoid loops.
|
|
281
243
|
export const extractSafeRrules = (context: SimpContext, thm: Thm): RawRrule[] =>
|
|
282
244
|
context.simpset.mkRews.mk(thm, context).flatMap((rew) => orientRrule(context, rew));
|
|
283
245
|
|
|
@@ -295,7 +257,6 @@ export const addSimps = (context: SimpContext, thms: readonly Thm[]): Simpset =>
|
|
|
295
257
|
.flatMap((rew) => mkRrule(context, rew))
|
|
296
258
|
.reduce((simpset, raw) => insertRrule(raw, simpset), context.simpset);
|
|
297
259
|
|
|
298
|
-
// mk_procrule: the rewrite rule a simplification procedure proves.
|
|
299
260
|
export const mkProcrule = (thm: Thm): Rrule[] => {
|
|
300
261
|
const decomposed = decompSimp(thm);
|
|
301
262
|
if (rewriteRuleExtraVars(decomposed.prems, decomposed.lhs, [decomposed.rhs])) return [];
|
|
@@ -307,7 +268,6 @@ export const addPrems = (thms: readonly Thm[], simpset: Simpset): Simpset => ({
|
|
|
307
268
|
prems: [...thms, ...simpset.prems],
|
|
308
269
|
});
|
|
309
270
|
|
|
310
|
-
// Rebuilds a rule net from Net.entries, as the reference simpset lists them.
|
|
311
271
|
export const rulesFromEntries = (thms: readonly Thm[]): Net<Rrule> =>
|
|
312
272
|
thms.reduceRight<Net<Rrule>>((net, thm) => {
|
|
313
273
|
const decomposed = decompSimp(thm);
|
|
@@ -319,7 +279,6 @@ export const emptyCongs: Table<string, Thm> = emptyTable((left: string, right: s
|
|
|
319
279
|
left === right ? 0 : left < right ? -1 : 1,
|
|
320
280
|
);
|
|
321
281
|
|
|
322
|
-
// empty_ss: rewrites with meta-equalities only, and solves no subgoal.
|
|
323
282
|
export const emptySimpset: Simpset = {
|
|
324
283
|
rules: emptyNet,
|
|
325
284
|
prems: [],
|
|
@@ -336,3 +295,8 @@ export const emptySimpset: Simpset = {
|
|
|
336
295
|
unsafeSolvers: [],
|
|
337
296
|
safeSolvers: [],
|
|
338
297
|
};
|
|
298
|
+
|
|
299
|
+
export const makeSimpContext = (limits: Limits, rules: readonly Thm[]): SimpContext => {
|
|
300
|
+
const empty = { limits, simpset: emptySimpset, bounds: 0 };
|
|
301
|
+
return { ...empty, simpset: addSimps(empty, rules) };
|
|
302
|
+
};
|
|
@@ -1,6 +1,4 @@
|
|
|
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
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { gconvRule, impCongRule } from "./conv";
|
|
@@ -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,11 +73,10 @@ 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
|
|
|
@@ -95,7 +91,6 @@ const betaEtaConversion = (term: Term) => {
|
|
|
95
91
|
return transitive(beta, etaConversion(rhsOf(beta)));
|
|
96
92
|
};
|
|
97
93
|
|
|
98
|
-
// Thm.match and Thm.instantiate: instantiates rule so that pattern becomes object.
|
|
99
94
|
const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
|
|
100
95
|
const typed = instantiateTypes(env.tyenv, rule);
|
|
101
96
|
const insts: Instantiation[] = tableEntries(env.tenv).map(([key, binding]) => ({
|
|
@@ -110,7 +105,6 @@ const renameBoundvars = (pattern: Term, object: Term, thm: Thm) => {
|
|
|
110
105
|
return renamed === undefined ? thm : renamedProp(renamed, thm);
|
|
111
106
|
};
|
|
112
107
|
|
|
113
|
-
// check_conv: joins thm and next, allowing for beta and eta differences in the middle term.
|
|
114
108
|
const checkConv = (thm: Thm, next: Thm): Thm | undefined => {
|
|
115
109
|
try {
|
|
116
110
|
return transitive(thm, next);
|
|
@@ -150,18 +144,9 @@ const isWeakCong = (context: SimpContext, lhs: Term) => {
|
|
|
150
144
|
const uncondSkel = (context: SimpContext, lhs: Term, rhs: Term) =>
|
|
151
145
|
isWeakCong(context, lhs) ? SKEL0 : rhs;
|
|
152
146
|
|
|
153
|
-
const varsOf = (term: Term) => foldVars((atom, result: Var[]) => [...result, atom], term, []);
|
|
154
|
-
|
|
155
147
|
const condSkel = (context: SimpContext, lhs: Term, rhs: Term) => {
|
|
156
148
|
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
|
-
)
|
|
149
|
+
return varsOf(rhs).every((variable) => hasVar(lhsVars, variable))
|
|
165
150
|
? uncondSkel(context, lhs, rhs)
|
|
166
151
|
: SKEL0;
|
|
167
152
|
};
|
|
@@ -187,7 +172,6 @@ const sortRrules = (rrules: readonly Rrule[]) => {
|
|
|
187
172
|
return [...simple, ...conditional];
|
|
188
173
|
};
|
|
189
174
|
|
|
190
|
-
// rewritec's rew: rewrites the eta-contracted term with one rule.
|
|
191
175
|
const rew = (
|
|
192
176
|
prover: Prover,
|
|
193
177
|
maxt: number,
|
|
@@ -199,7 +183,7 @@ const rew = (
|
|
|
199
183
|
const [rthm, elhs] =
|
|
200
184
|
maxt === -1 || !rrule.extra
|
|
201
185
|
? [rrule.thm, rrule.elhs]
|
|
202
|
-
: [incrIndexesThm(maxt + 1, rrule.thm),
|
|
186
|
+
: [incrIndexesThm(maxt + 1, rrule.thm), incrIndexes([], maxt + 1, rrule.elhs)];
|
|
203
187
|
const env = rrule.fo
|
|
204
188
|
? firstOrderMatchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv })
|
|
205
189
|
: matchPattern(elhs, etaTerm, { tyenv: emptyTyEnv, tenv: emptyTEnv });
|
|
@@ -224,7 +208,6 @@ const rew = (
|
|
|
224
208
|
return { thm: joined, skel: condSkel(context, ruleLhs, ruleRhs) };
|
|
225
209
|
};
|
|
226
210
|
|
|
227
|
-
// rewritec's rews: the first rule that rewrites the term.
|
|
228
211
|
const rews = (
|
|
229
212
|
prover: Prover,
|
|
230
213
|
maxt: number,
|
|
@@ -239,7 +222,6 @@ const rews = (
|
|
|
239
222
|
return undefined;
|
|
240
223
|
};
|
|
241
224
|
|
|
242
|
-
// rewritec: one rewrite step at the root of a term.
|
|
243
225
|
const rewritec = (
|
|
244
226
|
prover: Prover,
|
|
245
227
|
maxt: number,
|
|
@@ -259,7 +241,7 @@ const rewritec = (
|
|
|
259
241
|
sortRrules(matchTermNet(context.simpset.rules, etaTerm)),
|
|
260
242
|
);
|
|
261
243
|
if (rewritten !== undefined) return rewritten;
|
|
262
|
-
for (const proc of matchTermNet(context.simpset.simprocs
|
|
244
|
+
for (const proc of matchTermNet(context.simpset.simprocs, etaTerm)) {
|
|
263
245
|
if (!matches(proc.lhs, term, emptyTyEnv, emptyTEnv)) continue;
|
|
264
246
|
const raw = proc.proc(context, etaTerm);
|
|
265
247
|
if (raw === undefined) continue;
|
|
@@ -269,9 +251,6 @@ const rewritec = (
|
|
|
269
251
|
return undefined;
|
|
270
252
|
};
|
|
271
253
|
|
|
272
|
-
const incrementTerm = (increment: number, term: Term) => incrIndexes([], increment, term);
|
|
273
|
-
|
|
274
|
-
// congc: applies a congruence rule to a term.
|
|
275
254
|
const congc = (
|
|
276
255
|
prover: (thm: Thm) => Thm | undefined,
|
|
277
256
|
maxt: number,
|
|
@@ -313,16 +292,12 @@ export interface RewriteMode {
|
|
|
313
292
|
}
|
|
314
293
|
|
|
315
294
|
interface PremRules {
|
|
316
|
-
readonly rules:
|
|
295
|
+
readonly rules: readonly RawRrule[];
|
|
317
296
|
readonly asm: Thm | undefined;
|
|
318
297
|
}
|
|
319
298
|
|
|
320
|
-
// bottomc: bottom-up rewriting with the simpset of the context.
|
|
321
299
|
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.
|
|
300
|
+
// Deviation from Isabelle: botc loops instead of recursing, so an endless simpset hits the time limit, not the memory limit.
|
|
326
301
|
const botc = (skel: Term, context: SimpContext, term: Term): Thm | undefined => {
|
|
327
302
|
let chained: Thm | undefined;
|
|
328
303
|
let currentSkel = skel;
|
|
@@ -382,10 +357,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
382
357
|
};
|
|
383
358
|
const impc = (term: Term, context: SimpContext) =>
|
|
384
359
|
mode.mutsimp ? mutImpc0([], term, [], context) : nonmutImpc(term, context);
|
|
385
|
-
const rulesOfPrem = (prem: Term, context: SimpContext):
|
|
386
|
-
if (maxidxOfTerm(prem) !== -1) return
|
|
360
|
+
const rulesOfPrem = (prem: Term, context: SimpContext): PremRules => {
|
|
361
|
+
if (maxidxOfTerm(prem) !== -1) return { rules: [], asm: undefined };
|
|
387
362
|
const asm = assume(prem);
|
|
388
|
-
return
|
|
363
|
+
return { rules: extractSafeRrules(context, asm), asm };
|
|
389
364
|
};
|
|
390
365
|
const addRrules = (rules: readonly PremRules[], context: SimpContext): SimpContext => {
|
|
391
366
|
const simpset = rules.reduce(
|
|
@@ -419,7 +394,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
419
394
|
eq: Thm | undefined,
|
|
420
395
|
): Thm | undefined => {
|
|
421
396
|
if (prems.length === 0) return eq;
|
|
422
|
-
const
|
|
397
|
+
const prem = prems[0];
|
|
398
|
+
const rest = prems.slice(1);
|
|
423
399
|
const inner = addRrules(rules.slice(1).reverse(), context);
|
|
424
400
|
const nextConcl = mkImplies(prem, eq === undefined ? concl : rhsOf(eq));
|
|
425
401
|
const dprem = eq === undefined ? undefined : disch(false, prem, eq);
|
|
@@ -439,13 +415,8 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
439
415
|
context: SimpContext,
|
|
440
416
|
): Thm | undefined => {
|
|
441
417
|
const newPrems = stripImpPrems(concl);
|
|
442
|
-
let current = context;
|
|
443
418
|
const newRules: PremRules[] = [];
|
|
444
|
-
for (const prem of newPrems)
|
|
445
|
-
const [rule, next] = rulesOfPrem(prem, current);
|
|
446
|
-
newRules.push(rule);
|
|
447
|
-
current = next;
|
|
448
|
-
}
|
|
419
|
+
for (const prem of newPrems) newRules.push(rulesOfPrem(prem, context));
|
|
449
420
|
return mutImpc(
|
|
450
421
|
[...prems, ...newPrems],
|
|
451
422
|
stripImpConcl(concl),
|
|
@@ -453,7 +424,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
453
424
|
[],
|
|
454
425
|
[],
|
|
455
426
|
[],
|
|
456
|
-
|
|
427
|
+
context,
|
|
457
428
|
-1,
|
|
458
429
|
-1,
|
|
459
430
|
);
|
|
@@ -497,8 +468,10 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
497
468
|
);
|
|
498
469
|
return transitive1(folded, rest);
|
|
499
470
|
}
|
|
500
|
-
const
|
|
501
|
-
const
|
|
471
|
+
const prem = prems[0];
|
|
472
|
+
const otherPrems = prems.slice(1);
|
|
473
|
+
const rule = rules[0];
|
|
474
|
+
const otherRules = rules.slice(1);
|
|
502
475
|
const simplified =
|
|
503
476
|
count === 0
|
|
504
477
|
? undefined
|
|
@@ -526,7 +499,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
526
499
|
),
|
|
527
500
|
-1,
|
|
528
501
|
);
|
|
529
|
-
const
|
|
502
|
+
const newRule = rulesOfPrem(newPrem, context);
|
|
530
503
|
const eqn = otherPrems
|
|
531
504
|
.slice(0, index)
|
|
532
505
|
.reduceRight(
|
|
@@ -540,7 +513,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
540
513
|
[newPrem, ...donePrems],
|
|
541
514
|
[newRule, ...doneRules],
|
|
542
515
|
[eqn, ...eqns],
|
|
543
|
-
|
|
516
|
+
context,
|
|
544
517
|
donePrems.length,
|
|
545
518
|
-1,
|
|
546
519
|
);
|
|
@@ -550,7 +523,7 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
550
523
|
const first = mode.simprem ? botc(SKEL0, context, prem) : undefined;
|
|
551
524
|
const simplifiedPrem = first === undefined ? prem : rhsOf(first);
|
|
552
525
|
const inner = mode.useprem
|
|
553
|
-
? addRrules([rulesOfPrem(simplifiedPrem, context)
|
|
526
|
+
? addRrules([rulesOfPrem(simplifiedPrem, context)], context)
|
|
554
527
|
: context;
|
|
555
528
|
const second = botc(SKEL0, inner, conc);
|
|
556
529
|
if (second === undefined)
|
|
@@ -563,13 +536,9 @@ const bottomc = (mode: RewriteMode, prover: Prover, maxidx: number) => {
|
|
|
563
536
|
return tryBotc;
|
|
564
537
|
};
|
|
565
538
|
|
|
566
|
-
// Drule.flexflex_unique
|
|
567
539
|
const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
568
540
|
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
|
-
);
|
|
541
|
+
const distinct = distinctThms(listOfSeq(flexflexRule(limits, thm)));
|
|
573
542
|
if (distinct.length === 1) return distinct[0];
|
|
574
543
|
throw new TlaIsabelleError(
|
|
575
544
|
"THM",
|
|
@@ -579,7 +548,6 @@ const flexflexUnique = (limits: Limits, thm: Thm): Thm => {
|
|
|
579
548
|
);
|
|
580
549
|
};
|
|
581
550
|
|
|
582
|
-
// rewrite_cterm: proves term == term' by rewriting.
|
|
583
551
|
export const rewriteCterm = (
|
|
584
552
|
mode: RewriteMode,
|
|
585
553
|
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>,
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/simplifier.ML and
|
|
2
|
-
// simplification tactics. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
|
|
3
|
-
// Muenchen, and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/simplifier.ML and Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { genAll, isNormHhf, normHhfEq } from "./drule";
|
|
6
4
|
import { preferGoal } from "./goal";
|
|
7
|
-
import {
|
|
5
|
+
import { makeSimpContext, type SimpContext, type Solver } from "./raw-simplifier";
|
|
8
6
|
import { fconvRule } from "./conv";
|
|
9
7
|
import {
|
|
10
8
|
genericRewriteGoalTac,
|
|
@@ -32,7 +30,6 @@ const withSolvers = (context: SimpContext, solvers: readonly Solver[]): SimpCont
|
|
|
32
30
|
simpset: { ...context.simpset, unsafeSolvers: solvers, safeSolvers: solvers },
|
|
33
31
|
});
|
|
34
32
|
|
|
35
|
-
// solve_all_tac: solves goal 1 completely with the subgoaler.
|
|
36
33
|
const solveAllTac = (solvers: readonly Solver[], context: SimpContext): Tactic => {
|
|
37
34
|
const inner = withSolvers(context, solvers);
|
|
38
35
|
const solveTac = thenAllNew(inner.simpset.subgoalTac(inner), () => noTac);
|
|
@@ -47,7 +44,6 @@ const singleProver =
|
|
|
47
44
|
(context, thm) =>
|
|
48
45
|
solveAllTac(solvers, context)(thm).pull()?.[0];
|
|
49
46
|
|
|
50
|
-
// generic_simp_tac
|
|
51
47
|
const genericSimpTac =
|
|
52
48
|
(isSafe: boolean, mode: RewriteMode) =>
|
|
53
49
|
(context: SimpContext): GoalTactic =>
|
|
@@ -62,6 +58,7 @@ const genericSimpTac =
|
|
|
62
58
|
);
|
|
63
59
|
return preferGoal(simpLoopTac(1))(index);
|
|
64
60
|
};
|
|
61
|
+
|
|
65
62
|
export const asmSimpTac = genericSimpTac(false, { simprem: false, useprem: true, mutsimp: false });
|
|
66
63
|
export const asmLrSimpTac = genericSimpTac(false, { simprem: true, useprem: true, mutsimp: false });
|
|
67
64
|
export const asmFullSimpTac = genericSimpTac(false, {
|
|
@@ -75,7 +72,6 @@ export const safeAsmFullSimpTac = genericSimpTac(true, {
|
|
|
75
72
|
mutsimp: true,
|
|
76
73
|
});
|
|
77
74
|
|
|
78
|
-
// Simplifier.simp_thm: simplifies a theorem's proposition.
|
|
79
75
|
const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
80
76
|
const prover = singleProver([...context.simpset.unsafeSolvers].reverse());
|
|
81
77
|
return fconvRule((term) => rewriteCterm(mode, prover, context, term), thm);
|
|
@@ -84,13 +80,9 @@ const simpThm = (mode: RewriteMode, context: SimpContext, thm: Thm): Thm => {
|
|
|
84
80
|
export const simplify = (context: SimpContext, thm: Thm) =>
|
|
85
81
|
simpThm({ simprem: false, useprem: false, mutsimp: false }, context, thm);
|
|
86
82
|
|
|
87
|
-
// Raw_Simplifier.norm_hhf: moves the quantifiers of a theorem left of its implications, then makes
|
|
88
|
-
// the outermost ones schematic. Drule.sort_constraint_eq, the other rule of hhf_ss, never applies:
|
|
89
|
-
// tlapm's terms carry no sort constraints.
|
|
90
83
|
export const normHhf = (limits: Limits, thm: Thm): Thm => {
|
|
91
84
|
if (isNormHhf(false, thm.prop)) return genAll(thm);
|
|
92
|
-
const
|
|
93
|
-
const context = { ...empty, simpset: addSimps(empty, [normHhfEq]) };
|
|
85
|
+
const context = makeSimpContext(limits, [normHhfEq]);
|
|
94
86
|
return genAll(
|
|
95
87
|
fconvRule(
|
|
96
88
|
(term) =>
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/General/table.ML. Copyright (c) 1986-2025 University of
|
|
2
|
-
// Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// Persistent tables ordered by a comparison function. Isabelle's tables are 2-3 trees; any
|
|
5
|
-
// balanced search tree visits keys in the same order, which is all that the ports rely on.
|
|
1
|
+
// Ported from Isabelle2025's Pure/General/table.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
6
2
|
|
|
7
3
|
export type Compare<Key> = (left: Key, right: Key) => number;
|
|
8
4
|
|
|
@@ -120,27 +116,6 @@ export const updateTable = <Key, Value>(
|
|
|
120
116
|
root: insertNode(table.compare, key, value, table.root),
|
|
121
117
|
});
|
|
122
118
|
|
|
123
|
-
const removeMin = <Key, Value>(
|
|
124
|
-
node: NonNullable<Node<Key, Value>>,
|
|
125
|
-
): [NonNullable<Node<Key, Value>>, Node<Key, Value>] => {
|
|
126
|
-
if (!node.left) return [node, node.right];
|
|
127
|
-
const [minimum, left] = removeMin(node.left);
|
|
128
|
-
return [minimum, balance(node.key, node.value, left, node.right)];
|
|
129
|
-
};
|
|
130
|
-
|
|
131
|
-
export const deleteTable = <Key, Value>(table: Table<Key, Value>, key: Key): Table<Key, Value> => {
|
|
132
|
-
const remove = (node: Node<Key, Value>): Node<Key, Value> => {
|
|
133
|
-
if (!node) return undefined;
|
|
134
|
-
const order = table.compare(key, node.key);
|
|
135
|
-
if (order < 0) return balance(node.key, node.value, remove(node.left), node.right);
|
|
136
|
-
if (order > 0) return balance(node.key, node.value, node.left, remove(node.right));
|
|
137
|
-
if (!node.right) return node.left;
|
|
138
|
-
const [minimum, right] = removeMin(node.right);
|
|
139
|
-
return balance(minimum.key, minimum.value, node.left, right);
|
|
140
|
-
};
|
|
141
|
-
return { compare: table.compare, root: remove(table.root) };
|
|
142
|
-
};
|
|
143
|
-
|
|
144
119
|
export const minTable = <Key, Value>(table: Table<Key, Value>): [Key, Value] | undefined => {
|
|
145
120
|
let node = table.root;
|
|
146
121
|
if (!node) return undefined;
|
|
@@ -157,14 +132,12 @@ const foldNode = <Key, Value, State>(
|
|
|
157
132
|
? foldNode(visit, node.right, visit(node.key, node.value, foldNode(visit, node.left, state)))
|
|
158
133
|
: state;
|
|
159
134
|
|
|
160
|
-
// Table.fold: visits the entries in key order.
|
|
161
135
|
export const foldTable = <Key, Value, State>(
|
|
162
136
|
visit: (key: Key, value: Value, state: State) => State,
|
|
163
137
|
table: Table<Key, Value>,
|
|
164
138
|
state: State,
|
|
165
139
|
) => foldNode(visit, table.root, state);
|
|
166
140
|
|
|
167
|
-
// The entries in key order, as Table.dest lists them.
|
|
168
141
|
export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
169
142
|
foldTable<Key, Value, [Key, Value][]>(
|
|
170
143
|
(key, value, entries) => {
|
|
@@ -175,7 +148,6 @@ export const tableEntries = <Key, Value>(table: Table<Key, Value>) =>
|
|
|
175
148
|
[],
|
|
176
149
|
);
|
|
177
150
|
|
|
178
|
-
// fast_string_ord: shorter strings first, then by code units.
|
|
179
151
|
export const fastStringOrd = (left: string, right: string) =>
|
|
180
152
|
left === right
|
|
181
153
|
? 0
|
|
@@ -192,10 +164,8 @@ export interface IndexKey {
|
|
|
192
164
|
readonly index: number;
|
|
193
165
|
}
|
|
194
166
|
|
|
195
|
-
// Term_Ord.fast_indexname_ord: by index, then by fast_string_ord on the name.
|
|
196
167
|
export const fastIndexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
197
168
|
left.index !== right.index ? left.index - right.index : fastStringOrd(left.name, right.name);
|
|
198
169
|
|
|
199
|
-
// Term_Ord.indexname_ord: by index, then by string_ord on the name.
|
|
200
170
|
export const indexnameOrd = (left: IndexKey, right: IndexKey) =>
|
|
201
171
|
left.index !== right.index ? left.index - right.index : stringOrd(left.name, right.name);
|