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,6 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/unify.ML
|
|
2
|
-
// bound of 60. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen,
|
|
3
|
-
// and contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/unify.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { checkInterrupt, type Limits } from "./interrupt";
|
|
6
4
|
import { TlaIsabelleError } from "../../../errors";
|
|
@@ -29,8 +27,7 @@ import {
|
|
|
29
27
|
singleSeq,
|
|
30
28
|
type Seq,
|
|
31
29
|
} from "./seq";
|
|
32
|
-
import { indexnameOrd } from "./table";
|
|
33
|
-
import { lookupTyEnv } from "./type";
|
|
30
|
+
import { indexnameOrd, lookupTable, type IndexKey } from "./table";
|
|
34
31
|
import {
|
|
35
32
|
aconv,
|
|
36
33
|
eqTyp,
|
|
@@ -78,7 +75,7 @@ const etaNorm = (envir: Envir, binders: readonly Binder[], term: Term): Term =>
|
|
|
78
75
|
etif(type.args[1], mkApp(incrBoundvars(1, current), mkBound(0))),
|
|
79
76
|
);
|
|
80
77
|
if (type.kind === "TVar") {
|
|
81
|
-
const assigned =
|
|
78
|
+
const assigned = lookupTable(envir.tyenv, type);
|
|
82
79
|
return assigned === undefined ? current : etif(assigned, current);
|
|
83
80
|
}
|
|
84
81
|
return current;
|
|
@@ -94,10 +91,8 @@ const etaNorm = (envir: Envir, binders: readonly Binder[], term: Term): Term =>
|
|
|
94
91
|
return etaNm(binders, term);
|
|
95
92
|
};
|
|
96
93
|
|
|
97
|
-
const sameIndexname = (
|
|
98
|
-
left
|
|
99
|
-
right: { name: string; index: number },
|
|
100
|
-
) => left.name === right.name && left.index === right.index;
|
|
94
|
+
const sameIndexname = (left: IndexKey, right: IndexKey) =>
|
|
95
|
+
left.name === right.name && left.index === right.index;
|
|
101
96
|
|
|
102
97
|
const occursTerms = (seen: Var[], envir: Envir, variable: Var, terms: readonly Term[]): boolean => {
|
|
103
98
|
const occur = (term: Term): boolean => {
|
|
@@ -176,7 +171,6 @@ const unifyTypes = (left: Typ, right: Typ, envir: Envir) => {
|
|
|
176
171
|
return result;
|
|
177
172
|
};
|
|
178
173
|
|
|
179
|
-
// get_eta_var: the variable a term eta-contracts to over the binders, or undefined for ASSIGN.
|
|
180
174
|
const getEtaVar = (binders: readonly Binder[], level: number, term: Term): Var | undefined => {
|
|
181
175
|
if (binders.length === 0) return term.kind === "Var" ? term : undefined;
|
|
182
176
|
if (term.kind === "App" && term.arg.kind === "Bound" && term.arg.index === level)
|
|
@@ -184,7 +178,6 @@ const getEtaVar = (binders: readonly Binder[], level: number, term: Term): Var |
|
|
|
184
178
|
return undefined;
|
|
185
179
|
};
|
|
186
180
|
|
|
187
|
-
// assignment: undefined where Isabelle raises ASSIGN.
|
|
188
181
|
const assignment = (
|
|
189
182
|
binders: readonly Binder[],
|
|
190
183
|
left: Term,
|
|
@@ -340,6 +333,12 @@ interface Copy {
|
|
|
340
333
|
readonly dpairs: readonly Dpair[];
|
|
341
334
|
}
|
|
342
335
|
|
|
336
|
+
interface CopiedArgs {
|
|
337
|
+
args: Term[];
|
|
338
|
+
envir: Envir;
|
|
339
|
+
dpairs: readonly Dpair[];
|
|
340
|
+
}
|
|
341
|
+
|
|
343
342
|
const matchcopy = (name: string) => {
|
|
344
343
|
const copy = (
|
|
345
344
|
binders: readonly Binder[],
|
|
@@ -348,12 +347,9 @@ const matchcopy = (name: string) => {
|
|
|
348
347
|
envir: Envir,
|
|
349
348
|
dpairs: readonly Dpair[],
|
|
350
349
|
): Seq<Copy> => {
|
|
351
|
-
const copycons = (
|
|
352
|
-
uarg: Term,
|
|
353
|
-
prefix: { args: Term[]; envir: Envir; dpairs: readonly Dpair[] },
|
|
354
|
-
) =>
|
|
350
|
+
const copycons = (uarg: Term, prefix: CopiedArgs) =>
|
|
355
351
|
mapSeq(
|
|
356
|
-
(result: Copy) => ({
|
|
352
|
+
(result: Copy): CopiedArgs => ({
|
|
357
353
|
args: [result.term, ...prefix.args],
|
|
358
354
|
envir: result.envir,
|
|
359
355
|
dpairs: result.dpairs,
|
|
@@ -366,9 +362,7 @@ const matchcopy = (name: string) => {
|
|
|
366
362
|
prefix.dpairs,
|
|
367
363
|
),
|
|
368
364
|
);
|
|
369
|
-
const copyargs = (
|
|
370
|
-
uargs: readonly Term[],
|
|
371
|
-
): Seq<{ args: Term[]; envir: Envir; dpairs: readonly Dpair[] }> =>
|
|
365
|
+
const copyargs = (uargs: readonly Term[]): Seq<CopiedArgs> =>
|
|
372
366
|
uargs.length === 0
|
|
373
367
|
? consSeq({ args: [], envir, dpairs }, emptySeq)
|
|
374
368
|
: mapsSeq((prefix) => copycons(uargs[0], prefix), copyargs(uargs.slice(1)));
|
|
@@ -404,7 +398,7 @@ const matchcopy = (name: string) => {
|
|
|
404
398
|
}
|
|
405
399
|
});
|
|
406
400
|
};
|
|
407
|
-
const joinargs = (result:
|
|
401
|
+
const joinargs = (result: CopiedArgs): Copy => ({
|
|
408
402
|
term: listComb(uhead, result.args),
|
|
409
403
|
envir: result.envir,
|
|
410
404
|
dpairs: result.dpairs,
|
|
@@ -473,7 +467,6 @@ const match = (
|
|
|
473
467
|
);
|
|
474
468
|
};
|
|
475
469
|
|
|
476
|
-
// ff_assign: undefined where Isabelle raises ASSIGN.
|
|
477
470
|
const ffAssign = (
|
|
478
471
|
envir: Envir,
|
|
479
472
|
binders: readonly Binder[],
|
|
@@ -653,7 +646,7 @@ const addFfpair = (dpair: Dpair, envir: Envir, tpairs: readonly Tpair[]): [Envir
|
|
|
653
646
|
: cleanFfpair({ binders: dpair.binders, left, right }, envir, tpairs);
|
|
654
647
|
};
|
|
655
648
|
|
|
656
|
-
interface Unifier {
|
|
649
|
+
export interface Unifier {
|
|
657
650
|
readonly envir: Envir;
|
|
658
651
|
readonly tpairs: readonly Tpair[];
|
|
659
652
|
}
|
|
@@ -670,8 +663,6 @@ const hounifiers = (
|
|
|
670
663
|
dpairs: readonly Dpair[],
|
|
671
664
|
rest: Seq<Unifier>,
|
|
672
665
|
): Seq<Unifier> =>
|
|
673
|
-
// Isabelle pulls the alternatives inside its handler for CANTUNIFY, but each alternative
|
|
674
|
-
// handles its own, so handing them over to the caller's loop changes nothing.
|
|
675
666
|
deferSeq(() => {
|
|
676
667
|
if (limits !== undefined) checkInterrupt(limits);
|
|
677
668
|
try {
|
|
@@ -684,11 +675,13 @@ const hounifiers = (
|
|
|
684
675
|
return [{ envir: result[0], tpairs: result[1] }, rest];
|
|
685
676
|
}
|
|
686
677
|
if (depth > SEARCH_BOUND) return rest;
|
|
687
|
-
const [first, ...others] = simplified.flexrigid;
|
|
688
678
|
return itRightSeq(
|
|
689
679
|
(item: [Envir, readonly Dpair[]], tail: Seq<Unifier>) =>
|
|
690
680
|
addUnify(depth + 1, item[0], item[1], tail),
|
|
691
|
-
match(simplified.envir,
|
|
681
|
+
match(simplified.envir, simplified.flexrigid[0], [
|
|
682
|
+
...simplified.flexrigid.slice(1),
|
|
683
|
+
...simplified.flexflex,
|
|
684
|
+
]),
|
|
692
685
|
rest,
|
|
693
686
|
);
|
|
694
687
|
} catch (error) {
|
|
@@ -704,7 +697,6 @@ const hounifiers = (
|
|
|
704
697
|
);
|
|
705
698
|
};
|
|
706
699
|
|
|
707
|
-
// Unify.unifiers: pattern unification first, Huet's procedure outside the pattern fragment.
|
|
708
700
|
export const unifiers = (
|
|
709
701
|
limits: Limits | undefined,
|
|
710
702
|
envir: Envir,
|
|
@@ -739,8 +731,6 @@ const smashFlexflex1 = (pair: Tpair, envir: Envir): Envir => {
|
|
|
739
731
|
: vupdate(left, typeAbs(withVar, left.type, fresh), updated);
|
|
740
732
|
};
|
|
741
733
|
|
|
742
|
-
// Unify.smash_unifiers: unifiers with no remaining flex-flex pairs. A pair whose side is not
|
|
743
|
-
// flexible stops the sequence, as CANTUNIFY escapes Seq.map in Isabelle.
|
|
744
734
|
export const smashUnifiers = (
|
|
745
735
|
limits: Limits | undefined,
|
|
746
736
|
pairs: readonly Tpair[],
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/variable.ML,
|
|
2
|
-
// Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and
|
|
3
|
-
// contributors, see LICENSE.
|
|
1
|
+
// Ported from Isabelle2025's Pure/variable.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { variantList } from "./name";
|
|
6
|
-
import { addFreeNames, addVars, mkFree
|
|
4
|
+
import { addFreeNames, addVars, mkFree } from "./term";
|
|
7
5
|
import { generalize, instantiate, type Thm } from "./thm";
|
|
8
6
|
|
|
9
|
-
// Variable.trade with import true: fixes the schematic variables of a theorem as fresh free ones,
|
|
10
|
-
// derives theorems from it, and makes those variables schematic again.
|
|
11
7
|
export const trade = (derive: (thm: Thm) => readonly Thm[], thm: Thm): Thm[] => {
|
|
12
|
-
const vars = addVars(thm.prop, []
|
|
8
|
+
const vars = addVars(thm.prop, []);
|
|
13
9
|
const names = variantList(
|
|
14
10
|
thm.hyps.reduce((used, hyp) => addFreeNames(hyp, used), addFreeNames(thm.prop, [])),
|
|
15
11
|
vars.map((variable) => variable.name),
|
|
@@ -1,18 +1,10 @@
|
|
|
1
|
-
//
|
|
2
|
-
// instantiate them (BSD licensed, see LICENSE): the Hypsubst and Classical functor arguments, the
|
|
3
|
-
// claset with its nets as the reference heap orders them, and SetTheory's bspec wrapper.
|
|
1
|
+
// Ported from Isabelle/TLA+'s PredicateLogic.thy and SetTheory.thy, BSD licensed, see LICENSE.
|
|
4
2
|
|
|
5
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
6
4
|
import { emptyNet } from "../pure/net";
|
|
7
|
-
import { thenGoal
|
|
5
|
+
import { thenGoal } from "../pure/tactical";
|
|
8
6
|
import type { Limits } from "../pure/interrupt";
|
|
9
|
-
import {
|
|
10
|
-
assumeTac,
|
|
11
|
-
dresolveTac,
|
|
12
|
-
insertTaggedBrl,
|
|
13
|
-
type NetPair,
|
|
14
|
-
type TaggedRule,
|
|
15
|
-
} from "../pure/tactic";
|
|
7
|
+
import { assumeTac, dresolveTac, insertTaggedBrl, type NetPair } from "../pure/tactic";
|
|
16
8
|
import type { Term } from "../pure/term";
|
|
17
9
|
import type { Thm } from "../pure/thm";
|
|
18
10
|
import { addbefore, type Claset, type ClassicalData } from "../provers/classical";
|
|
@@ -72,9 +64,8 @@ export const getClassicalData = (logic: TlaLogic): ClassicalData => {
|
|
|
72
64
|
};
|
|
73
65
|
};
|
|
74
66
|
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
const insertAll = (items: readonly LogicNetItem[], netpair: NetPair<TaggedRule>) =>
|
|
67
|
+
export const toNetPair = <Item extends LogicNetItem>(pair: LogicNetPair<Item>): NetPair<Item> => {
|
|
68
|
+
const insertAll = (items: readonly Item[], netpair: NetPair<Item>) =>
|
|
78
69
|
items.reduceRight((result, item) => insertTaggedBrl(item, result), netpair);
|
|
79
70
|
return insertAll(pair.elim, insertAll(pair.intro, { intro: emptyNet, elim: emptyNet }));
|
|
80
71
|
};
|
|
@@ -92,10 +83,9 @@ export const getClaset = (logic: TlaLogic, limits: Limits): Claset => {
|
|
|
92
83
|
unsafe: toNetPair(logic.claset.unsafe),
|
|
93
84
|
dup: toNetPair(logic.claset.dup),
|
|
94
85
|
};
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
assumeTac(limits),
|
|
86
|
+
return addbefore(
|
|
87
|
+
claset,
|
|
88
|
+
"bspec",
|
|
89
|
+
thenGoal(dresolveTac(limits, [getFact(logic, "SetTheory.bspec")]), assumeTac(limits)),
|
|
99
90
|
);
|
|
100
|
-
return addbefore(claset, "bspec", bspec);
|
|
101
91
|
};
|
|
@@ -1,20 +1,19 @@
|
|
|
1
|
-
// The proof context of a theory tlapm writes, as the Isabelle/TLA+ heap sets it up: its simpset,
|
|
2
|
-
// claset, context rules and atomize rules, and Blast instantiated as PredicateLogic.thy does.
|
|
3
|
-
|
|
4
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
5
2
|
import type { ProofContext } from "../isar/method";
|
|
6
|
-
import { emptyNet } from "../pure/net";
|
|
7
3
|
import type { Limits } from "../pure/interrupt";
|
|
8
|
-
import { insertTaggedBrl, type NetPair } from "../pure/tactic";
|
|
9
4
|
import { blastDepthTac, blastTac, type BlastContext } from "../provers/blast/blast";
|
|
10
5
|
import type { ClassicalContext } from "../provers/classical";
|
|
11
6
|
import { blastHypSubstTac } from "../provers/hypsubst";
|
|
12
|
-
import
|
|
13
|
-
|
|
14
|
-
|
|
7
|
+
import {
|
|
8
|
+
getClaset,
|
|
9
|
+
getClassicalData,
|
|
10
|
+
getFact,
|
|
11
|
+
getHypsubstData,
|
|
12
|
+
toNetPair,
|
|
13
|
+
} from "./classical-setup";
|
|
14
|
+
import type { TlaLogic } from "./logic";
|
|
15
15
|
import { getSimpset } from "./simpdata";
|
|
16
16
|
|
|
17
|
-
// The atomize rules, newest first as Object_Logic keeps them.
|
|
18
17
|
const ATOMIZE_RULES = [
|
|
19
18
|
"Zenon.atomize_object_bAll",
|
|
20
19
|
"Zenon.atomize_meta_bAll",
|
|
@@ -25,13 +24,6 @@ const ATOMIZE_RULES = [
|
|
|
25
24
|
"PredicateLogic.atomize_all",
|
|
26
25
|
];
|
|
27
26
|
|
|
28
|
-
// Net.content lists a leaf's items newest first, so inserting them in reverse rebuilds the leaf.
|
|
29
|
-
const toNetPair = (pair: LogicNetPair<LogicExtraNetItem>): NetPair<ContextRule> => {
|
|
30
|
-
const insertAll = (items: readonly LogicExtraNetItem[], netpair: NetPair<ContextRule>) =>
|
|
31
|
-
items.reduceRight((result, item) => insertTaggedBrl(item, result), netpair);
|
|
32
|
-
return insertAll(pair.elim, insertAll(pair.intro, { intro: emptyNet, elim: emptyNet }));
|
|
33
|
-
};
|
|
34
|
-
|
|
35
27
|
export const getProofContext = (logic: TlaLogic, limits: Limits): ProofContext => {
|
|
36
28
|
const atomizeRules = ATOMIZE_RULES.map((name) => getFact(logic, name));
|
|
37
29
|
const classical = { limits, claset: getClaset(logic, limits), data: getClassicalData(logic) };
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// The Isabelle/TLA+ object logic that tlapm ships, decoded from logic-data.ts: its constants, the
|
|
2
|
-
// theorems its theories prove, and the order of the simpset and the classical rule nets.
|
|
3
|
-
|
|
4
1
|
import { axiomThm, type Thm } from "../pure/thm";
|
|
5
2
|
import type { ClassicalRule } from "../provers/classical";
|
|
6
3
|
import {
|
|
@@ -13,9 +10,10 @@ import {
|
|
|
13
10
|
mkTVar,
|
|
14
11
|
mkType,
|
|
15
12
|
mkVar,
|
|
13
|
+
type Term,
|
|
14
|
+
type Typ,
|
|
16
15
|
} from "../pure/term";
|
|
17
16
|
import { typargsOf, type TypargPosition } from "../pure/consts";
|
|
18
|
-
import type { Term, Typ } from "../pure/term";
|
|
19
17
|
import { LOGIC_DATA } from "./logic-data";
|
|
20
18
|
|
|
21
19
|
type TypeNode = [0, number, ...number[]] | [1, number] | [2, number, number];
|
|
@@ -26,7 +24,6 @@ type TermNode =
|
|
|
26
24
|
| [3, number]
|
|
27
25
|
| [4, number, number, number]
|
|
28
26
|
| [5, number, number];
|
|
29
|
-
// A rule of a claset or of the context rules, by theorem id, with its insertion tag.
|
|
30
27
|
type NetItem = [number, 0 | 1, number];
|
|
31
28
|
type ExtraNetItem = [number, number, 0 | 1, number];
|
|
32
29
|
type RawRule = [number, number, number[], number, number[]];
|
|
@@ -61,7 +58,6 @@ interface LogicJson {
|
|
|
61
58
|
export interface ConstInfo {
|
|
62
59
|
readonly type: Typ;
|
|
63
60
|
readonly typargs: readonly TypargPosition[];
|
|
64
|
-
// The right-hand side of an abbreviation, which parsing unfolds.
|
|
65
61
|
readonly abbreviation: Term | undefined;
|
|
66
62
|
}
|
|
67
63
|
|
|
@@ -82,11 +78,9 @@ export interface LogicNetPair<Item> {
|
|
|
82
78
|
|
|
83
79
|
export interface TlaLogic {
|
|
84
80
|
readonly consts: ReadonlyMap<string, ConstInfo>;
|
|
85
|
-
// The constant each unqualified name stands for.
|
|
86
81
|
readonly constNames: ReadonlyMap<string, string>;
|
|
87
82
|
readonly facts: ReadonlyMap<string, readonly Thm[]>;
|
|
88
83
|
readonly factNames: ReadonlyMap<string, string>;
|
|
89
|
-
// The simpset's rewrite rules, in the order of Net.entries.
|
|
90
84
|
readonly simps: readonly Thm[];
|
|
91
85
|
readonly congs: readonly {
|
|
92
86
|
readonly isConst: boolean;
|
|
@@ -209,7 +203,6 @@ const parseLogic = (): TlaLogic => {
|
|
|
209
203
|
};
|
|
210
204
|
};
|
|
211
205
|
|
|
212
|
-
|
|
206
|
+
let loadedLogic: TlaLogic | undefined;
|
|
213
207
|
|
|
214
|
-
|
|
215
|
-
export const loadLogic = (): TlaLogic => (loaded.logic ??= parseLogic());
|
|
208
|
+
export const loadLogic = (): TlaLogic => (loadedLogic ??= parseLogic());
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// licensed, see LICENSE): how theorems become rewrite rules, the solvers, the neq simproc, and the
|
|
3
|
-
// simpset of the reference heap.
|
|
4
|
-
//
|
|
5
|
-
// The heap's only looper, "split PredicateLogic.cond", is left out: its rule splitCond has the
|
|
6
|
-
// premise isBool(Q(x)), so Splitter.split_tac never composes it with a goal and the looper always
|
|
7
|
-
// fails.
|
|
1
|
+
// Ported from Isabelle/TLA+'s simplifier_setup.ML and PredicateLogic.thy, BSD licensed, see LICENSE.
|
|
8
2
|
|
|
9
3
|
import { TlaIsabelleError } from "../../../errors";
|
|
10
4
|
import { genAll, reflexiveThm } from "../pure/drule";
|
|
@@ -48,6 +42,9 @@ const isConstApp = (name: string, arity: number, term: Term): boolean =>
|
|
|
48
42
|
? term.kind === "Const" && term.name === name
|
|
49
43
|
: term.kind === "App" && isConstApp(name, arity - 1, term.fun);
|
|
50
44
|
|
|
45
|
+
const getPredicateFact = (logic: TlaLogic, name: string) =>
|
|
46
|
+
getFact(logic, `PredicateLogic.${name}`);
|
|
47
|
+
|
|
51
48
|
const catchThm = <Result>(derive: () => Result): Result | undefined => {
|
|
52
49
|
try {
|
|
53
50
|
return derive();
|
|
@@ -58,11 +55,9 @@ const catchThm = <Result>(derive: () => Result): Result | undefined => {
|
|
|
58
55
|
};
|
|
59
56
|
|
|
60
57
|
const getRewriting = (logic: TlaLogic) => {
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
const neqToEqFalse = rs(fact("neq_conv_eq_False"), eqReflection);
|
|
65
|
-
// Simpdata.mk_eq
|
|
58
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
59
|
+
const eqTrueI = getPredicateFact(logic, "eqTrueI");
|
|
60
|
+
const neqToEqFalse = rs(getPredicateFact(logic, "neq_conv_eq_False"), eqReflection);
|
|
66
61
|
const mkEq = (thm: Thm): Thm => {
|
|
67
62
|
const conclusion = conclOf(thm);
|
|
68
63
|
const concl = conclusion.kind === "App" ? conclusion : undefined;
|
|
@@ -78,22 +73,36 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
78
73
|
return rs(thm, neqToEqFalse);
|
|
79
74
|
return rs(rs(thm, eqTrueI), eqReflection);
|
|
80
75
|
};
|
|
81
|
-
// The final Simpdata.mksimps_pairs: the rules that split a premise by its outermost operator,
|
|
82
|
-
// and whether to simplify what they give.
|
|
83
76
|
const pairs = new Map<string, { rules: Thm[]; isSimplified: boolean }>([
|
|
84
|
-
[
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
[
|
|
77
|
+
[
|
|
78
|
+
"PredicateLogic.not",
|
|
79
|
+
{ rules: [getPredicateFact(logic, "boolifyFalseI")], isSimplified: true },
|
|
80
|
+
],
|
|
81
|
+
[
|
|
82
|
+
"PredicateLogic.iff",
|
|
83
|
+
{ rules: [getPredicateFact(logic, "iffThenBoolifyEqual")], isSimplified: true },
|
|
84
|
+
],
|
|
85
|
+
["PredicateLogic.imp", { rules: [getPredicateFact(logic, "mp")], isSimplified: false }],
|
|
86
|
+
[
|
|
87
|
+
"PredicateLogic.conj",
|
|
88
|
+
{
|
|
89
|
+
rules: [getPredicateFact(logic, "conjD1"), getPredicateFact(logic, "conjD2")],
|
|
90
|
+
isSimplified: false,
|
|
91
|
+
},
|
|
92
|
+
],
|
|
93
|
+
["PredicateLogic.All", { rules: [getPredicateFact(logic, "spec")], isSimplified: false }],
|
|
89
94
|
["PredicateLogic.TRUE", { rules: [], isSimplified: false }],
|
|
90
95
|
["PredicateLogic.FALSE", { rules: [], isSimplified: false }],
|
|
91
96
|
[
|
|
92
97
|
"PredicateLogic.cond",
|
|
93
|
-
{
|
|
98
|
+
{
|
|
99
|
+
rules: [
|
|
100
|
+
rs(getPredicateFact(logic, "if_bool_equiv_conj"), getPredicateFact(logic, "iffD1")),
|
|
101
|
+
],
|
|
102
|
+
isSimplified: false,
|
|
103
|
+
},
|
|
94
104
|
],
|
|
95
105
|
]);
|
|
96
|
-
// Simpdata.mk_atomize
|
|
97
106
|
const atoms = (context: SimpContext, thm: Thm): Thm[] => {
|
|
98
107
|
const concl = conclOf(thm);
|
|
99
108
|
if (!(concl.kind === "App" && isConstApp("PredicateLogic.Trueprop", 1, concl))) return [thm];
|
|
@@ -120,17 +129,19 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
120
129
|
};
|
|
121
130
|
|
|
122
131
|
const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
123
|
-
const fact = (name: string) => getFact(logic, `PredicateLogic.${name}`);
|
|
124
132
|
const solutions = [
|
|
125
133
|
reflexiveThm,
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
134
|
+
getPredicateFact(logic, "trueI"),
|
|
135
|
+
getPredicateFact(logic, "refl"),
|
|
136
|
+
getPredicateFact(logic, "iff_refl"),
|
|
137
|
+
getPredicateFact(logic, "notFalseI"),
|
|
138
|
+
];
|
|
139
|
+
const contradictions = [
|
|
140
|
+
getPredicateFact(logic, "falseE"),
|
|
141
|
+
getPredicateFact(logic, "not_refl_False"),
|
|
130
142
|
];
|
|
131
|
-
const
|
|
132
|
-
const
|
|
133
|
-
const simpImpliesI = fact("simp_impliesI");
|
|
143
|
+
const conjI = getPredicateFact(logic, "conjI");
|
|
144
|
+
const simpImpliesI = getPredicateFact(logic, "simp_impliesI");
|
|
134
145
|
const introSimpImplies =
|
|
135
146
|
(context: SimpContext): GoalTactic =>
|
|
136
147
|
(index) =>
|
|
@@ -167,12 +178,13 @@ const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
|
167
178
|
};
|
|
168
179
|
};
|
|
169
180
|
|
|
170
|
-
// PredicateLogic.thy's neq simproc: rewrites x = y to FALSE given y ~= x or (y = x) = FALSE.
|
|
171
181
|
const getNeqProc = (logic: TlaLogic) => {
|
|
172
|
-
const
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
182
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
183
|
+
const neqToEqFalse = rs(
|
|
184
|
+
rs(getPredicateFact(logic, "not_sym"), getPredicateFact(logic, "neq_conv_eq_False")),
|
|
185
|
+
eqReflection,
|
|
186
|
+
);
|
|
187
|
+
const symEqLeft = rs(getPredicateFact(logic, "symEqLeft"), eqReflection);
|
|
176
188
|
const isNeq = (eq: Term, lhs: Term, rhs: Term, thm: Thm) => {
|
|
177
189
|
const prop = thm.prop;
|
|
178
190
|
if (prop.kind !== "App" || prop.arg.kind !== "App") return false;
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/intuitionistic.ML and
|
|
2
|
-
// Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische
|
|
3
|
-
// Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
|
-
//
|
|
5
|
-
// iprover: intuitionistic proof search with the context rules, the rules declared intro, elim and
|
|
6
|
-
// dest. Isabelle/TLA+ declares no context rule wrappers, so Swrap and wrap leave tactics as they
|
|
7
|
-
// are.
|
|
1
|
+
// Ported from Isabelle2025's Tools/intuitionistic.ML and Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
8
2
|
|
|
9
3
|
import { remdupsRl } from "../pure/drule";
|
|
10
4
|
import { selectGoal } from "../pure/goal";
|
|
@@ -42,7 +36,6 @@ export interface ContextRule {
|
|
|
42
36
|
|
|
43
37
|
export interface IntuitionisticContext {
|
|
44
38
|
readonly limits: Limits;
|
|
45
|
-
// Context_Rules.netpair_bang and Context_Rules.netpair.
|
|
46
39
|
readonly safeRules: NetPair<ContextRule>;
|
|
47
40
|
readonly rules: NetPair<ContextRule>;
|
|
48
41
|
}
|
|
@@ -52,7 +45,6 @@ interface Visited {
|
|
|
52
45
|
readonly concl: Term;
|
|
53
46
|
}
|
|
54
47
|
|
|
55
|
-
// Context_Rules.orderlist: by weight, then by tag, dropping all but the last of equal keys.
|
|
56
48
|
const orderRules = (rules: ContextRule[]): BiresRule[] => {
|
|
57
49
|
const sorted = [...rules].sort(
|
|
58
50
|
(left, right) => left.weight - right.weight || left.tag - right.tag,
|
|
@@ -127,6 +119,5 @@ const intproverTac = (
|
|
|
127
119
|
)(index);
|
|
128
120
|
});
|
|
129
121
|
|
|
130
|
-
// Intuitionistic.prover_tac with the default depth limit.
|
|
131
122
|
export const proverTac = (context: IntuitionisticContext): GoalTactic =>
|
|
132
123
|
selectGoal(deepen(2, 20, (limit) => intproverTac(context, [], 0, limit), 4)(1));
|
package/src/prover/ocaml.ts
CHANGED
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
// The parts of OCaml's standard library whose exact order steers what tlapm prints.
|
|
2
|
-
|
|
3
1
|
type OcamlValue = number | string | OcamlValue[];
|
|
4
2
|
|
|
5
|
-
// String.compare: byte by byte, on the UTF-8 bytes. Code units order the same way for the ASCII
|
|
6
|
-
// names tlapm compares.
|
|
7
3
|
export const compareStrings = (left: string, right: string) =>
|
|
8
4
|
left < right ? -1 : left > right ? 1 : 0;
|
|
9
5
|
|
|
10
|
-
// Stdlib.compare on ints, strings, and lists, where a list is smaller than any longer list it
|
|
11
|
-
// starts.
|
|
12
6
|
export const compareValues = (left: OcamlValue, right: OcamlValue): number => {
|
|
13
7
|
if (typeof left === "number" && typeof right === "number") return left - right;
|
|
14
8
|
if (typeof left === "string" && typeof right === "string") return compareStrings(left, right);
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's action frontend (Action.process_obligation), which makes an obligation first
|
|
2
|
-
// order for the backends: [A]_v, <<A>>_v and UNCHANGED become primes (Expr.Tla_norm), primes move
|
|
3
|
-
// down to the variables (Symbol_commute), and what remains modal becomes opaque (Coalesce).
|
|
4
|
-
|
|
5
1
|
import { TlapmBugError } from "../../errors";
|
|
6
2
|
import { rewriteUnchanged } from "../../obligations/temporal";
|
|
7
3
|
import {
|
|
@@ -49,8 +45,6 @@ const isBuiltin = (expression: Expr, builtins: Builtin[]) =>
|
|
|
49
45
|
expression.operator.kind === "Internal" &&
|
|
50
46
|
builtins.includes(expression.operator.builtin);
|
|
51
47
|
|
|
52
|
-
// Visit.map over a sequent: each hypothesis maps in the scope before it, hidden ones too if hyps
|
|
53
|
-
// is "all". The context maps by the obligation's own hypotheses, from which it derives.
|
|
54
48
|
const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
55
49
|
const mapContext = createContextMap<Scope | undefined>(undefined, (scope, hyp) => {
|
|
56
50
|
const mapped = mapHyp(hyp, (inner) => map(scope, inner), hyps);
|
|
@@ -62,7 +56,6 @@ const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
|
62
56
|
};
|
|
63
57
|
};
|
|
64
58
|
|
|
65
|
-
// Expr.Tla_norm.expand_action, then expand_unchanged.
|
|
66
59
|
const expandAction: Rewrite = (scope, expression) => {
|
|
67
60
|
if (expression.kind === "Sub" || expression.kind === "Tsub") {
|
|
68
61
|
const action = expandAction(scope, expression.action);
|
|
@@ -88,7 +81,6 @@ const expandUnchanged: Rewrite = (scope, expression) =>
|
|
|
88
81
|
const applyModal = (builtin: Builtin, expression: Expr) =>
|
|
89
82
|
applyBuiltin(builtin, [expression], expression);
|
|
90
83
|
|
|
91
|
-
// prime_commuter: a prime distributes down to the declarations that are not constant.
|
|
92
84
|
const commutePrime: Rewrite = (scope, expression) => {
|
|
93
85
|
if (expression.kind === "Ix") {
|
|
94
86
|
const hyp = getHyp(scope, expression.index);
|
|
@@ -127,8 +119,6 @@ const commutePrime: Rewrite = (scope, expression) => {
|
|
|
127
119
|
return mapScoped(scope, expression, commutePrime, adjoin);
|
|
128
120
|
};
|
|
129
121
|
|
|
130
|
-
// box_commuter and dia_commuter: [] distributes over /\ and \A, and <> over \/ and \E, and both
|
|
131
|
-
// vanish on a constant.
|
|
132
122
|
const getModalCommuter = (builtin: "BoxTrue" | "Diamond"): Rewrite => {
|
|
133
123
|
const connective: Builtin = builtin === "BoxTrue" ? "Conj" : "Disj";
|
|
134
124
|
const quantifier = builtin === "BoxTrue" ? "Forall" : "Exists";
|
|
@@ -151,7 +141,6 @@ const COMMUTERS: Partial<Record<Builtin, Rewrite>> = {
|
|
|
151
141
|
Diamond: getModalCommuter("Diamond"),
|
|
152
142
|
};
|
|
153
143
|
|
|
154
|
-
// symbol_commute: each prime, [] and <> commutes down its operand.
|
|
155
144
|
const commuteSymbols: Rewrite = (scope, expression) => {
|
|
156
145
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
157
146
|
const commuter = COMMUTERS[expression.operator.builtin];
|
|
@@ -163,8 +152,6 @@ const commuteSymbols: Rewrite = (scope, expression) => {
|
|
|
163
152
|
return mapScoped(scope, expression, commuteSymbols, adjoin, "all");
|
|
164
153
|
};
|
|
165
154
|
|
|
166
|
-
// The prefix rename_with_loc gives a declaration of each level, and a definition by the number of
|
|
167
|
-
// its body's level.
|
|
168
155
|
export const LEVEL_PREFIXES: Record<Level, string> = {
|
|
169
156
|
Constant: "CONSTANT",
|
|
170
157
|
State: "STATE",
|
|
@@ -182,8 +169,6 @@ interface RenameState {
|
|
|
182
169
|
original: Scope | undefined;
|
|
183
170
|
}
|
|
184
171
|
|
|
185
|
-
// rename_with_loc: each declaration's name tells its level, as in CONSTANT_x_ or VARIABLE_x_. A
|
|
186
|
-
// definition's level is the one its body had before the commuters ran, unless given.
|
|
187
172
|
const renameDefn = (scope: Scope | undefined, definition: Defn, level?: number): Defn => {
|
|
188
173
|
if (definition.kind !== "Operator") {
|
|
189
174
|
return definition.kind === "Bpragma"
|
|
@@ -213,10 +198,6 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
|
|
|
213
198
|
}
|
|
214
199
|
};
|
|
215
200
|
|
|
216
|
-
// tlapm reads levels from properties that Expr.Levels computes before the frontend rewrites
|
|
217
|
-
// anything, and each node it builds takes the properties of a node it replaces: UNCHANGED's
|
|
218
|
-
// equalities those of the tuple or its only element, and a commuted prime, [] or <> those of its
|
|
219
|
-
// operand. A definition's name tells the level its body's top node ends up with.
|
|
220
201
|
const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
|
|
221
202
|
if (hyp.kind !== "Defn" || hyp.definition.kind !== "Operator") return undefined;
|
|
222
203
|
const getNodeLevel = (expression: Expr) => {
|
|
@@ -236,7 +217,6 @@ const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
|
|
|
236
217
|
return getNodeLevel(isCommuted && body.kind === "Apply" ? body.args[0] : body);
|
|
237
218
|
};
|
|
238
219
|
|
|
239
|
-
// renameSequent on the obligation, with the levels of its definitions from before commuting.
|
|
240
220
|
const renameContext = createContextMap<RenameState>(
|
|
241
221
|
{ scope: undefined, original: undefined },
|
|
242
222
|
(current, hyp, original) => {
|
|
@@ -325,8 +305,6 @@ const rename: Rewrite = (scope, expression) => {
|
|
|
325
305
|
}
|
|
326
306
|
};
|
|
327
307
|
|
|
328
|
-
// E_substitutive.make_array: for each parameter of an operator, counting from the last, whether
|
|
329
|
-
// the body uses it only outside primes and the other modal operators.
|
|
330
308
|
const substitutiveArgs = new WeakMap<Defn, boolean[]>();
|
|
331
309
|
|
|
332
310
|
const getSubstitutiveArgs = (scope: Scope | undefined, definition: Defn): boolean[] => {
|
|
@@ -354,7 +332,6 @@ const UNARY_MODALS: Builtin[] = [
|
|
|
354
332
|
|
|
355
333
|
const BINARY_MODALS: Builtin[] = ["Leadsto", "Actplus", "Cdot"];
|
|
356
334
|
|
|
357
|
-
// compute_substitutivity_array: whether the parameter at index occurs only where scope holds.
|
|
358
335
|
const isSubstitutive = (
|
|
359
336
|
scope: Scope | undefined,
|
|
360
337
|
expression: Expr,
|
|
@@ -388,30 +365,26 @@ const isSubstitutive = (
|
|
|
388
365
|
});
|
|
389
366
|
}
|
|
390
367
|
}
|
|
391
|
-
|
|
368
|
+
let isEverySubstitutive = true;
|
|
392
369
|
mapScoped(
|
|
393
370
|
{ scope, index },
|
|
394
371
|
expression,
|
|
395
372
|
(state, inner) => {
|
|
396
|
-
|
|
373
|
+
isEverySubstitutive &&= isSubstitutive(state.scope, inner, state.index, isInScope);
|
|
397
374
|
return inner;
|
|
398
375
|
},
|
|
399
376
|
(state, hyp) => ({ scope: adjoin(state.scope, hyp), index: state.index + 1 }),
|
|
400
377
|
"all",
|
|
401
378
|
);
|
|
402
|
-
return
|
|
379
|
+
return isEverySubstitutive;
|
|
403
380
|
};
|
|
404
381
|
|
|
405
|
-
// Coalesce.crypthash: h and the first five hexadecimal digits of the MD5 of the expression as
|
|
406
|
-
// tlapm prints it.
|
|
407
382
|
export const getHashName = (hyps: Hyp[], expression: Expr) =>
|
|
408
383
|
`h${getMd5(renderDoc(printExpression(hyps, expression))).slice(0, 5)}`;
|
|
409
384
|
|
|
410
385
|
const coalesce = (scope: Scope | undefined, expression: Expr): Expr =>
|
|
411
386
|
at({ kind: "Opaque", name: getHashName(getScopeHyps(scope), expression) }, expression);
|
|
412
387
|
|
|
413
|
-
// coalesce_operator: an operator applied to arguments that are not all substitutive is opaque,
|
|
414
|
-
// hiding the arguments that are constant or substitutive.
|
|
415
388
|
const coalesceOperator = (
|
|
416
389
|
scope: Scope | undefined,
|
|
417
390
|
name: string,
|
|
@@ -441,14 +414,10 @@ const MODAL_BUILTINS: Builtin[] = [
|
|
|
441
414
|
"UNCHANGED",
|
|
442
415
|
];
|
|
443
416
|
|
|
444
|
-
// coalesce_modal_visitor: a primed declaration becomes the opaque name#prime, and every other
|
|
445
|
-
// modal expression an opaque name. tlapm means to apply that name to the expression's free
|
|
446
|
-
// variables, but compute_vars collects them into an instance variable and returns its own empty
|
|
447
|
-
// set, so the name always stands alone.
|
|
448
417
|
const coalesceModal: Rewrite = (scope, expression) => {
|
|
449
418
|
if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
450
419
|
const operator = expression.operator;
|
|
451
|
-
const
|
|
420
|
+
const arg = expression.args[0];
|
|
452
421
|
if (
|
|
453
422
|
isBuiltin(expression, ["Prime", "StrongPrime"]) &&
|
|
454
423
|
expression.args.length === 1 &&
|
|
@@ -491,7 +460,6 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
491
460
|
throw new TlapmBugError();
|
|
492
461
|
};
|
|
493
462
|
|
|
494
|
-
// process_eob, on an obligation's sequent.
|
|
495
463
|
const expandActionSequent = createSequentMap(expandAction, "all");
|
|
496
464
|
|
|
497
465
|
const expandUnchangedSequent = createSequentMap(expandUnchanged, "all");
|