tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- 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 +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- 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 +120 -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 +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- 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 +226 -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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- 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 +9 -20
- 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 +3 -5
- 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/md5.ts +26 -29
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +178 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- 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 +68 -17
- 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 +167 -85
- 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 +163 -99
- 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 -290
- 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 +310 -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 +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- 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 +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -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 +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- 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 +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- 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 +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- 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 +1 -3
- 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/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -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/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getFunctionConstruction,
|
|
4
|
+
getReferencedName,
|
|
3
5
|
isLocallyResolved,
|
|
4
6
|
type Bound,
|
|
5
7
|
type BoundPattern,
|
|
@@ -21,13 +23,27 @@ import {
|
|
|
21
23
|
} from "./errors";
|
|
22
24
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
23
25
|
import { generateEvaluator } from "./codegen";
|
|
24
|
-
import {
|
|
26
|
+
import {
|
|
27
|
+
chargeContexts,
|
|
28
|
+
chargeFunctionConstruction,
|
|
29
|
+
chargeSetOperation,
|
|
30
|
+
costCoverage,
|
|
31
|
+
countCoverage,
|
|
32
|
+
createChargedEnumerator,
|
|
33
|
+
createProductSetEnumerator,
|
|
34
|
+
getCoverageNode,
|
|
35
|
+
runAtCoverageNode,
|
|
36
|
+
tagSubset,
|
|
37
|
+
type Coverage,
|
|
38
|
+
} from "./coverage";
|
|
25
39
|
import { MESSAGE_CODE } from "./tlc/messages";
|
|
26
40
|
import type { CheckerRuntime } from "./runtime";
|
|
27
41
|
import {
|
|
28
|
-
|
|
42
|
+
isEvaluatedAtStartup,
|
|
43
|
+
isExpressionImpure,
|
|
29
44
|
isImpureDefinition,
|
|
30
45
|
isNonconstant,
|
|
46
|
+
isTlcEvalReached,
|
|
31
47
|
type DefinitionFacts,
|
|
32
48
|
} from "./dependencies";
|
|
33
49
|
import { contextualApplications, substitutionFrames } from "./instances";
|
|
@@ -151,6 +167,7 @@ export interface Environment {
|
|
|
151
167
|
variableIndex: Map<string, number>;
|
|
152
168
|
facts: DefinitionFacts;
|
|
153
169
|
startupValues: (Value | undefined)[];
|
|
170
|
+
tlcEvalValues: WeakMap<Expression, Value>;
|
|
154
171
|
substitutedDefinitions: Set<Definition>;
|
|
155
172
|
instanceParams: Set<OperatorParam>;
|
|
156
173
|
evaluators: WeakMap<Expression, Evaluator>;
|
|
@@ -319,15 +336,14 @@ export const getDomainOperator = (expression: Expression) => (value: Value) => {
|
|
|
319
336
|
};
|
|
320
337
|
|
|
321
338
|
export const getSubsetOperator =
|
|
322
|
-
(expression: Expression,
|
|
339
|
+
(expression: Expression, subset: (left: Value, right: Value) => Value) =>
|
|
340
|
+
(left: Value, right: Value) => {
|
|
323
341
|
if (!isSetValue(left) || isOverriddenSet(left)) {
|
|
324
342
|
throw new TlaEvaluationError(
|
|
325
343
|
`Attempted to evaluate an expression of form S \\subseteq T, but S was not enumerable.\n${describeRange(expression)}`,
|
|
326
344
|
);
|
|
327
345
|
}
|
|
328
|
-
return
|
|
329
|
-
? builtin.evaluateBinary(left, right)
|
|
330
|
-
: builtin.evaluate([left, right]);
|
|
346
|
+
return subset(left, right);
|
|
331
347
|
};
|
|
332
348
|
|
|
333
349
|
export const createRealNumberError = (expression: DecimalExpression) =>
|
|
@@ -522,10 +538,13 @@ const someElement = (
|
|
|
522
538
|
return false;
|
|
523
539
|
};
|
|
524
540
|
|
|
525
|
-
export const mapBoundSets = <Result>(
|
|
541
|
+
export const mapBoundSets = <Result>(
|
|
542
|
+
bounds: Bound[],
|
|
543
|
+
map: (set: Expression, index: number) => Result,
|
|
544
|
+
) =>
|
|
526
545
|
bounds.reduce<Result[]>((results, bound, index) => {
|
|
527
546
|
results.push(
|
|
528
|
-
index > 0 && bounds[index - 1].set === bound.set ? results[index - 1] : map(bound.set),
|
|
547
|
+
index > 0 && bounds[index - 1].set === bound.set ? results[index - 1] : map(bound.set, index),
|
|
529
548
|
);
|
|
530
549
|
return results;
|
|
531
550
|
}, []);
|
|
@@ -556,6 +575,31 @@ export const forEachBinding = (
|
|
|
556
575
|
visit: (scope: Scope | undefined) => boolean,
|
|
557
576
|
) => forEachBoundElement(bounds, getBoundElements(bounds, context), context.scope, visit);
|
|
558
577
|
|
|
578
|
+
const forEachChargedBinding = (
|
|
579
|
+
bounds: Bound[],
|
|
580
|
+
context: Context,
|
|
581
|
+
coverage: Coverage,
|
|
582
|
+
visit: (scope: Scope | undefined) => boolean,
|
|
583
|
+
) => {
|
|
584
|
+
const bounded = mapBoundSets(bounds, (set) => {
|
|
585
|
+
const value = evaluate(set, context);
|
|
586
|
+
return {
|
|
587
|
+
value,
|
|
588
|
+
elements: getQuantifierElements(value, set, context.environment.runtime.version),
|
|
589
|
+
};
|
|
590
|
+
});
|
|
591
|
+
const sets = bounded.map((item) => item.elements);
|
|
592
|
+
const charge = chargeContexts(
|
|
593
|
+
coverage,
|
|
594
|
+
bounded.map((item) => item.value),
|
|
595
|
+
sets,
|
|
596
|
+
);
|
|
597
|
+
return forEachBoundElement(bounds, sets, context.scope, (scope) => {
|
|
598
|
+
charge();
|
|
599
|
+
return visit(scope);
|
|
600
|
+
});
|
|
601
|
+
};
|
|
602
|
+
|
|
559
603
|
const getBoundsDomain = (bounds: Bound[], context: Context): Value => {
|
|
560
604
|
const sets = mapBoundSets(bounds, (set) => evaluate(set, context));
|
|
561
605
|
return sets.length === 1 ? sets[0] : { kind: "ProductSet", factors: sets };
|
|
@@ -614,12 +658,16 @@ export const bindLazyArguments = (
|
|
|
614
658
|
typeof value.domain === "object" && value.domain.kind === "ProductSet"
|
|
615
659
|
? value.domain.factors
|
|
616
660
|
: [];
|
|
617
|
-
|
|
661
|
+
if (elements === undefined) {
|
|
662
|
+
throw new TlaEvaluationError(
|
|
663
|
+
`Attempted to apply a function to an argument not in its domain.\n${describeRange(expression.function)}`,
|
|
664
|
+
);
|
|
665
|
+
}
|
|
666
|
+
// Deviation from TLC: Tool#getFcnContext indexes past an argument tuple shorter than the bounds and ignores a longer one.
|
|
618
667
|
const createListError = () =>
|
|
619
668
|
new TlaEvaluationError(
|
|
620
669
|
`In applying the function\n${prettyPrint(formatValue(value))},\nthe argument list is:\n${prettyPrint(formatValue(argument))}\nwhich does not match its formal parameter.\n`,
|
|
621
670
|
);
|
|
622
|
-
if (elements === undefined) throw createListError();
|
|
623
671
|
bounds.forEach((bound, index) => {
|
|
624
672
|
if (index >= elements.length) throw createListError();
|
|
625
673
|
const element = elements[index];
|
|
@@ -668,7 +716,7 @@ const getLazyFunctionTemplate = (bounds: Bound[], body: Expression) => {
|
|
|
668
716
|
},
|
|
669
717
|
],
|
|
670
718
|
),
|
|
671
|
-
body:
|
|
719
|
+
body: describeNode(body),
|
|
672
720
|
};
|
|
673
721
|
};
|
|
674
722
|
|
|
@@ -714,28 +762,29 @@ const getBoundTupleLengths = (bounds: Bound[]) =>
|
|
|
714
762
|
bound.pattern.kind === "Tuple" ? bound.pattern.names.length : undefined,
|
|
715
763
|
);
|
|
716
764
|
|
|
717
|
-
const getDefinitionSource = (definition: FunctionDefinition): Expression => ({
|
|
718
|
-
kind: "FunctionConstruction",
|
|
719
|
-
bounds: definition.bounds,
|
|
720
|
-
body: definition.body,
|
|
721
|
-
location: definition.location,
|
|
722
|
-
});
|
|
723
|
-
|
|
724
765
|
const createRecursiveFunction = (
|
|
725
766
|
definition: FunctionDefinition,
|
|
726
767
|
context: Context,
|
|
727
768
|
): RebindableLazyFunction => {
|
|
728
769
|
const domain = getBoundsDomain(definition.bounds, context);
|
|
770
|
+
const compute = (argument: Value, self: Value) =>
|
|
771
|
+
evaluate(
|
|
772
|
+
definition.body,
|
|
773
|
+
withScope(
|
|
774
|
+
context,
|
|
775
|
+
bindArgument(definition.bounds, bindValue(undefined, definition.name, self), argument),
|
|
776
|
+
),
|
|
777
|
+
);
|
|
778
|
+
const coverage = context.environment.coverage;
|
|
779
|
+
const node = coverage && !context.environment.callStack ? coverage.current : -1;
|
|
729
780
|
const functionValue = createLazyFunction(
|
|
730
781
|
domain,
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
),
|
|
738
|
-
),
|
|
782
|
+
coverage
|
|
783
|
+
? (argument, self) =>
|
|
784
|
+
coverage.current === -1
|
|
785
|
+
? compute(argument, self)
|
|
786
|
+
: runAtCoverageNode(coverage, node, () => compute(argument, self))
|
|
787
|
+
: compute,
|
|
739
788
|
getLazyFunctionSource(
|
|
740
789
|
getLazyFunctionTemplate(definition.bounds, definition.body),
|
|
741
790
|
definition.bounds,
|
|
@@ -787,9 +836,17 @@ const compileDefinitionBody = (definition: Definition, environment: Environment)
|
|
|
787
836
|
};
|
|
788
837
|
}
|
|
789
838
|
if (definition.kind !== "Function") return getEntryEvaluator(definition.body, environment);
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
|
|
839
|
+
const construction = getFunctionConstruction(definition, false);
|
|
840
|
+
if (!definition.isSelfReferential) return getEntryEvaluator(construction, environment);
|
|
841
|
+
const evaluator: Evaluator = (context) => createRecursiveFunction(definition, context);
|
|
842
|
+
const coverage = environment.coverage;
|
|
843
|
+
return coverage ? countEvaluator(construction, evaluator, coverage) : evaluator;
|
|
844
|
+
};
|
|
845
|
+
|
|
846
|
+
const CALLER_SCOPE: Scope = {
|
|
847
|
+
name: "",
|
|
848
|
+
binding: { kind: "Value", value: false },
|
|
849
|
+
parent: undefined,
|
|
793
850
|
};
|
|
794
851
|
|
|
795
852
|
const getDefinitionEvaluator = (definition: Definition, environment: Environment): Evaluator => {
|
|
@@ -798,8 +855,15 @@ const getDefinitionEvaluator = (definition: Definition, environment: Environment
|
|
|
798
855
|
const body = compileDefinitionBody(definition, environment);
|
|
799
856
|
const definitionId = environment.facts.ids.get(definition);
|
|
800
857
|
const startupValues = environment.startupValues;
|
|
801
|
-
const
|
|
802
|
-
|
|
858
|
+
const isInCallerContext =
|
|
859
|
+
definition.kind === "Operator" &&
|
|
860
|
+
definition.params.length === 0 &&
|
|
861
|
+
isTlcEvalReached(definition.body, environment);
|
|
862
|
+
const evaluator: Evaluator = isInCallerContext
|
|
863
|
+
? (context) =>
|
|
864
|
+
(definitionId === undefined ? undefined : startupValues[definitionId]) ??
|
|
865
|
+
body(withScope(context, isTlcContextEmpty(context.scope) ? undefined : CALLER_SCOPE))
|
|
866
|
+
: definitionId === undefined
|
|
803
867
|
? (context) => body(withScope(context, undefined))
|
|
804
868
|
: (context) => startupValues[definitionId] ?? body(withScope(context, undefined));
|
|
805
869
|
environment.definitionEvaluators.set(definition, evaluator);
|
|
@@ -816,7 +880,7 @@ export const evaluateStartupDefinitions = (definitions: Definition[], environmen
|
|
|
816
880
|
if (definition.kind === "Operator" && definition.params.length > 0) return;
|
|
817
881
|
const name = definition.name;
|
|
818
882
|
if (environment.constants.has(name) || environment.substitutions.has(name)) return;
|
|
819
|
-
if (!
|
|
883
|
+
if (!isEvaluatedAtStartup(definition, environment)) return;
|
|
820
884
|
const definitionId = environment.facts.ids.get(definition);
|
|
821
885
|
if (definitionId === undefined || environment.startupValues[definitionId] !== undefined) return;
|
|
822
886
|
const context = { environment, scope: undefined, state: undefined, next: undefined };
|
|
@@ -872,7 +936,7 @@ const forceThunk = (thunk: Thunk, context: Context) => {
|
|
|
872
936
|
return value;
|
|
873
937
|
};
|
|
874
938
|
|
|
875
|
-
const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
939
|
+
export const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
876
940
|
kind: "Closure",
|
|
877
941
|
name: definition.name,
|
|
878
942
|
params: definition.params,
|
|
@@ -968,6 +1032,7 @@ const isOperatorArgument = (expression: Expression, context: Context) => {
|
|
|
968
1032
|
return operator !== undefined && getArity(operator) > 0;
|
|
969
1033
|
};
|
|
970
1034
|
|
|
1035
|
+
// Deviation from TLC: SymbolNodeValueLookupProvider#lookup takes an operator whose body is a literal for that literal, so a Java override rejects it as an argument.
|
|
971
1036
|
const evaluateBuiltinArguments = (args: Expression[], context: Context) =>
|
|
972
1037
|
args.map((arg) =>
|
|
973
1038
|
isOperatorArgument(arg, context)
|
|
@@ -1082,20 +1147,29 @@ interface ReevaluatedDefinitions {
|
|
|
1082
1147
|
streamed: ReadonlySet<Definition>;
|
|
1083
1148
|
}
|
|
1084
1149
|
|
|
1085
|
-
const
|
|
1150
|
+
const isRecursiveOperator = (definition: Definition) =>
|
|
1151
|
+
definition.kind === "Operator" && definition.isRecursive && definition.params.length > 0;
|
|
1086
1152
|
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1153
|
+
// TLC finds a RECURSIVE operator with parameters by its definition, not in its context, so every definition reaches it.
|
|
1154
|
+
const chainRecursiveOperatorsFirst = (
|
|
1155
|
+
definitions: Definition[],
|
|
1156
|
+
nodes: Scope[],
|
|
1157
|
+
outer: Scope | undefined,
|
|
1158
|
+
) => {
|
|
1159
|
+
let scope = outer;
|
|
1160
|
+
for (let index = 0; index < definitions.length; index++) {
|
|
1161
|
+
if (isRecursiveOperator(definitions[index])) {
|
|
1162
|
+
nodes[index].parent = scope;
|
|
1163
|
+
scope = nodes[index];
|
|
1164
|
+
}
|
|
1165
|
+
}
|
|
1166
|
+
for (let index = 0; index < definitions.length; index++) {
|
|
1167
|
+
if (!isRecursiveOperator(definitions[index])) {
|
|
1168
|
+
nodes[index].parent = scope;
|
|
1169
|
+
scope = nodes[index];
|
|
1170
|
+
}
|
|
1171
|
+
}
|
|
1172
|
+
return scope;
|
|
1099
1173
|
};
|
|
1100
1174
|
|
|
1101
1175
|
export const bindDefinitions = (
|
|
@@ -1108,16 +1182,29 @@ export const bindDefinitions = (
|
|
|
1108
1182
|
binding: { kind: "Value", value: false },
|
|
1109
1183
|
parent: undefined,
|
|
1110
1184
|
}));
|
|
1111
|
-
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1185
|
+
let scope = context.scope;
|
|
1186
|
+
let hasRecursive = false;
|
|
1187
|
+
for (let index = 0; index < nodes.length; index++) {
|
|
1188
|
+
nodes[index].parent = scope;
|
|
1189
|
+
scope = nodes[index];
|
|
1190
|
+
hasRecursive ||= definitions[index].isRecursive;
|
|
1191
|
+
}
|
|
1192
|
+
if (hasRecursive) scope = chainRecursiveOperatorsFirst(definitions, nodes, context.scope);
|
|
1193
|
+
let isRecursiveValueAtOrAfter = false;
|
|
1194
|
+
for (let index = definitions.length - 1; index >= 0; index--) {
|
|
1195
|
+
const definition = definitions[index];
|
|
1196
|
+
isRecursiveValueAtOrAfter ||=
|
|
1197
|
+
definition.isRecursive && definition.kind === "Operator" && definition.params.length === 0;
|
|
1198
|
+
// TLC's LET evaluates an operator without parameters in the context before it, which TLCEval#tlcEval tells from an empty one.
|
|
1199
|
+
const ownScope =
|
|
1200
|
+
definition.kind === "Operator" && definition.params.length === 0 && !isRecursiveValueAtOrAfter
|
|
1201
|
+
? nodes[index].parent
|
|
1202
|
+
: scope;
|
|
1116
1203
|
nodes[index].binding =
|
|
1117
1204
|
definition.kind === "Function"
|
|
1118
1205
|
? {
|
|
1119
1206
|
kind: "Thunk",
|
|
1120
|
-
expression:
|
|
1207
|
+
expression: getFunctionConstruction(definition, true),
|
|
1121
1208
|
scope,
|
|
1122
1209
|
state: context.state,
|
|
1123
1210
|
next: context.next,
|
|
@@ -1132,19 +1219,19 @@ export const bindDefinitions = (
|
|
|
1132
1219
|
name: definition.name,
|
|
1133
1220
|
params: definition.params,
|
|
1134
1221
|
body: definition.body,
|
|
1135
|
-
scope,
|
|
1222
|
+
scope: ownScope,
|
|
1136
1223
|
},
|
|
1137
1224
|
}
|
|
1138
1225
|
: {
|
|
1139
1226
|
kind: "Thunk",
|
|
1140
1227
|
expression: definition.body,
|
|
1141
|
-
scope,
|
|
1228
|
+
scope: ownScope,
|
|
1142
1229
|
state: context.state,
|
|
1143
1230
|
next: context.next,
|
|
1144
1231
|
cache: undefined,
|
|
1145
1232
|
isStreamed: reevaluated?.streamed.has(definition) ?? false,
|
|
1146
1233
|
};
|
|
1147
|
-
}
|
|
1234
|
+
}
|
|
1148
1235
|
const coverage = context.environment.coverage;
|
|
1149
1236
|
if (coverage && coverage.current !== -1) {
|
|
1150
1237
|
nodes.forEach((node) => {
|
|
@@ -1174,16 +1261,22 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1174
1261
|
if (global?.kind === "Definition") {
|
|
1175
1262
|
return getDefinitionEvaluator(global.definition, context.environment)(context);
|
|
1176
1263
|
}
|
|
1177
|
-
const builtin = context.environment.builtins.get(
|
|
1264
|
+
const builtin = context.environment.builtins.get(
|
|
1265
|
+
context.environment.substitutions.get(name) ?? name,
|
|
1266
|
+
);
|
|
1178
1267
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
1179
|
-
throw new TlaEvaluationError(
|
|
1268
|
+
throw new TlaEvaluationError(
|
|
1269
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1270
|
+
);
|
|
1180
1271
|
};
|
|
1181
1272
|
|
|
1182
1273
|
export const getReevaluatedDefinitions = (
|
|
1183
1274
|
definitions: Definition[],
|
|
1184
1275
|
environment: Environment,
|
|
1185
1276
|
): ReevaluatedDefinitions => ({
|
|
1186
|
-
impure: new Set(
|
|
1277
|
+
impure: new Set(
|
|
1278
|
+
definitions.filter((definition) => isImpureDefinition(definition, environment, "varying")),
|
|
1279
|
+
),
|
|
1187
1280
|
streamed: new Set(
|
|
1188
1281
|
definitions.filter((definition) => isImpureDefinition(definition, environment, "streamed")),
|
|
1189
1282
|
),
|
|
@@ -1212,7 +1305,7 @@ const isRebindable = (value: Value): value is RebindableFilteredSet | Rebindable
|
|
|
1212
1305
|
(value.kind === "FilteredSet" || value.kind === "LazyFunction") &&
|
|
1213
1306
|
"rebind" in value;
|
|
1214
1307
|
|
|
1215
|
-
const toNextContext = (context: Context): Context => ({
|
|
1308
|
+
export const toNextContext = (context: Context): Context => ({
|
|
1216
1309
|
environment: context.environment,
|
|
1217
1310
|
scope: context.scope,
|
|
1218
1311
|
state: context.next,
|
|
@@ -1315,7 +1408,6 @@ const headFingerprint = (callStack: CallStack, source: Expression, error: unknow
|
|
|
1315
1408
|
|
|
1316
1409
|
export const createTracingEnvironment = (environment: Environment): Environment => ({
|
|
1317
1410
|
...environment,
|
|
1318
|
-
coverage: undefined,
|
|
1319
1411
|
evaluators: new WeakMap(),
|
|
1320
1412
|
entryEvaluators: new WeakMap(),
|
|
1321
1413
|
definitionEvaluators: new WeakMap(),
|
|
@@ -1328,6 +1420,41 @@ export const createTracingEnvironment = (environment: Environment): Environment
|
|
|
1328
1420
|
},
|
|
1329
1421
|
});
|
|
1330
1422
|
|
|
1423
|
+
// TLC evaluates `a /\ b /\ c` as `(a /\ b) /\ c`, so its call stack holds each prefix.
|
|
1424
|
+
const compileTracedJunction = (
|
|
1425
|
+
expression: Expression & { kind: "And" | "Or" },
|
|
1426
|
+
operands: Evaluator[],
|
|
1427
|
+
callStack: CallStack | undefined,
|
|
1428
|
+
): Evaluator | undefined => {
|
|
1429
|
+
const range = expression.location.range;
|
|
1430
|
+
const prefixEnds = expression.prefixEnds;
|
|
1431
|
+
if (!callStack || expression.isBulleted || !range || !prefixEnds || operands.length < 3) {
|
|
1432
|
+
return undefined;
|
|
1433
|
+
}
|
|
1434
|
+
const prefixes = prefixEnds
|
|
1435
|
+
.slice(0, operands.length - 2)
|
|
1436
|
+
.map((end) => ({
|
|
1437
|
+
...expression,
|
|
1438
|
+
location: { ...expression.location, range: { ...range, end } },
|
|
1439
|
+
}))
|
|
1440
|
+
.reverse();
|
|
1441
|
+
const isAnd = expression.kind === "And";
|
|
1442
|
+
return (context) => {
|
|
1443
|
+
callStack.expressions.push(...prefixes);
|
|
1444
|
+
for (let index = 0; index < operands.length; index++) {
|
|
1445
|
+
if (index >= 2 && !callStack.isFrozen) callStack.expressions.pop();
|
|
1446
|
+
const value = operands[index](context);
|
|
1447
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
1448
|
+
if (value !== isAnd) {
|
|
1449
|
+
if (!callStack.isFrozen)
|
|
1450
|
+
callStack.expressions.length -= prefixes.length - Math.max(index - 1, 0);
|
|
1451
|
+
return value;
|
|
1452
|
+
}
|
|
1453
|
+
}
|
|
1454
|
+
return isAnd;
|
|
1455
|
+
};
|
|
1456
|
+
};
|
|
1457
|
+
|
|
1331
1458
|
const traceFrames =
|
|
1332
1459
|
(
|
|
1333
1460
|
expression: Expression,
|
|
@@ -1355,9 +1482,21 @@ const countEvaluator =
|
|
|
1355
1482
|
coverage.current = node;
|
|
1356
1483
|
try {
|
|
1357
1484
|
const value = evaluator(context);
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
|
|
1485
|
+
const isTagged =
|
|
1486
|
+
expression.kind === "SetEnumeration" ||
|
|
1487
|
+
((expression.kind === "SetFilter" || expression.kind === "SetMap") &&
|
|
1488
|
+
isReducibleSet(value)) ||
|
|
1489
|
+
(expression.kind === "SetFilter" &&
|
|
1490
|
+
typeof value === "object" &&
|
|
1491
|
+
value.kind === "FilteredSet") ||
|
|
1492
|
+
((expression.kind === "FunctionSet" || expression.kind === "RecordSet") &&
|
|
1493
|
+
typeof value === "object" &&
|
|
1494
|
+
value.kind === expression.kind) ||
|
|
1495
|
+
(expression.kind === "Apply" &&
|
|
1496
|
+
expression.operator === "SUBSET" &&
|
|
1497
|
+
typeof value === "object" &&
|
|
1498
|
+
value.kind === "Subset");
|
|
1499
|
+
if (typeof value === "object" && isTagged) coverage.values.set(value, node);
|
|
1361
1500
|
return value;
|
|
1362
1501
|
} finally {
|
|
1363
1502
|
coverage.current = outer;
|
|
@@ -1507,6 +1646,26 @@ const compileClosureCall = (
|
|
|
1507
1646
|
};
|
|
1508
1647
|
};
|
|
1509
1648
|
|
|
1649
|
+
// TLC's LET conses only its arity-0 definitions onto the context that TLCEval#tlcEval caches under when it is empty.
|
|
1650
|
+
const isTlcContextEmpty = (scope: Scope | undefined) => {
|
|
1651
|
+
for (let node = scope; node !== undefined; node = node.parent) {
|
|
1652
|
+
const binding = node.binding;
|
|
1653
|
+
if (
|
|
1654
|
+
binding.kind !== "Operator" ||
|
|
1655
|
+
binding.operator.kind !== "Closure" ||
|
|
1656
|
+
binding.operator.params.length === 0
|
|
1657
|
+
) {
|
|
1658
|
+
return false;
|
|
1659
|
+
}
|
|
1660
|
+
let letScope = binding.operator.scope;
|
|
1661
|
+
while (letScope !== undefined && letScope !== node) letScope = letScope.parent;
|
|
1662
|
+
if (letScope !== node) return false;
|
|
1663
|
+
}
|
|
1664
|
+
return true;
|
|
1665
|
+
};
|
|
1666
|
+
|
|
1667
|
+
const SET_OPERATORS = new Set(["\\cup", "\\cap", "\\"]);
|
|
1668
|
+
|
|
1510
1669
|
const compileApply = (
|
|
1511
1670
|
expression: Expression & { kind: "Apply" },
|
|
1512
1671
|
environment: Environment,
|
|
@@ -1546,19 +1705,63 @@ const compileApply = (
|
|
|
1546
1705
|
return (context) => domain(operand(context));
|
|
1547
1706
|
}
|
|
1548
1707
|
if (global?.kind === "Builtin" && global.name === "TLCEval" && args.length === 1) {
|
|
1708
|
+
// Deviation from TLC: TLCEval#tlcEval evaluates an argument SANY takes for constant, such as Print(v, TRUE), in an empty state.
|
|
1549
1709
|
const isCached =
|
|
1550
1710
|
!contextualApplications.has(expression) && !isNonconstant(args[0], environment);
|
|
1551
|
-
|
|
1552
|
-
|
|
1553
|
-
|
|
1554
|
-
|
|
1555
|
-
|
|
1711
|
+
const tlcEvalValues = environment.tlcEvalValues;
|
|
1712
|
+
return (context) => {
|
|
1713
|
+
if (!isCached || !isTlcContextEmpty(context.scope)) {
|
|
1714
|
+
return global.evaluate(getLazyArguments(args, context), context);
|
|
1715
|
+
}
|
|
1716
|
+
const cached = tlcEvalValues.get(expression);
|
|
1717
|
+
if (cached !== undefined) return cached;
|
|
1718
|
+
const value = global.evaluate(getLazyArguments(args, context), undefined);
|
|
1719
|
+
tlcEvalValues.set(expression, value);
|
|
1720
|
+
return value;
|
|
1721
|
+
};
|
|
1722
|
+
}
|
|
1723
|
+
if (
|
|
1724
|
+
global?.kind === "Builtin" &&
|
|
1725
|
+
global.name === "\\subseteq" &&
|
|
1726
|
+
global.evaluateBinary &&
|
|
1727
|
+
args.length === 2
|
|
1728
|
+
) {
|
|
1729
|
+
const left = getEvaluator(args[0], environment);
|
|
1730
|
+
const right = getEvaluator(args[1], environment);
|
|
1731
|
+
const subset = getSubsetOperator(expression, global.evaluateBinary);
|
|
1732
|
+
const coverage = environment.coverage;
|
|
1733
|
+
if (!coverage) return (context) => subset(left(context), right(context));
|
|
1734
|
+
return (context) => {
|
|
1735
|
+
const leftValue = left(context);
|
|
1736
|
+
const rightValue = right(context);
|
|
1737
|
+
if (
|
|
1738
|
+
typeof leftValue !== "object" ||
|
|
1739
|
+
leftValue.kind !== "Set" ||
|
|
1740
|
+
!coverage.values.has(leftValue)
|
|
1741
|
+
) {
|
|
1742
|
+
return subset(leftValue, rightValue);
|
|
1743
|
+
}
|
|
1744
|
+
const missing = leftValue.elements.findIndex((element) => !isElementOf(element, rightValue));
|
|
1745
|
+
costCoverage(coverage, leftValue, (missing === -1 ? leftValue.elements.length : missing) + 1);
|
|
1746
|
+
return missing === -1;
|
|
1747
|
+
};
|
|
1556
1748
|
}
|
|
1557
|
-
|
|
1749
|
+
const coverage = environment.coverage;
|
|
1750
|
+
const combine = global?.kind === "Builtin" ? global.evaluateBinary : undefined;
|
|
1751
|
+
if (coverage && combine && SET_OPERATORS.has(expression.operator) && args.length === 2) {
|
|
1558
1752
|
const left = getEvaluator(args[0], environment);
|
|
1559
1753
|
const right = getEvaluator(args[1], environment);
|
|
1560
|
-
|
|
1561
|
-
|
|
1754
|
+
return (context) => {
|
|
1755
|
+
const leftValue = left(context);
|
|
1756
|
+
const rightValue = right(context);
|
|
1757
|
+
return chargeSetOperation(
|
|
1758
|
+
coverage,
|
|
1759
|
+
expression.operator,
|
|
1760
|
+
leftValue,
|
|
1761
|
+
rightValue,
|
|
1762
|
+
combine(leftValue, rightValue),
|
|
1763
|
+
);
|
|
1764
|
+
};
|
|
1562
1765
|
}
|
|
1563
1766
|
if (global?.kind === "Builtin") return compileBuiltinCall(global, args, environment);
|
|
1564
1767
|
if (expression.operator === "\\cdot" && args.length === 2) {
|
|
@@ -1591,6 +1794,18 @@ const compileQuantifier = (
|
|
|
1591
1794
|
const isForall = expression.kind === "Forall";
|
|
1592
1795
|
const body = getEvaluator(expression.body, environment);
|
|
1593
1796
|
const bound = expression.bounds[0];
|
|
1797
|
+
const coverage = environment.coverage;
|
|
1798
|
+
if (coverage) {
|
|
1799
|
+
return (context) => {
|
|
1800
|
+
const isFound = forEachChargedBinding(
|
|
1801
|
+
expression.bounds,
|
|
1802
|
+
context,
|
|
1803
|
+
coverage,
|
|
1804
|
+
(scope) => expectBooleanBody(body(withScope(context, scope)), expression) !== isForall,
|
|
1805
|
+
);
|
|
1806
|
+
return isFound ? !isForall : isForall;
|
|
1807
|
+
};
|
|
1808
|
+
}
|
|
1594
1809
|
if (expression.bounds.length === 1 && bound.pattern.kind === "Name") {
|
|
1595
1810
|
const name = bound.pattern.name;
|
|
1596
1811
|
const set = getEvaluator(bound.set, environment);
|
|
@@ -1666,8 +1881,8 @@ const getScopeNames = (expression: Expression) => {
|
|
|
1666
1881
|
const names = new Set<string>();
|
|
1667
1882
|
const visit = (node: Expression): boolean => {
|
|
1668
1883
|
if (node.kind === "Subexpression") return false;
|
|
1669
|
-
|
|
1670
|
-
if (
|
|
1884
|
+
const name = getReferencedName(node);
|
|
1885
|
+
if (name !== undefined) names.add(name);
|
|
1671
1886
|
if (node.kind === "ExceptAt") names.add(EXCEPT_AT);
|
|
1672
1887
|
return getChildren(node).every(visit);
|
|
1673
1888
|
};
|
|
@@ -1716,8 +1931,14 @@ export const getFunctionBuilder = (
|
|
|
1716
1931
|
return markLambdaFunction(functionValue);
|
|
1717
1932
|
}
|
|
1718
1933
|
const pairs: [Value, Value][] = [];
|
|
1719
|
-
const sets = mapBoundSets(bounds, (set) =>
|
|
1720
|
-
getNormalizedElements(
|
|
1934
|
+
const sets = mapBoundSets(bounds, (set, index) =>
|
|
1935
|
+
getNormalizedElements(
|
|
1936
|
+
bounds.length > 1 && typeof domain === "object" && domain.kind === "ProductSet"
|
|
1937
|
+
? domain.factors[index]
|
|
1938
|
+
: domain,
|
|
1939
|
+
set,
|
|
1940
|
+
context.environment.runtime.version,
|
|
1941
|
+
),
|
|
1721
1942
|
);
|
|
1722
1943
|
forEachBoundElement(bounds, sets, context.scope, (scope) => {
|
|
1723
1944
|
const key =
|
|
@@ -1732,13 +1953,22 @@ export const getFunctionBuilder = (
|
|
|
1732
1953
|
const template = getLazyFunctionTemplate(bounds, expression.body);
|
|
1733
1954
|
const boundTupleLengths = getBoundTupleLengths(bounds);
|
|
1734
1955
|
const bodyNames = getScopeNames(expression.body);
|
|
1956
|
+
const coverage = environment.coverage;
|
|
1735
1957
|
const createLazy = (domain: Value, context: Context) => {
|
|
1736
1958
|
const scope = trimScope(context.scope, bodyNames);
|
|
1737
1959
|
const lambdaContext = withScope(context, scope);
|
|
1960
|
+
const compute = (argument: Value) =>
|
|
1961
|
+
body(withScope(lambdaContext, bindArgument(bounds, scope, argument)));
|
|
1962
|
+
const node = coverage && !environment.callStack ? coverage.current : -1;
|
|
1738
1963
|
const functionValue = keepLambda({
|
|
1739
1964
|
value: createLazyFunction(
|
|
1740
1965
|
domain,
|
|
1741
|
-
|
|
1966
|
+
coverage
|
|
1967
|
+
? (argument) =>
|
|
1968
|
+
coverage.current === -1
|
|
1969
|
+
? compute(argument)
|
|
1970
|
+
: runAtCoverageNode(coverage, node, () => compute(argument))
|
|
1971
|
+
: compute,
|
|
1742
1972
|
getLazyFunctionSource(template, bounds, domain),
|
|
1743
1973
|
boundTupleLengths,
|
|
1744
1974
|
),
|
|
@@ -1790,6 +2020,23 @@ const compileFunctionConstruction = (
|
|
|
1790
2020
|
): Evaluator => {
|
|
1791
2021
|
const build = getFunctionBuilder(expression, environment).build;
|
|
1792
2022
|
const bounds = expression.bounds;
|
|
2023
|
+
const coverage = environment.coverage;
|
|
2024
|
+
if (coverage) {
|
|
2025
|
+
return (context) => {
|
|
2026
|
+
const domain = getBoundsDomain(bounds, context);
|
|
2027
|
+
const value = build(domain, context);
|
|
2028
|
+
const sets =
|
|
2029
|
+
bounds.length === 1 || typeof domain !== "object" || domain.kind !== "ProductSet"
|
|
2030
|
+
? [domain]
|
|
2031
|
+
: domain.factors;
|
|
2032
|
+
const isConverted =
|
|
2033
|
+
(typeof value !== "object" || value.kind !== "LazyFunction") && sets.every(isReducibleSet);
|
|
2034
|
+
if (isConverted && coverage.current !== -1 && coverage.covered.has(expression)) {
|
|
2035
|
+
chargeFunctionConstruction(coverage, coverage.current, sets);
|
|
2036
|
+
}
|
|
2037
|
+
return value;
|
|
2038
|
+
};
|
|
2039
|
+
}
|
|
1793
2040
|
if (bounds.length === 1 && bounds[0].pattern.kind === "Name") {
|
|
1794
2041
|
const set = getEvaluator(bounds[0].set, environment);
|
|
1795
2042
|
return (context) => build(set(context), context);
|
|
@@ -1863,29 +2110,19 @@ export const getLazyFilter = (
|
|
|
1863
2110
|
) => {
|
|
1864
2111
|
const predicate = getEvaluator(expression.predicate, environment);
|
|
1865
2112
|
const pattern = expression.bound.pattern;
|
|
1866
|
-
const
|
|
1867
|
-
const source = range && {
|
|
2113
|
+
const predicateNode = describeNode(expression.predicate);
|
|
2114
|
+
const source = expression.predicate.location.range && {
|
|
1868
2115
|
names: pattern.kind === "Name" ? pattern.name : pattern.names.join(", "),
|
|
1869
|
-
predicate:
|
|
2116
|
+
predicate: predicateNode,
|
|
1870
2117
|
};
|
|
1871
|
-
const predicateNode = describeNode(expression.predicate);
|
|
1872
2118
|
const coverage = environment.coverage;
|
|
1873
|
-
const testCovered = (node: number, isMember: boolean, test: () => Value) => {
|
|
1874
|
-
if (!coverage || node === -1) return test();
|
|
1875
|
-
if (!isMember) coverage.secondary[node]++;
|
|
1876
|
-
const value = runAtCoverageNode(coverage, isMember ? -1 : node, test);
|
|
1877
|
-
if (!isMember && value === true) coverage.secondary[node]++;
|
|
1878
|
-
return value;
|
|
1879
|
-
};
|
|
1880
2119
|
const createFiltered = (
|
|
1881
2120
|
base: Value,
|
|
1882
2121
|
context: Context,
|
|
1883
2122
|
evaluator: Evaluator,
|
|
1884
2123
|
node: number,
|
|
1885
|
-
): RebindableFilteredSet =>
|
|
1886
|
-
|
|
1887
|
-
base,
|
|
1888
|
-
test: (element, isMember) => {
|
|
2124
|
+
): RebindableFilteredSet => {
|
|
2125
|
+
const test = (element: Value, isMember: boolean) => {
|
|
1889
2126
|
if (
|
|
1890
2127
|
pattern.kind === "Tuple" &&
|
|
1891
2128
|
getSequenceElements(element)?.length !== pattern.names.length
|
|
@@ -1894,29 +2131,60 @@ export const getLazyFilter = (
|
|
|
1894
2131
|
`Attempted to check if the value:\n${prettyPrint(formatValue(element))}\nis an element of a set of ${pattern.names.length}-tuples.`,
|
|
1895
2132
|
);
|
|
1896
2133
|
}
|
|
1897
|
-
const value =
|
|
1898
|
-
evaluator(withScope(context, bindPattern(context.scope, pattern, element))),
|
|
1899
|
-
);
|
|
2134
|
+
const value = evaluator(withScope(context, bindPattern(context.scope, pattern, element)));
|
|
1900
2135
|
if (typeof value !== "boolean") {
|
|
1901
2136
|
throw new TlaEvaluationError(
|
|
1902
2137
|
`${isMember ? "The evaluation of predicate" : "Evaluating predicate"} ${predicateNode} yielded non-Boolean value.`,
|
|
1903
2138
|
);
|
|
1904
2139
|
}
|
|
1905
2140
|
return value;
|
|
1906
|
-
}
|
|
1907
|
-
|
|
1908
|
-
rebind: (tracing) =>
|
|
2141
|
+
};
|
|
2142
|
+
const rebind = (tracing: Environment) =>
|
|
1909
2143
|
createFiltered(
|
|
1910
2144
|
base,
|
|
1911
2145
|
{ ...context, environment: tracing },
|
|
1912
2146
|
getEvaluator(expression.predicate, tracing),
|
|
1913
2147
|
-1,
|
|
1914
|
-
)
|
|
1915
|
-
|
|
2148
|
+
);
|
|
2149
|
+
if (!coverage || node === -1) return { kind: "FilteredSet", base, test, source, rebind };
|
|
2150
|
+
return {
|
|
2151
|
+
kind: "FilteredSet",
|
|
2152
|
+
base,
|
|
2153
|
+
test: (element, isMember) =>
|
|
2154
|
+
runAtCoverageNode(coverage, isMember ? -1 : node, () => test(element, isMember)),
|
|
2155
|
+
startPass: (isMaterialized) => {
|
|
2156
|
+
const draws = createProductSetEnumerator(coverage, base);
|
|
2157
|
+
return (element) => {
|
|
2158
|
+
draws?.next();
|
|
2159
|
+
tagSubset(coverage, base, element);
|
|
2160
|
+
coverage.secondary[node]++;
|
|
2161
|
+
const value = runAtCoverageNode(coverage, node, () => test(element, false));
|
|
2162
|
+
if (isMaterialized && value) coverage.secondary[node]++;
|
|
2163
|
+
return value;
|
|
2164
|
+
};
|
|
2165
|
+
},
|
|
2166
|
+
source,
|
|
2167
|
+
rebind,
|
|
2168
|
+
};
|
|
2169
|
+
};
|
|
1916
2170
|
return (base: Value, context: Context, node = -1) =>
|
|
1917
2171
|
createFiltered(base, context, predicate, node);
|
|
1918
2172
|
};
|
|
1919
2173
|
|
|
2174
|
+
const hasLocalName = (expression: Expression): boolean =>
|
|
2175
|
+
isLocallyResolved(expression) ||
|
|
2176
|
+
expression.kind === "OperatorReference" ||
|
|
2177
|
+
getChildren(expression).some(hasLocalName);
|
|
2178
|
+
|
|
2179
|
+
export const isUniformPredicate = (
|
|
2180
|
+
expression: Expression & { kind: "SetFilter" },
|
|
2181
|
+
environment: Environment,
|
|
2182
|
+
) =>
|
|
2183
|
+
expression.bound.pattern.kind === "Name" &&
|
|
2184
|
+
!environment.coverage &&
|
|
2185
|
+
!hasLocalName(expression.predicate) &&
|
|
2186
|
+
!isExpressionImpure([expression.predicate], environment, "varying");
|
|
2187
|
+
|
|
1920
2188
|
export const expectFilterPredicate = (
|
|
1921
2189
|
value: Value,
|
|
1922
2190
|
expression: Expression & { kind: "SetFilter" },
|
|
@@ -1959,32 +2227,34 @@ const compileSetComprehension = (
|
|
|
1959
2227
|
const filterLazily = getLazyFilter(expression, environment);
|
|
1960
2228
|
const pattern = expression.bound.pattern;
|
|
1961
2229
|
const coverage = environment.coverage;
|
|
2230
|
+
const isUniform = isUniformPredicate(expression, environment);
|
|
1962
2231
|
return (context) => {
|
|
1963
2232
|
const base = set(context);
|
|
1964
2233
|
if (!isReducibleSet(base)) return filterLazily(base, context, coverage?.current);
|
|
1965
2234
|
const kept: Value[] = [];
|
|
1966
|
-
const
|
|
2235
|
+
const elements = base.kind === "Interval" ? base : toFiniteSet(base).elements;
|
|
2236
|
+
const size = Array.isArray(elements) ? elements.length : elements.high - elements.low + 1;
|
|
2237
|
+
for (let position = 0; position < size; position++) {
|
|
2238
|
+
const element = Array.isArray(elements) ? elements[position] : elements.low + position;
|
|
1967
2239
|
const value = predicate(withScope(context, bindPattern(context.scope, pattern, element)));
|
|
1968
2240
|
if (expectFilterPredicate(value, expression)) addBoundedElement(kept, element);
|
|
1969
|
-
|
|
1970
|
-
const elements = base.kind === "Interval" ? base : toFiniteSet(base).elements;
|
|
1971
|
-
forEachElement(elements, visit);
|
|
1972
|
-
if (coverage && coverage.current !== -1) {
|
|
1973
|
-
coverage.secondary[coverage.current] +=
|
|
1974
|
-
(Array.isArray(elements) ? elements.length : elements.high - elements.low + 1) +
|
|
1975
|
-
kept.length;
|
|
2241
|
+
else if (isUniform) break;
|
|
1976
2242
|
}
|
|
2243
|
+
if (coverage) costCoverage(coverage, base, size + 1);
|
|
1977
2244
|
return createNormalizedSet(kept);
|
|
1978
2245
|
};
|
|
1979
2246
|
}
|
|
1980
2247
|
if (expression.kind === "SetMap") {
|
|
1981
2248
|
const mapped = getEvaluator(expression.expression, environment);
|
|
2249
|
+
const coverage = environment.coverage;
|
|
1982
2250
|
return (context) => {
|
|
1983
2251
|
const elements: Value[] = [];
|
|
1984
|
-
|
|
2252
|
+
const add = (scope: Scope | undefined) => {
|
|
1985
2253
|
addBoundedElement(elements, mapped(withScope(context, scope)));
|
|
1986
2254
|
return false;
|
|
1987
|
-
}
|
|
2255
|
+
};
|
|
2256
|
+
if (coverage) forEachChargedBinding(expression.bounds, context, coverage, add);
|
|
2257
|
+
else forEachBinding(expression.bounds, context, add);
|
|
1988
2258
|
return createEnumeratedSet(elements);
|
|
1989
2259
|
};
|
|
1990
2260
|
}
|
|
@@ -1998,16 +2268,15 @@ const compileSetComprehension = (
|
|
|
1998
2268
|
}
|
|
1999
2269
|
const body = getEvaluator(expression.body, environment);
|
|
2000
2270
|
const evaluateSet = getEvaluator(set, environment);
|
|
2271
|
+
const coverage = environment.coverage;
|
|
2001
2272
|
return (context) => {
|
|
2002
|
-
const
|
|
2003
|
-
|
|
2004
|
-
|
|
2005
|
-
set,
|
|
2006
|
-
context.environment.runtime.version,
|
|
2007
|
-
);
|
|
2273
|
+
const base = evaluateSet(context);
|
|
2274
|
+
const elements = getChoiceElements(base, expression, set, context.environment.runtime.version);
|
|
2275
|
+
const enumerator = coverage && createChargedEnumerator(coverage, base, elements, true);
|
|
2008
2276
|
let chosen: Value | undefined;
|
|
2009
2277
|
const pattern = expression.pattern;
|
|
2010
2278
|
someElement(elements, (element) => {
|
|
2279
|
+
enumerator?.next();
|
|
2011
2280
|
if (
|
|
2012
2281
|
pattern.kind === "Tuple" &&
|
|
2013
2282
|
getSequenceElements(element)?.length !== pattern.names.length
|
|
@@ -2021,8 +2290,9 @@ const compileSetComprehension = (
|
|
|
2021
2290
|
chosen = getBoundValue(pattern, scope);
|
|
2022
2291
|
return true;
|
|
2023
2292
|
});
|
|
2024
|
-
if (chosen
|
|
2025
|
-
|
|
2293
|
+
if (chosen !== undefined) return chosen;
|
|
2294
|
+
enumerator?.next();
|
|
2295
|
+
throw createNoChoiceError(expression);
|
|
2026
2296
|
};
|
|
2027
2297
|
};
|
|
2028
2298
|
|
|
@@ -2034,20 +2304,21 @@ export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
|
2034
2304
|
|
|
2035
2305
|
const compileRecord = (recordFields: RecordField[], environment: Environment): Evaluator => {
|
|
2036
2306
|
const fields = getSortedFields(recordFields);
|
|
2037
|
-
const
|
|
2038
|
-
|
|
2039
|
-
if (hasDuplicates) {
|
|
2307
|
+
const values = recordFields.map((field) => getEvaluator(field.value, environment));
|
|
2308
|
+
if (hasDuplicateFields(fields)) {
|
|
2040
2309
|
return (context) =>
|
|
2041
2310
|
createRecord(
|
|
2042
|
-
|
|
2311
|
+
recordFields.map((field, index): [string, Value] => [field.name, values[index](context)]),
|
|
2043
2312
|
);
|
|
2044
2313
|
}
|
|
2045
2314
|
const names = fields.map((field) => field.name);
|
|
2046
2315
|
const writtenNames = recordFields.map((field) => field.name);
|
|
2047
2316
|
if (writtenNames.some((name, index) => name !== names[index])) {
|
|
2317
|
+
const writtenIndexes = fields.map((field) => recordFields.indexOf(field));
|
|
2048
2318
|
return (context) =>
|
|
2049
2319
|
createWrittenRecord(
|
|
2050
2320
|
names,
|
|
2321
|
+
writtenIndexes,
|
|
2051
2322
|
values.map((value) => value(context)),
|
|
2052
2323
|
writtenNames,
|
|
2053
2324
|
);
|
|
@@ -2097,25 +2368,31 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2097
2368
|
};
|
|
2098
2369
|
case "And": {
|
|
2099
2370
|
const operands = expression.operands.map(getChildEvaluator);
|
|
2100
|
-
return (
|
|
2101
|
-
|
|
2102
|
-
|
|
2103
|
-
|
|
2104
|
-
|
|
2105
|
-
|
|
2106
|
-
|
|
2107
|
-
|
|
2371
|
+
return (
|
|
2372
|
+
compileTracedJunction(expression, operands, environment.callStack) ??
|
|
2373
|
+
((context) => {
|
|
2374
|
+
for (let index = 0; index < operands.length; index++) {
|
|
2375
|
+
const value = operands[index](context);
|
|
2376
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2377
|
+
if (!value) return false;
|
|
2378
|
+
}
|
|
2379
|
+
return true;
|
|
2380
|
+
})
|
|
2381
|
+
);
|
|
2108
2382
|
}
|
|
2109
2383
|
case "Or": {
|
|
2110
2384
|
const operands = expression.operands.map(getChildEvaluator);
|
|
2111
|
-
return (
|
|
2112
|
-
|
|
2113
|
-
|
|
2114
|
-
|
|
2115
|
-
|
|
2116
|
-
|
|
2117
|
-
|
|
2118
|
-
|
|
2385
|
+
return (
|
|
2386
|
+
compileTracedJunction(expression, operands, environment.callStack) ??
|
|
2387
|
+
((context) => {
|
|
2388
|
+
for (let index = 0; index < operands.length; index++) {
|
|
2389
|
+
const value = operands[index](context);
|
|
2390
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2391
|
+
if (value) return true;
|
|
2392
|
+
}
|
|
2393
|
+
return false;
|
|
2394
|
+
})
|
|
2395
|
+
);
|
|
2119
2396
|
}
|
|
2120
2397
|
case "Prime": {
|
|
2121
2398
|
const inner = getChildEvaluator(expression.expression);
|
|
@@ -2201,8 +2478,19 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2201
2478
|
case "RecordSet": {
|
|
2202
2479
|
const fields = getSortedFields(expression.fields);
|
|
2203
2480
|
const names = fields.map((field) => field.name);
|
|
2204
|
-
const
|
|
2205
|
-
|
|
2481
|
+
const writtenIndexes = fields.map((field) => expression.fields.indexOf(field));
|
|
2482
|
+
const sets = expression.fields.map((field) => getChildEvaluator(field.value));
|
|
2483
|
+
if (writtenIndexes.every((writtenIndex, index) => writtenIndex === index)) {
|
|
2484
|
+
return (context) => ({ kind: "RecordSet", names, sets: sets.map((set) => set(context)) });
|
|
2485
|
+
}
|
|
2486
|
+
return (context) => {
|
|
2487
|
+
const writtenSets = sets.map((set) => set(context));
|
|
2488
|
+
return {
|
|
2489
|
+
kind: "RecordSet",
|
|
2490
|
+
names,
|
|
2491
|
+
sets: writtenIndexes.map((index) => writtenSets[index]),
|
|
2492
|
+
};
|
|
2493
|
+
};
|
|
2206
2494
|
}
|
|
2207
2495
|
case "Except":
|
|
2208
2496
|
return compileExcept(expression, environment);
|
|
@@ -2269,6 +2557,8 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2269
2557
|
}
|
|
2270
2558
|
case "Label":
|
|
2271
2559
|
return getChildEvaluator(expression.body);
|
|
2560
|
+
case "Selection":
|
|
2561
|
+
return getChildEvaluator(expression.expression);
|
|
2272
2562
|
case "Subexpression":
|
|
2273
2563
|
return () => {
|
|
2274
2564
|
throw new TlaEvaluationError(
|