tla-ts 0.0.9 → 0.0.10-dev.094b9b512
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +40 -37
- package/dist/deciders.js +47 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2658 -410
- package/dist/prove.js +2657 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +208 -54
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +18 -43
- package/src/obligations/anonymize.ts +119 -90
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +2 -2
- package/src/obligations/expression.ts +38 -25
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +67 -63
- package/src/obligations/index.ts +38 -20
- package/src/obligations/levels.ts +28 -17
- package/src/obligations/module.ts +29 -54
- package/src/obligations/normalize.ts +31 -36
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +53 -25
- package/src/obligations/printer.ts +90 -57
- package/src/obligations/proof.ts +4 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +58 -62
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +51 -27
- package/src/obligations/substitution.ts +2 -4
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +961 -387
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +19 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -62
- package/src/prover/isabelle/isar/attrib.ts +219 -0
- package/src/prover/isabelle/isar/context.ts +336 -0
- package/src/prover/isabelle/isar/induct.ts +392 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +513 -225
- package/src/prover/isabelle/isar/proof.ts +569 -23
- package/src/prover/isabelle/isar/rule-cases.ts +234 -0
- package/src/prover/isabelle/isar/theory.ts +490 -89
- package/src/prover/isabelle/isar/toplevel.ts +341 -0
- package/src/prover/isabelle/isar/type-check.ts +100 -37
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +59 -60
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +96 -44
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +2 -8
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +16 -15
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +32 -73
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +28 -15
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +18 -24
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +29 -20
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +32 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +137 -83
- package/src/prover/prep/normalize.ts +38 -36
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +371 -132
- package/src/prover/ptl/decide.ts +104 -44
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +61 -29
- package/src/prover/smt/data.ts +497 -387
- package/src/prover/smt/encode.ts +156 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1025 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +63 -0
- package/src/prover/smt/solver/ackr-helper.ts +182 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +112 -0
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/add-bounds-tactic.ts +60 -0
- package/src/prover/smt/solver/aig-tactic.ts +43 -0
- package/src/prover/smt/solver/aig.ts +890 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -48
- package/src/prover/smt/solver/arith-terms.ts +123 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +176 -0
- package/src/prover/smt/solver/array-rewriter.ts +312 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -57
- package/src/prover/smt/solver/ast-lt.ts +166 -21
- package/src/prover/smt/solver/ast-util.ts +161 -7
- package/src/prover/smt/solver/ast.ts +1466 -178
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +591 -0
- package/src/prover/smt/solver/bit-blaster.ts +874 -0
- package/src/prover/smt/solver/bound-manager.ts +186 -0
- package/src/prover/smt/solver/bound-simplifier.ts +602 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +500 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +339 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +97 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1905 -0
- package/src/prover/smt/solver/bv1-blast.ts +224 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +175 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +545 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +534 -0
- package/src/prover/smt/solver/card2bv.ts +112 -0
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +28 -34
- package/src/prover/smt/solver/check-logic.ts +326 -0
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +280 -0
- package/src/prover/smt/solver/conflict-resolution.ts +79 -12
- package/src/prover/smt/solver/context.ts +510 -175
- package/src/prover/smt/solver/ctx-simplify.ts +34 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +124 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +575 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +83 -0
- package/src/prover/smt/solver/demodulator.ts +789 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +68 -0
- package/src/prover/smt/solver/der.ts +40 -30
- package/src/prover/smt/solver/diff-neq.ts +207 -0
- package/src/prover/smt/solver/distribute-forall.ts +67 -0
- package/src/prover/smt/solver/dom-simplify.ts +513 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +267 -0
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +130 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +558 -0
- package/src/prover/smt/solver/enode.ts +93 -22
- package/src/prover/smt/solver/eq2bv-tactic.ts +219 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +404 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +659 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +895 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +528 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +419 -0
- package/src/prover/smt/solver/euf/array-solver.ts +308 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +164 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +750 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +451 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +620 -0
- package/src/prover/smt/solver/euf/egraph.ts +885 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1203 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +333 -0
- package/src/prover/smt/solver/euf/mam.ts +1094 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +900 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +299 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +343 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +31 -0
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -6
- package/src/prover/smt/solver/expr2polynomial.ts +147 -0
- package/src/prover/smt/solver/factor.ts +152 -0
- package/src/prover/smt/solver/fd-solver.ts +269 -0
- package/src/prover/smt/solver/fingerprints.ts +16 -26
- package/src/prover/smt/solver/fix-dl-var.ts +149 -0
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/fm-tactic.ts +873 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +619 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +641 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2246 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +75 -0
- package/src/prover/smt/solver/goal.ts +177 -28
- package/src/prover/smt/solver/goal2nlsat.ts +191 -0
- package/src/prover/smt/solver/guard-set.ts +220 -0
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +27 -23
- package/src/prover/smt/solver/inf-eps.ts +64 -0
- package/src/prover/smt/solver/inj-axiom.ts +102 -0
- package/src/prover/smt/solver/internalizer.ts +72 -130
- package/src/prover/smt/solver/lackr.ts +383 -0
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/lia2card.ts +269 -0
- package/src/prover/smt/solver/lia2pb.ts +141 -0
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/logic-tactics.ts +349 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +24 -27
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +18 -39
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -82
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +79 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +69 -132
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +24 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +184 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +293 -0
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +30 -54
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +6 -5
- package/src/prover/smt/solver/macro-finder.ts +533 -0
- package/src/prover/smt/solver/mam-compiler.ts +117 -126
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +29 -0
- package/src/prover/smt/solver/max-cliques.ts +107 -0
- package/src/prover/smt/solver/maxcore.ts +318 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +9 -20
- package/src/prover/smt/solver/maxlex.ts +123 -0
- package/src/prover/smt/solver/maxsmt-base.ts +99 -0
- package/src/prover/smt/solver/maxsmt.ts +93 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +477 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +102 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +49 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +624 -0
- package/src/prover/smt/solver/model-based-opt.ts +845 -0
- package/src/prover/smt/solver/model-checker.ts +20 -62
- package/src/prover/smt/solver/model-evaluator.ts +186 -39
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +57 -40
- package/src/prover/smt/solver/model-macro-solver.ts +58 -111
- package/src/prover/smt/solver/model-printer.ts +215 -0
- package/src/prover/smt/solver/mpf.ts +712 -0
- package/src/prover/smt/solver/mus.ts +52 -0
- package/src/prover/smt/solver/muz/dl-context.ts +362 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +98 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +305 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +427 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +278 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +158 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +303 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +127 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +460 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +192 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +179 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1395 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +41 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +244 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +133 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +344 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +309 -0
- package/src/prover/smt/solver/muz/substitution.ts +154 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +286 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +179 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +61 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +10 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +48 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +30 -160
- package/src/prover/smt/solver/nlsat/solver.ts +227 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +311 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +369 -0
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nlsat-tactic.ts +83 -0
- package/src/prover/smt/solver/nnf.ts +108 -60
- package/src/prover/smt/solver/normalize-bounds.ts +54 -0
- package/src/prover/smt/solver/occf.ts +98 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +366 -0
- package/src/prover/smt/solver/opt-pareto.ts +284 -0
- package/src/prover/smt/solver/opt-preprocess.ts +102 -0
- package/src/prover/smt/solver/opt-solver.ts +300 -0
- package/src/prover/smt/solver/opt-value.ts +56 -0
- package/src/prover/smt/solver/optsmt.ts +691 -0
- package/src/prover/smt/solver/parallel-tactic.ts +301 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -23
- package/src/prover/smt/solver/pb-rewriter.ts +296 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +542 -0
- package/src/prover/smt/solver/poly-rewriter.ts +203 -77
- package/src/prover/smt/solver/probes.ts +514 -0
- package/src/prover/smt/solver/propagate-values.ts +34 -30
- package/src/prover/smt/solver/proto-model.ts +648 -63
- package/src/prover/smt/solver/pull-quant.ts +29 -23
- package/src/prover/smt/solver/purify-arith.ts +598 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1099 -0
- package/src/prover/smt/solver/qe-lite-der.ts +3 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +5 -28
- package/src/prover/smt/solver/qe-lite.ts +40 -49
- package/src/prover/smt/solver/qe-mbp.ts +281 -0
- package/src/prover/smt/solver/qe.ts +1508 -0
- package/src/prover/smt/solver/qel.ts +26 -0
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/qsat.ts +840 -0
- package/src/prover/smt/solver/quant-hoist.ts +195 -0
- package/src/prover/smt/solver/quant-tactics.ts +18 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +9 -23
- package/src/prover/smt/solver/quasi-macros.ts +254 -0
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +29 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +248 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +108 -0
- package/src/prover/smt/solver/reduce-args.ts +226 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +120 -0
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +3 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +49 -129
- package/src/prover/smt/solver/rewriter.ts +478 -120
- package/src/prover/smt/solver/rlimit.ts +27 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +314 -0
- package/src/prover/smt/solver/sat/big.ts +178 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +79 -0
- package/src/prover/smt/solver/sat/clause.ts +221 -0
- package/src/prover/smt/solver/sat/cleaner.ts +96 -0
- package/src/prover/smt/solver/sat/config.ts +125 -0
- package/src/prover/smt/solver/sat/consequences.ts +204 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +144 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +528 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +388 -0
- package/src/prover/smt/solver/sat/model-converter.ts +156 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +264 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1553 -0
- package/src/prover/smt/solver/sat/probing.ts +169 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +171 -0
- package/src/prover/smt/solver/sat/scc.ts +143 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1662 -0
- package/src/prover/smt/solver/sat/solver.ts +2128 -0
- package/src/prover/smt/solver/sat/var-queue.ts +119 -0
- package/src/prover/smt/solver/sat/watch-list.ts +136 -0
- package/src/prover/smt/solver/search-tree.ts +285 -0
- package/src/prover/smt/solver/seq-axioms.ts +1013 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +823 -0
- package/src/prover/smt/solver/seq-derive.ts +1303 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +238 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +440 -0
- package/src/prover/smt/solver/seq-factory.ts +91 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +225 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1296 -0
- package/src/prover/smt/solver/seq-re-util.ts +777 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +145 -0
- package/src/prover/smt/solver/seq-regex-live.ts +202 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +100 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2407 -0
- package/src/prover/smt/solver/seq-skolem.ts +318 -0
- package/src/prover/smt/solver/seq-subset.ts +166 -0
- package/src/prover/smt/solver/seq-view-witness.ts +355 -0
- package/src/prover/smt/solver/smt-consequences.ts +299 -0
- package/src/prover/smt/solver/smt-kernel.ts +85 -0
- package/src/prover/smt/solver/smt-logics.ts +67 -0
- package/src/prover/smt/solver/smt-setup.ts +492 -0
- package/src/prover/smt/solver/smt2-printer.ts +767 -0
- package/src/prover/smt/solver/smtlib-parser.ts +2423 -270
- package/src/prover/smt/solver/smtlib-script.ts +1493 -0
- package/src/prover/smt/solver/solve-eqs.ts +931 -0
- package/src/prover/smt/solver/solver.ts +120 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +319 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/tactic.ts +1936 -0
- package/src/prover/smt/solver/term-enumeration.ts +206 -0
- package/src/prover/smt/solver/theory-array.ts +1275 -0
- package/src/prover/smt/solver/theory-bv.ts +1239 -0
- package/src/prover/smt/solver/theory-char.ts +356 -0
- package/src/prover/smt/solver/theory-datatype.ts +599 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +422 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +56 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -10
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +87 -53
- package/src/prover/smt/solver/theory-lra-model.ts +24 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +25 -40
- package/src/prover/smt/solver/theory-lra-state.ts +7 -27
- package/src/prover/smt/solver/theory-lra.ts +194 -8
- package/src/prover/smt/solver/theory-pb.ts +932 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +59 -0
- package/src/prover/smt/solver/theory-recfun.ts +308 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +871 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1375 -0
- package/src/prover/smt/solver/theory-seq-state.ts +880 -0
- package/src/prover/smt/solver/theory-seq.ts +984 -0
- package/src/prover/smt/solver/theory.ts +175 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +487 -0
- package/src/prover/smt/solver/var-subst.ts +33 -35
- package/src/prover/smt/table.ts +1 -9
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -15
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +20 -14
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +10 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +11 -33
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +88 -57
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/tlaps-module.ts +0 -510
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Deref
|
|
2
|
-
// subexpression it names, abstracted over the bound names it uses.
|
|
1
|
+
// A port of tlapm's Expr.Deref.
|
|
3
2
|
|
|
4
3
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
4
|
import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
|
|
6
5
|
import {
|
|
7
6
|
at,
|
|
8
7
|
getErrorNote,
|
|
8
|
+
getErrorSetting,
|
|
9
9
|
getBoundFresh,
|
|
10
10
|
getChildren,
|
|
11
11
|
getFresh,
|
|
12
12
|
getParamFresh,
|
|
13
13
|
mapChildren,
|
|
14
14
|
mapSelectorArgs,
|
|
15
|
+
warnError,
|
|
15
16
|
type Bound,
|
|
16
17
|
type Defn,
|
|
17
18
|
type Expr,
|
|
@@ -20,6 +21,8 @@ import {
|
|
|
20
21
|
type Param,
|
|
21
22
|
type Selector,
|
|
22
23
|
} from "./expression";
|
|
24
|
+
import { renderDoc } from "./format";
|
|
25
|
+
import { printExpression } from "./printer";
|
|
23
26
|
|
|
24
27
|
interface Resolution {
|
|
25
28
|
params: Param[];
|
|
@@ -48,7 +51,6 @@ const stripParensAndAtomic = (expression: Expr): Expr => {
|
|
|
48
51
|
return rest;
|
|
49
52
|
};
|
|
50
53
|
|
|
51
|
-
// Parentheses go everywhere but in the definitions of a LET.
|
|
52
54
|
const stripParens = (expression: Expr): Expr => {
|
|
53
55
|
if (expression.kind === "Let") {
|
|
54
56
|
return at(
|
|
@@ -63,8 +65,6 @@ const stripParens = (expression: Expr): Expr => {
|
|
|
63
65
|
const hasNegativeIndex = (expression: Expr): boolean =>
|
|
64
66
|
expression.kind === "Ix" ? expression.index <= 0 : getChildren(expression).some(hasNegativeIndex);
|
|
65
67
|
|
|
66
|
-
// Visit.iter's context for each binder, stopping at labels with other names and at declarations
|
|
67
|
-
// in an ASSUME.
|
|
68
68
|
const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch | undefined => {
|
|
69
69
|
const search = (inner: Expr, innerContext = context) => findLabel(inner, label, innerContext);
|
|
70
70
|
const searchBounds = (bounds: Bound[], body: Expr) =>
|
|
@@ -133,7 +133,6 @@ const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch
|
|
|
133
133
|
}
|
|
134
134
|
};
|
|
135
135
|
|
|
136
|
-
// The first count indices in reverse, and the rest past the parameters.
|
|
137
136
|
const getReversal = (count: number, paramCount: number) =>
|
|
138
137
|
consAll(
|
|
139
138
|
Array.from({ length: count }, (_item, index): Expr => ({ kind: "Ix", index: index + 1 })),
|
|
@@ -152,6 +151,8 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
152
151
|
const expected = expression.bounds.length;
|
|
153
152
|
const message = `Arity mismatch in subexpression instance.\nExpected ${expected} argument${expected === 1 ? "" : "s"}, but found${args.length < expected ? " only" : ""} ${args.length}.`;
|
|
154
153
|
onWarning(getErrorNote(expression.location, message));
|
|
154
|
+
// Errors.set takes the message from Printf, which keeps the @ of Format's @\n.
|
|
155
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
155
156
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
156
157
|
}
|
|
157
158
|
const body = expression.kind === "SetOf" ? expression.element : expression.body;
|
|
@@ -198,12 +199,13 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
198
199
|
if (args.length !== 1) {
|
|
199
200
|
const message = `Arity mismatch in subexpression instance.\nExpected 1 argument, but found ${args.length}.`;
|
|
200
201
|
onWarning(getErrorNote(expression.location, message));
|
|
202
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
201
203
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
202
204
|
}
|
|
203
205
|
return substituteExpr(consAll(args, shift(0)), expression.body);
|
|
204
206
|
default: {
|
|
205
207
|
const message = "Cannot instantiate non-binding expression";
|
|
206
|
-
onWarning
|
|
208
|
+
warnError(onWarning, expression.location, message);
|
|
207
209
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
208
210
|
}
|
|
209
211
|
}
|
|
@@ -225,7 +227,7 @@ const abstract = (onWarning: Warn, definitionCount: number, expression: Expr): [
|
|
|
225
227
|
return [{ name: expression.name, shape: 0 }];
|
|
226
228
|
default: {
|
|
227
229
|
const message = "Cannot abstract over bound variables in a non-binding expression";
|
|
228
|
-
onWarning
|
|
230
|
+
warnError(onWarning, expression.location, message);
|
|
229
231
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_at" });
|
|
230
232
|
}
|
|
231
233
|
}
|
|
@@ -243,7 +245,7 @@ const getNumbered = (
|
|
|
243
245
|
): [Defn[], Expr] => {
|
|
244
246
|
const checkAtMost = (count: number) => {
|
|
245
247
|
if (position <= count) return;
|
|
246
|
-
onWarning
|
|
248
|
+
warnError(onWarning, origin.location, message);
|
|
247
249
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
248
250
|
};
|
|
249
251
|
const pick = (items: Expr[]) => {
|
|
@@ -261,7 +263,7 @@ const getNumbered = (
|
|
|
261
263
|
const hyp = sequent.context[position - 1];
|
|
262
264
|
if (hyp && hyp.kind !== "Fact") {
|
|
263
265
|
const hypMessage = "subexpression reference does not resolve to an expression";
|
|
264
|
-
onWarning
|
|
266
|
+
warnError(onWarning, expression.location, hypMessage);
|
|
265
267
|
throw new TlaProofError(hypMessage, { failure: "Expr.Deref.deref_num" });
|
|
266
268
|
}
|
|
267
269
|
const shifted = substituteExpr(
|
|
@@ -275,10 +277,10 @@ const getNumbered = (
|
|
|
275
277
|
`subexpression of ASSUME/PROVE uses identifiers declared therein\nTlapm does not handle yet such subexpression namings.`,
|
|
276
278
|
),
|
|
277
279
|
);
|
|
278
|
-
|
|
279
|
-
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings."
|
|
280
|
-
|
|
281
|
-
);
|
|
280
|
+
const message =
|
|
281
|
+
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings.";
|
|
282
|
+
onWarning(getErrorSetting(expression.location, message));
|
|
283
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
282
284
|
}
|
|
283
285
|
return shifted;
|
|
284
286
|
}
|
|
@@ -343,18 +345,17 @@ const getNumbered = (
|
|
|
343
345
|
]);
|
|
344
346
|
}
|
|
345
347
|
const emptyMessage = "Expression has no subexpressions";
|
|
346
|
-
onWarning
|
|
348
|
+
warnError(onWarning, expression.location, emptyMessage);
|
|
347
349
|
throw new TlaProofError(emptyMessage, { failure: "Expr.Deref.deref_num" });
|
|
348
350
|
})();
|
|
349
351
|
if (isUnresolved(result)) {
|
|
350
352
|
const badMessage = `Cannot resolve subexpression reference !${position}`;
|
|
351
|
-
onWarning
|
|
353
|
+
warnError(onWarning, expression.location, badMessage);
|
|
352
354
|
throw new TlaProofError(badMessage, { failure: "Expr.Deref.deref_num" });
|
|
353
355
|
}
|
|
354
356
|
return [expression.kind === "Let" ? expression.definitions : [], result];
|
|
355
357
|
};
|
|
356
358
|
|
|
357
|
-
// Reorders label arguments given in source order to the order of the label's de Bruijn indices.
|
|
358
359
|
const permute = (indices: number[], args: Expr[]) => {
|
|
359
360
|
const count = indices.length;
|
|
360
361
|
let current = indices;
|
|
@@ -381,7 +382,7 @@ const resolveLabel = (
|
|
|
381
382
|
if (indices.length !== labelArgs.length && labelArgs.length > 0) {
|
|
382
383
|
const plural = indices.length === 1 ? "" : "s";
|
|
383
384
|
const message = `Expected ${indices.length} argument${plural} for labelled reference !${label}, but found ${labelArgs.length}`;
|
|
384
|
-
onWarning
|
|
385
|
+
warnError(onWarning, found.expression.location, message);
|
|
385
386
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_lsub" });
|
|
386
387
|
}
|
|
387
388
|
const params =
|
|
@@ -436,8 +437,9 @@ const resolveLetOperator = (
|
|
|
436
437
|
args: Expr[],
|
|
437
438
|
): Resolution => {
|
|
438
439
|
if (expression.kind !== "Let") {
|
|
439
|
-
|
|
440
|
-
|
|
440
|
+
const message = "not a LET expression";
|
|
441
|
+
warnError(onWarning, expression.location, message);
|
|
442
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
441
443
|
}
|
|
442
444
|
const index = expression.definitions.findIndex(
|
|
443
445
|
(definition) => definition.kind === "Operator" && definition.name === label,
|
|
@@ -445,7 +447,7 @@ const resolveLetOperator = (
|
|
|
445
447
|
const definition = expression.definitions[index];
|
|
446
448
|
if (!definition || definition.kind !== "Operator") {
|
|
447
449
|
const message = `no definition of operator ${label}`;
|
|
448
|
-
onWarning
|
|
450
|
+
warnError(onWarning, expression.location, message);
|
|
449
451
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
450
452
|
}
|
|
451
453
|
const body = definition.body;
|
|
@@ -487,6 +489,7 @@ const resolveLetOperator = (
|
|
|
487
489
|
|
|
488
490
|
const resolveSelectors = (
|
|
489
491
|
onWarning: Warn,
|
|
492
|
+
hyps: Hyp[],
|
|
490
493
|
isLabel: boolean,
|
|
491
494
|
state: Resolution,
|
|
492
495
|
selectors: Selector[],
|
|
@@ -507,13 +510,14 @@ const resolveSelectors = (
|
|
|
507
510
|
return { ...stripParensAndAtomic(abstracted), isAtomic: true };
|
|
508
511
|
}
|
|
509
512
|
if (state.expression.isAtomic) {
|
|
510
|
-
|
|
513
|
+
const message = "Expression has no subexpressions";
|
|
514
|
+
warnError(onWarning, state.expression.location, message);
|
|
511
515
|
return UNRESOLVED;
|
|
512
516
|
}
|
|
513
517
|
const expression = isLabel ? state.expression : stripParens(state.expression);
|
|
514
518
|
const count = state.definitions.length;
|
|
515
519
|
const next = ((): Resolution & { rest: Selector[]; isLabel: boolean } => {
|
|
516
|
-
const
|
|
520
|
+
const resolveNumbered = (position: number, message: string) => {
|
|
517
521
|
const [definitions, inner] = getNumbered(
|
|
518
522
|
onWarning,
|
|
519
523
|
expression,
|
|
@@ -531,16 +535,33 @@ const resolveSelectors = (
|
|
|
531
535
|
return { ...result, rest: after, isLabel: true };
|
|
532
536
|
}
|
|
533
537
|
if (isLabel) return { params: [], definitions: [], expression, rest, isLabel: false };
|
|
538
|
+
onWarning(getErrorSetting(expression.location, "!: is forbidden for this expression.\n"));
|
|
539
|
+
const scope = [
|
|
540
|
+
...hyps,
|
|
541
|
+
...state.definitions.map((definition): Hyp => ({
|
|
542
|
+
kind: "Defn",
|
|
543
|
+
definition,
|
|
544
|
+
whereDefined: "User",
|
|
545
|
+
visibility: "Visible",
|
|
546
|
+
isLocal: true,
|
|
547
|
+
})),
|
|
548
|
+
];
|
|
549
|
+
onWarning(
|
|
550
|
+
getErrorNote(
|
|
551
|
+
expression.location,
|
|
552
|
+
`!: is forbidden for this expression:\n${renderDoc(printExpression(scope, expression))}`,
|
|
553
|
+
),
|
|
554
|
+
);
|
|
534
555
|
throw new TlaProofError("!: is forbidden for this expression.\n", {
|
|
535
556
|
failure: "Expr.Deref.deref: !:",
|
|
536
557
|
});
|
|
537
558
|
}
|
|
538
559
|
case "Number":
|
|
539
|
-
return
|
|
560
|
+
return resolveNumbered(selector.value, `Cannot resolve !${selector.value}`);
|
|
540
561
|
case "Left":
|
|
541
|
-
return
|
|
562
|
+
return resolveNumbered(1, "Cannot resolve !<<");
|
|
542
563
|
case "Right":
|
|
543
|
-
return
|
|
564
|
+
return resolveNumbered(2, "Cannot resolve !>>");
|
|
544
565
|
case "Instance":
|
|
545
566
|
return {
|
|
546
567
|
params: [],
|
|
@@ -564,6 +585,7 @@ const resolveSelectors = (
|
|
|
564
585
|
})();
|
|
565
586
|
return resolveSelectors(
|
|
566
587
|
onWarning,
|
|
588
|
+
hyps,
|
|
567
589
|
next.isLabel,
|
|
568
590
|
{
|
|
569
591
|
params: [...state.params, ...next.params],
|
|
@@ -587,19 +609,21 @@ const getInitialResolution = (onWarning: Warn, operator: Expr, args: Expr[]): Re
|
|
|
587
609
|
|
|
588
610
|
export const resolveSubexpression = (
|
|
589
611
|
onWarning: Warn,
|
|
612
|
+
hyps: Hyp[],
|
|
590
613
|
operator: Expr,
|
|
591
614
|
args: Expr[],
|
|
592
615
|
selectors: Selector[],
|
|
593
616
|
) => {
|
|
594
617
|
const result = resolveSelectors(
|
|
595
618
|
onWarning,
|
|
619
|
+
hyps,
|
|
596
620
|
true,
|
|
597
621
|
getInitialResolution(onWarning, operator, args),
|
|
598
622
|
selectors,
|
|
599
623
|
);
|
|
600
624
|
if (isUnresolved(result)) {
|
|
601
625
|
const message = "Could not resolve subexpression reference";
|
|
602
|
-
onWarning
|
|
626
|
+
warnError(onWarning, operator.location, message);
|
|
603
627
|
throw new TlaProofError(message, { failure: "Expr.Anon: 2" });
|
|
604
628
|
}
|
|
605
629
|
return result;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's E_subst
|
|
1
|
+
// A port of tlapm's E_subst.
|
|
2
2
|
|
|
3
3
|
import { TlaProofError } from "../errors";
|
|
4
4
|
import {
|
|
@@ -31,7 +31,6 @@ export const consSubstitution = (expression: Expr, rest: Substitution): Substitu
|
|
|
31
31
|
rest,
|
|
32
32
|
});
|
|
33
33
|
|
|
34
|
-
// Binds the expressions in order, so the last one becomes index 1.
|
|
35
34
|
export const consAll = (expressions: Expr[], rest: Substitution) =>
|
|
36
35
|
expressions.reduce((inner, expression) => consSubstitution(expression, inner), rest);
|
|
37
36
|
|
|
@@ -63,7 +62,6 @@ const applyIndex = (substitution: Substitution, index: number, from: Expr): Expr
|
|
|
63
62
|
export const substituteExprs = (substitution: Substitution, expressions: Expr[]) =>
|
|
64
63
|
expressions.map((expression) => substituteExpr(substitution, expression));
|
|
65
64
|
|
|
66
|
-
// Beta-reduces a lambda applied to arguments, as E_subst.normalize does.
|
|
67
65
|
export const normalizeApply = (operator: Expr, args: Expr[]): ExprCore => {
|
|
68
66
|
if (operator.kind === "Lambda") {
|
|
69
67
|
if (operator.params.length !== args.length) throw new TlaProofError("Arity mismatch");
|
|
@@ -96,7 +94,7 @@ export const substituteDefn = (substitution: Substitution, definition: Defn): De
|
|
|
96
94
|
instance: {
|
|
97
95
|
...definition.instance,
|
|
98
96
|
substitutions: definition.instance.substitutions.map((entry) => ({
|
|
99
|
-
|
|
97
|
+
...entry,
|
|
100
98
|
expression: substituteExpr(inner, entry.expression),
|
|
101
99
|
})),
|
|
102
100
|
},
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// the time of a fact (Expr.Temporal_props): a fact holds always when it is closed under [].
|
|
1
|
+
// A port of tlapm's Expr.Tla_norm, Expr.Constness and Expr.Temporal_props.
|
|
3
2
|
|
|
4
3
|
import {
|
|
5
4
|
adjoin,
|
|
@@ -9,6 +8,8 @@ import {
|
|
|
9
8
|
getFresh,
|
|
10
9
|
getLocalDefn,
|
|
11
10
|
getScopeAt,
|
|
11
|
+
getTrue,
|
|
12
|
+
isBuiltinApply,
|
|
12
13
|
mapChildren,
|
|
13
14
|
type Builtin,
|
|
14
15
|
type Expr,
|
|
@@ -27,17 +28,15 @@ const applyUnchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expressi
|
|
|
27
28
|
const getEquality = (expression: Expr) =>
|
|
28
29
|
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
29
30
|
|
|
30
|
-
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
31
31
|
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
32
32
|
const flatten = (inner: Expr): Expr[] =>
|
|
33
33
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
34
34
|
const items = flatten(expression);
|
|
35
|
-
if (items.length === 0) return
|
|
35
|
+
if (items.length === 0) return getTrue(expression);
|
|
36
36
|
if (items.length === 1) return getEquality(items[0]);
|
|
37
37
|
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
38
38
|
};
|
|
39
39
|
|
|
40
|
-
// Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
|
|
41
40
|
const rewrite =
|
|
42
41
|
(match: (expression: Expr, recurse: (inner: Expr) => Expr) => Expr | undefined) =>
|
|
43
42
|
(expression: Expr): Expr => {
|
|
@@ -46,7 +45,7 @@ const rewrite =
|
|
|
46
45
|
};
|
|
47
46
|
|
|
48
47
|
export const expandLeadsto = rewrite((expression, recurse) =>
|
|
49
|
-
|
|
48
|
+
isBuiltinApply(expression, "Leadsto")
|
|
50
49
|
? applyBuiltin(
|
|
51
50
|
"BoxTrue",
|
|
52
51
|
[
|
|
@@ -105,11 +104,8 @@ export const expandAction = rewrite((expression, recurse) => {
|
|
|
105
104
|
return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
|
|
106
105
|
});
|
|
107
106
|
|
|
108
|
-
// Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
|
|
109
107
|
const expandUnchanged = rewrite((expression) =>
|
|
110
|
-
expression
|
|
111
|
-
? rewriteUnchanged(expression.args[0])
|
|
112
|
-
: undefined,
|
|
108
|
+
isBuiltinApply(expression, "UNCHANGED") ? rewriteUnchanged(expression.args[0]) : undefined,
|
|
113
109
|
);
|
|
114
110
|
|
|
115
111
|
const TEMPORAL_BUILTINS: Builtin[] = [
|
|
@@ -127,6 +123,11 @@ const TEMPORAL_BUILTINS: Builtin[] = [
|
|
|
127
123
|
|
|
128
124
|
const constantBodies = new WeakMap<Expr, boolean>();
|
|
129
125
|
|
|
126
|
+
interface ConstnessState {
|
|
127
|
+
scope: Scope | undefined;
|
|
128
|
+
isGood: boolean;
|
|
129
|
+
}
|
|
130
|
+
|
|
130
131
|
const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
|
|
131
132
|
switch (hyp.kind) {
|
|
132
133
|
case "Fresh":
|
|
@@ -183,10 +184,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
183
184
|
expression.body,
|
|
184
185
|
);
|
|
185
186
|
case "Sequent": {
|
|
186
|
-
const inner = expression.sequent.context.reduce<
|
|
187
|
-
scope: Scope | undefined;
|
|
188
|
-
isGood: boolean;
|
|
189
|
-
}>(
|
|
187
|
+
const inner = expression.sequent.context.reduce<ConstnessState>(
|
|
190
188
|
(state, hyp) => ({
|
|
191
189
|
scope: adjoin(state.scope, hyp),
|
|
192
190
|
isGood: state.isGood && isConstantHyp(state.scope, hyp),
|
|
@@ -203,7 +201,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
203
201
|
case "Apply":
|
|
204
202
|
return recurse(expression.operator) && expression.args.every(recurse);
|
|
205
203
|
case "Let": {
|
|
206
|
-
const inner = expression.definitions.reduce<
|
|
204
|
+
const inner = expression.definitions.reduce<ConstnessState>(
|
|
207
205
|
(state, definition) => ({
|
|
208
206
|
scope: adjoin(state.scope, getLocalDefn(definition)),
|
|
209
207
|
isGood:
|
|
@@ -275,8 +273,6 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
275
273
|
}
|
|
276
274
|
};
|
|
277
275
|
|
|
278
|
-
// Temporal_props.box_closure: whether the formula is equivalent to [] of itself, judged by its
|
|
279
|
-
// shape. Under a negation or on the left of =>, <> takes the place of [].
|
|
280
276
|
const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): boolean => {
|
|
281
277
|
if (isConstant(scope, expression)) return true;
|
|
282
278
|
if (expression.kind === "Internal")
|
|
@@ -313,8 +309,6 @@ export const getTime = (scope: Scope | undefined, expression: Expr): Time =>
|
|
|
313
309
|
? "Always"
|
|
314
310
|
: "Now";
|
|
315
311
|
|
|
316
|
-
// Temporal_props.check_time_change: a proof stays in the always scope while no fact it assumes
|
|
317
|
-
// holds only now.
|
|
318
312
|
export const getScopeTime = (context: Hyp[], time: Time): Time =>
|
|
319
313
|
time === "Always" && context.some((hyp) => hyp.kind === "Fact" && hyp.time === "Now")
|
|
320
314
|
? "Now"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's E_tuply_declarations
|
|
1
|
+
// A port of tlapm's E_tuply_declarations.
|
|
2
2
|
|
|
3
3
|
import type { Bound, BoundDomain, Defn, Expr } from "./expression";
|
|
4
4
|
|
|
@@ -25,7 +25,6 @@ export const getUnbounded = (names: string[]): Bound[] =>
|
|
|
25
25
|
const getFactors = (domain: Expr | undefined, names: string[]) =>
|
|
26
26
|
domain?.kind === "Product" && domain.factors.length === names.length ? domain.factors : undefined;
|
|
27
27
|
|
|
28
|
-
// Each name is the matching item of the tuple: x == t[1], y == t[2].
|
|
29
28
|
const getItemDefinitions = (tuple: string, names: string[]): Defn[] =>
|
|
30
29
|
names.map((name, index) => ({
|
|
31
30
|
kind: "Operator",
|
|
@@ -50,8 +49,6 @@ const getNamedBound = (bound: Extract<TuplyBound, { kind: "Name" }>): Bound => (
|
|
|
50
49
|
domain: bound.domain,
|
|
51
50
|
});
|
|
52
51
|
|
|
53
|
-
// \E <<x, y>> \in A \X B: P becomes \E x \in A, y \in B: P, and \E <<x, y>> \in S: P becomes
|
|
54
|
-
// \E x, y: <<x, y>> \in S /\ P. Each domain quantifies separately, the last one innermost.
|
|
55
52
|
export const expandQuant = (
|
|
56
53
|
quantifier: "Forall" | "Exists",
|
|
57
54
|
bounds: TuplyBound[],
|
|
@@ -91,8 +88,6 @@ export const expandQuant = (
|
|
|
91
88
|
}, body);
|
|
92
89
|
};
|
|
93
90
|
|
|
94
|
-
// CHOOSE <<x, y>> \in A \X B: P binds t \in A \X B with x == t[1], y == t[2], and any other
|
|
95
|
-
// domain binds t with \E x, y: t = <<x, y>> /\ P. {<<x, y>> \in S: P} binds t the same way.
|
|
96
91
|
export const expandChoose = (
|
|
97
92
|
binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
|
|
98
93
|
names: string[],
|
|
@@ -117,8 +112,6 @@ export const expandChoose = (
|
|
|
117
112
|
};
|
|
118
113
|
};
|
|
119
114
|
|
|
120
|
-
// A set or function constructor binds each tuple as fcn#x, with its names defined in a LET around
|
|
121
|
-
// the value. A set constructor over a matching product binds the names to its factors instead.
|
|
122
115
|
const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boolean) => {
|
|
123
116
|
const expanded = bounds.map((bound): { bounds: Bound[]; definitions: Defn[] } => {
|
|
124
117
|
if (bound.kind === "Name") return { bounds: [getNamedBound(bound)], definitions: [] };
|
|
@@ -153,7 +146,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
|
|
|
153
146
|
const definitions = expanded.flatMap((item) => item.definitions);
|
|
154
147
|
return {
|
|
155
148
|
bounds: expanded.flatMap((item) => item.bounds),
|
|
156
|
-
value:
|
|
149
|
+
value:
|
|
150
|
+
definitions.length === 0 ? value : ({ kind: "Let", definitions, body: value } satisfies Expr),
|
|
157
151
|
};
|
|
158
152
|
};
|
|
159
153
|
|
package/src/parallel-worker.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { createEnvironment } from "./environment";
|
|
2
1
|
import {
|
|
3
2
|
createFingerprintTable,
|
|
4
3
|
insertSharedFingerprint,
|
|
@@ -6,19 +5,11 @@ import {
|
|
|
6
5
|
writeStateFingerprint,
|
|
7
6
|
} from "./fingerprints";
|
|
8
7
|
import type { CoordinatorMessage, StartMessage, WorkerMessage } from "./parallel";
|
|
9
|
-
import { createSearch } from "./search";
|
|
8
|
+
import { createCheckEnvironment, createSearch } from "./search";
|
|
10
9
|
import { getSuccessors, type Successor } from "./successors";
|
|
11
|
-
import { createTlcOrder } from "./tlc/order";
|
|
12
10
|
import { OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
13
11
|
import { createStateDecoder, createStateEncoder, type EncodedStates } from "./transfer";
|
|
14
|
-
import {
|
|
15
|
-
createCanonicalizer,
|
|
16
|
-
getRankedString,
|
|
17
|
-
getRankedStringCount,
|
|
18
|
-
setStringOrder,
|
|
19
|
-
setValueVersion,
|
|
20
|
-
type Value,
|
|
21
|
-
} from "./values";
|
|
12
|
+
import { createCanonicalizer, getUnorderedString, type Value } from "./values";
|
|
22
13
|
import { createBreak, getParentPort, type Port } from "./worker";
|
|
23
14
|
|
|
24
15
|
const LOCKED = -1;
|
|
@@ -42,25 +33,16 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
42
33
|
const modules = new Map(start.modules);
|
|
43
34
|
const loadModule = (name: string) => modules.get(name);
|
|
44
35
|
const classes = new Map(start.classes);
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
order,
|
|
53
|
-
loadClass: (name) => classes.get(name),
|
|
54
|
-
print: () => {},
|
|
55
|
-
files: { readFile: undefined, writeFile: undefined },
|
|
56
|
-
isTool: start.isTool,
|
|
57
|
-
isTraceRecorded: start.isTraceRecorded,
|
|
58
|
-
isWarningEnabled: start.isWarningEnabled,
|
|
59
|
-
version: start.version,
|
|
60
|
-
});
|
|
36
|
+
const created = createCheckEnvironment(
|
|
37
|
+
start.config,
|
|
38
|
+
{ ...start, loadModule, loadClass: (name) => classes.get(name), seed: undefined },
|
|
39
|
+
() => {},
|
|
40
|
+
true,
|
|
41
|
+
);
|
|
42
|
+
const specification = created.specification;
|
|
61
43
|
const environment = specification.environment;
|
|
62
|
-
const search = createSearch(start.config, environment, () =>
|
|
63
|
-
order.getDeclarationOrder("variable"),
|
|
44
|
+
const search = createSearch(start.config, environment, specification.variableLocations, () =>
|
|
45
|
+
created.order.getDeclarationOrder("variable"),
|
|
64
46
|
);
|
|
65
47
|
const nextAction = search?.spec.next;
|
|
66
48
|
if (!search || nextAction === undefined)
|
|
@@ -68,24 +50,20 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
68
50
|
const workerIndex = start.index;
|
|
69
51
|
const canonicalize = createCanonicalizer();
|
|
70
52
|
const decode = createStateDecoder(environment.variables.length);
|
|
71
|
-
|
|
53
|
+
let sharedFingerprints = start.fingerprints;
|
|
72
54
|
const requests = start.requests;
|
|
73
55
|
const remaining = start.remaining;
|
|
74
|
-
// Under symmetry, a successor the worker generated before has the representative it had then,
|
|
75
|
-
// so the worker skips the search for one.
|
|
76
56
|
const generatedStates = search.isSymmetric ? createFingerprintTable() : undefined;
|
|
77
57
|
const fingerprint = new Int32Array(2);
|
|
78
|
-
|
|
58
|
+
let resumeLevel = () => {};
|
|
59
|
+
let receiveLoot = (_states: EncodedStates) => {};
|
|
79
60
|
start.ports.forEach((port) => {
|
|
80
|
-
port?.addEventListener("message", (event) =>
|
|
61
|
+
port?.addEventListener("message", (event) => receiveLoot(event.data as EncodedStates));
|
|
81
62
|
port?.start?.();
|
|
82
63
|
});
|
|
83
|
-
|
|
64
|
+
let frontier = decode(start.seed).map(canonicalize);
|
|
84
65
|
const takeBreak = createBreak();
|
|
85
66
|
|
|
86
|
-
// A worker that runs out of states asks a peer for some by writing its index + 1 to the peer's
|
|
87
|
-
// request word. The peer sends half of the states it hasn't started, keeps expanding, and wakes
|
|
88
|
-
// the workers waiting to ask it next.
|
|
89
67
|
const answerRequest = (expansion: Expansion, request: number) => {
|
|
90
68
|
const thief = Atomics.load(requests, workerIndex) - 1;
|
|
91
69
|
const given = Math.floor((expansion.end - expansion.origin - 1) / 2);
|
|
@@ -99,8 +77,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
99
77
|
Atomics.notify(requests, workerIndex);
|
|
100
78
|
};
|
|
101
79
|
|
|
102
|
-
// A worker answers any request before it pauses or runs out of states, and takes no more until
|
|
103
|
-
// it resumes.
|
|
104
80
|
const lockRequests = (expansion: Expansion) => {
|
|
105
81
|
Atomics.store(remaining, workerIndex, 0);
|
|
106
82
|
if (Atomics.compareExchange(requests, workerIndex, 0, LOCKED) === 0) return;
|
|
@@ -112,7 +88,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
112
88
|
Atomics.store(requests, workerIndex, 0);
|
|
113
89
|
};
|
|
114
90
|
|
|
115
|
-
// The worker pauses before a successor when the shared table needs to grow, and resumes there.
|
|
116
91
|
const expand = (expansion: Expansion) => {
|
|
117
92
|
for (; expansion.origin < expansion.end; expansion.origin++) {
|
|
118
93
|
const state = expansion.states[expansion.origin];
|
|
@@ -126,7 +101,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
126
101
|
}
|
|
127
102
|
const successors = expansion.successors;
|
|
128
103
|
for (; expansion.index < successors.length; expansion.index++) {
|
|
129
|
-
if (isSharedFingerprintsFull(
|
|
104
|
+
if (isSharedFingerprintsFull(sharedFingerprints)) return "paused";
|
|
130
105
|
const successor = successors[expansion.index];
|
|
131
106
|
if (search.findViolatedActionProperty(state, successor.state)) return undefined;
|
|
132
107
|
if (!search.satisfiesActionConstraints(state, successor.state)) {
|
|
@@ -141,7 +116,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
141
116
|
canonicalize(successor.state);
|
|
142
117
|
const fingerprintState = search.getFingerprintState(successor.state);
|
|
143
118
|
writeStateFingerprint(fingerprintState, fingerprint);
|
|
144
|
-
if (!insertSharedFingerprint(
|
|
119
|
+
if (!insertSharedFingerprint(sharedFingerprints, fingerprint[0], fingerprint[1])) continue;
|
|
145
120
|
if (search.findViolatedInvariant(successor.state, state)) return undefined;
|
|
146
121
|
if (!search.satisfiesConstraints(successor.state, state)) continue;
|
|
147
122
|
expansion.next.push(successor.state);
|
|
@@ -156,9 +131,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
156
131
|
return "done";
|
|
157
132
|
};
|
|
158
133
|
|
|
159
|
-
// Each attempt asks the peer with the most states left. While another worker's request to that
|
|
160
|
-
// peer is open, the worker waits for the peer to answer it. The worker stops once no peer that
|
|
161
|
-
// takes requests has two states left.
|
|
162
134
|
const steal = async (expansion: Expansion) => {
|
|
163
135
|
const skipped = new Set<number>();
|
|
164
136
|
for (;;) {
|
|
@@ -173,7 +145,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
173
145
|
if (request === LOCKED) skipped.add(victim);
|
|
174
146
|
if (request > 0) Atomics.wait(requests, victim, request);
|
|
175
147
|
if (request !== 0) continue;
|
|
176
|
-
const loot = await new Promise<EncodedStates>((resolve) => (
|
|
148
|
+
const loot = await new Promise<EncodedStates>((resolve) => (receiveLoot = resolve));
|
|
177
149
|
if (loot.count === 0) {
|
|
178
150
|
skipped.add(victim);
|
|
179
151
|
continue;
|
|
@@ -191,9 +163,9 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
191
163
|
|
|
192
164
|
const runLevel = async (): Promise<WorkerMessage | undefined> => {
|
|
193
165
|
const expansion: Expansion = {
|
|
194
|
-
states: frontier
|
|
166
|
+
states: frontier,
|
|
195
167
|
origin: 0,
|
|
196
|
-
end: frontier.
|
|
168
|
+
end: frontier.length,
|
|
197
169
|
successors: undefined,
|
|
198
170
|
index: 0,
|
|
199
171
|
added: 0,
|
|
@@ -206,8 +178,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
206
178
|
for (;;) {
|
|
207
179
|
const status = expand(expansion);
|
|
208
180
|
if (status === undefined) return undefined;
|
|
209
|
-
// HACK: Bun
|
|
210
|
-
// long level without returning to the loop holds on to memory it no longer uses.
|
|
181
|
+
// HACK: Bun frees memory on event loop timers, so a long level returns to the loop.
|
|
211
182
|
if (status === "break") {
|
|
212
183
|
await takeBreak();
|
|
213
184
|
expansion.breakAt = performance.now() + BREAK_INTERVAL;
|
|
@@ -215,7 +186,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
215
186
|
}
|
|
216
187
|
lockRequests(expansion);
|
|
217
188
|
if (status === "paused") {
|
|
218
|
-
const resumed = new Promise<void>((resolve) => (
|
|
189
|
+
const resumed = new Promise<void>((resolve) => (resumeLevel = resolve));
|
|
219
190
|
report({ type: "paused" });
|
|
220
191
|
await resumed;
|
|
221
192
|
unlockRequests(expansion);
|
|
@@ -223,11 +194,10 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
223
194
|
}
|
|
224
195
|
if (!(await steal(expansion))) break;
|
|
225
196
|
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
Atomics.store(remaining, workerIndex, frontier.states.length);
|
|
197
|
+
const unorderedString = getUnorderedString();
|
|
198
|
+
if (unorderedString !== undefined) return { type: "abort", string: unorderedString };
|
|
199
|
+
frontier = expansion.next;
|
|
200
|
+
Atomics.store(remaining, workerIndex, frontier.length);
|
|
231
201
|
return {
|
|
232
202
|
type: "level",
|
|
233
203
|
generated: expansion.generated,
|
|
@@ -247,11 +217,11 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
247
217
|
const message = event.data as CoordinatorMessage;
|
|
248
218
|
if (message.type === "level") startLevel();
|
|
249
219
|
if (message.type === "resize") {
|
|
250
|
-
|
|
251
|
-
|
|
220
|
+
sharedFingerprints = message.fingerprints;
|
|
221
|
+
resumeLevel();
|
|
252
222
|
}
|
|
253
223
|
});
|
|
254
|
-
Atomics.store(remaining, workerIndex, frontier.
|
|
224
|
+
Atomics.store(remaining, workerIndex, frontier.length);
|
|
255
225
|
report({ type: "ready" });
|
|
256
226
|
};
|
|
257
227
|
|