tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- 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 +38 -10
- 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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- 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 +908 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 -6
- 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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- 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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- 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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- 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 +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 +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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- 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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- 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 +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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/evaluate.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getReferencedName,
|
|
3
4
|
isLocallyResolved,
|
|
4
5
|
type Bound,
|
|
5
6
|
type BoundPattern,
|
|
@@ -10,7 +11,6 @@ import {
|
|
|
10
11
|
type NumberExpression,
|
|
11
12
|
type OperatorParam,
|
|
12
13
|
type RecordField,
|
|
13
|
-
type SourceRange,
|
|
14
14
|
} from "./ast";
|
|
15
15
|
import { getKindString } from "./builtins";
|
|
16
16
|
import {
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
TlaEvaluationError,
|
|
19
19
|
TlaSetBoundError,
|
|
20
20
|
TlaUnassignedError,
|
|
21
|
+
formatRange,
|
|
21
22
|
} from "./errors";
|
|
22
23
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
23
24
|
import { generateEvaluator } from "./codegen";
|
|
@@ -103,9 +104,7 @@ export interface Builtin {
|
|
|
103
104
|
evaluateUnary: ((value: Value) => Value) | undefined;
|
|
104
105
|
evaluateBinary: ((left: Value, right: Value) => Value) | undefined;
|
|
105
106
|
isStateLevel?: boolean;
|
|
106
|
-
// Whether TLC takes an application for a constant one although its value depends on the state.
|
|
107
107
|
isLevelConstant?: boolean;
|
|
108
|
-
// TLC's minLevel of ActionLevel for a Java override.
|
|
109
108
|
isActionLevel?: boolean;
|
|
110
109
|
isLazy?: boolean;
|
|
111
110
|
}
|
|
@@ -127,14 +126,11 @@ export interface Thunk {
|
|
|
127
126
|
state: State | undefined;
|
|
128
127
|
next: State | undefined;
|
|
129
128
|
cache: Value | undefined;
|
|
130
|
-
// Whether the value may stream until TLC caches it, so the thunk caches only a settled value.
|
|
131
129
|
isStreamed: boolean;
|
|
132
|
-
// Whether the thunk dropped its scope after caching a value that holds in every state.
|
|
133
130
|
isReleased?: boolean;
|
|
134
131
|
}
|
|
135
132
|
|
|
136
133
|
type Binding =
|
|
137
|
-
// A literal argument keeps its expression, which TLC binds lazily like any other.
|
|
138
134
|
| { kind: "Value"; value: Value; argument?: Expression }
|
|
139
135
|
| Thunk
|
|
140
136
|
| { kind: "Operator"; operator: Operator };
|
|
@@ -155,9 +151,7 @@ export interface Environment {
|
|
|
155
151
|
variables: string[];
|
|
156
152
|
variableIndex: Map<string, number>;
|
|
157
153
|
facts: DefinitionFacts;
|
|
158
|
-
// TLC evaluates a constant definition it failed to compute at startup where the spec uses it.
|
|
159
154
|
startupValues: (Value | undefined)[];
|
|
160
|
-
// SANY wraps the body of each of these INSTANCE copies in its substitutions.
|
|
161
155
|
substitutedDefinitions: Set<Definition>;
|
|
162
156
|
instanceParams: Set<OperatorParam>;
|
|
163
157
|
evaluators: WeakMap<Expression, Evaluator>;
|
|
@@ -169,26 +163,20 @@ export interface Environment {
|
|
|
169
163
|
|
|
170
164
|
export interface CallStack {
|
|
171
165
|
expressions: Expression[];
|
|
172
|
-
// TLC stops popping the stack once an evaluation fails, so it keeps where the failure occurred.
|
|
173
166
|
isFrozen: boolean;
|
|
174
167
|
sources: WeakMap<ObjectValue, Expression>;
|
|
175
168
|
values: WeakMap<Expression, Value>;
|
|
176
|
-
// Tells a failure of an operand from one of the method that computes the operator.
|
|
177
169
|
failures: WeakMap<Error, Expression>;
|
|
178
170
|
fingerprint?: FingerprintFailure;
|
|
179
171
|
}
|
|
180
172
|
|
|
181
173
|
export interface FingerprintFailure {
|
|
182
|
-
// The sources of the values whose methods failed, outermost first.
|
|
183
174
|
sources: Expression[];
|
|
184
175
|
reason: string;
|
|
185
176
|
}
|
|
186
177
|
|
|
187
|
-
// The operators whose value TLC's CallStackTool gives a source.
|
|
188
178
|
const SOURCED_OPERATORS = new Set(["SUBSET", "UNION", "DOMAIN", "\\cup", "\\cap", "\\"]);
|
|
189
179
|
|
|
190
|
-
// CallStackTool returns these lazy values without their source, and a function TLC builds
|
|
191
|
-
// from a FcnLambdaValue has none.
|
|
192
180
|
const SOURCED_KINDS = new Set<Expression["kind"]>([
|
|
193
181
|
"SetEnumeration",
|
|
194
182
|
"SetFilter",
|
|
@@ -204,7 +192,6 @@ const isSourced = (expression: Expression) =>
|
|
|
204
192
|
SOURCED_KINDS.has(expression.kind) ||
|
|
205
193
|
(expression.kind === "Apply" && SOURCED_OPERATORS.has(expression.operator));
|
|
206
194
|
|
|
207
|
-
// The operand whose Java method computes the operator, such as S in e \in S or f in f[e].
|
|
208
195
|
const getReceiver = (expression: Expression, values: CallStack["values"]) => {
|
|
209
196
|
if (expression.kind === "FunctionApplication" || expression.kind === "Except") {
|
|
210
197
|
return expression.function;
|
|
@@ -225,7 +212,6 @@ export interface Context {
|
|
|
225
212
|
scope: Scope | undefined;
|
|
226
213
|
state: State | undefined;
|
|
227
214
|
next: State | undefined;
|
|
228
|
-
// TLC's EvalControl.KeepLazy, so a function constructor within an applied function stays lazy.
|
|
229
215
|
isKeepLazy?: boolean;
|
|
230
216
|
}
|
|
231
217
|
|
|
@@ -249,9 +235,6 @@ const EXCEPT_AT = "@";
|
|
|
249
235
|
export const describeLocation = (expression: Expression) =>
|
|
250
236
|
`line ${expression.location.line}, column ${expression.location.column}`;
|
|
251
237
|
|
|
252
|
-
export const formatRange = (range: SourceRange) =>
|
|
253
|
-
`line ${range.start.line}, col ${range.start.column} to line ${range.end.line}, col ${range.end.column} of module ${range.module}`;
|
|
254
|
-
|
|
255
238
|
export const describeRange = (expression: Expression) => {
|
|
256
239
|
const range = expression.location.range;
|
|
257
240
|
return range ? formatRange(range) : describeLocation(expression);
|
|
@@ -269,7 +252,6 @@ const createTemporalFormulaError = (form: string, expression: Expression) =>
|
|
|
269
252
|
`TLC encountered a temporal formula (${form}) when evaluating a predicate or action.\n${describeRange(expression)}`,
|
|
270
253
|
);
|
|
271
254
|
|
|
272
|
-
// SANY prints a numeral as written and any other expression by its location.
|
|
273
255
|
export const describeNode = (expression: Expression) =>
|
|
274
256
|
expression.kind === "Number"
|
|
275
257
|
? (expression.text ?? String(expression.value))
|
|
@@ -280,7 +262,6 @@ export const createConditionError = (expression: Expression, value: Value) =>
|
|
|
280
262
|
`A non-boolean expression (${getKindString(value)}) was used as the condition of an IF.\n${describeRange(expression)}`,
|
|
281
263
|
);
|
|
282
264
|
|
|
283
|
-
// TLC words the error differently for an infix chain of /\ or \/ and for a bulleted list.
|
|
284
265
|
export const createJunctionError = (
|
|
285
266
|
expression: Expression & { kind: "And" | "Or" },
|
|
286
267
|
index: number,
|
|
@@ -301,7 +282,6 @@ export const createJunctionError = (
|
|
|
301
282
|
);
|
|
302
283
|
};
|
|
303
284
|
|
|
304
|
-
// TLC selects a field from the function it converts a non-record to, which keeps a tuple's domain.
|
|
305
285
|
export const getFieldSelector = (expression: Expression & { kind: "FieldAccess" }) => {
|
|
306
286
|
const field = expression.field;
|
|
307
287
|
const describeMissing = (record: Value) =>
|
|
@@ -316,7 +296,6 @@ export const getFieldSelector = (expression: Expression & { kind: "FieldAccess"
|
|
|
316
296
|
}
|
|
317
297
|
const functionClass = getFunctionClass(value);
|
|
318
298
|
if (functionClass === "tuple") throw createNonIntegerKeyError(field);
|
|
319
|
-
// Only TLC's RecordValue names the field it lacks, and TLC enumerates a FcnLambdaValue first.
|
|
320
299
|
return applyFunction(
|
|
321
300
|
value.kind === "LazyFunction" ? toFiniteFunction(value) : value,
|
|
322
301
|
field,
|
|
@@ -325,7 +304,6 @@ export const getFieldSelector = (expression: Expression & { kind: "FieldAccess"
|
|
|
325
304
|
};
|
|
326
305
|
};
|
|
327
306
|
|
|
328
|
-
// TLC 1.7.4 words what a tuple or a record lacks differently.
|
|
329
307
|
export const getMissingArgumentDescriber = (version: TlcVersion | undefined) =>
|
|
330
308
|
version === "1.7.4"
|
|
331
309
|
? (functionValue: Value, argument: Value) =>
|
|
@@ -353,7 +331,6 @@ export const getSubsetOperator =
|
|
|
353
331
|
: builtin.evaluate([left, right]);
|
|
354
332
|
};
|
|
355
333
|
|
|
356
|
-
// TLC rejects a decimal, or an integer literal too big for it, while it processes the spec.
|
|
357
334
|
export const createRealNumberError = (expression: DecimalExpression) =>
|
|
358
335
|
setExitCode(
|
|
359
336
|
new TlaEvaluationError(`TLC can't handle real numbers.\n${expression.text}`),
|
|
@@ -374,8 +351,6 @@ export const createUnassignedError = (name: string, expression: Expression) =>
|
|
|
374
351
|
name,
|
|
375
352
|
);
|
|
376
353
|
|
|
377
|
-
// TLC reads the subscript of <<A>>_v in the successor as a state of its own, and after 1.7.4
|
|
378
|
-
// names the fairness condition when A leaves a variable of v unassigned.
|
|
379
354
|
export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
|
|
380
355
|
error instanceof TlaUnassignedError && version !== "1.7.4"
|
|
381
356
|
? new TlaEvaluationError(
|
|
@@ -411,7 +386,6 @@ export const bindPattern = (scope: Scope | undefined, pattern: BoundPattern, val
|
|
|
411
386
|
);
|
|
412
387
|
};
|
|
413
388
|
|
|
414
|
-
// Tool#evalAppl checks that it applies a function before it evaluates the argument.
|
|
415
389
|
export const expectFunction = (value: Value, application: Expression) => {
|
|
416
390
|
if (isFunctionValue(value)) return value;
|
|
417
391
|
throw new TlaEvaluationError(
|
|
@@ -502,11 +476,9 @@ const getBoundExplanation = (set: Value, text: string) => {
|
|
|
502
476
|
return undefined;
|
|
503
477
|
};
|
|
504
478
|
|
|
505
|
-
// TLC enumerates every set but its Java ones, so any other set fails as its own class does.
|
|
506
479
|
const checkEnumerable = (set: Value, expression: Expression, version: TlcVersion) => {
|
|
507
480
|
if (!isSetValue(set) || isOverriddenSet(set)) {
|
|
508
481
|
const text = formatValue(set);
|
|
509
|
-
// TLC 1.7.4 doesn't explain why it can't enumerate a set.
|
|
510
482
|
const explanation = version === "1.7.4" ? undefined : getBoundExplanation(set, text);
|
|
511
483
|
throw new TlaEvaluationError(
|
|
512
484
|
explanation === undefined
|
|
@@ -522,14 +494,12 @@ const getEnumeratedElements = (set: Value, expression: Expression, version: TlcV
|
|
|
522
494
|
return getLazySubsets(set) ?? getNormalizedSetElements(set);
|
|
523
495
|
};
|
|
524
496
|
|
|
525
|
-
// TLC 1.7.4 streams a lazy set's elements, where later versions normalize the set first.
|
|
526
497
|
export const getContextElements = (set: Value, expression: Expression, version: TlcVersion) => {
|
|
527
498
|
if (version !== "1.7.4") return getEnumeratedElements(set, expression, version);
|
|
528
499
|
checkEnumerable(set, expression, version);
|
|
529
500
|
return getLazySubsets(set) ?? getStreamedElements(set);
|
|
530
501
|
};
|
|
531
502
|
|
|
532
|
-
// Like TLC, keep an interval so a quantifier can stop at a witness in 1..2000000000 early.
|
|
533
503
|
const getKeptInterval = (set: Value) => {
|
|
534
504
|
if (typeof set !== "object" || set.kind !== "Interval") return undefined;
|
|
535
505
|
getCardinality(set);
|
|
@@ -553,7 +523,6 @@ const someElement = (
|
|
|
553
523
|
return false;
|
|
554
524
|
};
|
|
555
525
|
|
|
556
|
-
// The names of one bound, as in \A x, y \in S, share its set, which TLC evaluates once.
|
|
557
526
|
export const mapBoundSets = <Result>(bounds: Bound[], map: (set: Expression) => Result) =>
|
|
558
527
|
bounds.reduce<Result[]>((results, bound, index) => {
|
|
559
528
|
results.push(
|
|
@@ -646,8 +615,7 @@ export const bindLazyArguments = (
|
|
|
646
615
|
typeof value.domain === "object" && value.domain.kind === "ProductSet"
|
|
647
616
|
? value.domain.factors
|
|
648
617
|
: [];
|
|
649
|
-
// FcnLambdaValue#apply indexes past an argument tuple shorter than the bounds and ignores one
|
|
650
|
-
// longer, where this rejects the list.
|
|
618
|
+
// Deviation from TLC: FcnLambdaValue#apply indexes past an argument tuple shorter than the bounds and ignores a longer one.
|
|
651
619
|
const createListError = () =>
|
|
652
620
|
new TlaEvaluationError(
|
|
653
621
|
`In applying the function\n${prettyPrint(formatValue(value))},\nthe argument list is:\n${prettyPrint(formatValue(argument))}\nwhich does not match its formal parameter.\n`,
|
|
@@ -679,7 +647,6 @@ export const bindLazyArguments = (
|
|
|
679
647
|
return bindArgument(bounds, lambda.scope, argument);
|
|
680
648
|
};
|
|
681
649
|
|
|
682
|
-
// TLC prints a function it can't enumerate with only the first name of a group such as m, n.
|
|
683
650
|
interface LazyFunctionTemplate {
|
|
684
651
|
parameters: { index: number; name: string }[];
|
|
685
652
|
body: string;
|
|
@@ -748,7 +715,6 @@ const getBoundTupleLengths = (bounds: Bound[]) =>
|
|
|
748
715
|
bound.pattern.kind === "Tuple" ? bound.pattern.names.length : undefined,
|
|
749
716
|
);
|
|
750
717
|
|
|
751
|
-
// The function constructor of a definition, which SANY locates at the whole definition.
|
|
752
718
|
const getDefinitionSource = (definition: FunctionDefinition): Expression => ({
|
|
753
719
|
kind: "FunctionConstruction",
|
|
754
720
|
bounds: definition.bounds,
|
|
@@ -794,7 +760,6 @@ const createRecursiveFunction = (
|
|
|
794
760
|
return definition.bounds.length === 1 ? markLambdaFunction(rebindable) : rebindable;
|
|
795
761
|
};
|
|
796
762
|
|
|
797
|
-
// TLC computes a constant definition eagerly, so a function over a reducible set is a FcnRcdValue.
|
|
798
763
|
const toStartupValue = (definition: Definition, value: Value): Value => {
|
|
799
764
|
if (typeof value !== "object" || getFunctionClass(value) !== "lambda") return value;
|
|
800
765
|
if (
|
|
@@ -809,13 +774,11 @@ const toStartupValue = (definition: Definition, value: Value): Value => {
|
|
|
809
774
|
const finite = toFiniteFunction(value);
|
|
810
775
|
return createSortedFunction(finite.domain, finite.range);
|
|
811
776
|
} catch (error) {
|
|
812
|
-
// TLC leaves a definition it fails to compute to evaluate where the spec uses it.
|
|
813
777
|
if (error instanceof TlaEvaluationError) return value;
|
|
814
778
|
throw error;
|
|
815
779
|
}
|
|
816
780
|
};
|
|
817
781
|
|
|
818
|
-
// TLC evaluates a function definition that isn't recursive as it does a function constructor.
|
|
819
782
|
const compileDefinitionBody = (definition: Definition, environment: Environment): Evaluator => {
|
|
820
783
|
if (definition.kind === "Operator" && definition.params.length > 0) {
|
|
821
784
|
return () => {
|
|
@@ -834,19 +797,19 @@ const getDefinitionEvaluator = (definition: Definition, environment: Environment
|
|
|
834
797
|
const compiled = environment.definitionEvaluators.get(definition);
|
|
835
798
|
if (compiled) return compiled;
|
|
836
799
|
const body = compileDefinitionBody(definition, environment);
|
|
837
|
-
const
|
|
800
|
+
const definitionId = environment.facts.ids.get(definition);
|
|
838
801
|
const startupValues = environment.startupValues;
|
|
839
802
|
const evaluator: Evaluator =
|
|
840
|
-
|
|
803
|
+
definitionId === undefined
|
|
841
804
|
? (context) => body(withScope(context, undefined))
|
|
842
|
-
: (context) => startupValues[
|
|
805
|
+
: (context) => startupValues[definitionId] ?? body(withScope(context, undefined));
|
|
843
806
|
environment.definitionEvaluators.set(definition, evaluator);
|
|
844
807
|
return evaluator;
|
|
845
808
|
};
|
|
846
809
|
|
|
847
810
|
export const getStartupValue = (definition: Definition, environment: Environment) => {
|
|
848
|
-
const
|
|
849
|
-
return
|
|
811
|
+
const definitionId = environment.facts.ids.get(definition);
|
|
812
|
+
return definitionId === undefined ? undefined : environment.startupValues[definitionId];
|
|
850
813
|
};
|
|
851
814
|
|
|
852
815
|
export const evaluateStartupDefinitions = (definitions: Definition[], environment: Environment) =>
|
|
@@ -855,22 +818,21 @@ export const evaluateStartupDefinitions = (definitions: Definition[], environmen
|
|
|
855
818
|
const name = definition.name;
|
|
856
819
|
if (environment.constants.has(name) || environment.substitutions.has(name)) return;
|
|
857
820
|
if (!isConstantLevel(definition, environment)) return;
|
|
858
|
-
const
|
|
859
|
-
if (
|
|
821
|
+
const definitionId = environment.facts.ids.get(definition);
|
|
822
|
+
if (definitionId === undefined || environment.startupValues[definitionId] !== undefined) return;
|
|
860
823
|
const context = { environment, scope: undefined, state: undefined, next: undefined };
|
|
861
824
|
try {
|
|
862
825
|
const value = environment.runtime.evaluateAtStartup(() =>
|
|
863
826
|
toStartupValue(definition, compileDefinitionBody(definition, environment)(context)),
|
|
864
827
|
);
|
|
865
828
|
markNormalized(value);
|
|
866
|
-
environment.startupValues[
|
|
829
|
+
environment.startupValues[definitionId] = value;
|
|
867
830
|
} catch (error) {
|
|
868
831
|
// TLC swallows whatever the definition throws, a stack overflow included.
|
|
869
832
|
if (!(error instanceof TlaEvaluationError) && !isStackOverflow(error)) throw error;
|
|
870
833
|
}
|
|
871
834
|
});
|
|
872
835
|
|
|
873
|
-
// TLC reuses a cached value while each variable the cached state assigns keeps its value.
|
|
874
836
|
const isStateWithin = (state: State | undefined, cached: State | undefined) => {
|
|
875
837
|
if (cached === undefined || state === cached) return true;
|
|
876
838
|
try {
|
|
@@ -904,8 +866,6 @@ const forceThunk = (thunk: Thunk, context: Context) => {
|
|
|
904
866
|
thunk.state = context.state;
|
|
905
867
|
thunk.next = context.next;
|
|
906
868
|
}
|
|
907
|
-
// A value a thunk cached with no state read no variable, so it holds in every state. Releasing
|
|
908
|
-
// its scope frees the evaluations the scope's bindings cached, which a long script keeps alive.
|
|
909
869
|
if (thunk.cache !== undefined && thunk.state === undefined && thunk.next === undefined) {
|
|
910
870
|
thunk.scope = undefined;
|
|
911
871
|
thunk.isReleased = true;
|
|
@@ -913,7 +873,7 @@ const forceThunk = (thunk: Thunk, context: Context) => {
|
|
|
913
873
|
return value;
|
|
914
874
|
};
|
|
915
875
|
|
|
916
|
-
const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
876
|
+
export const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
917
877
|
kind: "Closure",
|
|
918
878
|
name: definition.name,
|
|
919
879
|
params: definition.params,
|
|
@@ -1054,7 +1014,6 @@ const compileArgumentBinder = (argument: Expression, environment: Environment):
|
|
|
1054
1014
|
const binding: Binding = { kind: "Value", value: argument.value, argument };
|
|
1055
1015
|
return () => binding;
|
|
1056
1016
|
}
|
|
1057
|
-
// TLC counts an argument where the operator's body evaluates it, under the call.
|
|
1058
1017
|
const coverage = environment.coverage;
|
|
1059
1018
|
if (coverage) {
|
|
1060
1019
|
return (context) => {
|
|
@@ -1124,8 +1083,6 @@ interface ReevaluatedDefinitions {
|
|
|
1124
1083
|
streamed: ReadonlySet<Definition>;
|
|
1125
1084
|
}
|
|
1126
1085
|
|
|
1127
|
-
// A LET's function definition has one function constructor, as in SANY, so its code compiles once
|
|
1128
|
-
// however often the LET is evaluated.
|
|
1129
1086
|
const letFunctionConstructions = new WeakMap<FunctionDefinition, Expression>();
|
|
1130
1087
|
|
|
1131
1088
|
const getLetFunctionConstruction = (definition: FunctionDefinition): Expression => {
|
|
@@ -1189,7 +1146,6 @@ export const bindDefinitions = (
|
|
|
1189
1146
|
isStreamed: reevaluated?.streamed.has(definition) ?? false,
|
|
1190
1147
|
};
|
|
1191
1148
|
});
|
|
1192
|
-
// TLC counts a LET definition under the node that encloses the LET.
|
|
1193
1149
|
const coverage = context.environment.coverage;
|
|
1194
1150
|
if (coverage && coverage.current !== -1) {
|
|
1195
1151
|
nodes.forEach((node) => {
|
|
@@ -1221,11 +1177,11 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1221
1177
|
}
|
|
1222
1178
|
const builtin = context.environment.builtins.get(name);
|
|
1223
1179
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
1224
|
-
throw new TlaEvaluationError(
|
|
1180
|
+
throw new TlaEvaluationError(
|
|
1181
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1182
|
+
);
|
|
1225
1183
|
};
|
|
1226
1184
|
|
|
1227
|
-
// TLC's next-state generator evaluates a LET definition again at each reference, so one that
|
|
1228
|
-
// calls an impure builtin repeats its effects, and a UNION or \cup set starts out uncached.
|
|
1229
1185
|
export const getReevaluatedDefinitions = (
|
|
1230
1186
|
definitions: Definition[],
|
|
1231
1187
|
environment: Environment,
|
|
@@ -1259,7 +1215,7 @@ const isRebindable = (value: Value): value is RebindableFilteredSet | Rebindable
|
|
|
1259
1215
|
(value.kind === "FilteredSet" || value.kind === "LazyFunction") &&
|
|
1260
1216
|
"rebind" in value;
|
|
1261
1217
|
|
|
1262
|
-
const toNextContext = (context: Context): Context => ({
|
|
1218
|
+
export const toNextContext = (context: Context): Context => ({
|
|
1263
1219
|
environment: context.environment,
|
|
1264
1220
|
scope: context.scope,
|
|
1265
1221
|
state: context.next,
|
|
@@ -1267,7 +1223,6 @@ const toNextContext = (context: Context): Context => ({
|
|
|
1267
1223
|
isKeepLazy: context.isKeepLazy,
|
|
1268
1224
|
});
|
|
1269
1225
|
|
|
1270
|
-
// TLC evaluates the expression in the current state first.
|
|
1271
1226
|
const compileUnchanged =
|
|
1272
1227
|
(evaluator: Evaluator): Evaluator =>
|
|
1273
1228
|
(context) => {
|
|
@@ -1275,7 +1230,6 @@ const compileUnchanged =
|
|
|
1275
1230
|
return valuesEqual(current, evaluator(toNextContext(context)));
|
|
1276
1231
|
};
|
|
1277
1232
|
|
|
1278
|
-
// TLC's CallStackTool rebinds the lazy values it returns, so their later evaluation records too.
|
|
1279
1233
|
const traceEvaluator =
|
|
1280
1234
|
(
|
|
1281
1235
|
expression: Expression,
|
|
@@ -1331,19 +1285,15 @@ const traceEvaluator =
|
|
|
1331
1285
|
}
|
|
1332
1286
|
};
|
|
1333
1287
|
|
|
1334
|
-
// A FingerprintException from a method of a value with a source is headed by each such value
|
|
1335
|
-
// whose method called it in turn, outermost first.
|
|
1336
1288
|
export const freezeCallStack = (
|
|
1337
1289
|
callStack: CallStack,
|
|
1338
1290
|
values: (Value | undefined)[],
|
|
1339
1291
|
error: unknown,
|
|
1340
1292
|
) => {
|
|
1341
|
-
// A set that streams its elements enumerates itself too, so it can appear twice.
|
|
1342
1293
|
const sources = [...new Set(values)].flatMap((item) => {
|
|
1343
1294
|
const source = typeof item === "object" ? callStack.sources.get(item) : undefined;
|
|
1344
1295
|
return source ? [source] : [];
|
|
1345
1296
|
});
|
|
1346
|
-
// A value with a source raises a FingerprintException even when the stack is frozen already.
|
|
1347
1297
|
if (sources.length > 0 && error instanceof TlaEvaluationError) {
|
|
1348
1298
|
if (!callStack.isFrozen) callStack.expressions.push(...sources);
|
|
1349
1299
|
const inner = callStack.fingerprint;
|
|
@@ -1366,7 +1316,6 @@ const headFingerprint = (callStack: CallStack, source: Expression, error: unknow
|
|
|
1366
1316
|
};
|
|
1367
1317
|
};
|
|
1368
1318
|
|
|
1369
|
-
// With evaluators of its own, since the environment's evaluators record nothing.
|
|
1370
1319
|
export const createTracingEnvironment = (environment: Environment): Environment => ({
|
|
1371
1320
|
...environment,
|
|
1372
1321
|
coverage: undefined,
|
|
@@ -1382,7 +1331,6 @@ export const createTracingEnvironment = (environment: Environment): Environment
|
|
|
1382
1331
|
},
|
|
1383
1332
|
});
|
|
1384
1333
|
|
|
1385
|
-
// A replay that walks into the expression has recorded its frames already.
|
|
1386
1334
|
const traceFrames =
|
|
1387
1335
|
(
|
|
1388
1336
|
expression: Expression,
|
|
@@ -1400,8 +1348,6 @@ const traceFrames =
|
|
|
1400
1348
|
}
|
|
1401
1349
|
};
|
|
1402
1350
|
|
|
1403
|
-
// TLC counts an evaluation under the node of the expression in the tree of the check it counts,
|
|
1404
|
-
// or, when the tree has none there, under the node it evaluates in.
|
|
1405
1351
|
const countEvaluator =
|
|
1406
1352
|
(expression: Expression, evaluator: Evaluator, coverage: Coverage): Evaluator =>
|
|
1407
1353
|
(context) => {
|
|
@@ -1469,11 +1415,9 @@ const compileIdentifier = (
|
|
|
1469
1415
|
return () => value;
|
|
1470
1416
|
}
|
|
1471
1417
|
if (global?.kind === "Definition") {
|
|
1472
|
-
// The body compiles when first evaluated, as a recursive definition's body refers back to it.
|
|
1473
1418
|
const definition = global.definition;
|
|
1474
|
-
|
|
1475
|
-
return (context) =>
|
|
1476
|
-
(compiled.reference ??= getDefinitionEvaluator(definition, environment))(context);
|
|
1419
|
+
let compiled: Evaluator | undefined;
|
|
1420
|
+
return (context) => (compiled ??= getDefinitionEvaluator(definition, environment))(context);
|
|
1477
1421
|
}
|
|
1478
1422
|
return (context) => evaluateLocalIdentifier(name, expression, context);
|
|
1479
1423
|
};
|
|
@@ -1553,11 +1497,10 @@ const compileClosureCall = (
|
|
|
1553
1497
|
environment: Environment,
|
|
1554
1498
|
): Evaluator => {
|
|
1555
1499
|
const bindArguments = compileArgumentScope(closure, args, environment);
|
|
1556
|
-
|
|
1557
|
-
const compiled = { body: undefined as Evaluator | undefined };
|
|
1500
|
+
let body: Evaluator | undefined;
|
|
1558
1501
|
return (context) => {
|
|
1559
|
-
|
|
1560
|
-
return
|
|
1502
|
+
body ??= getEntryEvaluator(closure.body, environment);
|
|
1503
|
+
return body({
|
|
1561
1504
|
environment,
|
|
1562
1505
|
scope: bindArguments(context),
|
|
1563
1506
|
state: context.state,
|
|
@@ -1605,7 +1548,6 @@ const compileApply = (
|
|
|
1605
1548
|
const domain = getDomainOperator(expression);
|
|
1606
1549
|
return (context) => domain(operand(context));
|
|
1607
1550
|
}
|
|
1608
|
-
// TLC caches the value of a constant TLCEval argument only where no context binds a name.
|
|
1609
1551
|
if (global?.kind === "Builtin" && global.name === "TLCEval" && args.length === 1) {
|
|
1610
1552
|
const isCached =
|
|
1611
1553
|
!contextualApplications.has(expression) && !isNonconstant(args[0], environment);
|
|
@@ -1622,7 +1564,6 @@ const compileApply = (
|
|
|
1622
1564
|
return (context) => subset(left(context), right(context));
|
|
1623
1565
|
}
|
|
1624
1566
|
if (global?.kind === "Builtin") return compileBuiltinCall(global, args, environment);
|
|
1625
|
-
// TLC refuses action composition unless a Java property enables its incomplete implementation.
|
|
1626
1567
|
if (expression.operator === "\\cdot" && args.length === 2) {
|
|
1627
1568
|
return () => {
|
|
1628
1569
|
throw new TlaEvaluationError(
|
|
@@ -1713,7 +1654,6 @@ const getBoundValue = (pattern: BoundPattern, scope: Scope | undefined) => {
|
|
|
1713
1654
|
return binding?.kind === "Value" ? binding.value : undefined;
|
|
1714
1655
|
};
|
|
1715
1656
|
|
|
1716
|
-
// TLC keeps a function constructor lazy when it is applied, or is the base of an applied EXCEPT.
|
|
1717
1657
|
const keptLazyExpressions = new WeakSet<Expression>();
|
|
1718
1658
|
|
|
1719
1659
|
export const keepLazy = (expression: Expression) => {
|
|
@@ -1722,8 +1662,6 @@ export const keepLazy = (expression: Expression) => {
|
|
|
1722
1662
|
}
|
|
1723
1663
|
};
|
|
1724
1664
|
|
|
1725
|
-
// The names an expression may look up in its scope, or undefined when a subexpression selector may
|
|
1726
|
-
// look up others.
|
|
1727
1665
|
const scopeNames = new WeakMap<Expression, string[] | undefined>();
|
|
1728
1666
|
|
|
1729
1667
|
const getScopeNames = (expression: Expression) => {
|
|
@@ -1731,8 +1669,8 @@ const getScopeNames = (expression: Expression) => {
|
|
|
1731
1669
|
const names = new Set<string>();
|
|
1732
1670
|
const visit = (node: Expression): boolean => {
|
|
1733
1671
|
if (node.kind === "Subexpression") return false;
|
|
1734
|
-
|
|
1735
|
-
if (
|
|
1672
|
+
const name = getReferencedName(node);
|
|
1673
|
+
if (name !== undefined) names.add(name);
|
|
1736
1674
|
if (node.kind === "ExceptAt") names.add(EXCEPT_AT);
|
|
1737
1675
|
return getChildren(node).every(visit);
|
|
1738
1676
|
};
|
|
@@ -1741,9 +1679,6 @@ const getScopeNames = (expression: Expression) => {
|
|
|
1741
1679
|
return result;
|
|
1742
1680
|
};
|
|
1743
1681
|
|
|
1744
|
-
// The bindings of a scope that names look up, so that a lazy function keeps only those alive and
|
|
1745
|
-
// not the values its other bindings cached. An unnamed node ends the chain, since a TLCEval in the
|
|
1746
|
-
// body sorts its value only where no context binds a name.
|
|
1747
1682
|
const trimScope = (scope: Scope | undefined, names: string[] | undefined) =>
|
|
1748
1683
|
names === undefined || scope === undefined
|
|
1749
1684
|
? scope
|
|
@@ -1757,7 +1692,6 @@ const trimScope = (scope: Scope | undefined, names: string[] | undefined) =>
|
|
|
1757
1692
|
|
|
1758
1693
|
export const isKeptLazy = (expression: Expression) => keptLazyExpressions.has(expression);
|
|
1759
1694
|
|
|
1760
|
-
// Builds the function of a constructor from its evaluated domain.
|
|
1761
1695
|
export const getFunctionBuilder = (
|
|
1762
1696
|
expression: Expression & { kind: "FunctionConstruction" },
|
|
1763
1697
|
environment: Environment,
|
|
@@ -1772,8 +1706,7 @@ export const getFunctionBuilder = (
|
|
|
1772
1706
|
const name = bound.pattern.name;
|
|
1773
1707
|
const evaluateAt = (key: Value) =>
|
|
1774
1708
|
body(withScope(context, bindValue(context.scope, name, key)));
|
|
1775
|
-
// TLC sizes the domain
|
|
1776
|
-
// the values stays lazy.
|
|
1709
|
+
// TLC sizes the domain and evaluates the body at each element of a domain too large to hold.
|
|
1777
1710
|
if (isBeyondSetBound(domain)) {
|
|
1778
1711
|
getCardinality(domain);
|
|
1779
1712
|
forEachElement(domain, evaluateAt);
|
|
@@ -1828,7 +1761,6 @@ export const getFunctionBuilder = (
|
|
|
1828
1761
|
) {
|
|
1829
1762
|
return createLazy(domain, context);
|
|
1830
1763
|
}
|
|
1831
|
-
// TLC builds a function lazily unless each bound is reducible, so its body fails where forced.
|
|
1832
1764
|
const isReducibleDomain =
|
|
1833
1765
|
bounds.length === 1
|
|
1834
1766
|
? isReducibleSet(domain)
|
|
@@ -1845,7 +1777,6 @@ export const getFunctionBuilder = (
|
|
|
1845
1777
|
}
|
|
1846
1778
|
}
|
|
1847
1779
|
if (!callStack) return construct(domain, context);
|
|
1848
|
-
// TLC builds the function in a method of the FcnLambdaValue that CallStackTool gives a source.
|
|
1849
1780
|
try {
|
|
1850
1781
|
return construct(domain, context);
|
|
1851
1782
|
} catch (error) {
|
|
@@ -1873,8 +1804,8 @@ const compileExcept = (
|
|
|
1873
1804
|
expression: Expression & { kind: "Except" },
|
|
1874
1805
|
environment: Environment,
|
|
1875
1806
|
): Evaluator => {
|
|
1876
|
-
const
|
|
1877
|
-
if (
|
|
1807
|
+
const isKeptLazyExpression = keptLazyExpressions.has(expression);
|
|
1808
|
+
if (isKeptLazyExpression) keepLazy(expression.function);
|
|
1878
1809
|
const evaluateFunction = getEvaluator(expression.function, environment);
|
|
1879
1810
|
const updates = expression.updates.map((update) => ({
|
|
1880
1811
|
path: update.path.map((step): CompiledStep =>
|
|
@@ -1907,19 +1838,18 @@ const compileExcept = (
|
|
|
1907
1838
|
current,
|
|
1908
1839
|
getKey(path[depth], context),
|
|
1909
1840
|
(previous) => update(previous, path, depth + 1, context, value),
|
|
1910
|
-
|
|
1841
|
+
isKeptLazyExpression && depth === 0,
|
|
1911
1842
|
);
|
|
1912
1843
|
};
|
|
1913
1844
|
return (context) => {
|
|
1914
1845
|
let current = evaluateFunction(context);
|
|
1915
1846
|
for (const item of updates) {
|
|
1916
|
-
|
|
1917
|
-
const found = { value: false };
|
|
1847
|
+
let isFound = false;
|
|
1918
1848
|
current = update(current, item.path, 0, context, (inner) => {
|
|
1919
|
-
|
|
1849
|
+
isFound = true;
|
|
1920
1850
|
return item.value(inner);
|
|
1921
1851
|
});
|
|
1922
|
-
if (!
|
|
1852
|
+
if (!isFound) {
|
|
1923
1853
|
context.environment.runtime.warn(
|
|
1924
1854
|
MESSAGE_CODE.exceptAppliedToUnknownField,
|
|
1925
1855
|
`The EXCEPT was applied to non-existing fields of the value at\n${describeRange(expression.function)}`,
|
|
@@ -1930,7 +1860,6 @@ const compileExcept = (
|
|
|
1930
1860
|
};
|
|
1931
1861
|
};
|
|
1932
1862
|
|
|
1933
|
-
// TLC filters any value it can't enumerate lazily, and fails only when it uses the result.
|
|
1934
1863
|
export const getLazyFilter = (
|
|
1935
1864
|
expression: Expression & { kind: "SetFilter" },
|
|
1936
1865
|
environment: Environment,
|
|
@@ -1944,8 +1873,6 @@ export const getLazyFilter = (
|
|
|
1944
1873
|
};
|
|
1945
1874
|
const predicateNode = describeNode(expression.predicate);
|
|
1946
1875
|
const coverage = environment.coverage;
|
|
1947
|
-
// TLC evaluates a lazy set's predicate under the set's node only as it enumerates the set,
|
|
1948
|
-
// and costs each element it tests and each it keeps.
|
|
1949
1876
|
const testCovered = (node: number, isMember: boolean, test: () => Value) => {
|
|
1950
1877
|
if (!coverage || node === -1) return test();
|
|
1951
1878
|
if (!isMember) coverage.secondary[node]++;
|
|
@@ -2081,7 +2008,7 @@ const compileSetComprehension = (
|
|
|
2081
2008
|
set,
|
|
2082
2009
|
context.environment.runtime.version,
|
|
2083
2010
|
);
|
|
2084
|
-
|
|
2011
|
+
let chosen: Value | undefined;
|
|
2085
2012
|
const pattern = expression.pattern;
|
|
2086
2013
|
someElement(elements, (element) => {
|
|
2087
2014
|
if (
|
|
@@ -2094,11 +2021,11 @@ const compileSetComprehension = (
|
|
|
2094
2021
|
}
|
|
2095
2022
|
const scope = bindPattern(context.scope, pattern, element);
|
|
2096
2023
|
if (!expectBooleanBody(body(withScope(context, scope)), expression)) return false;
|
|
2097
|
-
chosen
|
|
2024
|
+
chosen = getBoundValue(pattern, scope);
|
|
2098
2025
|
return true;
|
|
2099
2026
|
});
|
|
2100
|
-
if (chosen
|
|
2101
|
-
return chosen
|
|
2027
|
+
if (chosen === undefined) throw createNoChoiceError(expression);
|
|
2028
|
+
return chosen;
|
|
2102
2029
|
};
|
|
2103
2030
|
};
|
|
2104
2031
|
|
package/src/exit-codes.ts
CHANGED
|
@@ -76,10 +76,13 @@ export const withLivenessExitCode = (
|
|
|
76
76
|
return (
|
|
77
77
|
checker && {
|
|
78
78
|
branches: checker.branches,
|
|
79
|
+
solutions: checker.solutions,
|
|
79
80
|
addInitialState: (index, state, tracing) =>
|
|
80
81
|
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
81
82
|
addState: (index, state, successors, tracing) =>
|
|
82
83
|
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
84
|
+
storeState: checker.storeState,
|
|
85
|
+
getStateCounts: checker.getStateCounts,
|
|
83
86
|
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
84
87
|
getViolatedProperties: (path, cycleStart) =>
|
|
85
88
|
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|