tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +28 -28
- package/dist/deciders.js +43 -43
- 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 +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 +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 +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- 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 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- 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 +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -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 +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- 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 +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 +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- 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 +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- 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 +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -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 +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 +780 -337
- package/src/worker.ts +7 -8
|
@@ -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 };
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Backend.Fingerprints.fp_sequent: the digest of an obligation that names its
|
|
2
|
-
// hypotheses and bound variables by the order of their first use, so two obligations that differ
|
|
3
|
-
// only in names share it.
|
|
4
|
-
|
|
5
1
|
import { TlapmBugError } from "../../errors";
|
|
6
2
|
import {
|
|
7
3
|
adjoin,
|
|
@@ -15,7 +11,6 @@ import {
|
|
|
15
11
|
import { isConstant } from "../../obligations/temporal";
|
|
16
12
|
import { getMd5 } from "./md5";
|
|
17
13
|
|
|
18
|
-
// builtin_to_int, whose numbers skip [], which fp_bin prints by name.
|
|
19
14
|
const BUILTIN_NUMBERS: Builtin[] = [
|
|
20
15
|
"TRUE",
|
|
21
16
|
"FALSE",
|
|
@@ -97,8 +92,6 @@ const MODALS = { Box: 0, Dia: 1 };
|
|
|
97
92
|
|
|
98
93
|
const FAIRNESS = { Weak: 0, Strong: 1 };
|
|
99
94
|
|
|
100
|
-
// What a stack entry stands for: a hypothesis not yet used, under the label its first use prints,
|
|
101
|
-
// one used, numbered, a bound variable not yet used, one used, a pragma, or a hidden fact.
|
|
102
95
|
type Ident =
|
|
103
96
|
| { kind: "Hyp"; label: string }
|
|
104
97
|
| { kind: "HypIndex"; index: number }
|
|
@@ -126,7 +119,6 @@ const OCAML_ESCAPES: Record<number, string> = {
|
|
|
126
119
|
0x08: "\\b",
|
|
127
120
|
};
|
|
128
121
|
|
|
129
|
-
// OCaml's %S: a string literal, with each byte outside printable ASCII as a decimal escape.
|
|
130
122
|
const quoteString = (value: string) =>
|
|
131
123
|
`"${[...new TextEncoder().encode(value)]
|
|
132
124
|
.map(
|
|
@@ -147,7 +139,6 @@ const getBuiltin = (builtin: Builtin) => {
|
|
|
147
139
|
const getFreshLabel = (hyp: Extract<Hyp, { kind: "Fresh" }>) =>
|
|
148
140
|
hyp.level === "Unknown" ? "Unknown" : hyp.level.toUpperCase();
|
|
149
141
|
|
|
150
|
-
// fp_sequent's text for an obligation, before its digest.
|
|
151
142
|
const getFingerprintText = (sequent: Sequent) => {
|
|
152
143
|
const stack: Entry[] = [];
|
|
153
144
|
const getEntry = (index: number) => {
|
|
@@ -163,7 +154,6 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
163
154
|
};
|
|
164
155
|
const pushVariables = (count: number) =>
|
|
165
156
|
Array.from({ length: count }).forEach(() => push({ kind: "Var" }));
|
|
166
|
-
// Stack.popn: the entries from the top down.
|
|
167
157
|
const popVariables = (count: number) => Array.from({ length: count }, pop);
|
|
168
158
|
const getVariableNumber = (entry: Entry) => {
|
|
169
159
|
if (entry.ident.kind === "VarIndex") return entry.ident.index;
|
|
@@ -178,7 +168,6 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
178
168
|
const printExpr = (counters: Counters, expression: Expr): string => {
|
|
179
169
|
const print = (inner: Expr) => printExpr(counters, inner);
|
|
180
170
|
const printList = (items: Expr[]) => items.map(print).join(",");
|
|
181
|
-
// fp_bounds pairs each bound with an entry, and prints those with a domain.
|
|
182
171
|
const printBounds = (entries: Entry[], bounds: Bound[]) =>
|
|
183
172
|
bounds
|
|
184
173
|
.map((bound, index) =>
|
|
@@ -187,7 +176,6 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
187
176
|
: "",
|
|
188
177
|
)
|
|
189
178
|
.join("");
|
|
190
|
-
// A binder's body comes first, then what pops off the stack after it.
|
|
191
179
|
const printBound = (count: number, body: Expr) => {
|
|
192
180
|
pushVariables(count);
|
|
193
181
|
const text = print(body);
|
|
@@ -220,7 +208,6 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
220
208
|
case "Pragma":
|
|
221
209
|
return "";
|
|
222
210
|
}
|
|
223
|
-
throw new TlapmBugError();
|
|
224
211
|
}
|
|
225
212
|
case "Opaque":
|
|
226
213
|
return expression.name;
|
|
@@ -333,8 +320,6 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
333
320
|
}
|
|
334
321
|
};
|
|
335
322
|
|
|
336
|
-
// Each hypothesis prints after the goal and the hypotheses after it, once their uses have
|
|
337
|
-
// numbered it.
|
|
338
323
|
const printSequent = (inner: Sequent): string => {
|
|
339
324
|
const counters = { hyp: 1, variable: 1 };
|
|
340
325
|
const spin = (index: number, scope: Scope | undefined): string => {
|
|
@@ -384,5 +369,4 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
384
369
|
return printSequent(sequent);
|
|
385
370
|
};
|
|
386
371
|
|
|
387
|
-
// fingerprint: the hex digest of an obligation's fp_sequent text.
|
|
388
372
|
export const getFingerprint = (sequent: Sequent) => getMd5(getFingerprintText(sequent));
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Expr.LevelComparison, the LevelComparison frontend: it proves an obligation
|
|
2
|
-
// whose goal is a visible fact, or the goal of a visible ASSUME/PROVE fact, with identifiers
|
|
3
|
-
// renamed to identifiers of no higher level, each renamed one declared by the fact.
|
|
4
|
-
|
|
5
1
|
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
6
2
|
import {
|
|
7
3
|
adjoin,
|
|
@@ -30,6 +26,12 @@ interface Declaration {
|
|
|
30
26
|
level: number;
|
|
31
27
|
}
|
|
32
28
|
|
|
29
|
+
interface Binder {
|
|
30
|
+
name: string;
|
|
31
|
+
domain: Expr | undefined;
|
|
32
|
+
body: Expr;
|
|
33
|
+
}
|
|
34
|
+
|
|
33
35
|
const RANKS: Partial<Record<Declaration["kind"], number>> = {
|
|
34
36
|
Constant: 0,
|
|
35
37
|
State: 1,
|
|
@@ -46,7 +48,6 @@ const isPairwise = <Item>(
|
|
|
46
48
|
left.every((item, index) => index < right.length && isSameItem(item, right[index])) &&
|
|
47
49
|
left.length === right.length;
|
|
48
50
|
|
|
49
|
-
// Util.Coll.Sm built from a list, where the first entry of a name wins, in key order.
|
|
50
51
|
const getSortedFields = (fields: { name: string; value: Expr }[]) =>
|
|
51
52
|
[...new Map(fields.toReversed().map((field) => [field.name, field.value]))].toSorted(
|
|
52
53
|
(first, second) => (first[0] < second[0] ? -1 : 1),
|
|
@@ -81,8 +82,6 @@ const bindFlexible = (scope: Scope | undefined, names: string[]) =>
|
|
|
81
82
|
names.map((name) => ({ kind: "Flex", name })),
|
|
82
83
|
);
|
|
83
84
|
|
|
84
|
-
// level_comparison#compare: the expressions match up to a renaming that maps each name one way,
|
|
85
|
-
// and the fact's context declares each name it changes.
|
|
86
85
|
const compare = (
|
|
87
86
|
factScope: Scope | undefined,
|
|
88
87
|
goalScope: Scope | undefined,
|
|
@@ -227,8 +226,8 @@ const compare = (
|
|
|
227
226
|
const isSameBinder = (
|
|
228
227
|
leftScope: Scope | undefined,
|
|
229
228
|
rightScope: Scope | undefined,
|
|
230
|
-
left:
|
|
231
|
-
right:
|
|
229
|
+
left: Binder,
|
|
230
|
+
right: Binder,
|
|
232
231
|
) => {
|
|
233
232
|
if (!left.domain || !right.domain) {
|
|
234
233
|
return (
|
|
@@ -317,7 +316,6 @@ const compare = (
|
|
|
317
316
|
}
|
|
318
317
|
return selector.kind === other.kind;
|
|
319
318
|
});
|
|
320
|
-
// List.for_all2 raises when the lists differ in length after a matching prefix.
|
|
321
319
|
if (isPrefix && left.selectors.length !== rightSelectors.length) {
|
|
322
320
|
throw new TlapmBugError("Invalid_argument");
|
|
323
321
|
}
|
|
@@ -507,8 +505,6 @@ const compare = (
|
|
|
507
505
|
return isMatch && isDeclared.every(Boolean);
|
|
508
506
|
};
|
|
509
507
|
|
|
510
|
-
// check_level_change: the first visible fact that matches proves the goal, which becomes TRUE.
|
|
511
|
-
// When none does, tlapm records the obligation as not tried.
|
|
512
508
|
export const checkLevelChange = (sequent: Sequent): Sequent => {
|
|
513
509
|
const goalScope = adjoinAll(undefined, sequent.context);
|
|
514
510
|
const isProved = sequent.context.some((hyp, index) => {
|
package/src/prover/prep/md5.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// MD5 (RFC 1321), as OCaml's Digest computes it. tlapm names the operators it coalesces by
|
|
2
|
-
// the digest of their printed form, so matching its SMT-LIB output needs the same digest.
|
|
3
1
|
const SHIFTS = [7, 12, 17, 22, 5, 9, 14, 20, 4, 11, 16, 23, 6, 10, 15, 21];
|
|
4
2
|
|
|
5
3
|
const CONSTANTS = Array.from({ length: 64 }, (_value, index) =>
|
|
@@ -1,14 +1,7 @@
|
|
|
1
|
-
// Prep.find_meth and Prep.compute_meth: the methods the pragmas an obligation cites select, each a
|
|
2
|
-
// prover with its time limit, or a frontend that rewrites the obligation first. A malformed method
|
|
3
|
-
// throws a TlaProverError, since Prep.ship catches compute_meth's failure and fails only that
|
|
4
|
-
// obligation.
|
|
5
|
-
|
|
6
1
|
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
7
2
|
import type { Expr, Locus, Sequent } from "../../obligations/expression";
|
|
8
3
|
import type { OldMethod, PragmaSetting } from "../../obligations/pragma";
|
|
9
4
|
|
|
10
|
-
// A method, named after the Method.t constructor tlapm reports it by. A Z3 resource budget turns
|
|
11
|
-
// the time limit off.
|
|
12
5
|
export interface Method {
|
|
13
6
|
prover: string;
|
|
14
7
|
timeLimitMs: number;
|
|
@@ -16,7 +9,6 @@ export interface Method {
|
|
|
16
9
|
tactic?: string;
|
|
17
10
|
}
|
|
18
11
|
|
|
19
|
-
// The methods that rewrite an obligation in Prep.expand_enabled_cdot instead of proving it.
|
|
20
12
|
const FRONTENDS = new Set([
|
|
21
13
|
"expandenabled",
|
|
22
14
|
"expandcdot",
|
|
@@ -26,25 +18,20 @@ const FRONTENDS = new Set([
|
|
|
26
18
|
"levelcomparison",
|
|
27
19
|
]);
|
|
28
20
|
|
|
29
|
-
// Method.default_*_timeout, in seconds.
|
|
30
21
|
const SMT_SECONDS = 5;
|
|
31
22
|
const ZENON_SECONDS = 10;
|
|
32
23
|
const ISABELLE_SECONDS = 30;
|
|
33
24
|
const LS4_SECONDS = 10;
|
|
34
25
|
|
|
35
|
-
// Method.rlimit_base and Method.max_rlimit.
|
|
36
26
|
const RLIMIT_BASE = 3_000_000;
|
|
37
27
|
const MAX_RLIMIT = 0xffff_ffff;
|
|
38
28
|
|
|
39
|
-
// Params.default_method: what tlapm tries when a step cites no prover.
|
|
40
29
|
const DEFAULT_METHODS: Method[] = [
|
|
41
30
|
{ prover: "smt", timeLimitMs: SMT_SECONDS * 1000 },
|
|
42
31
|
{ prover: "zenon", timeLimitMs: ZENON_SECONDS * 1000 },
|
|
43
32
|
{ prover: "isabelle", timeLimitMs: ISABELLE_SECONDS * 1000, tactic: "auto" },
|
|
44
33
|
];
|
|
45
34
|
|
|
46
|
-
// compute_meth's names for each prover, and the Method.t constructor and default time each
|
|
47
|
-
// selects. The SMT solvers take a resource budget.
|
|
48
35
|
const PROVERS: Record<string, { prover: string; seconds: number; isBudgeted?: boolean }> = {
|
|
49
36
|
zenon: { prover: "zenon", seconds: ZENON_SECONDS },
|
|
50
37
|
isabelle: { prover: "isabelle", seconds: ISABELLE_SECONDS },
|
|
@@ -89,7 +76,6 @@ const getProverMethod = (
|
|
|
89
76
|
};
|
|
90
77
|
};
|
|
91
78
|
|
|
92
|
-
// parse_rlimit: "rN" is N times the base resource count, at least 1.
|
|
93
79
|
const getRlimit = (budget: string) => {
|
|
94
80
|
const count = Number.parseFloat(budget.slice(1));
|
|
95
81
|
if (!/^[rR]./.test(budget) || !Number.isFinite(count) || count <= 0)
|
|
@@ -97,8 +83,6 @@ const getRlimit = (budget: string) => {
|
|
|
97
83
|
return Math.max(1, Math.trunc(Math.min(count * RLIMIT_BASE, MAX_RLIMIT)));
|
|
98
84
|
};
|
|
99
85
|
|
|
100
|
-
// compute_meth: a group of a pragma's settings, where each @ takes the next argument the pragma is
|
|
101
|
-
// applied to.
|
|
102
86
|
const computeMethod = (settings: PragmaSetting[], args: Expr[]): Method => {
|
|
103
87
|
const values = settings.reduce<{
|
|
104
88
|
args: Expr[];
|
|
@@ -146,7 +130,6 @@ const computeMethod = (settings: PragmaSetting[], args: Expr[]): Method => {
|
|
|
146
130
|
return getProverMethod(values.prover, values.timeout, values.rlimit, values.tactic);
|
|
147
131
|
};
|
|
148
132
|
|
|
149
|
-
// An old-style method, as Method_prs reads it, with its default time unless it names one.
|
|
150
133
|
const getOldMethod = (method: OldMethod) =>
|
|
151
134
|
getProverMethod(method.name, method.timeout, undefined, method.tactic);
|
|
152
135
|
|
|
@@ -155,21 +138,14 @@ type Cited =
|
|
|
155
138
|
| { kind: "Meth"; method: OldMethod }
|
|
156
139
|
| undefined;
|
|
157
140
|
|
|
158
|
-
// find_meth: an obligation whose proof names a method keeps it. Otherwise each visible fact that
|
|
159
|
-
// cites a pragma, alone or applied to arguments, adds the methods its groups compute, and each that
|
|
160
|
-
// cites a theorem or carries an old-style method adds that method. A pragma that a fact from
|
|
161
|
-
// another BY or USE cites drops the methods found so far: tlapm compares the USE locations
|
|
162
|
-
// physically, as tla-ts compares the objects.
|
|
163
141
|
const getCitedMethods = (sequent: Sequent) => {
|
|
164
142
|
const cited: Cited[] = [];
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
useLocation: null,
|
|
168
|
-
};
|
|
143
|
+
let methods: Method[] = [];
|
|
144
|
+
let useLocation: Locus | undefined | null = null;
|
|
169
145
|
sequent.context.forEach((hyp, index) => {
|
|
170
146
|
const expression = hyp.kind === "Fact" && hyp.visibility === "Visible" && hyp.expression;
|
|
171
147
|
if (expression && expression.kind === "With") {
|
|
172
|
-
|
|
148
|
+
methods.push(getOldMethod(expression.method));
|
|
173
149
|
cited.push(undefined);
|
|
174
150
|
return;
|
|
175
151
|
}
|
|
@@ -188,24 +164,21 @@ const getCitedMethods = (sequent: Sequent) => {
|
|
|
188
164
|
if (operator.kind !== "Ix") return;
|
|
189
165
|
const entry = cited[index - operator.index];
|
|
190
166
|
if (entry?.kind === "Premeth") {
|
|
191
|
-
if (hyp.useLocation !==
|
|
192
|
-
|
|
193
|
-
|
|
167
|
+
if (hyp.useLocation !== useLocation) {
|
|
168
|
+
methods = [];
|
|
169
|
+
useLocation = hyp.useLocation;
|
|
194
170
|
}
|
|
195
171
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
196
|
-
|
|
172
|
+
methods.push(...entry.groups.map((group) => computeMethod(group, args)));
|
|
197
173
|
return;
|
|
198
174
|
}
|
|
199
175
|
if (entry?.kind !== "Meth") return;
|
|
200
|
-
// find_meth asserts that a theorem with a method is not applied to arguments.
|
|
201
176
|
if (expression.kind === "Apply") throw new TlapmBugError();
|
|
202
|
-
|
|
177
|
+
methods.push(getOldMethod(entry.method));
|
|
203
178
|
});
|
|
204
|
-
return
|
|
179
|
+
return methods;
|
|
205
180
|
};
|
|
206
181
|
|
|
207
|
-
// The methods find_meth selects: the frontends to apply, and the provers to try in order, which
|
|
208
|
-
// are tlapm's default ones when the obligation cites only frontends or nothing.
|
|
209
182
|
export const findMethods = (obligation: { sequent: Sequent; method?: OldMethod }) => {
|
|
210
183
|
const methods =
|
|
211
184
|
obligation.method === undefined
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// What Backend.Prep does to an obligation before a backend's frontend: normalize_expand, which
|
|
2
|
-
// expands definitions, runs Expr.Elab.normalize and the frontend methods the obligation cites, then
|
|
3
|
-
// trivial and flatten.
|
|
4
|
-
|
|
5
1
|
import { TlapmBugError, TlaProofError } from "../../errors";
|
|
6
2
|
import { expandActionOperators, lambdify } from "../../obligations/action";
|
|
7
3
|
import { createAnonymizer } from "../../obligations/anonymize";
|
|
@@ -50,9 +46,6 @@ const expandDefinitionsAndPragmas = createDefinitionExpander(true);
|
|
|
50
46
|
|
|
51
47
|
const expandDefinitions = createDefinitionExpander(false);
|
|
52
48
|
|
|
53
|
-
// expand_defs: each visible operator definition and each pragma, whatever its visibility,
|
|
54
|
-
// substitutes into the rest of the obligation and leaves the context. Toolbox.expand_defs leaves
|
|
55
|
-
// the pragmas.
|
|
56
49
|
export const expandDefs = (sequent: Sequent, isPragmaExpanded = true): Sequent => {
|
|
57
50
|
const expanded = (isPragmaExpanded ? expandDefinitionsAndPragmas : expandDefinitions)(
|
|
58
51
|
sequent.context,
|
|
@@ -64,7 +57,6 @@ type ExceptSpec = Extract<Expr, { kind: "Except" }>["specs"][number];
|
|
|
64
57
|
|
|
65
58
|
const TEMPORAL_BUILTINS = new Set(["BoxTrue", "BoxFalse", "Diamond", "Actplus", "Leadsto", "Cdot"]);
|
|
66
59
|
|
|
67
|
-
// The expressions of a hypothesis that Visit.iter visits, none for a hidden one.
|
|
68
60
|
const getVisitedExprs = (hyp: Hyp): Expr[] => {
|
|
69
61
|
switch (hyp.kind) {
|
|
70
62
|
case "Fresh":
|
|
@@ -81,7 +73,6 @@ const getVisitedExprs = (hyp: Hyp): Expr[] => {
|
|
|
81
73
|
}
|
|
82
74
|
};
|
|
83
75
|
|
|
84
|
-
// Elab.non_temporal: no temporal operator, but in hidden hypotheses.
|
|
85
76
|
const isNonTemporal = (expression: Expr): boolean => {
|
|
86
77
|
if (expression.kind === "Tsub" || expression.kind === "Fair") return false;
|
|
87
78
|
if (
|
|
@@ -97,10 +88,9 @@ const isNonTemporal = (expression: Expr): boolean => {
|
|
|
97
88
|
return getChildren(expression).every(isNonTemporal);
|
|
98
89
|
};
|
|
99
90
|
|
|
100
|
-
// Elab.let_normalize: each LET definition is substituted into the rest of the LET.
|
|
101
91
|
const normalizeLet = (expression: Expr): Expr => {
|
|
102
92
|
if (expression.kind !== "Let") return mapChildren(expression, normalizeLet);
|
|
103
|
-
const
|
|
93
|
+
const definition = expression.definitions[0];
|
|
104
94
|
if (!definition) return normalizeLet(expression.body);
|
|
105
95
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
106
96
|
throw new TlaProofError(
|
|
@@ -110,7 +100,7 @@ const normalizeLet = (expression: Expr): Expr => {
|
|
|
110
100
|
);
|
|
111
101
|
}
|
|
112
102
|
const operator = normalizeLet(definition.body);
|
|
113
|
-
const rest: Expr = { ...expression, definitions };
|
|
103
|
+
const rest: Expr = { ...expression, definitions: expression.definitions.slice(1) };
|
|
114
104
|
return normalizeLet(substituteExpr(consSubstitution(operator, shift(0)), rest));
|
|
115
105
|
};
|
|
116
106
|
|
|
@@ -124,7 +114,6 @@ const isSameHead = (left: ExceptPoint, right: ExceptPoint) =>
|
|
|
124
114
|
? right.kind === "Dot" && left.field === right.field
|
|
125
115
|
: right.kind === "Apply" && isEqualExpr(left.expression, right.expression);
|
|
126
116
|
|
|
127
|
-
// The field of a record constructor that a point names, as a field or as a string argument.
|
|
128
117
|
const getRecordField = (record: Expr, point: ExceptPoint) => {
|
|
129
118
|
const name =
|
|
130
119
|
point.kind === "Dot"
|
|
@@ -137,8 +126,6 @@ const getRecordField = (record: Expr, point: ExceptPoint) => {
|
|
|
137
126
|
: undefined;
|
|
138
127
|
};
|
|
139
128
|
|
|
140
|
-
// Elab.except_normalize: [f EXCEPT p1 = b1, ...] folds left to right into f, sharing each prefix of
|
|
141
|
-
// adjacent updates and updating a record constructor in place on a field it has.
|
|
142
129
|
const normalizeExcept = (expression: Expr): Expr => {
|
|
143
130
|
if (expression.kind !== "Except") return mapChildren(expression, normalizeExcept);
|
|
144
131
|
const except = expression;
|
|
@@ -154,9 +141,9 @@ const normalizeExcept = (expression: Expr): Expr => {
|
|
|
154
141
|
return at({ kind: "Record", fields }, base);
|
|
155
142
|
};
|
|
156
143
|
const apply = (base: Expr, specs: ExceptSpec[]): Expr => {
|
|
157
|
-
const
|
|
144
|
+
const first = specs[0];
|
|
158
145
|
if (!first) return base;
|
|
159
|
-
if (first.trail.length === 0) return apply(first.value,
|
|
146
|
+
if (first.trail.length === 0) return apply(first.value, specs.slice(1));
|
|
160
147
|
const head = first.trail[0];
|
|
161
148
|
const end = specs.findIndex(
|
|
162
149
|
(spec) => spec.trail.length === 0 || !isSameHead(spec.trail[0], head),
|
|
@@ -170,7 +157,6 @@ const normalizeExcept = (expression: Expr): Expr => {
|
|
|
170
157
|
return apply(normalizeExcept(except.function), mapExceptSpecs(except.specs, normalizeExcept));
|
|
171
158
|
};
|
|
172
159
|
|
|
173
|
-
// let_normalize on each hypothesis, and whether the context so far is non_temporal.
|
|
174
160
|
const normalizeLetContext = createContextMap(true, (isContextNonTemporal, hyp) => [
|
|
175
161
|
isContextNonTemporal && getVisitedExprs(hyp).every(isNonTemporal),
|
|
176
162
|
mapHyp(hyp, normalizeLet, "all"),
|
|
@@ -181,8 +167,6 @@ const normalizeExceptContext = createContextMap(undefined, (_state, hyp) => [
|
|
|
181
167
|
mapHyp(hyp, normalizeExcept, "all"),
|
|
182
168
|
]);
|
|
183
169
|
|
|
184
|
-
// Elab.normalize, on an obligation as a sequent expression, as Prep.normalize_expr calls it: LET
|
|
185
|
-
// definitions inline, and the updates of an EXCEPT fold into the function they update.
|
|
186
170
|
export const normalizeSequent = (sequent: Sequent): Sequent => {
|
|
187
171
|
const inlined = normalizeLetContext(sequent.context);
|
|
188
172
|
const active = normalizeLet(sequent.active);
|
|
@@ -194,8 +178,6 @@ export const normalizeSequent = (sequent: Sequent): Sequent => {
|
|
|
194
178
|
: { context: inlined.context, active };
|
|
195
179
|
};
|
|
196
180
|
|
|
197
|
-
// expand_enabled_cdot: the first frontend the methods cite, in tlapm's order, transforms the
|
|
198
|
-
// obligation. Its soundness checks throw a TlaProverError, as tlapm then runs no backend.
|
|
199
181
|
const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent => {
|
|
200
182
|
const isEnabled = frontends.has("expandenabled");
|
|
201
183
|
const isCdot = frontends.has("expandcdot");
|
|
@@ -206,7 +188,6 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
206
188
|
if (frontends.has("enabledaxioms")) return implicationToEnabled(sequent);
|
|
207
189
|
return sequent;
|
|
208
190
|
}
|
|
209
|
-
// Expr.Anon's anon, which only meets the names that lambdification binds.
|
|
210
191
|
const anonymizer = createAnonymizer(
|
|
211
192
|
{ value: 0 },
|
|
212
193
|
() => {
|
|
@@ -231,14 +212,11 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
231
212
|
return result.sequent;
|
|
232
213
|
};
|
|
233
214
|
|
|
234
|
-
// normalize_expand: expand_defs, Elab.normalize, then the frontends the obligation cites.
|
|
235
215
|
export const normalizeExpand = (
|
|
236
216
|
obligation: { sequent: Sequent; method?: OldMethod },
|
|
237
217
|
methods = findMethods(obligation),
|
|
238
218
|
) => expandEnabledCdot(normalizeSequent(expandDefs(obligation.sequent)), methods.frontends);
|
|
239
219
|
|
|
240
|
-
// trivial: the goal is TRUE, or find_fact finds it as a hypothesis, visible or not: a fact
|
|
241
|
-
// alpha-equivalent to it, or the x \in S of a declaration NEW x \in S.
|
|
242
220
|
export const isTrivial = (sequent: Sequent) =>
|
|
243
221
|
(sequent.active.kind === "Internal" && sequent.active.builtin === "TRUE") ||
|
|
244
222
|
sequent.context.some((hyp, index) => {
|
|
@@ -253,7 +231,6 @@ export const isTrivial = (sequent: Sequent) =>
|
|
|
253
231
|
|
|
254
232
|
const isUnbounded = (bound: Bound) => bound.domain.kind === "NoDomain";
|
|
255
233
|
|
|
256
|
-
// extract_equalities: the equalities in a conjunction, apart from the rest of it.
|
|
257
234
|
const extractEqualities = (expression: Expr): [Expr[], Expr | undefined] => {
|
|
258
235
|
if (expression.kind === "List" && (expression.bullet === "And" || expression.bullet === "Refs")) {
|
|
259
236
|
const parts = expression.items.map(extractEqualities);
|
|
@@ -290,7 +267,6 @@ const extractEqualities = (expression: Expr): [Expr[], Expr | undefined] => {
|
|
|
290
267
|
return [[], expression];
|
|
291
268
|
};
|
|
292
269
|
|
|
293
|
-
// flatten: each visible fact becomes the rest of it, then its equalities.
|
|
294
270
|
export const flatten = (sequent: Sequent): Sequent => {
|
|
295
271
|
const context: Hyp[] = [];
|
|
296
272
|
const substitution = sequent.context.reduce<Substitution>((current, hyp) => {
|