tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
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,23 +40,29 @@ 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
|
-
// A part of a temporal formula, with the name TLC gives the part when the formula is a property:
|
|
51
|
-
// a conjunct's location, or the name of the definition the part is the body of.
|
|
52
50
|
interface ExpandedExpression extends ScopedExpression {
|
|
53
51
|
name: string | undefined;
|
|
52
|
+
path: string[];
|
|
54
53
|
}
|
|
55
54
|
|
|
56
55
|
export interface TemporalProperty extends ScopedExpression {
|
|
57
56
|
name: string;
|
|
58
57
|
}
|
|
59
58
|
|
|
59
|
+
interface Expansion {
|
|
60
|
+
name: string | undefined;
|
|
61
|
+
path: string[];
|
|
62
|
+
expanding: Set<Definition>;
|
|
63
|
+
isSubstituted: boolean;
|
|
64
|
+
}
|
|
65
|
+
|
|
60
66
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
61
67
|
|
|
62
68
|
export const createTautologyError = () =>
|
|
@@ -69,6 +75,11 @@ const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
|
69
75
|
|
|
70
76
|
const definitionThunks = new WeakSet<Thunk>();
|
|
71
77
|
|
|
78
|
+
const JUNCTIONS = new Map<string, "And" | "Or">([
|
|
79
|
+
["/\\", "And"],
|
|
80
|
+
["\\/", "Or"],
|
|
81
|
+
]);
|
|
82
|
+
|
|
72
83
|
const getConstantContext = (environment: Environment, scope: Scope | undefined): Context => ({
|
|
73
84
|
environment,
|
|
74
85
|
scope,
|
|
@@ -76,7 +87,6 @@ const getConstantContext = (environment: Environment, scope: Scope | undefined):
|
|
|
76
87
|
next: undefined,
|
|
77
88
|
});
|
|
78
89
|
|
|
79
|
-
// TLC adds the message of the error that stopped it, when it has one.
|
|
80
90
|
const createCannotHandleError = (expression: Expression, inner?: string) =>
|
|
81
91
|
new TlaEvaluationError(
|
|
82
92
|
`TLC cannot handle the temporal formula ${describeRange(expression)}${inner === undefined ? "" : `:\n${inner}`}`,
|
|
@@ -87,15 +97,27 @@ export const getLevel = (
|
|
|
87
97
|
scope: Scope | undefined,
|
|
88
98
|
environment: Environment,
|
|
89
99
|
shadowed = new Set<string>(),
|
|
100
|
+
visiting = new Set<object>(),
|
|
90
101
|
): number => {
|
|
102
|
+
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
103
|
+
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
104
|
+
visiting.add(binding);
|
|
105
|
+
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
106
|
+
visiting.delete(binding);
|
|
107
|
+
return level;
|
|
108
|
+
};
|
|
91
109
|
const getBindingLevel = (name: string) => {
|
|
92
110
|
const binding = lookupScope(scope, name);
|
|
93
111
|
if (!binding) return undefined;
|
|
94
112
|
if (binding.kind === "Value") return CONSTANT_LEVEL;
|
|
95
|
-
if (binding.kind === "Thunk")
|
|
113
|
+
if (binding.kind === "Thunk") {
|
|
114
|
+
return binding.isReleased
|
|
115
|
+
? CONSTANT_LEVEL
|
|
116
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
117
|
+
}
|
|
96
118
|
const operator = binding.operator;
|
|
97
119
|
return operator.kind === "Closure"
|
|
98
|
-
?
|
|
120
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
99
121
|
: CONSTANT_LEVEL;
|
|
100
122
|
};
|
|
101
123
|
const getGlobalLevel = (name: string) => {
|
|
@@ -105,6 +127,7 @@ export const getLevel = (
|
|
|
105
127
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
106
128
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
107
129
|
if (!builtin) return undefined;
|
|
130
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
108
131
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
109
132
|
};
|
|
110
133
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -115,20 +138,21 @@ export const getLevel = (
|
|
|
115
138
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
116
139
|
};
|
|
117
140
|
const getChildrenLevel = (node: Expression) => {
|
|
118
|
-
|
|
141
|
+
let level = CONSTANT_LEVEL;
|
|
119
142
|
mapChildren(node, (child, bound) => {
|
|
120
|
-
level
|
|
121
|
-
level
|
|
143
|
+
level = Math.max(
|
|
144
|
+
level,
|
|
122
145
|
getLevel(
|
|
123
146
|
child,
|
|
124
147
|
scope,
|
|
125
148
|
environment,
|
|
126
149
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
150
|
+
visiting,
|
|
127
151
|
),
|
|
128
152
|
);
|
|
129
153
|
return child;
|
|
130
154
|
});
|
|
131
|
-
return level
|
|
155
|
+
return level;
|
|
132
156
|
};
|
|
133
157
|
switch (expression.kind) {
|
|
134
158
|
case "Prime":
|
|
@@ -149,16 +173,32 @@ export const getLevel = (
|
|
|
149
173
|
return getNameLevel(expression.name, expression);
|
|
150
174
|
case "OperatorReference":
|
|
151
175
|
return getNameLevel(expression.operator, expression);
|
|
152
|
-
case "Apply":
|
|
176
|
+
case "Apply": {
|
|
153
177
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
154
178
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
155
|
-
|
|
179
|
+
const operatorLevel = getNameLevel(expression.operator, expression);
|
|
180
|
+
const level = Math.max(operatorLevel, getChildrenLevel(expression));
|
|
181
|
+
const operator = isLocallyResolved(expression)
|
|
182
|
+
? undefined
|
|
183
|
+
: resolveGlobalOperator(expression.operator, environment);
|
|
184
|
+
if (
|
|
185
|
+
level === operatorLevel ||
|
|
186
|
+
operator?.kind !== "Closure" ||
|
|
187
|
+
operator.params.length !== expression.args.length
|
|
188
|
+
) {
|
|
189
|
+
return level;
|
|
190
|
+
}
|
|
191
|
+
return getBodyLevel(
|
|
192
|
+
operator,
|
|
193
|
+
operator.body,
|
|
194
|
+
bindOperatorArguments(operator, expression.args, getConstantContext(environment, scope)),
|
|
195
|
+
);
|
|
196
|
+
}
|
|
156
197
|
default:
|
|
157
198
|
return getChildrenLevel(expression);
|
|
158
199
|
}
|
|
159
200
|
};
|
|
160
201
|
|
|
161
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
162
202
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
163
203
|
try {
|
|
164
204
|
return getBoundElements(bounds, context);
|
|
@@ -176,31 +216,27 @@ export const expandTemporal = (
|
|
|
176
216
|
expression: Expression,
|
|
177
217
|
scope: Scope | undefined,
|
|
178
218
|
environment: Environment,
|
|
179
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
180
219
|
isProperty: boolean,
|
|
181
|
-
|
|
182
|
-
// Whether the expansion entered the body of an instance's definition. Like TLC, it then no
|
|
183
|
-
// longer expands an operator applied to arguments.
|
|
184
|
-
isSubstituted = false,
|
|
185
|
-
name?: string,
|
|
220
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
186
221
|
): ExpandedExpression[] => {
|
|
187
222
|
const expand = (
|
|
188
223
|
child: Expression,
|
|
189
224
|
childScope: Scope | undefined,
|
|
190
|
-
childName = name,
|
|
191
|
-
childExpanding = expanding,
|
|
225
|
+
childName = expansion.name,
|
|
226
|
+
childExpanding = expansion.expanding,
|
|
192
227
|
definition?: Definition,
|
|
193
228
|
): ExpandedExpression[] =>
|
|
194
|
-
expandTemporal(
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
229
|
+
expandTemporal(child, childScope, environment, isProperty, {
|
|
230
|
+
name: childName,
|
|
231
|
+
path:
|
|
232
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
233
|
+
? [...expansion.path, definition.name]
|
|
234
|
+
: expansion.path,
|
|
235
|
+
expanding: childExpanding,
|
|
236
|
+
isSubstituted:
|
|
237
|
+
expansion.isSubstituted ||
|
|
201
238
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
202
|
-
|
|
203
|
-
);
|
|
239
|
+
});
|
|
204
240
|
if (expression.kind === "And") {
|
|
205
241
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
206
242
|
}
|
|
@@ -210,8 +246,12 @@ export const expandTemporal = (
|
|
|
210
246
|
}
|
|
211
247
|
if (expression.kind === "Identifier") {
|
|
212
248
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
213
|
-
if (binding?.kind === "Thunk") {
|
|
214
|
-
return expand(
|
|
249
|
+
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
250
|
+
return expand(
|
|
251
|
+
binding.expression,
|
|
252
|
+
binding.scope,
|
|
253
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
254
|
+
);
|
|
215
255
|
}
|
|
216
256
|
const definition = environment.constants.has(expression.name)
|
|
217
257
|
? undefined
|
|
@@ -220,23 +260,23 @@ export const expandTemporal = (
|
|
|
220
260
|
!binding &&
|
|
221
261
|
definition?.kind === "Operator" &&
|
|
222
262
|
definition.params.length === 0 &&
|
|
223
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
263
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
264
|
+
getStartupValue(definition, environment) === undefined)
|
|
224
265
|
) {
|
|
225
|
-
if (expanding.has(definition)) {
|
|
266
|
+
if (expansion.expanding.has(definition)) {
|
|
226
267
|
throw createStackOverflowError();
|
|
227
268
|
}
|
|
228
269
|
return expand(
|
|
229
270
|
definition.body,
|
|
230
271
|
undefined,
|
|
231
|
-
|
|
232
|
-
|
|
272
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
273
|
+
definition.name,
|
|
274
|
+
new Set([...expansion.expanding, definition]),
|
|
233
275
|
definition,
|
|
234
276
|
);
|
|
235
277
|
}
|
|
236
278
|
}
|
|
237
279
|
const context = getConstantContext(environment, scope);
|
|
238
|
-
// TLC 1.7.4 never expands an operator applied to arguments. A property expands every one it
|
|
239
|
-
// applies, but a specification only the temporal ones.
|
|
240
280
|
if (
|
|
241
281
|
expression.kind === "Apply" &&
|
|
242
282
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -246,17 +286,20 @@ export const expandTemporal = (
|
|
|
246
286
|
const definition = isLocallyResolved(expression)
|
|
247
287
|
? undefined
|
|
248
288
|
: getDefinition(expression.operator, environment);
|
|
289
|
+
const isOwnArgumentFree =
|
|
290
|
+
operator?.kind === "Closure" &&
|
|
291
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
249
292
|
const isExpandable =
|
|
250
293
|
operator?.kind === "Closure" &&
|
|
251
294
|
operator.params.length === expression.args.length &&
|
|
252
295
|
!definition?.isRecursive &&
|
|
253
|
-
!isSubstituted;
|
|
296
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
254
297
|
if (isExpandable) {
|
|
255
298
|
return expand(
|
|
256
299
|
operator.body,
|
|
257
300
|
bindOperatorArguments(operator, expression.args, context),
|
|
258
|
-
expression.operator,
|
|
259
|
-
expanding,
|
|
301
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
302
|
+
expansion.expanding,
|
|
260
303
|
definition,
|
|
261
304
|
);
|
|
262
305
|
}
|
|
@@ -275,7 +318,7 @@ export const expandTemporal = (
|
|
|
275
318
|
if (expanded.length === 0) throw createTautologyError();
|
|
276
319
|
return expanded;
|
|
277
320
|
}
|
|
278
|
-
return [{ expression, scope, name }];
|
|
321
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
279
322
|
};
|
|
280
323
|
|
|
281
324
|
const bindLetDefinitions = (
|
|
@@ -301,7 +344,6 @@ export const toLiveExpression = (
|
|
|
301
344
|
scope: Scope | undefined,
|
|
302
345
|
level: number,
|
|
303
346
|
): LiveExpression => {
|
|
304
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
305
347
|
const atomLevel =
|
|
306
348
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
307
349
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -314,10 +356,18 @@ export const toLiveExpression = (
|
|
|
314
356
|
return createBoolean(value);
|
|
315
357
|
}
|
|
316
358
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
317
|
-
|
|
359
|
+
if (expression.kind === "AngleAction") {
|
|
360
|
+
return {
|
|
361
|
+
kind: "Action",
|
|
362
|
+
expression: expression.action,
|
|
363
|
+
subscript: expression.subscript,
|
|
364
|
+
scope,
|
|
365
|
+
};
|
|
366
|
+
}
|
|
367
|
+
return { kind: "Action", expression, subscript: undefined, scope };
|
|
318
368
|
};
|
|
319
369
|
|
|
320
|
-
|
|
370
|
+
let expansionDepth = 0;
|
|
321
371
|
|
|
322
372
|
const expand = (
|
|
323
373
|
body: Expression,
|
|
@@ -325,14 +375,17 @@ export const toLiveExpression = (
|
|
|
325
375
|
expression: Expression,
|
|
326
376
|
scope: Scope | undefined,
|
|
327
377
|
) => {
|
|
328
|
-
if (
|
|
378
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
329
379
|
throw createStackOverflowError();
|
|
330
380
|
}
|
|
331
|
-
|
|
381
|
+
expansionDepth++;
|
|
332
382
|
const result = convert(body, bodyScope);
|
|
333
|
-
|
|
383
|
+
expansionDepth--;
|
|
334
384
|
const level = getLiveLevel(result);
|
|
335
|
-
|
|
385
|
+
// Deviation from TLC: Liveness#astToLive takes a temporal call with a constant body for an action, which classifyExpr rejects.
|
|
386
|
+
const isConstantTemporal =
|
|
387
|
+
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
388
|
+
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
336
389
|
};
|
|
337
390
|
|
|
338
391
|
const convertCall = (
|
|
@@ -345,7 +398,7 @@ export const toLiveExpression = (
|
|
|
345
398
|
isLocallyResolved(expression) || getDefinition(name, environment) === undefined
|
|
346
399
|
? lookupScope(scope, name)
|
|
347
400
|
: undefined;
|
|
348
|
-
if (binding?.kind === "Thunk" && definitionThunks.has(binding)) {
|
|
401
|
+
if (binding?.kind === "Thunk" && !binding.isReleased && definitionThunks.has(binding)) {
|
|
349
402
|
return expandCall(expression, () =>
|
|
350
403
|
expand(binding.expression, binding.scope, expression, scope),
|
|
351
404
|
);
|
|
@@ -358,8 +411,14 @@ export const toLiveExpression = (
|
|
|
358
411
|
: isLocallyResolved(expression)
|
|
359
412
|
? resolveOperator(name, context)
|
|
360
413
|
: resolveGlobalOperator(name, environment);
|
|
361
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
362
414
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
415
|
+
const junction =
|
|
416
|
+
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
417
|
+
if (junction) {
|
|
418
|
+
const operands = args.map((arg) => convert(arg, scope));
|
|
419
|
+
return toWhole(expression, scope, createJunction(junction, operands));
|
|
420
|
+
}
|
|
421
|
+
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
363
422
|
const isRecursive =
|
|
364
423
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
365
424
|
return expandCall(
|
|
@@ -382,8 +441,6 @@ export const toLiveExpression = (
|
|
|
382
441
|
);
|
|
383
442
|
};
|
|
384
443
|
|
|
385
|
-
// TLC takes an application of an operator whose expansion fails for a formula it can't handle,
|
|
386
|
-
// except that TLC after 1.7.4 fails as the expansion of a recursive operator does.
|
|
387
444
|
const expandCall = (
|
|
388
445
|
expression: Expression,
|
|
389
446
|
expandBody: () => LiveExpression,
|
|
@@ -403,17 +460,8 @@ export const toLiveExpression = (
|
|
|
403
460
|
scope: Scope | undefined,
|
|
404
461
|
) => {
|
|
405
462
|
const level = getLevel(expression, scope, environment);
|
|
406
|
-
const isConstant = expression.bounds.every(
|
|
407
|
-
(bound) => getLevel(bound.set, scope, environment) === CONSTANT_LEVEL,
|
|
408
|
-
);
|
|
409
|
-
if (!isConstant) {
|
|
410
|
-
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
411
|
-
throw createCannotHandleError(expression);
|
|
412
|
-
}
|
|
413
463
|
const operands: LiveExpression[] = [];
|
|
414
464
|
const isForall = expression.kind === "Forall";
|
|
415
|
-
// TLC takes a quantified formula whose body fails for one it can't handle, and under \A it adds
|
|
416
|
-
// the message of a failure that isn't an EvalException.
|
|
417
465
|
try {
|
|
418
466
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
419
467
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -433,50 +481,21 @@ export const toLiveExpression = (
|
|
|
433
481
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
434
482
|
};
|
|
435
483
|
|
|
436
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
437
484
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
438
485
|
const level = getLiveLevel(parts);
|
|
439
486
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
440
487
|
};
|
|
441
488
|
|
|
442
|
-
//
|
|
443
|
-
// that is constant, such as a quantifier over the empty set, can make the formula constant.
|
|
444
|
-
const isTranslatedWhole = (expression: Expression) =>
|
|
445
|
-
expression.kind === "Label" ||
|
|
446
|
-
expression.kind === "Let" ||
|
|
447
|
-
expression.kind === "And" ||
|
|
448
|
-
expression.kind === "Or" ||
|
|
449
|
-
expression.kind === "Forall" ||
|
|
450
|
-
expression.kind === "Exists" ||
|
|
451
|
-
expression.kind === "If" ||
|
|
452
|
-
(expression.kind === "Apply" &&
|
|
453
|
-
((expression.operator === "~" && !isLocallyResolved(expression)) ||
|
|
454
|
-
expression.operator === "=>"));
|
|
455
|
-
|
|
489
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
456
490
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
457
491
|
const level = getLevel(expression, scope, environment);
|
|
458
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
459
|
-
return toAtom(expression, scope, level);
|
|
460
|
-
}
|
|
461
492
|
switch (expression.kind) {
|
|
462
493
|
case "Label":
|
|
463
494
|
return convert(expression.body, scope);
|
|
464
495
|
case "Let":
|
|
465
496
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
466
|
-
case "Identifier":
|
|
467
|
-
return convertCall(expression, scope);
|
|
468
497
|
case "Apply": {
|
|
469
498
|
const args = expression.args;
|
|
470
|
-
if (expression.operator === "~>") {
|
|
471
|
-
return createUnary(
|
|
472
|
-
"Always",
|
|
473
|
-
createPair(
|
|
474
|
-
"Or",
|
|
475
|
-
createUnary("Not", convert(args[0], scope)),
|
|
476
|
-
createUnary("Eventually", convert(args[1], scope)),
|
|
477
|
-
),
|
|
478
|
-
);
|
|
479
|
-
}
|
|
480
499
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
481
500
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
482
501
|
}
|
|
@@ -487,7 +506,7 @@ export const toLiveExpression = (
|
|
|
487
506
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
488
507
|
);
|
|
489
508
|
}
|
|
490
|
-
|
|
509
|
+
break;
|
|
491
510
|
}
|
|
492
511
|
case "And":
|
|
493
512
|
case "Or":
|
|
@@ -503,7 +522,6 @@ export const toLiveExpression = (
|
|
|
503
522
|
case "Exists":
|
|
504
523
|
return convertQuantifier(expression, scope);
|
|
505
524
|
case "If": {
|
|
506
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
507
525
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
508
526
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
509
527
|
if (typeof condition === "boolean") {
|
|
@@ -525,6 +543,22 @@ export const toLiveExpression = (
|
|
|
525
543
|
),
|
|
526
544
|
);
|
|
527
545
|
}
|
|
546
|
+
}
|
|
547
|
+
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
548
|
+
switch (expression.kind) {
|
|
549
|
+
case "Identifier":
|
|
550
|
+
return convertCall(expression, scope);
|
|
551
|
+
case "Apply":
|
|
552
|
+
return expression.operator === "~>"
|
|
553
|
+
? createUnary(
|
|
554
|
+
"Always",
|
|
555
|
+
createPair(
|
|
556
|
+
"Or",
|
|
557
|
+
createUnary("Not", convert(expression.args[0], scope)),
|
|
558
|
+
createUnary("Eventually", convert(expression.args[1], scope)),
|
|
559
|
+
),
|
|
560
|
+
)
|
|
561
|
+
: convertCall(expression, scope);
|
|
528
562
|
case "Always":
|
|
529
563
|
case "Eventually":
|
|
530
564
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -541,11 +575,7 @@ export const toLiveExpression = (
|
|
|
541
575
|
const taken: LiveExpression = {
|
|
542
576
|
kind: "Action",
|
|
543
577
|
expression: expression.action,
|
|
544
|
-
|
|
545
|
-
kind: "Unchanged",
|
|
546
|
-
expression: expression.subscript,
|
|
547
|
-
location: step.location,
|
|
548
|
-
},
|
|
578
|
+
subscript: expression.subscript,
|
|
549
579
|
scope,
|
|
550
580
|
enabled,
|
|
551
581
|
};
|
|
@@ -586,22 +616,33 @@ export const evaluateLive = (
|
|
|
586
616
|
const cached = stateCache.get(expression);
|
|
587
617
|
if (cached !== undefined) return cached;
|
|
588
618
|
const context = { environment, scope: expression.scope, state, next: undefined };
|
|
589
|
-
const
|
|
619
|
+
const value =
|
|
590
620
|
expression.kind === "State"
|
|
591
|
-
?
|
|
621
|
+
? evaluate(expression.expression, context)
|
|
592
622
|
: isEnabled(expression.step, context);
|
|
593
|
-
|
|
594
|
-
|
|
623
|
+
if (typeof value !== "boolean") {
|
|
624
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
625
|
+
}
|
|
626
|
+
stateCache.set(expression, value);
|
|
627
|
+
return value;
|
|
595
628
|
}
|
|
596
629
|
case "Action": {
|
|
597
630
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
598
|
-
const
|
|
631
|
+
const scope = expression.scope;
|
|
632
|
+
const subscript = expression.subscript;
|
|
599
633
|
if (
|
|
600
|
-
|
|
601
|
-
|
|
634
|
+
subscript &&
|
|
635
|
+
isEqualLikeTlc(
|
|
636
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
637
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
638
|
+
)
|
|
602
639
|
)
|
|
603
640
|
return false;
|
|
604
|
-
|
|
641
|
+
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
642
|
+
if (typeof value !== "boolean") {
|
|
643
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
644
|
+
}
|
|
645
|
+
return value;
|
|
605
646
|
}
|
|
606
647
|
case "Not":
|
|
607
648
|
return !recurse(expression.body);
|
|
@@ -626,7 +667,7 @@ export const evaluateOnLasso = (
|
|
|
626
667
|
): boolean => {
|
|
627
668
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
628
669
|
const getFuture = (index: number) =>
|
|
629
|
-
path.map((
|
|
670
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
630
671
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
631
672
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
632
673
|
switch (expression.kind) {
|