tla-ts 0.0.9-dev.8298a52 → 0.0.10
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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +71 -10
- package/dist/index.d.ts +71 -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 +141 -29
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +128 -103
- package/dist/transfer.js +128 -103
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +539 -276
- package/src/cli/options.ts +10 -5
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -0
- package/src/cli/tlc.ts +525 -216
- package/src/cli/typescript.ts +0 -3
- 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 +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +567 -289
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- package/src/java-overrides.ts +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +17 -26
- package/src/liveness-checker.ts +4 -15
- package/src/liveness.ts +115 -47
- 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 +24 -33
- package/src/parallel.ts +24 -9
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +1 -16
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +119 -169
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +1 -8
- 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 +494 -154
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +166 -48
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +264 -74
- package/src/symmetry.ts +31 -8
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -61
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +33 -38
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +563 -211
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +793 -267
- package/src/worker.ts +7 -8
package/src/liveness-checker.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { TlaEvaluationError } from "./errors";
|
|
2
2
|
import { hasRepeatedEffects, type Environment } from "./evaluate";
|
|
3
3
|
import {
|
|
4
|
-
createTautologyError,
|
|
5
4
|
evaluateLive,
|
|
6
5
|
evaluateOnLasso,
|
|
7
6
|
toLiveExpression,
|
|
@@ -28,8 +27,8 @@ export interface LiveSuccessor {
|
|
|
28
27
|
export interface Lasso {
|
|
29
28
|
prefix: number[];
|
|
30
29
|
cycle: number[];
|
|
31
|
-
//
|
|
32
|
-
//
|
|
30
|
+
// TLC warns that a stuttering counterexample to a liveness property may come from a missing
|
|
31
|
+
// fairness constraint.
|
|
33
32
|
isCycleConstrained: boolean;
|
|
34
33
|
}
|
|
35
34
|
|
|
@@ -62,10 +61,8 @@ interface Pool<Data extends Int32Array | Uint8Array> {
|
|
|
62
61
|
create: (length: number) => Data;
|
|
63
62
|
}
|
|
64
63
|
|
|
65
|
-
// TLC's behavior graph for one solution: a node per state, or per state and tableau node.
|
|
66
64
|
interface BehaviorGraph {
|
|
67
65
|
solution: Solution;
|
|
68
|
-
// One id per distinct action check across the solutions.
|
|
69
66
|
actionIds: Int32Array;
|
|
70
67
|
nodeStates: number[];
|
|
71
68
|
nodeTableaux: number[];
|
|
@@ -104,7 +101,6 @@ const containsAlways = (expression: LiveExpression): boolean => {
|
|
|
104
101
|
}
|
|
105
102
|
};
|
|
106
103
|
|
|
107
|
-
// TLC's OrderOfSolution#hasEmptyPEMAndBoxFreePromises, negated.
|
|
108
104
|
const isCycleConstrained = (solution: Solution) =>
|
|
109
105
|
solution.promises.some((promise) => containsAlways(promise.body)) ||
|
|
110
106
|
solution.models.some(
|
|
@@ -178,7 +174,6 @@ const getStateResult = (behavior: BehaviorGraph, node: number, position: number)
|
|
|
178
174
|
behavior.nodeStates[node] * behavior.solution.stateChecks.length + position
|
|
179
175
|
] === 1;
|
|
180
176
|
|
|
181
|
-
// A node owns one entry in each per-node array of its graph.
|
|
182
177
|
const pushNode = (behavior: BehaviorGraph, state: number, tableauNode: number) => {
|
|
183
178
|
behavior.nodeStates.push(state);
|
|
184
179
|
behavior.nodeTableaux.push(tableauNode);
|
|
@@ -225,9 +220,6 @@ export const createLivenessChecker = (
|
|
|
225
220
|
const formula =
|
|
226
221
|
fairness.length === 0 ? violation : createJunction("And", [...fairness, violation]);
|
|
227
222
|
const solutions = getSolutions(formula);
|
|
228
|
-
if (solutions.length === 0) {
|
|
229
|
-
throw createTautologyError();
|
|
230
|
-
}
|
|
231
223
|
const actionIds = new Map<string, number>();
|
|
232
224
|
const behaviors = solutions.map((solution): BehaviorGraph => ({
|
|
233
225
|
solution,
|
|
@@ -442,7 +434,6 @@ export const createLivenessChecker = (
|
|
|
442
434
|
return table.slots.filter((entry): entry is LiveSuccessor => entry !== undefined);
|
|
443
435
|
};
|
|
444
436
|
|
|
445
|
-
// TLC's TableauLiveChecker#addNextState for a node it finds after it expanded the node's state.
|
|
446
437
|
const expandLate = (
|
|
447
438
|
behavior: BehaviorGraph,
|
|
448
439
|
tableau: Tableau,
|
|
@@ -554,7 +545,6 @@ export const createLivenessChecker = (
|
|
|
554
545
|
writeNode(behavior, index, successors, actions, stateResults);
|
|
555
546
|
};
|
|
556
547
|
|
|
557
|
-
// The shortest path from an initial node to the node, last node first, as TLC's getPath finds it.
|
|
558
548
|
const getPath = (behavior: BehaviorGraph, target: number) => {
|
|
559
549
|
if (behavior.initial.includes(target)) return [target];
|
|
560
550
|
const parents = new Map<number, number>();
|
|
@@ -638,8 +628,8 @@ export const createLivenessChecker = (
|
|
|
638
628
|
return getLasso(root, members, membersByState);
|
|
639
629
|
};
|
|
640
630
|
|
|
641
|
-
// TLC's LiveWorker#printTrace: a prefix to the root, a greedy walk through the component
|
|
642
|
-
//
|
|
631
|
+
// TLC's LiveWorker#printTrace: a prefix to the root, a greedy walk through the component until it
|
|
632
|
+
// satisfies every check, and a breadth-first path back to the root.
|
|
643
633
|
const getLasso = (
|
|
644
634
|
root: number,
|
|
645
635
|
members: Set<number>,
|
|
@@ -736,7 +726,6 @@ export const createLivenessChecker = (
|
|
|
736
726
|
};
|
|
737
727
|
};
|
|
738
728
|
|
|
739
|
-
// TLC's LiveWorker#bfsPostFix, the states from the walk's end back to the root, last first.
|
|
740
729
|
const getClosingPath = (
|
|
741
730
|
root: number,
|
|
742
731
|
end: number,
|
package/src/liveness.ts
CHANGED
|
@@ -12,11 +12,11 @@ import {
|
|
|
12
12
|
bindDefinitions,
|
|
13
13
|
bindOperatorArguments,
|
|
14
14
|
evaluate,
|
|
15
|
-
expectBoolean,
|
|
16
15
|
forEachBinding,
|
|
17
16
|
forEachBoundElement,
|
|
18
17
|
getBoundElements,
|
|
19
18
|
getDefinition,
|
|
19
|
+
getStartupValue,
|
|
20
20
|
lookupScope,
|
|
21
21
|
resolveApplyOperator,
|
|
22
22
|
resolveGlobalOperator,
|
|
@@ -40,17 +40,17 @@ import {
|
|
|
40
40
|
type LiveEnabled,
|
|
41
41
|
type LiveExpression,
|
|
42
42
|
} from "./tableau";
|
|
43
|
-
import type
|
|
43
|
+
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
44
|
|
|
45
45
|
export interface ScopedExpression {
|
|
46
46
|
expression: Expression;
|
|
47
47
|
scope: Scope | undefined;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
//
|
|
51
|
-
// a conjunct's location, or the name of the definition the part is the body of.
|
|
50
|
+
// The name TLC gives a part of a property: a conjunct's location or the enclosing definition.
|
|
52
51
|
interface ExpandedExpression extends ScopedExpression {
|
|
53
52
|
name: string | undefined;
|
|
53
|
+
path: string[];
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
export interface TemporalProperty extends ScopedExpression {
|
|
@@ -69,6 +69,11 @@ const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
|
69
69
|
|
|
70
70
|
const definitionThunks = new WeakSet<Thunk>();
|
|
71
71
|
|
|
72
|
+
const JUNCTIONS = new Map<string, "And" | "Or">([
|
|
73
|
+
["/\\", "And"],
|
|
74
|
+
["\\/", "Or"],
|
|
75
|
+
]);
|
|
76
|
+
|
|
72
77
|
const getConstantContext = (environment: Environment, scope: Scope | undefined): Context => ({
|
|
73
78
|
environment,
|
|
74
79
|
scope,
|
|
@@ -87,7 +92,16 @@ export const getLevel = (
|
|
|
87
92
|
scope: Scope | undefined,
|
|
88
93
|
environment: Environment,
|
|
89
94
|
shadowed = new Set<string>(),
|
|
95
|
+
visiting = new Set<object>(),
|
|
90
96
|
): number => {
|
|
97
|
+
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
98
|
+
// A recursive call adds nothing, as SANY's level never decreases while it iterates.
|
|
99
|
+
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
100
|
+
visiting.add(binding);
|
|
101
|
+
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
102
|
+
visiting.delete(binding);
|
|
103
|
+
return level;
|
|
104
|
+
};
|
|
91
105
|
const getBindingLevel = (name: string) => {
|
|
92
106
|
const binding = lookupScope(scope, name);
|
|
93
107
|
if (!binding) return undefined;
|
|
@@ -95,11 +109,11 @@ export const getLevel = (
|
|
|
95
109
|
if (binding.kind === "Thunk") {
|
|
96
110
|
return binding.isReleased
|
|
97
111
|
? CONSTANT_LEVEL
|
|
98
|
-
:
|
|
112
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
99
113
|
}
|
|
100
114
|
const operator = binding.operator;
|
|
101
115
|
return operator.kind === "Closure"
|
|
102
|
-
?
|
|
116
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
103
117
|
: CONSTANT_LEVEL;
|
|
104
118
|
};
|
|
105
119
|
const getGlobalLevel = (name: string) => {
|
|
@@ -109,6 +123,7 @@ export const getLevel = (
|
|
|
109
123
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
110
124
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
111
125
|
if (!builtin) return undefined;
|
|
126
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
112
127
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
113
128
|
};
|
|
114
129
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -128,6 +143,7 @@ export const getLevel = (
|
|
|
128
143
|
scope,
|
|
129
144
|
environment,
|
|
130
145
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
146
|
+
visiting,
|
|
131
147
|
),
|
|
132
148
|
);
|
|
133
149
|
return child;
|
|
@@ -153,10 +169,29 @@ export const getLevel = (
|
|
|
153
169
|
return getNameLevel(expression.name, expression);
|
|
154
170
|
case "OperatorReference":
|
|
155
171
|
return getNameLevel(expression.operator, expression);
|
|
156
|
-
case "Apply":
|
|
172
|
+
case "Apply": {
|
|
157
173
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
158
174
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
159
|
-
|
|
175
|
+
const operatorLevel = getNameLevel(expression.operator, expression);
|
|
176
|
+
const level = Math.max(operatorLevel, getChildrenLevel(expression));
|
|
177
|
+
const operator = isLocallyResolved(expression)
|
|
178
|
+
? undefined
|
|
179
|
+
: resolveGlobalOperator(expression.operator, environment);
|
|
180
|
+
if (
|
|
181
|
+
level === operatorLevel ||
|
|
182
|
+
operator?.kind !== "Closure" ||
|
|
183
|
+
operator.params.length !== expression.args.length
|
|
184
|
+
) {
|
|
185
|
+
return level;
|
|
186
|
+
}
|
|
187
|
+
// SANY counts an argument only where the definition's level depends on its parameter, so
|
|
188
|
+
// ENABLED of an operator argument stays a state predicate.
|
|
189
|
+
return getBodyLevel(
|
|
190
|
+
operator,
|
|
191
|
+
operator.body,
|
|
192
|
+
bindOperatorArguments(operator, expression.args, getConstantContext(environment, scope)),
|
|
193
|
+
);
|
|
194
|
+
}
|
|
160
195
|
default:
|
|
161
196
|
return getChildrenLevel(expression);
|
|
162
197
|
}
|
|
@@ -183,10 +218,10 @@ export const expandTemporal = (
|
|
|
183
218
|
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
184
219
|
isProperty: boolean,
|
|
185
220
|
expanding = new Set<Definition>(),
|
|
186
|
-
// Whether the expansion entered
|
|
187
|
-
// longer expands an operator applied to arguments.
|
|
221
|
+
// Whether the expansion entered an instance's definition, after which TLC expands no call.
|
|
188
222
|
isSubstituted = false,
|
|
189
223
|
name?: string,
|
|
224
|
+
path: string[] = [],
|
|
190
225
|
): ExpandedExpression[] => {
|
|
191
226
|
const expand = (
|
|
192
227
|
child: Expression,
|
|
@@ -204,6 +239,9 @@ export const expandTemporal = (
|
|
|
204
239
|
isSubstituted ||
|
|
205
240
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
206
241
|
childName,
|
|
242
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
243
|
+
? [...path, definition.name]
|
|
244
|
+
: path,
|
|
207
245
|
);
|
|
208
246
|
if (expression.kind === "And") {
|
|
209
247
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
@@ -215,32 +253,38 @@ export const expandTemporal = (
|
|
|
215
253
|
if (expression.kind === "Identifier") {
|
|
216
254
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
217
255
|
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
218
|
-
return expand(
|
|
256
|
+
return expand(
|
|
257
|
+
binding.expression,
|
|
258
|
+
binding.scope,
|
|
259
|
+
definitionThunks.has(binding) ? expression.name : name,
|
|
260
|
+
);
|
|
219
261
|
}
|
|
220
262
|
const definition = environment.constants.has(expression.name)
|
|
221
263
|
? undefined
|
|
222
264
|
: getDefinition(expression.name, environment);
|
|
265
|
+
// TLC expands a definition it didn't compute at startup, even a constant one.
|
|
223
266
|
if (
|
|
224
267
|
!binding &&
|
|
225
268
|
definition?.kind === "Operator" &&
|
|
226
269
|
definition.params.length === 0 &&
|
|
227
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
270
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
271
|
+
getStartupValue(definition, environment) === undefined)
|
|
228
272
|
) {
|
|
229
273
|
if (expanding.has(definition)) {
|
|
230
274
|
throw createStackOverflowError();
|
|
231
275
|
}
|
|
276
|
+
// TLC names a part after the operator as the spec writes it, as I!Op outside the instance.
|
|
232
277
|
return expand(
|
|
233
278
|
definition.body,
|
|
234
279
|
undefined,
|
|
235
|
-
definition.name,
|
|
280
|
+
(!isSubstituted && environment.instanceNames.get(expression.name)) || definition.name,
|
|
236
281
|
new Set([...expanding, definition]),
|
|
237
282
|
definition,
|
|
238
283
|
);
|
|
239
284
|
}
|
|
240
285
|
}
|
|
241
286
|
const context = getConstantContext(environment, scope);
|
|
242
|
-
// TLC 1.7.4
|
|
243
|
-
// applies, but a specification only the temporal ones.
|
|
287
|
+
// TLC 1.7.4 expands no call, a property every one, and a specification only temporal ones.
|
|
244
288
|
if (
|
|
245
289
|
expression.kind === "Apply" &&
|
|
246
290
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -250,16 +294,21 @@ export const expandTemporal = (
|
|
|
250
294
|
const definition = isLocallyResolved(expression)
|
|
251
295
|
? undefined
|
|
252
296
|
: getDefinition(expression.operator, environment);
|
|
297
|
+
// An instance's definition that takes only the instance's parameters takes no arguments in
|
|
298
|
+
// TLC, which expands it even within the instance.
|
|
299
|
+
const isOwnArgumentFree =
|
|
300
|
+
operator?.kind === "Closure" &&
|
|
301
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
253
302
|
const isExpandable =
|
|
254
303
|
operator?.kind === "Closure" &&
|
|
255
304
|
operator.params.length === expression.args.length &&
|
|
256
305
|
!definition?.isRecursive &&
|
|
257
|
-
!isSubstituted;
|
|
306
|
+
(!isSubstituted || isOwnArgumentFree);
|
|
258
307
|
if (isExpandable) {
|
|
259
308
|
return expand(
|
|
260
309
|
operator.body,
|
|
261
310
|
bindOperatorArguments(operator, expression.args, context),
|
|
262
|
-
expression.operator,
|
|
311
|
+
isSubstituted && definition ? definition.name : expression.operator,
|
|
263
312
|
expanding,
|
|
264
313
|
definition,
|
|
265
314
|
);
|
|
@@ -279,7 +328,7 @@ export const expandTemporal = (
|
|
|
279
328
|
if (expanded.length === 0) throw createTautologyError();
|
|
280
329
|
return expanded;
|
|
281
330
|
}
|
|
282
|
-
return [{ expression, scope, name }];
|
|
331
|
+
return [{ expression, scope, name, path }];
|
|
283
332
|
};
|
|
284
333
|
|
|
285
334
|
const bindLetDefinitions = (
|
|
@@ -318,7 +367,16 @@ export const toLiveExpression = (
|
|
|
318
367
|
return createBoolean(value);
|
|
319
368
|
}
|
|
320
369
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
321
|
-
|
|
370
|
+
// TLC checks <<A>>_v's subscript before it evaluates A.
|
|
371
|
+
if (expression.kind === "AngleAction") {
|
|
372
|
+
return {
|
|
373
|
+
kind: "Action",
|
|
374
|
+
expression: expression.action,
|
|
375
|
+
subscript: expression.subscript,
|
|
376
|
+
scope,
|
|
377
|
+
};
|
|
378
|
+
}
|
|
379
|
+
return { kind: "Action", expression, subscript: undefined, scope };
|
|
322
380
|
};
|
|
323
381
|
|
|
324
382
|
const expansion = { depth: 0 };
|
|
@@ -336,7 +394,11 @@ export const toLiveExpression = (
|
|
|
336
394
|
const result = convert(body, bodyScope);
|
|
337
395
|
expansion.depth--;
|
|
338
396
|
const level = getLiveLevel(result);
|
|
339
|
-
|
|
397
|
+
// For a constant body, Liveness#astToLive bounds the level of a temporal call by its own and
|
|
398
|
+
// takes the call for an action, which classifyExpr rejects. tla-ts keeps the constant.
|
|
399
|
+
const isConstantTemporal =
|
|
400
|
+
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
401
|
+
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
340
402
|
};
|
|
341
403
|
|
|
342
404
|
const convertCall = (
|
|
@@ -362,8 +424,16 @@ export const toLiveExpression = (
|
|
|
362
424
|
: isLocallyResolved(expression)
|
|
363
425
|
? resolveOperator(name, context)
|
|
364
426
|
: resolveGlobalOperator(name, environment);
|
|
365
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
366
427
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
428
|
+
// An operator constant can be substituted by a conjunction or disjunction, whose arguments
|
|
429
|
+
// TLC translates as it translates its operands.
|
|
430
|
+
const junction =
|
|
431
|
+
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
432
|
+
if (junction) {
|
|
433
|
+
const operands = args.map((arg) => convert(arg, scope));
|
|
434
|
+
return toWhole(expression, scope, createJunction(junction, operands));
|
|
435
|
+
}
|
|
436
|
+
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
367
437
|
const isRecursive =
|
|
368
438
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
369
439
|
return expandCall(
|
|
@@ -386,8 +456,8 @@ export const toLiveExpression = (
|
|
|
386
456
|
);
|
|
387
457
|
};
|
|
388
458
|
|
|
389
|
-
// TLC
|
|
390
|
-
//
|
|
459
|
+
// TLC can't handle a call whose expansion fails, except that after 1.7.4 it fails as a
|
|
460
|
+
// recursive operator's expansion does.
|
|
391
461
|
const expandCall = (
|
|
392
462
|
expression: Expression,
|
|
393
463
|
expandBody: () => LiveExpression,
|
|
@@ -407,17 +477,9 @@ export const toLiveExpression = (
|
|
|
407
477
|
scope: Scope | undefined,
|
|
408
478
|
) => {
|
|
409
479
|
const level = getLevel(expression, scope, environment);
|
|
410
|
-
const isConstant = expression.bounds.every(
|
|
411
|
-
(bound) => getLevel(bound.set, scope, environment) === CONSTANT_LEVEL,
|
|
412
|
-
);
|
|
413
|
-
if (!isConstant) {
|
|
414
|
-
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
415
|
-
throw createCannotHandleError(expression);
|
|
416
|
-
}
|
|
417
480
|
const operands: LiveExpression[] = [];
|
|
418
481
|
const isForall = expression.kind === "Forall";
|
|
419
|
-
// TLC
|
|
420
|
-
// the message of a failure that isn't an EvalException.
|
|
482
|
+
// TLC can't handle a quantifier whose body fails, and under \A adds another failure's message.
|
|
421
483
|
try {
|
|
422
484
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
423
485
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -443,8 +505,7 @@ export const toLiveExpression = (
|
|
|
443
505
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
444
506
|
};
|
|
445
507
|
|
|
446
|
-
//
|
|
447
|
-
// that is constant, such as a quantifier over the empty set, can make the formula constant.
|
|
508
|
+
// A constant translated part, such as a quantifier over {}, can make the whole formula constant.
|
|
448
509
|
const isTranslatedWhole = (expression: Expression) =>
|
|
449
510
|
expression.kind === "Label" ||
|
|
450
511
|
expression.kind === "Let" ||
|
|
@@ -545,11 +606,7 @@ export const toLiveExpression = (
|
|
|
545
606
|
const taken: LiveExpression = {
|
|
546
607
|
kind: "Action",
|
|
547
608
|
expression: expression.action,
|
|
548
|
-
|
|
549
|
-
kind: "Unchanged",
|
|
550
|
-
expression: expression.subscript,
|
|
551
|
-
location: step.location,
|
|
552
|
-
},
|
|
609
|
+
subscript: expression.subscript,
|
|
553
610
|
scope,
|
|
554
611
|
enabled,
|
|
555
612
|
};
|
|
@@ -590,22 +647,33 @@ export const evaluateLive = (
|
|
|
590
647
|
const cached = stateCache.get(expression);
|
|
591
648
|
if (cached !== undefined) return cached;
|
|
592
649
|
const context = { environment, scope: expression.scope, state, next: undefined };
|
|
593
|
-
const
|
|
650
|
+
const value =
|
|
594
651
|
expression.kind === "State"
|
|
595
|
-
?
|
|
652
|
+
? evaluate(expression.expression, context)
|
|
596
653
|
: isEnabled(expression.step, context);
|
|
597
|
-
|
|
598
|
-
|
|
654
|
+
if (typeof value !== "boolean") {
|
|
655
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
656
|
+
}
|
|
657
|
+
stateCache.set(expression, value);
|
|
658
|
+
return value;
|
|
599
659
|
}
|
|
600
660
|
case "Action": {
|
|
601
661
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
602
|
-
const
|
|
662
|
+
const scope = expression.scope;
|
|
663
|
+
const subscript = expression.subscript;
|
|
603
664
|
if (
|
|
604
|
-
|
|
605
|
-
|
|
665
|
+
subscript &&
|
|
666
|
+
isEqualLikeTlc(
|
|
667
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
668
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
669
|
+
)
|
|
606
670
|
)
|
|
607
671
|
return false;
|
|
608
|
-
|
|
672
|
+
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
673
|
+
if (typeof value !== "boolean") {
|
|
674
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
675
|
+
}
|
|
676
|
+
return value;
|
|
609
677
|
}
|
|
610
678
|
case "Not":
|
|
611
679
|
return !recurse(expression.body);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Action.
|
|
2
|
-
// variables it binds, after expanding the definitions soundness needs expanded. The ExpandENABLED
|
|
3
|
-
// and ExpandCdot frontends then replace each LAMBDA with an existential quantifier.
|
|
1
|
+
// A port of tlapm's Expr.Action.
|
|
4
2
|
|
|
5
3
|
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
6
4
|
import type { Anonymizer } from "./anonymize";
|
|
@@ -26,8 +24,6 @@ import {
|
|
|
26
24
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
27
25
|
import { rewriteUnchanged } from "./temporal";
|
|
28
26
|
|
|
29
|
-
// Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
|
|
30
|
-
// soundness needs expanded, as the AutoUSE directive allows.
|
|
31
27
|
interface ActionOptions {
|
|
32
28
|
isEnabled: boolean;
|
|
33
29
|
isCdot: boolean;
|
|
@@ -48,10 +44,8 @@ const NESTED_ENABLED =
|
|
|
48
44
|
const NESTED_CDOT =
|
|
49
45
|
"Nested occurrence of the operator `\\cdot` found in scope of `ENABLED` when expanding `ENABLED`. Using the proof directive `ExpandCdot` from the module `TLAPS` is expected to avoid this error.";
|
|
50
46
|
|
|
51
|
-
// Unlike auto_expansion_of_defs, tlapm puts a space before "For example" here.
|
|
52
47
|
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
53
48
|
|
|
54
|
-
// Visit.map_visible_hyp with no state.
|
|
55
49
|
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
56
50
|
mapScoped(
|
|
57
51
|
undefined,
|
|
@@ -88,8 +82,6 @@ const getInitialLevel = (level: number | undefined) =>
|
|
|
88
82
|
const getDecrementedLevel = (level: number | undefined) =>
|
|
89
83
|
level === undefined ? undefined : Math.max(1, level - 1);
|
|
90
84
|
|
|
91
|
-
// auto_expansion_of_defs. ENABLED and the first argument of \cdot need every definition of action
|
|
92
|
-
// level expanded, a prime lowers that bound to 1, and so does the second argument of \cdot.
|
|
93
85
|
const expandDefinitions = (
|
|
94
86
|
options: ActionOptions,
|
|
95
87
|
onWarning: Warn,
|
|
@@ -209,7 +201,6 @@ const expandDefinitions = (
|
|
|
209
201
|
);
|
|
210
202
|
};
|
|
211
203
|
|
|
212
|
-
// expand_propositional_action_operators: UNCHANGED v, [A]_v and <<A>>_v in terms of primes.
|
|
213
204
|
const expandPropositional = (expression: Expr): Expr => {
|
|
214
205
|
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
215
206
|
return rewriteUnchanged(expression.args[0]);
|
|
@@ -225,8 +216,7 @@ const expandPropositional = (expression: Expr): Expr => {
|
|
|
225
216
|
);
|
|
226
217
|
};
|
|
227
218
|
|
|
228
|
-
|
|
229
|
-
const getHash = (text: string) => {
|
|
219
|
+
const getOcamlHash = (text: string) => {
|
|
230
220
|
const rotate = (value: number, amount: number) => (value << amount) | (value >>> (32 - amount));
|
|
231
221
|
const mix = (hash: number, data: number) => {
|
|
232
222
|
const word = Math.imul(rotate(Math.imul(data, 0xcc9e2d51), 15), 0x1b873593);
|
|
@@ -249,23 +239,18 @@ const getHash = (text: string) => {
|
|
|
249
239
|
return (hash ^ (hash >>> 16)) & 0x3fffffff;
|
|
250
240
|
};
|
|
251
241
|
|
|
252
|
-
// The keys of an OCaml Hashtbl.create 16 in Hashtbl.to_seq_keys order. Hashtbl.add prepends to a
|
|
253
|
-
// bucket and doubles the buckets once the table holds more than twice their count.
|
|
254
242
|
const getHashtblKeys = (names: string[]) => {
|
|
255
243
|
let buckets: string[][] = Array.from({ length: 16 }, () => []);
|
|
256
244
|
names.forEach((name, index) => {
|
|
257
|
-
buckets[
|
|
245
|
+
buckets[getOcamlHash(name) & (buckets.length - 1)].unshift(name);
|
|
258
246
|
if (index + 1 <= buckets.length * 2) return;
|
|
259
247
|
const resized: string[][] = Array.from({ length: buckets.length * 2 }, () => []);
|
|
260
|
-
buckets.flat().forEach((key) => resized[
|
|
248
|
+
buckets.flat().forEach((key) => resized[getOcamlHash(key) & (resized.length - 1)].push(key));
|
|
261
249
|
buckets = resized;
|
|
262
250
|
});
|
|
263
251
|
return buckets.flat();
|
|
264
252
|
};
|
|
265
253
|
|
|
266
|
-
// lambdify_action_operators. A variable met directly binds into current, and one met under a prime
|
|
267
|
-
// into primed. ENABLED A binds the primes of A, and A \cdot B binds those of A and the unprimed
|
|
268
|
-
// variables of B, each as an opaque name such as x#enabled#prime1.
|
|
269
254
|
const bindVariables = (
|
|
270
255
|
options: ActionOptions,
|
|
271
256
|
onWarning: Warn,
|
|
@@ -354,8 +339,6 @@ const bindVariables = (
|
|
|
354
339
|
);
|
|
355
340
|
};
|
|
356
341
|
|
|
357
|
-
// shift_indices_after_lambdify, a Subst.map_visible_hyp that makes room in each new LAMBDA body
|
|
358
|
-
// for its parameters and drops the placeholder parameter.
|
|
359
342
|
const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
360
343
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
361
344
|
const [lambda] = expression.args;
|
|
@@ -387,7 +370,6 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
|
387
370
|
return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
|
|
388
371
|
};
|
|
389
372
|
|
|
390
|
-
// normalize_lambda_param_names.
|
|
391
373
|
const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
392
374
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
393
375
|
const [lambda] = expression.args;
|
|
@@ -413,7 +395,6 @@ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
|
413
395
|
return mapVisibleChildren(expression, (child) => renameParams(isKeepingNames, child));
|
|
414
396
|
};
|
|
415
397
|
|
|
416
|
-
// check_arity.
|
|
417
398
|
const checkArity = (expression: Expr): Expr => {
|
|
418
399
|
if (
|
|
419
400
|
isBuiltinApply(expression, "Cdot") &&
|
|
@@ -425,7 +406,6 @@ const checkArity = (expression: Expr): Expr => {
|
|
|
425
406
|
return mapVisibleChildren(expression, checkArity);
|
|
426
407
|
};
|
|
427
408
|
|
|
428
|
-
// lambdify_action_operators#expand.
|
|
429
409
|
const lambdifyOperators = (
|
|
430
410
|
anonymizer: Anonymizer,
|
|
431
411
|
onWarning: Warn,
|
|
@@ -451,8 +431,6 @@ export const lambdify = (
|
|
|
451
431
|
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
452
432
|
};
|
|
453
433
|
|
|
454
|
-
// replace_action_operators_with_quantifiers: each lambdified ENABLED or \cdot that the frontend
|
|
455
|
-
// expands becomes \E over the parameters of its LAMBDA.
|
|
456
434
|
const replaceWithQuantifiers = (
|
|
457
435
|
options: ActionOptions,
|
|
458
436
|
onWarning: Warn,
|
|
@@ -521,7 +499,6 @@ const replaceWithQuantifiers = (
|
|
|
521
499
|
);
|
|
522
500
|
};
|
|
523
501
|
|
|
524
|
-
// commute_exists_disjunction: \E x : A \/ B as (\E x : A) \/ (\E x : B), everywhere.
|
|
525
502
|
const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
526
503
|
if (expression.kind === "Quant" && expression.quantifier === "Exists") {
|
|
527
504
|
const body = expression.body;
|
|
@@ -542,7 +519,6 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
542
519
|
return mapVisibleChildren(expression, commuteExistsDisjunction);
|
|
543
520
|
};
|
|
544
521
|
|
|
545
|
-
// expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
|
|
546
522
|
export const expandActionOperators = (
|
|
547
523
|
anonymizer: Anonymizer,
|
|
548
524
|
onWarning: Warn,
|