tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,8 +1,7 @@
|
|
|
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";
|
|
3
|
+
import type { TaggedRule } from "../pure/tactic";
|
|
4
|
+
import type { ContextRule } from "../tools/intuitionistic";
|
|
6
5
|
import {
|
|
7
6
|
mkAbs,
|
|
8
7
|
mkApp,
|
|
@@ -13,9 +12,10 @@ import {
|
|
|
13
12
|
mkTVar,
|
|
14
13
|
mkType,
|
|
15
14
|
mkVar,
|
|
15
|
+
type Term,
|
|
16
|
+
type Typ,
|
|
16
17
|
} from "../pure/term";
|
|
17
18
|
import { typargsOf, type TypargPosition } from "../pure/consts";
|
|
18
|
-
import type { Term, Typ } from "../pure/term";
|
|
19
19
|
import { LOGIC_DATA } from "./logic-data";
|
|
20
20
|
|
|
21
21
|
type TypeNode = [0, number, ...number[]] | [1, number] | [2, number, number];
|
|
@@ -26,7 +26,6 @@ type TermNode =
|
|
|
26
26
|
| [3, number]
|
|
27
27
|
| [4, number, number, number]
|
|
28
28
|
| [5, number, number];
|
|
29
|
-
// A rule of a claset or of the context rules, by theorem id, with its insertion tag.
|
|
30
29
|
type NetItem = [number, 0 | 1, number];
|
|
31
30
|
type ExtraNetItem = [number, number, 0 | 1, number];
|
|
32
31
|
type RawRule = [number, number, number[], number, number[]];
|
|
@@ -53,7 +52,6 @@ interface LogicJson {
|
|
|
53
52
|
safep: [NetItem[], NetItem[]];
|
|
54
53
|
unsafe: [NetItem[], NetItem[]];
|
|
55
54
|
dup: [NetItem[], NetItem[]];
|
|
56
|
-
extra: [ExtraNetItem[], ExtraNetItem[]];
|
|
57
55
|
};
|
|
58
56
|
contextRules: { bang: [ExtraNetItem[], ExtraNetItem[]]; plain: [ExtraNetItem[], ExtraNetItem[]] };
|
|
59
57
|
}
|
|
@@ -61,20 +59,9 @@ interface LogicJson {
|
|
|
61
59
|
export interface ConstInfo {
|
|
62
60
|
readonly type: Typ;
|
|
63
61
|
readonly typargs: readonly TypargPosition[];
|
|
64
|
-
// The right-hand side of an abbreviation, which parsing unfolds.
|
|
65
62
|
readonly abbreviation: Term | undefined;
|
|
66
63
|
}
|
|
67
64
|
|
|
68
|
-
export interface LogicNetItem {
|
|
69
|
-
readonly tag: number;
|
|
70
|
-
readonly isElim: boolean;
|
|
71
|
-
readonly rule: Thm;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
export interface LogicExtraNetItem extends LogicNetItem {
|
|
75
|
-
readonly weight: number;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
65
|
export interface LogicNetPair<Item> {
|
|
79
66
|
readonly intro: readonly Item[];
|
|
80
67
|
readonly elim: readonly Item[];
|
|
@@ -82,11 +69,9 @@ export interface LogicNetPair<Item> {
|
|
|
82
69
|
|
|
83
70
|
export interface TlaLogic {
|
|
84
71
|
readonly consts: ReadonlyMap<string, ConstInfo>;
|
|
85
|
-
// The constant each unqualified name stands for.
|
|
86
72
|
readonly constNames: ReadonlyMap<string, string>;
|
|
87
73
|
readonly facts: ReadonlyMap<string, readonly Thm[]>;
|
|
88
74
|
readonly factNames: ReadonlyMap<string, string>;
|
|
89
|
-
// The simpset's rewrite rules, in the order of Net.entries.
|
|
90
75
|
readonly simps: readonly Thm[];
|
|
91
76
|
readonly congs: readonly {
|
|
92
77
|
readonly isConst: boolean;
|
|
@@ -100,14 +85,14 @@ export interface TlaLogic {
|
|
|
100
85
|
readonly safeEs: readonly ClassicalRule[];
|
|
101
86
|
readonly unsafeIs: readonly ClassicalRule[];
|
|
102
87
|
readonly unsafeEs: readonly ClassicalRule[];
|
|
103
|
-
readonly safe0: LogicNetPair<
|
|
104
|
-
readonly safep: LogicNetPair<
|
|
105
|
-
readonly unsafe: LogicNetPair<
|
|
106
|
-
readonly dup: LogicNetPair<
|
|
88
|
+
readonly safe0: LogicNetPair<TaggedRule>;
|
|
89
|
+
readonly safep: LogicNetPair<TaggedRule>;
|
|
90
|
+
readonly unsafe: LogicNetPair<TaggedRule>;
|
|
91
|
+
readonly dup: LogicNetPair<TaggedRule>;
|
|
107
92
|
};
|
|
108
93
|
readonly contextRules: {
|
|
109
|
-
readonly bang: LogicNetPair<
|
|
110
|
-
readonly plain: LogicNetPair<
|
|
94
|
+
readonly bang: LogicNetPair<ContextRule>;
|
|
95
|
+
readonly plain: LogicNetPair<ContextRule>;
|
|
111
96
|
};
|
|
112
97
|
}
|
|
113
98
|
|
|
@@ -155,15 +140,13 @@ const parseLogic = (): TlaLogic => {
|
|
|
155
140
|
dup: thms[raw[3]],
|
|
156
141
|
dupSwapped: raw[4].map((id) => thms[id]),
|
|
157
142
|
});
|
|
158
|
-
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<
|
|
143
|
+
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<TaggedRule> => {
|
|
159
144
|
const [intro, elim] = pair.map((side) =>
|
|
160
145
|
side.map((item) => ({ tag: item[0], isElim: item[1] === 1, rule: thms[item[2]] })),
|
|
161
146
|
);
|
|
162
147
|
return { intro, elim };
|
|
163
148
|
};
|
|
164
|
-
const toExtraItems = (
|
|
165
|
-
pair: [ExtraNetItem[], ExtraNetItem[]],
|
|
166
|
-
): LogicNetPair<LogicExtraNetItem> => {
|
|
149
|
+
const toExtraItems = (pair: [ExtraNetItem[], ExtraNetItem[]]): LogicNetPair<ContextRule> => {
|
|
167
150
|
const [intro, elim] = pair.map((side) =>
|
|
168
151
|
side.map((item) => ({
|
|
169
152
|
weight: item[0],
|
|
@@ -209,7 +192,6 @@ const parseLogic = (): TlaLogic => {
|
|
|
209
192
|
};
|
|
210
193
|
};
|
|
211
194
|
|
|
212
|
-
|
|
195
|
+
let loadedLogic: TlaLogic | undefined;
|
|
213
196
|
|
|
214
|
-
|
|
215
|
-
export const loadLogic = (): TlaLogic => (loaded.logic ??= parseLogic());
|
|
197
|
+
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";
|
|
@@ -38,7 +32,7 @@ import {
|
|
|
38
32
|
type GoalTactic,
|
|
39
33
|
} from "../pure/tactical";
|
|
40
34
|
import { aconv, eqTerm, headOf, type Term } from "../pure/term";
|
|
41
|
-
import { conclOf, rs, type Thm } from "../pure/thm";
|
|
35
|
+
import { catchThm, conclOf, rs, type Thm } from "../pure/thm";
|
|
42
36
|
import { trade } from "../pure/variable";
|
|
43
37
|
import { getFact } from "./classical-setup";
|
|
44
38
|
import type { TlaLogic } from "./logic";
|
|
@@ -48,21 +42,13 @@ 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
|
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
return derive();
|
|
54
|
-
} catch (error) {
|
|
55
|
-
if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
|
|
56
|
-
throw error;
|
|
57
|
-
}
|
|
58
|
-
};
|
|
45
|
+
const getPredicateFact = (logic: TlaLogic, name: string) =>
|
|
46
|
+
getFact(logic, `PredicateLogic.${name}`);
|
|
59
47
|
|
|
60
48
|
const getRewriting = (logic: TlaLogic) => {
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
const neqToEqFalse = rs(fact("neq_conv_eq_False"), eqReflection);
|
|
65
|
-
// Simpdata.mk_eq
|
|
49
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
50
|
+
const eqTrueI = getPredicateFact(logic, "eqTrueI");
|
|
51
|
+
const neqToEqFalse = rs(getPredicateFact(logic, "neq_conv_eq_False"), eqReflection);
|
|
66
52
|
const mkEq = (thm: Thm): Thm => {
|
|
67
53
|
const conclusion = conclOf(thm);
|
|
68
54
|
const concl = conclusion.kind === "App" ? conclusion : undefined;
|
|
@@ -78,22 +64,36 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
78
64
|
return rs(thm, neqToEqFalse);
|
|
79
65
|
return rs(rs(thm, eqTrueI), eqReflection);
|
|
80
66
|
};
|
|
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
67
|
const pairs = new Map<string, { rules: Thm[]; isSimplified: boolean }>([
|
|
84
|
-
[
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
[
|
|
68
|
+
[
|
|
69
|
+
"PredicateLogic.not",
|
|
70
|
+
{ rules: [getPredicateFact(logic, "boolifyFalseI")], isSimplified: true },
|
|
71
|
+
],
|
|
72
|
+
[
|
|
73
|
+
"PredicateLogic.iff",
|
|
74
|
+
{ rules: [getPredicateFact(logic, "iffThenBoolifyEqual")], isSimplified: true },
|
|
75
|
+
],
|
|
76
|
+
["PredicateLogic.imp", { rules: [getPredicateFact(logic, "mp")], isSimplified: false }],
|
|
77
|
+
[
|
|
78
|
+
"PredicateLogic.conj",
|
|
79
|
+
{
|
|
80
|
+
rules: [getPredicateFact(logic, "conjD1"), getPredicateFact(logic, "conjD2")],
|
|
81
|
+
isSimplified: false,
|
|
82
|
+
},
|
|
83
|
+
],
|
|
84
|
+
["PredicateLogic.All", { rules: [getPredicateFact(logic, "spec")], isSimplified: false }],
|
|
89
85
|
["PredicateLogic.TRUE", { rules: [], isSimplified: false }],
|
|
90
86
|
["PredicateLogic.FALSE", { rules: [], isSimplified: false }],
|
|
91
87
|
[
|
|
92
88
|
"PredicateLogic.cond",
|
|
93
|
-
{
|
|
89
|
+
{
|
|
90
|
+
rules: [
|
|
91
|
+
rs(getPredicateFact(logic, "if_bool_equiv_conj"), getPredicateFact(logic, "iffD1")),
|
|
92
|
+
],
|
|
93
|
+
isSimplified: false,
|
|
94
|
+
},
|
|
94
95
|
],
|
|
95
96
|
]);
|
|
96
|
-
// Simpdata.mk_atomize
|
|
97
97
|
const atoms = (context: SimpContext, thm: Thm): Thm[] => {
|
|
98
98
|
const concl = conclOf(thm);
|
|
99
99
|
if (!(concl.kind === "App" && isConstApp("PredicateLogic.Trueprop", 1, concl))) return [thm];
|
|
@@ -120,17 +120,19 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
123
|
-
const fact = (name: string) => getFact(logic, `PredicateLogic.${name}`);
|
|
124
123
|
const solutions = [
|
|
125
124
|
reflexiveThm,
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
125
|
+
getPredicateFact(logic, "trueI"),
|
|
126
|
+
getPredicateFact(logic, "refl"),
|
|
127
|
+
getPredicateFact(logic, "iff_refl"),
|
|
128
|
+
getPredicateFact(logic, "notFalseI"),
|
|
129
|
+
];
|
|
130
|
+
const contradictions = [
|
|
131
|
+
getPredicateFact(logic, "falseE"),
|
|
132
|
+
getPredicateFact(logic, "not_refl_False"),
|
|
130
133
|
];
|
|
131
|
-
const
|
|
132
|
-
const
|
|
133
|
-
const simpImpliesI = fact("simp_impliesI");
|
|
134
|
+
const conjI = getPredicateFact(logic, "conjI");
|
|
135
|
+
const simpImpliesI = getPredicateFact(logic, "simp_impliesI");
|
|
134
136
|
const introSimpImplies =
|
|
135
137
|
(context: SimpContext): GoalTactic =>
|
|
136
138
|
(index) =>
|
|
@@ -167,12 +169,13 @@ const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
|
167
169
|
};
|
|
168
170
|
};
|
|
169
171
|
|
|
170
|
-
// PredicateLogic.thy's neq simproc: rewrites x = y to FALSE given y ~= x or (y = x) = FALSE.
|
|
171
172
|
const getNeqProc = (logic: TlaLogic) => {
|
|
172
|
-
const
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
173
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
174
|
+
const neqToEqFalse = rs(
|
|
175
|
+
rs(getPredicateFact(logic, "not_sym"), getPredicateFact(logic, "neq_conv_eq_False")),
|
|
176
|
+
eqReflection,
|
|
177
|
+
);
|
|
178
|
+
const symEqLeft = rs(getPredicateFact(logic, "symEqLeft"), eqReflection);
|
|
176
179
|
const isNeq = (eq: Term, lhs: Term, rhs: Term, thm: Thm) => {
|
|
177
180
|
const prop = thm.prop;
|
|
178
181
|
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 {
|
|
@@ -44,13 +40,14 @@ const getHyp = (scope: Scope | undefined, index: number) => {
|
|
|
44
40
|
const getLevel = (scope: Scope | undefined, expression: Expr) =>
|
|
45
41
|
getLevelInfo(scope, expression).level;
|
|
46
42
|
|
|
47
|
-
const isBuiltin = (
|
|
43
|
+
const isBuiltin = (
|
|
44
|
+
expression: Expr,
|
|
45
|
+
builtins: Builtin[],
|
|
46
|
+
): expression is Extract<Expr, { kind: "Apply" }> =>
|
|
48
47
|
expression.kind === "Apply" &&
|
|
49
48
|
expression.operator.kind === "Internal" &&
|
|
50
49
|
builtins.includes(expression.operator.builtin);
|
|
51
50
|
|
|
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
51
|
const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
55
52
|
const mapContext = createContextMap<Scope | undefined>(undefined, (scope, hyp) => {
|
|
56
53
|
const mapped = mapHyp(hyp, (inner) => map(scope, inner), hyps);
|
|
@@ -62,7 +59,6 @@ const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
|
62
59
|
};
|
|
63
60
|
};
|
|
64
61
|
|
|
65
|
-
// Expr.Tla_norm.expand_action, then expand_unchanged.
|
|
66
62
|
const expandAction: Rewrite = (scope, expression) => {
|
|
67
63
|
if (expression.kind === "Sub" || expression.kind === "Tsub") {
|
|
68
64
|
const action = expandAction(scope, expression.action);
|
|
@@ -79,16 +75,13 @@ const expandAction: Rewrite = (scope, expression) => {
|
|
|
79
75
|
};
|
|
80
76
|
|
|
81
77
|
const expandUnchanged: Rewrite = (scope, expression) =>
|
|
82
|
-
expression
|
|
83
|
-
isBuiltin(expression, ["UNCHANGED"]) &&
|
|
84
|
-
expression.args.length === 1
|
|
78
|
+
isBuiltin(expression, ["UNCHANGED"]) && expression.args.length === 1
|
|
85
79
|
? rewriteUnchanged(expression.args[0])
|
|
86
80
|
: mapScoped(scope, expression, expandUnchanged, adjoin, "all");
|
|
87
81
|
|
|
88
82
|
const applyModal = (builtin: Builtin, expression: Expr) =>
|
|
89
83
|
applyBuiltin(builtin, [expression], expression);
|
|
90
84
|
|
|
91
|
-
// prime_commuter: a prime distributes down to the declarations that are not constant.
|
|
92
85
|
const commutePrime: Rewrite = (scope, expression) => {
|
|
93
86
|
if (expression.kind === "Ix") {
|
|
94
87
|
const hyp = getHyp(scope, expression.index);
|
|
@@ -127,8 +120,6 @@ const commutePrime: Rewrite = (scope, expression) => {
|
|
|
127
120
|
return mapScoped(scope, expression, commutePrime, adjoin);
|
|
128
121
|
};
|
|
129
122
|
|
|
130
|
-
// box_commuter and dia_commuter: [] distributes over /\ and \A, and <> over \/ and \E, and both
|
|
131
|
-
// vanish on a constant.
|
|
132
123
|
const getModalCommuter = (builtin: "BoxTrue" | "Diamond"): Rewrite => {
|
|
133
124
|
const connective: Builtin = builtin === "BoxTrue" ? "Conj" : "Disj";
|
|
134
125
|
const quantifier = builtin === "BoxTrue" ? "Forall" : "Exists";
|
|
@@ -151,7 +142,6 @@ const COMMUTERS: Partial<Record<Builtin, Rewrite>> = {
|
|
|
151
142
|
Diamond: getModalCommuter("Diamond"),
|
|
152
143
|
};
|
|
153
144
|
|
|
154
|
-
// symbol_commute: each prime, [] and <> commutes down its operand.
|
|
155
145
|
const commuteSymbols: Rewrite = (scope, expression) => {
|
|
156
146
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
157
147
|
const commuter = COMMUTERS[expression.operator.builtin];
|
|
@@ -163,8 +153,6 @@ const commuteSymbols: Rewrite = (scope, expression) => {
|
|
|
163
153
|
return mapScoped(scope, expression, commuteSymbols, adjoin, "all");
|
|
164
154
|
};
|
|
165
155
|
|
|
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
156
|
export const LEVEL_PREFIXES: Record<Level, string> = {
|
|
169
157
|
Constant: "CONSTANT",
|
|
170
158
|
State: "STATE",
|
|
@@ -182,8 +170,6 @@ interface RenameState {
|
|
|
182
170
|
original: Scope | undefined;
|
|
183
171
|
}
|
|
184
172
|
|
|
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
173
|
const renameDefn = (scope: Scope | undefined, definition: Defn, level?: number): Defn => {
|
|
188
174
|
if (definition.kind !== "Operator") {
|
|
189
175
|
return definition.kind === "Bpragma"
|
|
@@ -213,30 +199,20 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
|
|
|
213
199
|
}
|
|
214
200
|
};
|
|
215
201
|
|
|
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
202
|
const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
|
|
221
203
|
if (hyp.kind !== "Defn" || hyp.definition.kind !== "Operator") return undefined;
|
|
222
204
|
const getNodeLevel = (expression: Expr) => {
|
|
223
|
-
if (!isBuiltin(expression, ["UNCHANGED"])
|
|
224
|
-
return getLevel(scope, expression);
|
|
225
|
-
}
|
|
205
|
+
if (!isBuiltin(expression, ["UNCHANGED"])) return getLevel(scope, expression);
|
|
226
206
|
const flatten = (inner: Expr): Expr[] =>
|
|
227
207
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
228
208
|
const items = flatten(expression.args[0]);
|
|
229
209
|
return getLevel(scope, items.length === 1 ? items[0] : expression.args[0]);
|
|
230
210
|
};
|
|
231
211
|
const body = hyp.definition.body;
|
|
232
|
-
const isCommuted =
|
|
233
|
-
|
|
234
|
-
body.kind === "Apply" &&
|
|
235
|
-
body.args.length === 1;
|
|
236
|
-
return getNodeLevel(isCommuted && body.kind === "Apply" ? body.args[0] : body);
|
|
212
|
+
const isCommuted = isBuiltin(body, ["Prime", "BoxTrue", "Diamond"]) && body.args.length === 1;
|
|
213
|
+
return getNodeLevel(isCommuted ? body.args[0] : body);
|
|
237
214
|
};
|
|
238
215
|
|
|
239
|
-
// renameSequent on the obligation, with the levels of its definitions from before commuting.
|
|
240
216
|
const renameContext = createContextMap<RenameState>(
|
|
241
217
|
{ scope: undefined, original: undefined },
|
|
242
218
|
(current, hyp, original) => {
|
|
@@ -325,8 +301,6 @@ const rename: Rewrite = (scope, expression) => {
|
|
|
325
301
|
}
|
|
326
302
|
};
|
|
327
303
|
|
|
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
304
|
const substitutiveArgs = new WeakMap<Defn, boolean[]>();
|
|
331
305
|
|
|
332
306
|
const getSubstitutiveArgs = (scope: Scope | undefined, definition: Defn): boolean[] => {
|
|
@@ -354,7 +328,6 @@ const UNARY_MODALS: Builtin[] = [
|
|
|
354
328
|
|
|
355
329
|
const BINARY_MODALS: Builtin[] = ["Leadsto", "Actplus", "Cdot"];
|
|
356
330
|
|
|
357
|
-
// compute_substitutivity_array: whether the parameter at index occurs only where scope holds.
|
|
358
331
|
const isSubstitutive = (
|
|
359
332
|
scope: Scope | undefined,
|
|
360
333
|
expression: Expr,
|
|
@@ -388,30 +361,26 @@ const isSubstitutive = (
|
|
|
388
361
|
});
|
|
389
362
|
}
|
|
390
363
|
}
|
|
391
|
-
|
|
364
|
+
let isEverySubstitutive = true;
|
|
392
365
|
mapScoped(
|
|
393
366
|
{ scope, index },
|
|
394
367
|
expression,
|
|
395
368
|
(state, inner) => {
|
|
396
|
-
|
|
369
|
+
isEverySubstitutive &&= isSubstitutive(state.scope, inner, state.index, isInScope);
|
|
397
370
|
return inner;
|
|
398
371
|
},
|
|
399
372
|
(state, hyp) => ({ scope: adjoin(state.scope, hyp), index: state.index + 1 }),
|
|
400
373
|
"all",
|
|
401
374
|
);
|
|
402
|
-
return
|
|
375
|
+
return isEverySubstitutive;
|
|
403
376
|
};
|
|
404
377
|
|
|
405
|
-
// Coalesce.crypthash: h and the first five hexadecimal digits of the MD5 of the expression as
|
|
406
|
-
// tlapm prints it.
|
|
407
378
|
export const getHashName = (hyps: Hyp[], expression: Expr) =>
|
|
408
379
|
`h${getMd5(renderDoc(printExpression(hyps, expression))).slice(0, 5)}`;
|
|
409
380
|
|
|
410
381
|
const coalesce = (scope: Scope | undefined, expression: Expr): Expr =>
|
|
411
382
|
at({ kind: "Opaque", name: getHashName(getScopeHyps(scope), expression) }, expression);
|
|
412
383
|
|
|
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
384
|
const coalesceOperator = (
|
|
416
385
|
scope: Scope | undefined,
|
|
417
386
|
name: string,
|
|
@@ -441,19 +410,12 @@ const MODAL_BUILTINS: Builtin[] = [
|
|
|
441
410
|
"UNCHANGED",
|
|
442
411
|
];
|
|
443
412
|
|
|
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
413
|
const coalesceModal: Rewrite = (scope, expression) => {
|
|
449
414
|
if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
450
415
|
const operator = expression.operator;
|
|
451
|
-
const
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
expression.args.length === 1 &&
|
|
455
|
-
arg.kind === "Ix"
|
|
456
|
-
) {
|
|
416
|
+
const args = expression.args;
|
|
417
|
+
const arg = args[0];
|
|
418
|
+
if (isBuiltin(expression, ["Prime", "StrongPrime"]) && args.length === 1 && arg.kind === "Ix") {
|
|
457
419
|
const hyp = getHyp(scope, arg.index);
|
|
458
420
|
if (hyp.kind === "Fresh" || hyp.kind === "Flex") {
|
|
459
421
|
return at({ kind: "Opaque", name: `${hyp.name}#prime` }, expression);
|
|
@@ -464,7 +426,6 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
464
426
|
const hypScope = getScopeAt(scope, operator.index - 1);
|
|
465
427
|
const hyp = hypScope?.hyp;
|
|
466
428
|
if (!hyp) throw new TlapmBugError();
|
|
467
|
-
const args = expression.args;
|
|
468
429
|
if (hyp.kind === "Defn" && hyp.definition.kind === "Operator") {
|
|
469
430
|
const substitutive = getSubstitutiveArgs(hypScope.rest, hyp.definition);
|
|
470
431
|
const isKept = args.every(
|
|
@@ -491,7 +452,6 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
491
452
|
throw new TlapmBugError();
|
|
492
453
|
};
|
|
493
454
|
|
|
494
|
-
// process_eob, on an obligation's sequent.
|
|
495
455
|
const expandActionSequent = createSequentMap(expandAction, "all");
|
|
496
456
|
|
|
497
457
|
const expandUnchangedSequent = createSequentMap(expandUnchanged, "all");
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Expr.Action.implication_to_enabled, the ENABLEDaxioms frontend: it proves a rule about ENABLED
|
|
2
|
-
// from facts of the form the rule needs.
|
|
3
|
-
|
|
4
1
|
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
5
2
|
import { shiftExpr } from "../../obligations/substitution";
|
|
6
3
|
import { isEqualExpr } from "../../obligations/equality";
|
|
@@ -40,7 +37,6 @@ const getEnabled = (expression: Expr) =>
|
|
|
40
37
|
? expression.args[0]
|
|
41
38
|
: undefined;
|
|
42
39
|
|
|
43
|
-
// Both operands of the connective, when each is an ENABLED.
|
|
44
40
|
const getEnabledOperands = (expression: Expr, builtin: Builtin) => {
|
|
45
41
|
const operands = getOperands(expression, builtin);
|
|
46
42
|
const left = operands && getEnabled(operands[0]);
|
|
@@ -48,7 +44,6 @@ const getEnabledOperands = (expression: Expr, builtin: Builtin) => {
|
|
|
48
44
|
return left && right ? [left, right] : undefined;
|
|
49
45
|
};
|
|
50
46
|
|
|
51
|
-
// E_visit.collect_primed_vars: the variables under a prime, an UNCHANGED, or a subscript.
|
|
52
47
|
const getPrimedVariables = (scope: Scope | undefined, expression: Expr) => {
|
|
53
48
|
const names = new Set<string>();
|
|
54
49
|
const visit = (state: { scope: Scope | undefined; isPrimed: boolean }, inner: Expr): Expr => {
|
|
@@ -90,7 +85,6 @@ const isDisjoint = (scope: Scope | undefined, left: Expr, right: Expr) => {
|
|
|
90
85
|
return [...getPrimedVariables(scope, right)].every((name) => !leftNames.has(name));
|
|
91
86
|
};
|
|
92
87
|
|
|
93
|
-
// check_active: the rule the goal's form calls for, with the operands the facts must mention.
|
|
94
88
|
const getRule = (scope: Scope | undefined, goal: Expr): Rule | undefined => {
|
|
95
89
|
const getLevelOf = (expression: Expr) => getLevelInfo(scope, expression).level;
|
|
96
90
|
const assertActions = (left: Expr, right: Expr) => {
|
|
@@ -135,13 +129,12 @@ const getRule = (scope: Scope | undefined, goal: Expr): Rule | undefined => {
|
|
|
135
129
|
return implication && { name: "implies", left: implication[0], right: implication[1] };
|
|
136
130
|
};
|
|
137
131
|
|
|
138
|
-
// implication_to_enabled: the goal follows by the rule its form calls for when a visible fact is
|
|
139
|
-
// the rule's premise and others say that both operands are in BOOLEAN, or the premise is an
|
|
140
|
-
// equivalence. The goal then becomes TRUE; otherwise tlapm records the obligation as not tried.
|
|
141
132
|
export const implicationToEnabled = (sequent: Sequent): Sequent => {
|
|
142
133
|
const goalScope = adjoinAll(undefined, sequent.context);
|
|
143
134
|
const rule = getRule(goalScope, sequent.active);
|
|
144
|
-
|
|
135
|
+
let isPremise = false;
|
|
136
|
+
let isLeftBoolean = false;
|
|
137
|
+
let isRightBoolean = false;
|
|
145
138
|
sequent.context.forEach((hyp, index) => {
|
|
146
139
|
if (!rule || hyp.kind !== "Fact" || hyp.visibility !== "Visible") return;
|
|
147
140
|
const amount = sequent.context.length - index;
|
|
@@ -167,22 +160,22 @@ export const implicationToEnabled = (sequent: Sequent): Sequent => {
|
|
|
167
160
|
isPair(getEnabledOperands(fact, "Conj"), ["abconj_inverse", "pconj_inverse"]) ||
|
|
168
161
|
isPair(conjunction && action && [conjunction[0], action], ["pconj_inverse"])
|
|
169
162
|
) {
|
|
170
|
-
|
|
163
|
+
isPremise = true;
|
|
171
164
|
} else if (isPair(getOperands(fact, "Equiv"), ["equiv"])) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
165
|
+
isPremise = true;
|
|
166
|
+
isLeftBoolean = true;
|
|
167
|
+
isRightBoolean = true;
|
|
175
168
|
} else if (isPair(getOperands(fact, "Eq"), ["equiv"])) {
|
|
176
|
-
|
|
169
|
+
isPremise = true;
|
|
177
170
|
} else if (membership && isBoolean && isLeft(membership[0])) {
|
|
178
|
-
|
|
171
|
+
isLeftBoolean = true;
|
|
179
172
|
} else if (membership && isBoolean && isRight(membership[0])) {
|
|
180
|
-
|
|
173
|
+
isRightBoolean = true;
|
|
181
174
|
} else if (isPair(getOperands(fact, "Implies"), ["implies"])) {
|
|
182
|
-
|
|
175
|
+
isPremise = true;
|
|
183
176
|
}
|
|
184
177
|
});
|
|
185
|
-
if (!
|
|
178
|
+
if (!isPremise || !isLeftBoolean || !isRightBoolean) {
|
|
186
179
|
throw new TlaProverError("ENABLEDaxioms proof directive did not succeed.\n");
|
|
187
180
|
}
|
|
188
181
|
return { ...sequent, active: TRUE };
|