tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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 +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- 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 +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- 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 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -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 +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- 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 +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- 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 +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/liveness.ts
CHANGED
|
@@ -12,11 +12,12 @@ 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
|
+
getReevaluatedDefinitions,
|
|
20
|
+
getStartupValue,
|
|
20
21
|
lookupScope,
|
|
21
22
|
resolveApplyOperator,
|
|
22
23
|
resolveGlobalOperator,
|
|
@@ -37,26 +38,34 @@ import {
|
|
|
37
38
|
createPair,
|
|
38
39
|
createUnary,
|
|
39
40
|
getLiveLevel,
|
|
41
|
+
type LiveAction,
|
|
40
42
|
type LiveEnabled,
|
|
41
43
|
type LiveExpression,
|
|
44
|
+
type LiveState,
|
|
42
45
|
} from "./tableau";
|
|
43
|
-
import type
|
|
46
|
+
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
47
|
|
|
45
48
|
export interface ScopedExpression {
|
|
46
49
|
expression: Expression;
|
|
47
50
|
scope: Scope | undefined;
|
|
48
51
|
}
|
|
49
52
|
|
|
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
53
|
interface ExpandedExpression extends ScopedExpression {
|
|
53
54
|
name: string | undefined;
|
|
55
|
+
path: string[];
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
export interface TemporalProperty extends ScopedExpression {
|
|
57
59
|
name: string;
|
|
58
60
|
}
|
|
59
61
|
|
|
62
|
+
interface Expansion {
|
|
63
|
+
name: string | undefined;
|
|
64
|
+
path: string[];
|
|
65
|
+
expanding: Set<Definition>;
|
|
66
|
+
isSubstituted: boolean;
|
|
67
|
+
}
|
|
68
|
+
|
|
60
69
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
61
70
|
|
|
62
71
|
export const createTautologyError = () =>
|
|
@@ -69,6 +78,11 @@ const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
|
69
78
|
|
|
70
79
|
const definitionThunks = new WeakSet<Thunk>();
|
|
71
80
|
|
|
81
|
+
const JUNCTIONS = new Map<string, "And" | "Or">([
|
|
82
|
+
["/\\", "And"],
|
|
83
|
+
["\\/", "Or"],
|
|
84
|
+
]);
|
|
85
|
+
|
|
72
86
|
const getConstantContext = (environment: Environment, scope: Scope | undefined): Context => ({
|
|
73
87
|
environment,
|
|
74
88
|
scope,
|
|
@@ -76,7 +90,6 @@ const getConstantContext = (environment: Environment, scope: Scope | undefined):
|
|
|
76
90
|
next: undefined,
|
|
77
91
|
});
|
|
78
92
|
|
|
79
|
-
// TLC adds the message of the error that stopped it, when it has one.
|
|
80
93
|
const createCannotHandleError = (expression: Expression, inner?: string) =>
|
|
81
94
|
new TlaEvaluationError(
|
|
82
95
|
`TLC cannot handle the temporal formula ${describeRange(expression)}${inner === undefined ? "" : `:\n${inner}`}`,
|
|
@@ -87,7 +100,15 @@ export const getLevel = (
|
|
|
87
100
|
scope: Scope | undefined,
|
|
88
101
|
environment: Environment,
|
|
89
102
|
shadowed = new Set<string>(),
|
|
103
|
+
visiting = new Set<object>(),
|
|
90
104
|
): number => {
|
|
105
|
+
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
106
|
+
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
107
|
+
visiting.add(binding);
|
|
108
|
+
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
109
|
+
visiting.delete(binding);
|
|
110
|
+
return level;
|
|
111
|
+
};
|
|
91
112
|
const getBindingLevel = (name: string) => {
|
|
92
113
|
const binding = lookupScope(scope, name);
|
|
93
114
|
if (!binding) return undefined;
|
|
@@ -95,11 +116,11 @@ export const getLevel = (
|
|
|
95
116
|
if (binding.kind === "Thunk") {
|
|
96
117
|
return binding.isReleased
|
|
97
118
|
? CONSTANT_LEVEL
|
|
98
|
-
:
|
|
119
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
99
120
|
}
|
|
100
121
|
const operator = binding.operator;
|
|
101
122
|
return operator.kind === "Closure"
|
|
102
|
-
?
|
|
123
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
103
124
|
: CONSTANT_LEVEL;
|
|
104
125
|
};
|
|
105
126
|
const getGlobalLevel = (name: string) => {
|
|
@@ -109,6 +130,7 @@ export const getLevel = (
|
|
|
109
130
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
110
131
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
111
132
|
if (!builtin) return undefined;
|
|
133
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
112
134
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
113
135
|
};
|
|
114
136
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -119,20 +141,21 @@ export const getLevel = (
|
|
|
119
141
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
120
142
|
};
|
|
121
143
|
const getChildrenLevel = (node: Expression) => {
|
|
122
|
-
|
|
144
|
+
let level = CONSTANT_LEVEL;
|
|
123
145
|
mapChildren(node, (child, bound) => {
|
|
124
|
-
level
|
|
125
|
-
level
|
|
146
|
+
level = Math.max(
|
|
147
|
+
level,
|
|
126
148
|
getLevel(
|
|
127
149
|
child,
|
|
128
150
|
scope,
|
|
129
151
|
environment,
|
|
130
152
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
153
|
+
visiting,
|
|
131
154
|
),
|
|
132
155
|
);
|
|
133
156
|
return child;
|
|
134
157
|
});
|
|
135
|
-
return level
|
|
158
|
+
return level;
|
|
136
159
|
};
|
|
137
160
|
switch (expression.kind) {
|
|
138
161
|
case "Prime":
|
|
@@ -153,16 +176,32 @@ export const getLevel = (
|
|
|
153
176
|
return getNameLevel(expression.name, expression);
|
|
154
177
|
case "OperatorReference":
|
|
155
178
|
return getNameLevel(expression.operator, expression);
|
|
156
|
-
case "Apply":
|
|
179
|
+
case "Apply": {
|
|
157
180
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
158
181
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
159
|
-
|
|
182
|
+
const operatorLevel = getNameLevel(expression.operator, expression);
|
|
183
|
+
const level = Math.max(operatorLevel, getChildrenLevel(expression));
|
|
184
|
+
const operator = isLocallyResolved(expression)
|
|
185
|
+
? undefined
|
|
186
|
+
: resolveGlobalOperator(expression.operator, environment);
|
|
187
|
+
if (
|
|
188
|
+
level === operatorLevel ||
|
|
189
|
+
operator?.kind !== "Closure" ||
|
|
190
|
+
operator.params.length !== expression.args.length
|
|
191
|
+
) {
|
|
192
|
+
return level;
|
|
193
|
+
}
|
|
194
|
+
return getBodyLevel(
|
|
195
|
+
operator,
|
|
196
|
+
operator.body,
|
|
197
|
+
bindOperatorArguments(operator, expression.args, getConstantContext(environment, scope)),
|
|
198
|
+
);
|
|
199
|
+
}
|
|
160
200
|
default:
|
|
161
201
|
return getChildrenLevel(expression);
|
|
162
202
|
}
|
|
163
203
|
};
|
|
164
204
|
|
|
165
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
166
205
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
167
206
|
try {
|
|
168
207
|
return getBoundElements(bounds, context);
|
|
@@ -180,42 +219,43 @@ export const expandTemporal = (
|
|
|
180
219
|
expression: Expression,
|
|
181
220
|
scope: Scope | undefined,
|
|
182
221
|
environment: Environment,
|
|
183
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
184
222
|
isProperty: boolean,
|
|
185
|
-
|
|
186
|
-
// Whether the expansion entered the body of an instance's definition. Like TLC, it then no
|
|
187
|
-
// longer expands an operator applied to arguments.
|
|
188
|
-
isSubstituted = false,
|
|
189
|
-
name?: string,
|
|
223
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
190
224
|
): ExpandedExpression[] => {
|
|
191
225
|
const expand = (
|
|
192
226
|
child: Expression,
|
|
193
227
|
childScope: Scope | undefined,
|
|
194
|
-
childName = name,
|
|
195
|
-
childExpanding = expanding,
|
|
228
|
+
childName = expansion.name,
|
|
229
|
+
childExpanding = expansion.expanding,
|
|
196
230
|
definition?: Definition,
|
|
197
231
|
): ExpandedExpression[] =>
|
|
198
|
-
expandTemporal(
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
232
|
+
expandTemporal(child, childScope, environment, isProperty, {
|
|
233
|
+
name: childName,
|
|
234
|
+
path:
|
|
235
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
236
|
+
? [...expansion.path, definition.name]
|
|
237
|
+
: expansion.path,
|
|
238
|
+
expanding: childExpanding,
|
|
239
|
+
isSubstituted:
|
|
240
|
+
expansion.isSubstituted ||
|
|
205
241
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
206
|
-
|
|
207
|
-
);
|
|
242
|
+
});
|
|
208
243
|
if (expression.kind === "And") {
|
|
209
244
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
210
245
|
}
|
|
211
246
|
if (expression.kind === "Label") return expand(expression.body, scope);
|
|
247
|
+
if (expression.kind === "Selection") return expand(expression.expression, scope);
|
|
212
248
|
if (expression.kind === "Let") {
|
|
213
249
|
return expand(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
214
250
|
}
|
|
215
251
|
if (expression.kind === "Identifier") {
|
|
216
252
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
217
253
|
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
218
|
-
return expand(
|
|
254
|
+
return expand(
|
|
255
|
+
binding.expression,
|
|
256
|
+
binding.scope,
|
|
257
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
258
|
+
);
|
|
219
259
|
}
|
|
220
260
|
const definition = environment.constants.has(expression.name)
|
|
221
261
|
? undefined
|
|
@@ -224,23 +264,23 @@ export const expandTemporal = (
|
|
|
224
264
|
!binding &&
|
|
225
265
|
definition?.kind === "Operator" &&
|
|
226
266
|
definition.params.length === 0 &&
|
|
227
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
267
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
268
|
+
getStartupValue(definition, environment) === undefined)
|
|
228
269
|
) {
|
|
229
|
-
if (expanding.has(definition)) {
|
|
270
|
+
if (expansion.expanding.has(definition)) {
|
|
230
271
|
throw createStackOverflowError();
|
|
231
272
|
}
|
|
232
273
|
return expand(
|
|
233
274
|
definition.body,
|
|
234
275
|
undefined,
|
|
235
|
-
|
|
236
|
-
|
|
276
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
277
|
+
definition.name,
|
|
278
|
+
new Set([...expansion.expanding, definition]),
|
|
237
279
|
definition,
|
|
238
280
|
);
|
|
239
281
|
}
|
|
240
282
|
}
|
|
241
283
|
const context = getConstantContext(environment, scope);
|
|
242
|
-
// TLC 1.7.4 never expands an operator applied to arguments. A property expands every one it
|
|
243
|
-
// applies, but a specification only the temporal ones.
|
|
244
284
|
if (
|
|
245
285
|
expression.kind === "Apply" &&
|
|
246
286
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -250,17 +290,20 @@ export const expandTemporal = (
|
|
|
250
290
|
const definition = isLocallyResolved(expression)
|
|
251
291
|
? undefined
|
|
252
292
|
: getDefinition(expression.operator, environment);
|
|
293
|
+
const isOwnArgumentFree =
|
|
294
|
+
operator?.kind === "Closure" &&
|
|
295
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
253
296
|
const isExpandable =
|
|
254
297
|
operator?.kind === "Closure" &&
|
|
255
298
|
operator.params.length === expression.args.length &&
|
|
256
299
|
!definition?.isRecursive &&
|
|
257
|
-
!isSubstituted;
|
|
300
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
258
301
|
if (isExpandable) {
|
|
259
302
|
return expand(
|
|
260
303
|
operator.body,
|
|
261
304
|
bindOperatorArguments(operator, expression.args, context),
|
|
262
|
-
expression.operator,
|
|
263
|
-
expanding,
|
|
305
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
306
|
+
expansion.expanding,
|
|
264
307
|
definition,
|
|
265
308
|
);
|
|
266
309
|
}
|
|
@@ -279,15 +322,20 @@ export const expandTemporal = (
|
|
|
279
322
|
if (expanded.length === 0) throw createTautologyError();
|
|
280
323
|
return expanded;
|
|
281
324
|
}
|
|
282
|
-
return [{ expression, scope, name }];
|
|
325
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
283
326
|
};
|
|
284
327
|
|
|
285
|
-
|
|
328
|
+
// TLC takes a formula apart through a LET without binding its definitions, so it evaluates an impure one again at each reference.
|
|
329
|
+
export const bindLetDefinitions = (
|
|
286
330
|
expression: Expression & { kind: "Let" },
|
|
287
331
|
scope: Scope | undefined,
|
|
288
332
|
environment: Environment,
|
|
289
333
|
) => {
|
|
290
|
-
const bound = bindDefinitions(
|
|
334
|
+
const bound = bindDefinitions(
|
|
335
|
+
expression.definitions,
|
|
336
|
+
getConstantContext(environment, scope),
|
|
337
|
+
getReevaluatedDefinitions(expression.definitions, environment),
|
|
338
|
+
);
|
|
291
339
|
for (let current = bound; current && current !== scope; current = current.parent) {
|
|
292
340
|
if (current.binding.kind === "Thunk") definitionThunks.add(current.binding);
|
|
293
341
|
}
|
|
@@ -305,7 +353,6 @@ export const toLiveExpression = (
|
|
|
305
353
|
scope: Scope | undefined,
|
|
306
354
|
level: number,
|
|
307
355
|
): LiveExpression => {
|
|
308
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
309
356
|
const atomLevel =
|
|
310
357
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
311
358
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -318,10 +365,18 @@ export const toLiveExpression = (
|
|
|
318
365
|
return createBoolean(value);
|
|
319
366
|
}
|
|
320
367
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
321
|
-
|
|
368
|
+
if (expression.kind === "AngleAction") {
|
|
369
|
+
return {
|
|
370
|
+
kind: "Action",
|
|
371
|
+
expression: expression.action,
|
|
372
|
+
subscript: expression.subscript,
|
|
373
|
+
scope,
|
|
374
|
+
};
|
|
375
|
+
}
|
|
376
|
+
return { kind: "Action", expression, subscript: undefined, scope };
|
|
322
377
|
};
|
|
323
378
|
|
|
324
|
-
|
|
379
|
+
let expansionDepth = 0;
|
|
325
380
|
|
|
326
381
|
const expand = (
|
|
327
382
|
body: Expression,
|
|
@@ -329,14 +384,17 @@ export const toLiveExpression = (
|
|
|
329
384
|
expression: Expression,
|
|
330
385
|
scope: Scope | undefined,
|
|
331
386
|
) => {
|
|
332
|
-
if (
|
|
387
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
333
388
|
throw createStackOverflowError();
|
|
334
389
|
}
|
|
335
|
-
|
|
390
|
+
expansionDepth++;
|
|
336
391
|
const result = convert(body, bodyScope);
|
|
337
|
-
|
|
392
|
+
expansionDepth--;
|
|
338
393
|
const level = getLiveLevel(result);
|
|
339
|
-
|
|
394
|
+
// Deviation from TLC: Liveness#astToLive takes a temporal call with a constant body for an action, which classifyExpr rejects.
|
|
395
|
+
const isConstantTemporal =
|
|
396
|
+
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
397
|
+
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
340
398
|
};
|
|
341
399
|
|
|
342
400
|
const convertCall = (
|
|
@@ -362,8 +420,14 @@ export const toLiveExpression = (
|
|
|
362
420
|
: isLocallyResolved(expression)
|
|
363
421
|
? resolveOperator(name, context)
|
|
364
422
|
: resolveGlobalOperator(name, environment);
|
|
365
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
366
423
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
424
|
+
const junction =
|
|
425
|
+
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
426
|
+
if (junction) {
|
|
427
|
+
const operands = args.map((arg) => convert(arg, scope));
|
|
428
|
+
return toWhole(expression, scope, createJunction(junction, operands));
|
|
429
|
+
}
|
|
430
|
+
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
367
431
|
const isRecursive =
|
|
368
432
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
369
433
|
return expandCall(
|
|
@@ -386,8 +450,6 @@ export const toLiveExpression = (
|
|
|
386
450
|
);
|
|
387
451
|
};
|
|
388
452
|
|
|
389
|
-
// TLC takes an application of an operator whose expansion fails for a formula it can't handle,
|
|
390
|
-
// except that TLC after 1.7.4 fails as the expansion of a recursive operator does.
|
|
391
453
|
const expandCall = (
|
|
392
454
|
expression: Expression,
|
|
393
455
|
expandBody: () => LiveExpression,
|
|
@@ -407,17 +469,8 @@ export const toLiveExpression = (
|
|
|
407
469
|
scope: Scope | undefined,
|
|
408
470
|
) => {
|
|
409
471
|
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
472
|
const operands: LiveExpression[] = [];
|
|
418
473
|
const isForall = expression.kind === "Forall";
|
|
419
|
-
// TLC takes a quantified formula whose body fails for one it can't handle, and under \A it adds
|
|
420
|
-
// the message of a failure that isn't an EvalException.
|
|
421
474
|
try {
|
|
422
475
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
423
476
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -437,50 +490,62 @@ export const toLiveExpression = (
|
|
|
437
490
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
438
491
|
};
|
|
439
492
|
|
|
440
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
441
493
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
442
494
|
const level = getLiveLevel(parts);
|
|
443
495
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
444
496
|
};
|
|
445
497
|
|
|
446
|
-
//
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
expression.
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
498
|
+
// SANY parses `a /\ b /\ c` as `(a /\ b) /\ c`, so TLC takes a prefix below the temporal level as one formula.
|
|
499
|
+
const convertJunction = (
|
|
500
|
+
expression: Expression & { kind: "And" | "Or" },
|
|
501
|
+
scope: Scope | undefined,
|
|
502
|
+
) => {
|
|
503
|
+
const operands = expression.operands;
|
|
504
|
+
const range = expression.location.range;
|
|
505
|
+
const prefixEnds = expression.prefixEnds;
|
|
506
|
+
if (expression.isBulleted || !range || !prefixEnds) {
|
|
507
|
+
return toWhole(
|
|
508
|
+
expression,
|
|
509
|
+
scope,
|
|
510
|
+
createJunction(
|
|
511
|
+
expression.kind,
|
|
512
|
+
operands.map((operand) => convert(operand, scope)),
|
|
513
|
+
),
|
|
514
|
+
);
|
|
515
|
+
}
|
|
516
|
+
return operands.slice(1).reduce(
|
|
517
|
+
(prefix, operand, index) => {
|
|
518
|
+
const node =
|
|
519
|
+
index === operands.length - 2
|
|
520
|
+
? expression
|
|
521
|
+
: {
|
|
522
|
+
...expression,
|
|
523
|
+
operands: operands.slice(0, index + 2),
|
|
524
|
+
prefixEnds: prefixEnds.slice(0, index + 1),
|
|
525
|
+
location: { ...expression.location, range: { ...range, end: prefixEnds[index] } },
|
|
526
|
+
};
|
|
527
|
+
return toWhole(
|
|
528
|
+
node,
|
|
529
|
+
scope,
|
|
530
|
+
createJunction(expression.kind, [prefix, convert(operand, scope)]),
|
|
531
|
+
);
|
|
532
|
+
},
|
|
533
|
+
convert(operands[0], scope),
|
|
534
|
+
);
|
|
535
|
+
};
|
|
459
536
|
|
|
537
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
460
538
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
461
539
|
const level = getLevel(expression, scope, environment);
|
|
462
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
463
|
-
return toAtom(expression, scope, level);
|
|
464
|
-
}
|
|
465
540
|
switch (expression.kind) {
|
|
466
541
|
case "Label":
|
|
467
542
|
return convert(expression.body, scope);
|
|
543
|
+
case "Selection":
|
|
544
|
+
return convert(expression.expression, scope);
|
|
468
545
|
case "Let":
|
|
469
546
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
470
|
-
case "Identifier":
|
|
471
|
-
return convertCall(expression, scope);
|
|
472
547
|
case "Apply": {
|
|
473
548
|
const args = expression.args;
|
|
474
|
-
if (expression.operator === "~>") {
|
|
475
|
-
return createUnary(
|
|
476
|
-
"Always",
|
|
477
|
-
createPair(
|
|
478
|
-
"Or",
|
|
479
|
-
createUnary("Not", convert(args[0], scope)),
|
|
480
|
-
createUnary("Eventually", convert(args[1], scope)),
|
|
481
|
-
),
|
|
482
|
-
);
|
|
483
|
-
}
|
|
484
549
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
485
550
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
486
551
|
}
|
|
@@ -491,23 +556,15 @@ export const toLiveExpression = (
|
|
|
491
556
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
492
557
|
);
|
|
493
558
|
}
|
|
494
|
-
|
|
559
|
+
break;
|
|
495
560
|
}
|
|
496
561
|
case "And":
|
|
497
562
|
case "Or":
|
|
498
|
-
return
|
|
499
|
-
expression,
|
|
500
|
-
scope,
|
|
501
|
-
createJunction(
|
|
502
|
-
expression.kind,
|
|
503
|
-
expression.operands.map((operand) => convert(operand, scope)),
|
|
504
|
-
),
|
|
505
|
-
);
|
|
563
|
+
return convertJunction(expression, scope);
|
|
506
564
|
case "Forall":
|
|
507
565
|
case "Exists":
|
|
508
566
|
return convertQuantifier(expression, scope);
|
|
509
567
|
case "If": {
|
|
510
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
511
568
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
512
569
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
513
570
|
if (typeof condition === "boolean") {
|
|
@@ -529,6 +586,22 @@ export const toLiveExpression = (
|
|
|
529
586
|
),
|
|
530
587
|
);
|
|
531
588
|
}
|
|
589
|
+
}
|
|
590
|
+
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
591
|
+
switch (expression.kind) {
|
|
592
|
+
case "Identifier":
|
|
593
|
+
return convertCall(expression, scope);
|
|
594
|
+
case "Apply":
|
|
595
|
+
return expression.operator === "~>"
|
|
596
|
+
? createUnary(
|
|
597
|
+
"Always",
|
|
598
|
+
createPair(
|
|
599
|
+
"Or",
|
|
600
|
+
createUnary("Not", convert(expression.args[0], scope)),
|
|
601
|
+
createUnary("Eventually", convert(expression.args[1], scope)),
|
|
602
|
+
),
|
|
603
|
+
)
|
|
604
|
+
: convertCall(expression, scope);
|
|
532
605
|
case "Always":
|
|
533
606
|
case "Eventually":
|
|
534
607
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -545,11 +618,7 @@ export const toLiveExpression = (
|
|
|
545
618
|
const taken: LiveExpression = {
|
|
546
619
|
kind: "Action",
|
|
547
620
|
expression: expression.action,
|
|
548
|
-
|
|
549
|
-
kind: "Unchanged",
|
|
550
|
-
expression: expression.subscript,
|
|
551
|
-
location: step.location,
|
|
552
|
-
},
|
|
621
|
+
subscript: expression.subscript,
|
|
553
622
|
scope,
|
|
554
623
|
enabled,
|
|
555
624
|
};
|
|
@@ -573,15 +642,50 @@ export const toLiveExpression = (
|
|
|
573
642
|
return convert(root, rootScope);
|
|
574
643
|
};
|
|
575
644
|
|
|
576
|
-
|
|
645
|
+
// Evaluates the atoms of a formula, which the interpreter and the typed tier evaluate differently.
|
|
646
|
+
export interface LiveAtoms<State> {
|
|
647
|
+
holdsState: (atom: LiveState | LiveEnabled, state: State) => boolean;
|
|
648
|
+
holdsAction: (atom: LiveAction, state: State, next: State) => boolean;
|
|
649
|
+
}
|
|
650
|
+
|
|
651
|
+
export const getInterpretedAtoms = (environment: Environment): LiveAtoms<Value[]> => ({
|
|
652
|
+
holdsState: (atom, state) => {
|
|
653
|
+
const context = { environment, scope: atom.scope, state, next: undefined };
|
|
654
|
+
const value =
|
|
655
|
+
atom.kind === "State" ? evaluate(atom.expression, context) : isEnabled(atom.step, context);
|
|
656
|
+
if (typeof value !== "boolean") {
|
|
657
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
658
|
+
}
|
|
659
|
+
return value;
|
|
660
|
+
},
|
|
661
|
+
holdsAction: (atom, state, next) => {
|
|
662
|
+
const scope = atom.scope;
|
|
663
|
+
const subscript = atom.subscript;
|
|
664
|
+
if (
|
|
665
|
+
subscript &&
|
|
666
|
+
isEqualLikeTlc(
|
|
667
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
668
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
669
|
+
)
|
|
670
|
+
)
|
|
671
|
+
return false;
|
|
672
|
+
const value = evaluate(atom.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;
|
|
677
|
+
},
|
|
678
|
+
});
|
|
679
|
+
|
|
680
|
+
export const evaluateLive = <State>(
|
|
577
681
|
expression: LiveExpression,
|
|
578
|
-
state:
|
|
579
|
-
next:
|
|
580
|
-
|
|
682
|
+
state: State,
|
|
683
|
+
next: State | undefined,
|
|
684
|
+
atoms: LiveAtoms<State>,
|
|
581
685
|
stateCache: Map<LiveExpression, boolean>,
|
|
582
686
|
): boolean => {
|
|
583
687
|
const recurse = (operand: LiveExpression) =>
|
|
584
|
-
evaluateLive(operand, state, next,
|
|
688
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
585
689
|
switch (expression.kind) {
|
|
586
690
|
case "Boolean":
|
|
587
691
|
return expression.value;
|
|
@@ -589,24 +693,13 @@ export const evaluateLive = (
|
|
|
589
693
|
case "Enabled": {
|
|
590
694
|
const cached = stateCache.get(expression);
|
|
591
695
|
if (cached !== undefined) return cached;
|
|
592
|
-
const
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
? expectBoolean(evaluate(expression.expression, context), "a temporal property predicate")
|
|
596
|
-
: isEnabled(expression.step, context);
|
|
597
|
-
stateCache.set(expression, result);
|
|
598
|
-
return result;
|
|
696
|
+
const value = atoms.holdsState(expression, state);
|
|
697
|
+
stateCache.set(expression, value);
|
|
698
|
+
return value;
|
|
599
699
|
}
|
|
600
|
-
case "Action":
|
|
700
|
+
case "Action":
|
|
601
701
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
602
|
-
|
|
603
|
-
if (
|
|
604
|
-
expression.unchanged &&
|
|
605
|
-
expectBoolean(evaluate(expression.unchanged, context), "a subscript")
|
|
606
|
-
)
|
|
607
|
-
return false;
|
|
608
|
-
return expectBoolean(evaluate(expression.expression, context), "an action predicate");
|
|
609
|
-
}
|
|
702
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
610
703
|
case "Not":
|
|
611
704
|
return !recurse(expression.body);
|
|
612
705
|
case "And":
|
|
@@ -614,7 +707,7 @@ export const evaluateLive = (
|
|
|
614
707
|
case "Or":
|
|
615
708
|
return expression.operands.some(recurse);
|
|
616
709
|
case "Next":
|
|
617
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
710
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
618
711
|
case "Always":
|
|
619
712
|
case "Eventually":
|
|
620
713
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -630,7 +723,7 @@ export const evaluateOnLasso = (
|
|
|
630
723
|
): boolean => {
|
|
631
724
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
632
725
|
const getFuture = (index: number) =>
|
|
633
|
-
path.map((
|
|
726
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
634
727
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
635
728
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
636
729
|
switch (expression.kind) {
|
|
@@ -651,7 +744,7 @@ export const evaluateOnLasso = (
|
|
|
651
744
|
expression,
|
|
652
745
|
path[position],
|
|
653
746
|
path[getNext(position)],
|
|
654
|
-
environment,
|
|
747
|
+
getInterpretedAtoms(environment),
|
|
655
748
|
new Map(),
|
|
656
749
|
);
|
|
657
750
|
}
|