tla-ts 0.0.9 → 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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -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 +3 -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 +1156 -888
- 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 +330 -659
- 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 +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 +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- 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 -322
- package/src/liveness.ts +230 -133
- 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 +36 -60
- package/src/parallel.ts +64 -73
- 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 +135 -40
- 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 +299 -108
- 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 +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 +945 -526
- 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,15 +100,27 @@ 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;
|
|
94
115
|
if (binding.kind === "Value") return CONSTANT_LEVEL;
|
|
95
|
-
if (binding.kind === "Thunk")
|
|
116
|
+
if (binding.kind === "Thunk") {
|
|
117
|
+
return binding.isReleased
|
|
118
|
+
? CONSTANT_LEVEL
|
|
119
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
120
|
+
}
|
|
96
121
|
const operator = binding.operator;
|
|
97
122
|
return operator.kind === "Closure"
|
|
98
|
-
?
|
|
123
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
99
124
|
: CONSTANT_LEVEL;
|
|
100
125
|
};
|
|
101
126
|
const getGlobalLevel = (name: string) => {
|
|
@@ -105,6 +130,7 @@ export const getLevel = (
|
|
|
105
130
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
106
131
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
107
132
|
if (!builtin) return undefined;
|
|
133
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
108
134
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
109
135
|
};
|
|
110
136
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -115,20 +141,21 @@ export const getLevel = (
|
|
|
115
141
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
116
142
|
};
|
|
117
143
|
const getChildrenLevel = (node: Expression) => {
|
|
118
|
-
|
|
144
|
+
let level = CONSTANT_LEVEL;
|
|
119
145
|
mapChildren(node, (child, bound) => {
|
|
120
|
-
level
|
|
121
|
-
level
|
|
146
|
+
level = Math.max(
|
|
147
|
+
level,
|
|
122
148
|
getLevel(
|
|
123
149
|
child,
|
|
124
150
|
scope,
|
|
125
151
|
environment,
|
|
126
152
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
153
|
+
visiting,
|
|
127
154
|
),
|
|
128
155
|
);
|
|
129
156
|
return child;
|
|
130
157
|
});
|
|
131
|
-
return level
|
|
158
|
+
return level;
|
|
132
159
|
};
|
|
133
160
|
switch (expression.kind) {
|
|
134
161
|
case "Prime":
|
|
@@ -149,16 +176,32 @@ export const getLevel = (
|
|
|
149
176
|
return getNameLevel(expression.name, expression);
|
|
150
177
|
case "OperatorReference":
|
|
151
178
|
return getNameLevel(expression.operator, expression);
|
|
152
|
-
case "Apply":
|
|
179
|
+
case "Apply": {
|
|
153
180
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
154
181
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
155
|
-
|
|
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
|
+
}
|
|
156
200
|
default:
|
|
157
201
|
return getChildrenLevel(expression);
|
|
158
202
|
}
|
|
159
203
|
};
|
|
160
204
|
|
|
161
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
162
205
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
163
206
|
try {
|
|
164
207
|
return getBoundElements(bounds, context);
|
|
@@ -176,42 +219,43 @@ export const expandTemporal = (
|
|
|
176
219
|
expression: Expression,
|
|
177
220
|
scope: Scope | undefined,
|
|
178
221
|
environment: Environment,
|
|
179
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
180
222
|
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,
|
|
223
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
186
224
|
): ExpandedExpression[] => {
|
|
187
225
|
const expand = (
|
|
188
226
|
child: Expression,
|
|
189
227
|
childScope: Scope | undefined,
|
|
190
|
-
childName = name,
|
|
191
|
-
childExpanding = expanding,
|
|
228
|
+
childName = expansion.name,
|
|
229
|
+
childExpanding = expansion.expanding,
|
|
192
230
|
definition?: Definition,
|
|
193
231
|
): ExpandedExpression[] =>
|
|
194
|
-
expandTemporal(
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
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 ||
|
|
201
241
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
202
|
-
|
|
203
|
-
);
|
|
242
|
+
});
|
|
204
243
|
if (expression.kind === "And") {
|
|
205
244
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
206
245
|
}
|
|
207
246
|
if (expression.kind === "Label") return expand(expression.body, scope);
|
|
247
|
+
if (expression.kind === "Selection") return expand(expression.expression, scope);
|
|
208
248
|
if (expression.kind === "Let") {
|
|
209
249
|
return expand(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
210
250
|
}
|
|
211
251
|
if (expression.kind === "Identifier") {
|
|
212
252
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
213
|
-
if (binding?.kind === "Thunk") {
|
|
214
|
-
return expand(
|
|
253
|
+
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
254
|
+
return expand(
|
|
255
|
+
binding.expression,
|
|
256
|
+
binding.scope,
|
|
257
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
258
|
+
);
|
|
215
259
|
}
|
|
216
260
|
const definition = environment.constants.has(expression.name)
|
|
217
261
|
? undefined
|
|
@@ -220,23 +264,23 @@ export const expandTemporal = (
|
|
|
220
264
|
!binding &&
|
|
221
265
|
definition?.kind === "Operator" &&
|
|
222
266
|
definition.params.length === 0 &&
|
|
223
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
267
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
268
|
+
getStartupValue(definition, environment) === undefined)
|
|
224
269
|
) {
|
|
225
|
-
if (expanding.has(definition)) {
|
|
270
|
+
if (expansion.expanding.has(definition)) {
|
|
226
271
|
throw createStackOverflowError();
|
|
227
272
|
}
|
|
228
273
|
return expand(
|
|
229
274
|
definition.body,
|
|
230
275
|
undefined,
|
|
231
|
-
|
|
232
|
-
|
|
276
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
277
|
+
definition.name,
|
|
278
|
+
new Set([...expansion.expanding, definition]),
|
|
233
279
|
definition,
|
|
234
280
|
);
|
|
235
281
|
}
|
|
236
282
|
}
|
|
237
283
|
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
284
|
if (
|
|
241
285
|
expression.kind === "Apply" &&
|
|
242
286
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -246,17 +290,20 @@ export const expandTemporal = (
|
|
|
246
290
|
const definition = isLocallyResolved(expression)
|
|
247
291
|
? undefined
|
|
248
292
|
: getDefinition(expression.operator, environment);
|
|
293
|
+
const isOwnArgumentFree =
|
|
294
|
+
operator?.kind === "Closure" &&
|
|
295
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
249
296
|
const isExpandable =
|
|
250
297
|
operator?.kind === "Closure" &&
|
|
251
298
|
operator.params.length === expression.args.length &&
|
|
252
299
|
!definition?.isRecursive &&
|
|
253
|
-
!isSubstituted;
|
|
300
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
254
301
|
if (isExpandable) {
|
|
255
302
|
return expand(
|
|
256
303
|
operator.body,
|
|
257
304
|
bindOperatorArguments(operator, expression.args, context),
|
|
258
|
-
expression.operator,
|
|
259
|
-
expanding,
|
|
305
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
306
|
+
expansion.expanding,
|
|
260
307
|
definition,
|
|
261
308
|
);
|
|
262
309
|
}
|
|
@@ -275,15 +322,20 @@ export const expandTemporal = (
|
|
|
275
322
|
if (expanded.length === 0) throw createTautologyError();
|
|
276
323
|
return expanded;
|
|
277
324
|
}
|
|
278
|
-
return [{ expression, scope, name }];
|
|
325
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
279
326
|
};
|
|
280
327
|
|
|
281
|
-
|
|
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 = (
|
|
282
330
|
expression: Expression & { kind: "Let" },
|
|
283
331
|
scope: Scope | undefined,
|
|
284
332
|
environment: Environment,
|
|
285
333
|
) => {
|
|
286
|
-
const bound = bindDefinitions(
|
|
334
|
+
const bound = bindDefinitions(
|
|
335
|
+
expression.definitions,
|
|
336
|
+
getConstantContext(environment, scope),
|
|
337
|
+
getReevaluatedDefinitions(expression.definitions, environment),
|
|
338
|
+
);
|
|
287
339
|
for (let current = bound; current && current !== scope; current = current.parent) {
|
|
288
340
|
if (current.binding.kind === "Thunk") definitionThunks.add(current.binding);
|
|
289
341
|
}
|
|
@@ -301,7 +353,6 @@ export const toLiveExpression = (
|
|
|
301
353
|
scope: Scope | undefined,
|
|
302
354
|
level: number,
|
|
303
355
|
): LiveExpression => {
|
|
304
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
305
356
|
const atomLevel =
|
|
306
357
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
307
358
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -314,10 +365,18 @@ export const toLiveExpression = (
|
|
|
314
365
|
return createBoolean(value);
|
|
315
366
|
}
|
|
316
367
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
317
|
-
|
|
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 };
|
|
318
377
|
};
|
|
319
378
|
|
|
320
|
-
|
|
379
|
+
let expansionDepth = 0;
|
|
321
380
|
|
|
322
381
|
const expand = (
|
|
323
382
|
body: Expression,
|
|
@@ -325,14 +384,17 @@ export const toLiveExpression = (
|
|
|
325
384
|
expression: Expression,
|
|
326
385
|
scope: Scope | undefined,
|
|
327
386
|
) => {
|
|
328
|
-
if (
|
|
387
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
329
388
|
throw createStackOverflowError();
|
|
330
389
|
}
|
|
331
|
-
|
|
390
|
+
expansionDepth++;
|
|
332
391
|
const result = convert(body, bodyScope);
|
|
333
|
-
|
|
392
|
+
expansionDepth--;
|
|
334
393
|
const level = getLiveLevel(result);
|
|
335
|
-
|
|
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);
|
|
336
398
|
};
|
|
337
399
|
|
|
338
400
|
const convertCall = (
|
|
@@ -345,7 +407,7 @@ export const toLiveExpression = (
|
|
|
345
407
|
isLocallyResolved(expression) || getDefinition(name, environment) === undefined
|
|
346
408
|
? lookupScope(scope, name)
|
|
347
409
|
: undefined;
|
|
348
|
-
if (binding?.kind === "Thunk" && definitionThunks.has(binding)) {
|
|
410
|
+
if (binding?.kind === "Thunk" && !binding.isReleased && definitionThunks.has(binding)) {
|
|
349
411
|
return expandCall(expression, () =>
|
|
350
412
|
expand(binding.expression, binding.scope, expression, scope),
|
|
351
413
|
);
|
|
@@ -358,8 +420,14 @@ export const toLiveExpression = (
|
|
|
358
420
|
: isLocallyResolved(expression)
|
|
359
421
|
? resolveOperator(name, context)
|
|
360
422
|
: resolveGlobalOperator(name, environment);
|
|
361
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
362
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);
|
|
363
431
|
const isRecursive =
|
|
364
432
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
365
433
|
return expandCall(
|
|
@@ -382,8 +450,6 @@ export const toLiveExpression = (
|
|
|
382
450
|
);
|
|
383
451
|
};
|
|
384
452
|
|
|
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
453
|
const expandCall = (
|
|
388
454
|
expression: Expression,
|
|
389
455
|
expandBody: () => LiveExpression,
|
|
@@ -403,17 +469,8 @@ export const toLiveExpression = (
|
|
|
403
469
|
scope: Scope | undefined,
|
|
404
470
|
) => {
|
|
405
471
|
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
472
|
const operands: LiveExpression[] = [];
|
|
414
473
|
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
474
|
try {
|
|
418
475
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
419
476
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -433,50 +490,62 @@ export const toLiveExpression = (
|
|
|
433
490
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
434
491
|
};
|
|
435
492
|
|
|
436
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
437
493
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
438
494
|
const level = getLiveLevel(parts);
|
|
439
495
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
440
496
|
};
|
|
441
497
|
|
|
442
|
-
//
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
expression.
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
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
|
+
};
|
|
455
536
|
|
|
537
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
456
538
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
457
539
|
const level = getLevel(expression, scope, environment);
|
|
458
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
459
|
-
return toAtom(expression, scope, level);
|
|
460
|
-
}
|
|
461
540
|
switch (expression.kind) {
|
|
462
541
|
case "Label":
|
|
463
542
|
return convert(expression.body, scope);
|
|
543
|
+
case "Selection":
|
|
544
|
+
return convert(expression.expression, scope);
|
|
464
545
|
case "Let":
|
|
465
546
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
466
|
-
case "Identifier":
|
|
467
|
-
return convertCall(expression, scope);
|
|
468
547
|
case "Apply": {
|
|
469
548
|
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
549
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
481
550
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
482
551
|
}
|
|
@@ -487,23 +556,15 @@ export const toLiveExpression = (
|
|
|
487
556
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
488
557
|
);
|
|
489
558
|
}
|
|
490
|
-
|
|
559
|
+
break;
|
|
491
560
|
}
|
|
492
561
|
case "And":
|
|
493
562
|
case "Or":
|
|
494
|
-
return
|
|
495
|
-
expression,
|
|
496
|
-
scope,
|
|
497
|
-
createJunction(
|
|
498
|
-
expression.kind,
|
|
499
|
-
expression.operands.map((operand) => convert(operand, scope)),
|
|
500
|
-
),
|
|
501
|
-
);
|
|
563
|
+
return convertJunction(expression, scope);
|
|
502
564
|
case "Forall":
|
|
503
565
|
case "Exists":
|
|
504
566
|
return convertQuantifier(expression, scope);
|
|
505
567
|
case "If": {
|
|
506
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
507
568
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
508
569
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
509
570
|
if (typeof condition === "boolean") {
|
|
@@ -525,6 +586,22 @@ export const toLiveExpression = (
|
|
|
525
586
|
),
|
|
526
587
|
);
|
|
527
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);
|
|
528
605
|
case "Always":
|
|
529
606
|
case "Eventually":
|
|
530
607
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -541,11 +618,7 @@ export const toLiveExpression = (
|
|
|
541
618
|
const taken: LiveExpression = {
|
|
542
619
|
kind: "Action",
|
|
543
620
|
expression: expression.action,
|
|
544
|
-
|
|
545
|
-
kind: "Unchanged",
|
|
546
|
-
expression: expression.subscript,
|
|
547
|
-
location: step.location,
|
|
548
|
-
},
|
|
621
|
+
subscript: expression.subscript,
|
|
549
622
|
scope,
|
|
550
623
|
enabled,
|
|
551
624
|
};
|
|
@@ -569,15 +642,50 @@ export const toLiveExpression = (
|
|
|
569
642
|
return convert(root, rootScope);
|
|
570
643
|
};
|
|
571
644
|
|
|
572
|
-
|
|
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>(
|
|
573
681
|
expression: LiveExpression,
|
|
574
|
-
state:
|
|
575
|
-
next:
|
|
576
|
-
|
|
682
|
+
state: State,
|
|
683
|
+
next: State | undefined,
|
|
684
|
+
atoms: LiveAtoms<State>,
|
|
577
685
|
stateCache: Map<LiveExpression, boolean>,
|
|
578
686
|
): boolean => {
|
|
579
687
|
const recurse = (operand: LiveExpression) =>
|
|
580
|
-
evaluateLive(operand, state, next,
|
|
688
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
581
689
|
switch (expression.kind) {
|
|
582
690
|
case "Boolean":
|
|
583
691
|
return expression.value;
|
|
@@ -585,24 +693,13 @@ export const evaluateLive = (
|
|
|
585
693
|
case "Enabled": {
|
|
586
694
|
const cached = stateCache.get(expression);
|
|
587
695
|
if (cached !== undefined) return cached;
|
|
588
|
-
const
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
? expectBoolean(evaluate(expression.expression, context), "a temporal property predicate")
|
|
592
|
-
: isEnabled(expression.step, context);
|
|
593
|
-
stateCache.set(expression, result);
|
|
594
|
-
return result;
|
|
696
|
+
const value = atoms.holdsState(expression, state);
|
|
697
|
+
stateCache.set(expression, value);
|
|
698
|
+
return value;
|
|
595
699
|
}
|
|
596
|
-
case "Action":
|
|
700
|
+
case "Action":
|
|
597
701
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
598
|
-
|
|
599
|
-
if (
|
|
600
|
-
expression.unchanged &&
|
|
601
|
-
expectBoolean(evaluate(expression.unchanged, context), "a subscript")
|
|
602
|
-
)
|
|
603
|
-
return false;
|
|
604
|
-
return expectBoolean(evaluate(expression.expression, context), "an action predicate");
|
|
605
|
-
}
|
|
702
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
606
703
|
case "Not":
|
|
607
704
|
return !recurse(expression.body);
|
|
608
705
|
case "And":
|
|
@@ -610,7 +707,7 @@ export const evaluateLive = (
|
|
|
610
707
|
case "Or":
|
|
611
708
|
return expression.operands.some(recurse);
|
|
612
709
|
case "Next":
|
|
613
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
710
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
614
711
|
case "Always":
|
|
615
712
|
case "Eventually":
|
|
616
713
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -626,7 +723,7 @@ export const evaluateOnLasso = (
|
|
|
626
723
|
): boolean => {
|
|
627
724
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
628
725
|
const getFuture = (index: number) =>
|
|
629
|
-
path.map((
|
|
726
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
630
727
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
631
728
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
632
729
|
switch (expression.kind) {
|
|
@@ -647,7 +744,7 @@ export const evaluateOnLasso = (
|
|
|
647
744
|
expression,
|
|
648
745
|
path[position],
|
|
649
746
|
path[getNext(position)],
|
|
650
|
-
environment,
|
|
747
|
+
getInterpretedAtoms(environment),
|
|
651
748
|
new Map(),
|
|
652
749
|
);
|
|
653
750
|
}
|