tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- 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 +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -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 +110 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -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 +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -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 +260 -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-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +105 -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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +496 -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 +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -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 +814 -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 +8 -23
- 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 +261 -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 +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -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 +1200 -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 +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -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 +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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,11 @@ import {
|
|
|
12
12
|
bindDefinitions,
|
|
13
13
|
bindOperatorArguments,
|
|
14
14
|
evaluate,
|
|
15
|
-
expectBoolean,
|
|
16
15
|
forEachBinding,
|
|
17
16
|
forEachBoundElement,
|
|
18
17
|
getBoundElements,
|
|
19
18
|
getDefinition,
|
|
19
|
+
getStartupValue,
|
|
20
20
|
lookupScope,
|
|
21
21
|
resolveApplyOperator,
|
|
22
22
|
resolveGlobalOperator,
|
|
@@ -37,26 +37,34 @@ import {
|
|
|
37
37
|
createPair,
|
|
38
38
|
createUnary,
|
|
39
39
|
getLiveLevel,
|
|
40
|
+
type LiveAction,
|
|
40
41
|
type LiveEnabled,
|
|
41
42
|
type LiveExpression,
|
|
43
|
+
type LiveState,
|
|
42
44
|
} from "./tableau";
|
|
43
|
-
import type
|
|
45
|
+
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
46
|
|
|
45
47
|
export interface ScopedExpression {
|
|
46
48
|
expression: Expression;
|
|
47
49
|
scope: Scope | undefined;
|
|
48
50
|
}
|
|
49
51
|
|
|
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
52
|
interface ExpandedExpression extends ScopedExpression {
|
|
53
53
|
name: string | undefined;
|
|
54
|
+
path: string[];
|
|
54
55
|
}
|
|
55
56
|
|
|
56
57
|
export interface TemporalProperty extends ScopedExpression {
|
|
57
58
|
name: string;
|
|
58
59
|
}
|
|
59
60
|
|
|
61
|
+
interface Expansion {
|
|
62
|
+
name: string | undefined;
|
|
63
|
+
path: string[];
|
|
64
|
+
expanding: Set<Definition>;
|
|
65
|
+
isSubstituted: boolean;
|
|
66
|
+
}
|
|
67
|
+
|
|
60
68
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
61
69
|
|
|
62
70
|
export const createTautologyError = () =>
|
|
@@ -69,6 +77,11 @@ const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
|
69
77
|
|
|
70
78
|
const definitionThunks = new WeakSet<Thunk>();
|
|
71
79
|
|
|
80
|
+
const JUNCTIONS = new Map<string, "And" | "Or">([
|
|
81
|
+
["/\\", "And"],
|
|
82
|
+
["\\/", "Or"],
|
|
83
|
+
]);
|
|
84
|
+
|
|
72
85
|
const getConstantContext = (environment: Environment, scope: Scope | undefined): Context => ({
|
|
73
86
|
environment,
|
|
74
87
|
scope,
|
|
@@ -76,7 +89,6 @@ const getConstantContext = (environment: Environment, scope: Scope | undefined):
|
|
|
76
89
|
next: undefined,
|
|
77
90
|
});
|
|
78
91
|
|
|
79
|
-
// TLC adds the message of the error that stopped it, when it has one.
|
|
80
92
|
const createCannotHandleError = (expression: Expression, inner?: string) =>
|
|
81
93
|
new TlaEvaluationError(
|
|
82
94
|
`TLC cannot handle the temporal formula ${describeRange(expression)}${inner === undefined ? "" : `:\n${inner}`}`,
|
|
@@ -87,15 +99,27 @@ export const getLevel = (
|
|
|
87
99
|
scope: Scope | undefined,
|
|
88
100
|
environment: Environment,
|
|
89
101
|
shadowed = new Set<string>(),
|
|
102
|
+
visiting = new Set<object>(),
|
|
90
103
|
): number => {
|
|
104
|
+
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
105
|
+
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
106
|
+
visiting.add(binding);
|
|
107
|
+
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
108
|
+
visiting.delete(binding);
|
|
109
|
+
return level;
|
|
110
|
+
};
|
|
91
111
|
const getBindingLevel = (name: string) => {
|
|
92
112
|
const binding = lookupScope(scope, name);
|
|
93
113
|
if (!binding) return undefined;
|
|
94
114
|
if (binding.kind === "Value") return CONSTANT_LEVEL;
|
|
95
|
-
if (binding.kind === "Thunk")
|
|
115
|
+
if (binding.kind === "Thunk") {
|
|
116
|
+
return binding.isReleased
|
|
117
|
+
? CONSTANT_LEVEL
|
|
118
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
119
|
+
}
|
|
96
120
|
const operator = binding.operator;
|
|
97
121
|
return operator.kind === "Closure"
|
|
98
|
-
?
|
|
122
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
99
123
|
: CONSTANT_LEVEL;
|
|
100
124
|
};
|
|
101
125
|
const getGlobalLevel = (name: string) => {
|
|
@@ -105,6 +129,7 @@ export const getLevel = (
|
|
|
105
129
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
106
130
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
107
131
|
if (!builtin) return undefined;
|
|
132
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
108
133
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
109
134
|
};
|
|
110
135
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -115,20 +140,21 @@ export const getLevel = (
|
|
|
115
140
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
116
141
|
};
|
|
117
142
|
const getChildrenLevel = (node: Expression) => {
|
|
118
|
-
|
|
143
|
+
let level = CONSTANT_LEVEL;
|
|
119
144
|
mapChildren(node, (child, bound) => {
|
|
120
|
-
level
|
|
121
|
-
level
|
|
145
|
+
level = Math.max(
|
|
146
|
+
level,
|
|
122
147
|
getLevel(
|
|
123
148
|
child,
|
|
124
149
|
scope,
|
|
125
150
|
environment,
|
|
126
151
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
152
|
+
visiting,
|
|
127
153
|
),
|
|
128
154
|
);
|
|
129
155
|
return child;
|
|
130
156
|
});
|
|
131
|
-
return level
|
|
157
|
+
return level;
|
|
132
158
|
};
|
|
133
159
|
switch (expression.kind) {
|
|
134
160
|
case "Prime":
|
|
@@ -149,16 +175,32 @@ export const getLevel = (
|
|
|
149
175
|
return getNameLevel(expression.name, expression);
|
|
150
176
|
case "OperatorReference":
|
|
151
177
|
return getNameLevel(expression.operator, expression);
|
|
152
|
-
case "Apply":
|
|
178
|
+
case "Apply": {
|
|
153
179
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
154
180
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
155
|
-
|
|
181
|
+
const operatorLevel = getNameLevel(expression.operator, expression);
|
|
182
|
+
const level = Math.max(operatorLevel, getChildrenLevel(expression));
|
|
183
|
+
const operator = isLocallyResolved(expression)
|
|
184
|
+
? undefined
|
|
185
|
+
: resolveGlobalOperator(expression.operator, environment);
|
|
186
|
+
if (
|
|
187
|
+
level === operatorLevel ||
|
|
188
|
+
operator?.kind !== "Closure" ||
|
|
189
|
+
operator.params.length !== expression.args.length
|
|
190
|
+
) {
|
|
191
|
+
return level;
|
|
192
|
+
}
|
|
193
|
+
return getBodyLevel(
|
|
194
|
+
operator,
|
|
195
|
+
operator.body,
|
|
196
|
+
bindOperatorArguments(operator, expression.args, getConstantContext(environment, scope)),
|
|
197
|
+
);
|
|
198
|
+
}
|
|
156
199
|
default:
|
|
157
200
|
return getChildrenLevel(expression);
|
|
158
201
|
}
|
|
159
202
|
};
|
|
160
203
|
|
|
161
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
162
204
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
163
205
|
try {
|
|
164
206
|
return getBoundElements(bounds, context);
|
|
@@ -176,31 +218,27 @@ export const expandTemporal = (
|
|
|
176
218
|
expression: Expression,
|
|
177
219
|
scope: Scope | undefined,
|
|
178
220
|
environment: Environment,
|
|
179
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
180
221
|
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,
|
|
222
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
186
223
|
): ExpandedExpression[] => {
|
|
187
224
|
const expand = (
|
|
188
225
|
child: Expression,
|
|
189
226
|
childScope: Scope | undefined,
|
|
190
|
-
childName = name,
|
|
191
|
-
childExpanding = expanding,
|
|
227
|
+
childName = expansion.name,
|
|
228
|
+
childExpanding = expansion.expanding,
|
|
192
229
|
definition?: Definition,
|
|
193
230
|
): ExpandedExpression[] =>
|
|
194
|
-
expandTemporal(
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
231
|
+
expandTemporal(child, childScope, environment, isProperty, {
|
|
232
|
+
name: childName,
|
|
233
|
+
path:
|
|
234
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
235
|
+
? [...expansion.path, definition.name]
|
|
236
|
+
: expansion.path,
|
|
237
|
+
expanding: childExpanding,
|
|
238
|
+
isSubstituted:
|
|
239
|
+
expansion.isSubstituted ||
|
|
201
240
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
202
|
-
|
|
203
|
-
);
|
|
241
|
+
});
|
|
204
242
|
if (expression.kind === "And") {
|
|
205
243
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
206
244
|
}
|
|
@@ -210,8 +248,12 @@ export const expandTemporal = (
|
|
|
210
248
|
}
|
|
211
249
|
if (expression.kind === "Identifier") {
|
|
212
250
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
213
|
-
if (binding?.kind === "Thunk") {
|
|
214
|
-
return expand(
|
|
251
|
+
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
252
|
+
return expand(
|
|
253
|
+
binding.expression,
|
|
254
|
+
binding.scope,
|
|
255
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
256
|
+
);
|
|
215
257
|
}
|
|
216
258
|
const definition = environment.constants.has(expression.name)
|
|
217
259
|
? undefined
|
|
@@ -220,23 +262,23 @@ export const expandTemporal = (
|
|
|
220
262
|
!binding &&
|
|
221
263
|
definition?.kind === "Operator" &&
|
|
222
264
|
definition.params.length === 0 &&
|
|
223
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
265
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
266
|
+
getStartupValue(definition, environment) === undefined)
|
|
224
267
|
) {
|
|
225
|
-
if (expanding.has(definition)) {
|
|
268
|
+
if (expansion.expanding.has(definition)) {
|
|
226
269
|
throw createStackOverflowError();
|
|
227
270
|
}
|
|
228
271
|
return expand(
|
|
229
272
|
definition.body,
|
|
230
273
|
undefined,
|
|
231
|
-
|
|
232
|
-
|
|
274
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
275
|
+
definition.name,
|
|
276
|
+
new Set([...expansion.expanding, definition]),
|
|
233
277
|
definition,
|
|
234
278
|
);
|
|
235
279
|
}
|
|
236
280
|
}
|
|
237
281
|
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
282
|
if (
|
|
241
283
|
expression.kind === "Apply" &&
|
|
242
284
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -246,17 +288,20 @@ export const expandTemporal = (
|
|
|
246
288
|
const definition = isLocallyResolved(expression)
|
|
247
289
|
? undefined
|
|
248
290
|
: getDefinition(expression.operator, environment);
|
|
291
|
+
const isOwnArgumentFree =
|
|
292
|
+
operator?.kind === "Closure" &&
|
|
293
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
249
294
|
const isExpandable =
|
|
250
295
|
operator?.kind === "Closure" &&
|
|
251
296
|
operator.params.length === expression.args.length &&
|
|
252
297
|
!definition?.isRecursive &&
|
|
253
|
-
!isSubstituted;
|
|
298
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
254
299
|
if (isExpandable) {
|
|
255
300
|
return expand(
|
|
256
301
|
operator.body,
|
|
257
302
|
bindOperatorArguments(operator, expression.args, context),
|
|
258
|
-
expression.operator,
|
|
259
|
-
expanding,
|
|
303
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
304
|
+
expansion.expanding,
|
|
260
305
|
definition,
|
|
261
306
|
);
|
|
262
307
|
}
|
|
@@ -275,7 +320,7 @@ export const expandTemporal = (
|
|
|
275
320
|
if (expanded.length === 0) throw createTautologyError();
|
|
276
321
|
return expanded;
|
|
277
322
|
}
|
|
278
|
-
return [{ expression, scope, name }];
|
|
323
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
279
324
|
};
|
|
280
325
|
|
|
281
326
|
const bindLetDefinitions = (
|
|
@@ -301,7 +346,6 @@ export const toLiveExpression = (
|
|
|
301
346
|
scope: Scope | undefined,
|
|
302
347
|
level: number,
|
|
303
348
|
): LiveExpression => {
|
|
304
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
305
349
|
const atomLevel =
|
|
306
350
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
307
351
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -314,10 +358,18 @@ export const toLiveExpression = (
|
|
|
314
358
|
return createBoolean(value);
|
|
315
359
|
}
|
|
316
360
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
317
|
-
|
|
361
|
+
if (expression.kind === "AngleAction") {
|
|
362
|
+
return {
|
|
363
|
+
kind: "Action",
|
|
364
|
+
expression: expression.action,
|
|
365
|
+
subscript: expression.subscript,
|
|
366
|
+
scope,
|
|
367
|
+
};
|
|
368
|
+
}
|
|
369
|
+
return { kind: "Action", expression, subscript: undefined, scope };
|
|
318
370
|
};
|
|
319
371
|
|
|
320
|
-
|
|
372
|
+
let expansionDepth = 0;
|
|
321
373
|
|
|
322
374
|
const expand = (
|
|
323
375
|
body: Expression,
|
|
@@ -325,14 +377,17 @@ export const toLiveExpression = (
|
|
|
325
377
|
expression: Expression,
|
|
326
378
|
scope: Scope | undefined,
|
|
327
379
|
) => {
|
|
328
|
-
if (
|
|
380
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
329
381
|
throw createStackOverflowError();
|
|
330
382
|
}
|
|
331
|
-
|
|
383
|
+
expansionDepth++;
|
|
332
384
|
const result = convert(body, bodyScope);
|
|
333
|
-
|
|
385
|
+
expansionDepth--;
|
|
334
386
|
const level = getLiveLevel(result);
|
|
335
|
-
|
|
387
|
+
// Deviation from TLC: Liveness#astToLive takes a temporal call with a constant body for an action, which classifyExpr rejects.
|
|
388
|
+
const isConstantTemporal =
|
|
389
|
+
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
390
|
+
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
336
391
|
};
|
|
337
392
|
|
|
338
393
|
const convertCall = (
|
|
@@ -345,7 +400,7 @@ export const toLiveExpression = (
|
|
|
345
400
|
isLocallyResolved(expression) || getDefinition(name, environment) === undefined
|
|
346
401
|
? lookupScope(scope, name)
|
|
347
402
|
: undefined;
|
|
348
|
-
if (binding?.kind === "Thunk" && definitionThunks.has(binding)) {
|
|
403
|
+
if (binding?.kind === "Thunk" && !binding.isReleased && definitionThunks.has(binding)) {
|
|
349
404
|
return expandCall(expression, () =>
|
|
350
405
|
expand(binding.expression, binding.scope, expression, scope),
|
|
351
406
|
);
|
|
@@ -358,8 +413,14 @@ export const toLiveExpression = (
|
|
|
358
413
|
: isLocallyResolved(expression)
|
|
359
414
|
? resolveOperator(name, context)
|
|
360
415
|
: resolveGlobalOperator(name, environment);
|
|
361
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
362
416
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
417
|
+
const junction =
|
|
418
|
+
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
419
|
+
if (junction) {
|
|
420
|
+
const operands = args.map((arg) => convert(arg, scope));
|
|
421
|
+
return toWhole(expression, scope, createJunction(junction, operands));
|
|
422
|
+
}
|
|
423
|
+
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
363
424
|
const isRecursive =
|
|
364
425
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
365
426
|
return expandCall(
|
|
@@ -382,8 +443,6 @@ export const toLiveExpression = (
|
|
|
382
443
|
);
|
|
383
444
|
};
|
|
384
445
|
|
|
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
446
|
const expandCall = (
|
|
388
447
|
expression: Expression,
|
|
389
448
|
expandBody: () => LiveExpression,
|
|
@@ -403,17 +462,8 @@ export const toLiveExpression = (
|
|
|
403
462
|
scope: Scope | undefined,
|
|
404
463
|
) => {
|
|
405
464
|
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
465
|
const operands: LiveExpression[] = [];
|
|
414
466
|
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
467
|
try {
|
|
418
468
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
419
469
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -433,50 +483,21 @@ export const toLiveExpression = (
|
|
|
433
483
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
434
484
|
};
|
|
435
485
|
|
|
436
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
437
486
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
438
487
|
const level = getLiveLevel(parts);
|
|
439
488
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
440
489
|
};
|
|
441
490
|
|
|
442
|
-
//
|
|
443
|
-
// that is constant, such as a quantifier over the empty set, can make the formula constant.
|
|
444
|
-
const isTranslatedWhole = (expression: Expression) =>
|
|
445
|
-
expression.kind === "Label" ||
|
|
446
|
-
expression.kind === "Let" ||
|
|
447
|
-
expression.kind === "And" ||
|
|
448
|
-
expression.kind === "Or" ||
|
|
449
|
-
expression.kind === "Forall" ||
|
|
450
|
-
expression.kind === "Exists" ||
|
|
451
|
-
expression.kind === "If" ||
|
|
452
|
-
(expression.kind === "Apply" &&
|
|
453
|
-
((expression.operator === "~" && !isLocallyResolved(expression)) ||
|
|
454
|
-
expression.operator === "=>"));
|
|
455
|
-
|
|
491
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
456
492
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
457
493
|
const level = getLevel(expression, scope, environment);
|
|
458
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
459
|
-
return toAtom(expression, scope, level);
|
|
460
|
-
}
|
|
461
494
|
switch (expression.kind) {
|
|
462
495
|
case "Label":
|
|
463
496
|
return convert(expression.body, scope);
|
|
464
497
|
case "Let":
|
|
465
498
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
466
|
-
case "Identifier":
|
|
467
|
-
return convertCall(expression, scope);
|
|
468
499
|
case "Apply": {
|
|
469
500
|
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
501
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
481
502
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
482
503
|
}
|
|
@@ -487,7 +508,7 @@ export const toLiveExpression = (
|
|
|
487
508
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
488
509
|
);
|
|
489
510
|
}
|
|
490
|
-
|
|
511
|
+
break;
|
|
491
512
|
}
|
|
492
513
|
case "And":
|
|
493
514
|
case "Or":
|
|
@@ -503,7 +524,6 @@ export const toLiveExpression = (
|
|
|
503
524
|
case "Exists":
|
|
504
525
|
return convertQuantifier(expression, scope);
|
|
505
526
|
case "If": {
|
|
506
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
507
527
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
508
528
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
509
529
|
if (typeof condition === "boolean") {
|
|
@@ -525,6 +545,22 @@ export const toLiveExpression = (
|
|
|
525
545
|
),
|
|
526
546
|
);
|
|
527
547
|
}
|
|
548
|
+
}
|
|
549
|
+
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
550
|
+
switch (expression.kind) {
|
|
551
|
+
case "Identifier":
|
|
552
|
+
return convertCall(expression, scope);
|
|
553
|
+
case "Apply":
|
|
554
|
+
return expression.operator === "~>"
|
|
555
|
+
? createUnary(
|
|
556
|
+
"Always",
|
|
557
|
+
createPair(
|
|
558
|
+
"Or",
|
|
559
|
+
createUnary("Not", convert(expression.args[0], scope)),
|
|
560
|
+
createUnary("Eventually", convert(expression.args[1], scope)),
|
|
561
|
+
),
|
|
562
|
+
)
|
|
563
|
+
: convertCall(expression, scope);
|
|
528
564
|
case "Always":
|
|
529
565
|
case "Eventually":
|
|
530
566
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -541,11 +577,7 @@ export const toLiveExpression = (
|
|
|
541
577
|
const taken: LiveExpression = {
|
|
542
578
|
kind: "Action",
|
|
543
579
|
expression: expression.action,
|
|
544
|
-
|
|
545
|
-
kind: "Unchanged",
|
|
546
|
-
expression: expression.subscript,
|
|
547
|
-
location: step.location,
|
|
548
|
-
},
|
|
580
|
+
subscript: expression.subscript,
|
|
549
581
|
scope,
|
|
550
582
|
enabled,
|
|
551
583
|
};
|
|
@@ -569,15 +601,50 @@ export const toLiveExpression = (
|
|
|
569
601
|
return convert(root, rootScope);
|
|
570
602
|
};
|
|
571
603
|
|
|
572
|
-
|
|
604
|
+
// Evaluates the atoms of a formula, which the interpreter and the typed tier evaluate differently.
|
|
605
|
+
export interface LiveAtoms<State> {
|
|
606
|
+
holdsState: (atom: LiveState | LiveEnabled, state: State) => boolean;
|
|
607
|
+
holdsAction: (atom: LiveAction, state: State, next: State) => boolean;
|
|
608
|
+
}
|
|
609
|
+
|
|
610
|
+
export const getInterpretedAtoms = (environment: Environment): LiveAtoms<Value[]> => ({
|
|
611
|
+
holdsState: (atom, state) => {
|
|
612
|
+
const context = { environment, scope: atom.scope, state, next: undefined };
|
|
613
|
+
const value =
|
|
614
|
+
atom.kind === "State" ? evaluate(atom.expression, context) : isEnabled(atom.step, context);
|
|
615
|
+
if (typeof value !== "boolean") {
|
|
616
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
617
|
+
}
|
|
618
|
+
return value;
|
|
619
|
+
},
|
|
620
|
+
holdsAction: (atom, state, next) => {
|
|
621
|
+
const scope = atom.scope;
|
|
622
|
+
const subscript = atom.subscript;
|
|
623
|
+
if (
|
|
624
|
+
subscript &&
|
|
625
|
+
isEqualLikeTlc(
|
|
626
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
627
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
628
|
+
)
|
|
629
|
+
)
|
|
630
|
+
return false;
|
|
631
|
+
const value = evaluate(atom.expression, { environment, scope, state, next });
|
|
632
|
+
if (typeof value !== "boolean") {
|
|
633
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
634
|
+
}
|
|
635
|
+
return value;
|
|
636
|
+
},
|
|
637
|
+
});
|
|
638
|
+
|
|
639
|
+
export const evaluateLive = <State>(
|
|
573
640
|
expression: LiveExpression,
|
|
574
|
-
state:
|
|
575
|
-
next:
|
|
576
|
-
|
|
641
|
+
state: State,
|
|
642
|
+
next: State | undefined,
|
|
643
|
+
atoms: LiveAtoms<State>,
|
|
577
644
|
stateCache: Map<LiveExpression, boolean>,
|
|
578
645
|
): boolean => {
|
|
579
646
|
const recurse = (operand: LiveExpression) =>
|
|
580
|
-
evaluateLive(operand, state, next,
|
|
647
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
581
648
|
switch (expression.kind) {
|
|
582
649
|
case "Boolean":
|
|
583
650
|
return expression.value;
|
|
@@ -585,24 +652,13 @@ export const evaluateLive = (
|
|
|
585
652
|
case "Enabled": {
|
|
586
653
|
const cached = stateCache.get(expression);
|
|
587
654
|
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;
|
|
655
|
+
const value = atoms.holdsState(expression, state);
|
|
656
|
+
stateCache.set(expression, value);
|
|
657
|
+
return value;
|
|
595
658
|
}
|
|
596
|
-
case "Action":
|
|
659
|
+
case "Action":
|
|
597
660
|
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
|
-
}
|
|
661
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
606
662
|
case "Not":
|
|
607
663
|
return !recurse(expression.body);
|
|
608
664
|
case "And":
|
|
@@ -610,7 +666,7 @@ export const evaluateLive = (
|
|
|
610
666
|
case "Or":
|
|
611
667
|
return expression.operands.some(recurse);
|
|
612
668
|
case "Next":
|
|
613
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
669
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
614
670
|
case "Always":
|
|
615
671
|
case "Eventually":
|
|
616
672
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -626,7 +682,7 @@ export const evaluateOnLasso = (
|
|
|
626
682
|
): boolean => {
|
|
627
683
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
628
684
|
const getFuture = (index: number) =>
|
|
629
|
-
path.map((
|
|
685
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
630
686
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
631
687
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
632
688
|
switch (expression.kind) {
|
|
@@ -647,7 +703,7 @@ export const evaluateOnLasso = (
|
|
|
647
703
|
expression,
|
|
648
704
|
path[position],
|
|
649
705
|
path[getNext(position)],
|
|
650
|
-
environment,
|
|
706
|
+
getInterpretedAtoms(environment),
|
|
651
707
|
new Map(),
|
|
652
708
|
);
|
|
653
709
|
}
|