tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Deref: a subexpression reference such as Op!2!<< resolves to the
|
|
2
|
-
// subexpression it names, abstracted over the bound names it uses.
|
|
3
|
-
|
|
4
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
2
|
import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
|
|
6
3
|
import {
|
|
7
4
|
at,
|
|
8
5
|
getErrorNote,
|
|
6
|
+
getErrorSetting,
|
|
9
7
|
getBoundFresh,
|
|
10
8
|
getChildren,
|
|
11
9
|
getFresh,
|
|
12
10
|
getParamFresh,
|
|
13
11
|
mapChildren,
|
|
14
12
|
mapSelectorArgs,
|
|
13
|
+
warnError,
|
|
15
14
|
type Bound,
|
|
16
15
|
type Defn,
|
|
17
16
|
type Expr,
|
|
@@ -20,6 +19,8 @@ import {
|
|
|
20
19
|
type Param,
|
|
21
20
|
type Selector,
|
|
22
21
|
} from "./expression";
|
|
22
|
+
import { renderDoc } from "./format";
|
|
23
|
+
import { printExpression } from "./printer";
|
|
23
24
|
|
|
24
25
|
interface Resolution {
|
|
25
26
|
params: Param[];
|
|
@@ -48,7 +49,6 @@ const stripParensAndAtomic = (expression: Expr): Expr => {
|
|
|
48
49
|
return rest;
|
|
49
50
|
};
|
|
50
51
|
|
|
51
|
-
// Parentheses go everywhere but in the definitions of a LET.
|
|
52
52
|
const stripParens = (expression: Expr): Expr => {
|
|
53
53
|
if (expression.kind === "Let") {
|
|
54
54
|
return at(
|
|
@@ -63,8 +63,6 @@ const stripParens = (expression: Expr): Expr => {
|
|
|
63
63
|
const hasNegativeIndex = (expression: Expr): boolean =>
|
|
64
64
|
expression.kind === "Ix" ? expression.index <= 0 : getChildren(expression).some(hasNegativeIndex);
|
|
65
65
|
|
|
66
|
-
// Visit.iter's context for each binder, stopping at labels with other names and at declarations
|
|
67
|
-
// in an ASSUME.
|
|
68
66
|
const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch | undefined => {
|
|
69
67
|
const search = (inner: Expr, innerContext = context) => findLabel(inner, label, innerContext);
|
|
70
68
|
const searchBounds = (bounds: Bound[], body: Expr) =>
|
|
@@ -133,7 +131,6 @@ const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch
|
|
|
133
131
|
}
|
|
134
132
|
};
|
|
135
133
|
|
|
136
|
-
// The first count indices in reverse, and the rest past the parameters.
|
|
137
134
|
const getReversal = (count: number, paramCount: number) =>
|
|
138
135
|
consAll(
|
|
139
136
|
Array.from({ length: count }, (_item, index): Expr => ({ kind: "Ix", index: index + 1 })),
|
|
@@ -152,6 +149,8 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
152
149
|
const expected = expression.bounds.length;
|
|
153
150
|
const message = `Arity mismatch in subexpression instance.\nExpected ${expected} argument${expected === 1 ? "" : "s"}, but found${args.length < expected ? " only" : ""} ${args.length}.`;
|
|
154
151
|
onWarning(getErrorNote(expression.location, message));
|
|
152
|
+
// Errors.set takes the message from Printf, which keeps the @ of Format's @\n.
|
|
153
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
155
154
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
156
155
|
}
|
|
157
156
|
const body = expression.kind === "SetOf" ? expression.element : expression.body;
|
|
@@ -198,12 +197,13 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
198
197
|
if (args.length !== 1) {
|
|
199
198
|
const message = `Arity mismatch in subexpression instance.\nExpected 1 argument, but found ${args.length}.`;
|
|
200
199
|
onWarning(getErrorNote(expression.location, message));
|
|
200
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
201
201
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
202
202
|
}
|
|
203
203
|
return substituteExpr(consAll(args, shift(0)), expression.body);
|
|
204
204
|
default: {
|
|
205
205
|
const message = "Cannot instantiate non-binding expression";
|
|
206
|
-
onWarning
|
|
206
|
+
warnError(onWarning, expression.location, message);
|
|
207
207
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
208
208
|
}
|
|
209
209
|
}
|
|
@@ -225,7 +225,7 @@ const abstract = (onWarning: Warn, definitionCount: number, expression: Expr): [
|
|
|
225
225
|
return [{ name: expression.name, shape: 0 }];
|
|
226
226
|
default: {
|
|
227
227
|
const message = "Cannot abstract over bound variables in a non-binding expression";
|
|
228
|
-
onWarning
|
|
228
|
+
warnError(onWarning, expression.location, message);
|
|
229
229
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_at" });
|
|
230
230
|
}
|
|
231
231
|
}
|
|
@@ -243,7 +243,7 @@ const getNumbered = (
|
|
|
243
243
|
): [Defn[], Expr] => {
|
|
244
244
|
const checkAtMost = (count: number) => {
|
|
245
245
|
if (position <= count) return;
|
|
246
|
-
onWarning
|
|
246
|
+
warnError(onWarning, origin.location, message);
|
|
247
247
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
248
248
|
};
|
|
249
249
|
const pick = (items: Expr[]) => {
|
|
@@ -261,7 +261,7 @@ const getNumbered = (
|
|
|
261
261
|
const hyp = sequent.context[position - 1];
|
|
262
262
|
if (hyp && hyp.kind !== "Fact") {
|
|
263
263
|
const hypMessage = "subexpression reference does not resolve to an expression";
|
|
264
|
-
onWarning
|
|
264
|
+
warnError(onWarning, expression.location, hypMessage);
|
|
265
265
|
throw new TlaProofError(hypMessage, { failure: "Expr.Deref.deref_num" });
|
|
266
266
|
}
|
|
267
267
|
const shifted = substituteExpr(
|
|
@@ -275,10 +275,10 @@ const getNumbered = (
|
|
|
275
275
|
`subexpression of ASSUME/PROVE uses identifiers declared therein\nTlapm does not handle yet such subexpression namings.`,
|
|
276
276
|
),
|
|
277
277
|
);
|
|
278
|
-
|
|
279
|
-
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings."
|
|
280
|
-
|
|
281
|
-
);
|
|
278
|
+
const message =
|
|
279
|
+
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings.";
|
|
280
|
+
onWarning(getErrorSetting(expression.location, message));
|
|
281
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
282
282
|
}
|
|
283
283
|
return shifted;
|
|
284
284
|
}
|
|
@@ -343,18 +343,17 @@ const getNumbered = (
|
|
|
343
343
|
]);
|
|
344
344
|
}
|
|
345
345
|
const emptyMessage = "Expression has no subexpressions";
|
|
346
|
-
onWarning
|
|
346
|
+
warnError(onWarning, expression.location, emptyMessage);
|
|
347
347
|
throw new TlaProofError(emptyMessage, { failure: "Expr.Deref.deref_num" });
|
|
348
348
|
})();
|
|
349
349
|
if (isUnresolved(result)) {
|
|
350
350
|
const badMessage = `Cannot resolve subexpression reference !${position}`;
|
|
351
|
-
onWarning
|
|
351
|
+
warnError(onWarning, expression.location, badMessage);
|
|
352
352
|
throw new TlaProofError(badMessage, { failure: "Expr.Deref.deref_num" });
|
|
353
353
|
}
|
|
354
354
|
return [expression.kind === "Let" ? expression.definitions : [], result];
|
|
355
355
|
};
|
|
356
356
|
|
|
357
|
-
// Reorders label arguments given in source order to the order of the label's de Bruijn indices.
|
|
358
357
|
const permute = (indices: number[], args: Expr[]) => {
|
|
359
358
|
const count = indices.length;
|
|
360
359
|
let current = indices;
|
|
@@ -381,7 +380,7 @@ const resolveLabel = (
|
|
|
381
380
|
if (indices.length !== labelArgs.length && labelArgs.length > 0) {
|
|
382
381
|
const plural = indices.length === 1 ? "" : "s";
|
|
383
382
|
const message = `Expected ${indices.length} argument${plural} for labelled reference !${label}, but found ${labelArgs.length}`;
|
|
384
|
-
onWarning
|
|
383
|
+
warnError(onWarning, found.expression.location, message);
|
|
385
384
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_lsub" });
|
|
386
385
|
}
|
|
387
386
|
const params =
|
|
@@ -436,8 +435,9 @@ const resolveLetOperator = (
|
|
|
436
435
|
args: Expr[],
|
|
437
436
|
): Resolution => {
|
|
438
437
|
if (expression.kind !== "Let") {
|
|
439
|
-
|
|
440
|
-
|
|
438
|
+
const message = "not a LET expression";
|
|
439
|
+
warnError(onWarning, expression.location, message);
|
|
440
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
441
441
|
}
|
|
442
442
|
const index = expression.definitions.findIndex(
|
|
443
443
|
(definition) => definition.kind === "Operator" && definition.name === label,
|
|
@@ -445,7 +445,7 @@ const resolveLetOperator = (
|
|
|
445
445
|
const definition = expression.definitions[index];
|
|
446
446
|
if (!definition || definition.kind !== "Operator") {
|
|
447
447
|
const message = `no definition of operator ${label}`;
|
|
448
|
-
onWarning
|
|
448
|
+
warnError(onWarning, expression.location, message);
|
|
449
449
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
450
450
|
}
|
|
451
451
|
const body = definition.body;
|
|
@@ -487,6 +487,7 @@ const resolveLetOperator = (
|
|
|
487
487
|
|
|
488
488
|
const resolveSelectors = (
|
|
489
489
|
onWarning: Warn,
|
|
490
|
+
hyps: Hyp[],
|
|
490
491
|
isLabel: boolean,
|
|
491
492
|
state: Resolution,
|
|
492
493
|
selectors: Selector[],
|
|
@@ -507,13 +508,13 @@ const resolveSelectors = (
|
|
|
507
508
|
return { ...stripParensAndAtomic(abstracted), isAtomic: true };
|
|
508
509
|
}
|
|
509
510
|
if (state.expression.isAtomic) {
|
|
510
|
-
onWarning
|
|
511
|
+
warnError(onWarning, state.expression.location, "Expression has no subexpressions");
|
|
511
512
|
return UNRESOLVED;
|
|
512
513
|
}
|
|
513
514
|
const expression = isLabel ? state.expression : stripParens(state.expression);
|
|
514
515
|
const count = state.definitions.length;
|
|
515
516
|
const next = ((): Resolution & { rest: Selector[]; isLabel: boolean } => {
|
|
516
|
-
const
|
|
517
|
+
const resolveNumbered = (position: number, message: string) => {
|
|
517
518
|
const [definitions, inner] = getNumbered(
|
|
518
519
|
onWarning,
|
|
519
520
|
expression,
|
|
@@ -531,16 +532,33 @@ const resolveSelectors = (
|
|
|
531
532
|
return { ...result, rest: after, isLabel: true };
|
|
532
533
|
}
|
|
533
534
|
if (isLabel) return { params: [], definitions: [], expression, rest, isLabel: false };
|
|
535
|
+
onWarning(getErrorSetting(expression.location, "!: is forbidden for this expression.\n"));
|
|
536
|
+
const scope = [
|
|
537
|
+
...hyps,
|
|
538
|
+
...state.definitions.map((definition): Hyp => ({
|
|
539
|
+
kind: "Defn",
|
|
540
|
+
definition,
|
|
541
|
+
whereDefined: "User",
|
|
542
|
+
visibility: "Visible",
|
|
543
|
+
isLocal: true,
|
|
544
|
+
})),
|
|
545
|
+
];
|
|
546
|
+
onWarning(
|
|
547
|
+
getErrorNote(
|
|
548
|
+
expression.location,
|
|
549
|
+
`!: is forbidden for this expression:\n${renderDoc(printExpression(scope, expression))}`,
|
|
550
|
+
),
|
|
551
|
+
);
|
|
534
552
|
throw new TlaProofError("!: is forbidden for this expression.\n", {
|
|
535
553
|
failure: "Expr.Deref.deref: !:",
|
|
536
554
|
});
|
|
537
555
|
}
|
|
538
556
|
case "Number":
|
|
539
|
-
return
|
|
557
|
+
return resolveNumbered(selector.value, `Cannot resolve !${selector.value}`);
|
|
540
558
|
case "Left":
|
|
541
|
-
return
|
|
559
|
+
return resolveNumbered(1, "Cannot resolve !<<");
|
|
542
560
|
case "Right":
|
|
543
|
-
return
|
|
561
|
+
return resolveNumbered(2, "Cannot resolve !>>");
|
|
544
562
|
case "Instance":
|
|
545
563
|
return {
|
|
546
564
|
params: [],
|
|
@@ -564,6 +582,7 @@ const resolveSelectors = (
|
|
|
564
582
|
})();
|
|
565
583
|
return resolveSelectors(
|
|
566
584
|
onWarning,
|
|
585
|
+
hyps,
|
|
567
586
|
next.isLabel,
|
|
568
587
|
{
|
|
569
588
|
params: [...state.params, ...next.params],
|
|
@@ -587,19 +606,21 @@ const getInitialResolution = (onWarning: Warn, operator: Expr, args: Expr[]): Re
|
|
|
587
606
|
|
|
588
607
|
export const resolveSubexpression = (
|
|
589
608
|
onWarning: Warn,
|
|
609
|
+
hyps: Hyp[],
|
|
590
610
|
operator: Expr,
|
|
591
611
|
args: Expr[],
|
|
592
612
|
selectors: Selector[],
|
|
593
613
|
) => {
|
|
594
614
|
const result = resolveSelectors(
|
|
595
615
|
onWarning,
|
|
616
|
+
hyps,
|
|
596
617
|
true,
|
|
597
618
|
getInitialResolution(onWarning, operator, args),
|
|
598
619
|
selectors,
|
|
599
620
|
);
|
|
600
621
|
if (isUnresolved(result)) {
|
|
601
622
|
const message = "Could not resolve subexpression reference";
|
|
602
|
-
onWarning
|
|
623
|
+
warnError(onWarning, operator.location, message);
|
|
603
624
|
throw new TlaProofError(message, { failure: "Expr.Anon: 2" });
|
|
604
625
|
}
|
|
605
626
|
return result;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// tlapm's E_subst: substitutions for de Bruijn indices, applied to every part of an expression.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError } from "../errors";
|
|
4
2
|
import {
|
|
5
3
|
at,
|
|
@@ -31,7 +29,6 @@ export const consSubstitution = (expression: Expr, rest: Substitution): Substitu
|
|
|
31
29
|
rest,
|
|
32
30
|
});
|
|
33
31
|
|
|
34
|
-
// Binds the expressions in order, so the last one becomes index 1.
|
|
35
32
|
export const consAll = (expressions: Expr[], rest: Substitution) =>
|
|
36
33
|
expressions.reduce((inner, expression) => consSubstitution(expression, inner), rest);
|
|
37
34
|
|
|
@@ -63,7 +60,6 @@ const applyIndex = (substitution: Substitution, index: number, from: Expr): Expr
|
|
|
63
60
|
export const substituteExprs = (substitution: Substitution, expressions: Expr[]) =>
|
|
64
61
|
expressions.map((expression) => substituteExpr(substitution, expression));
|
|
65
62
|
|
|
66
|
-
// Beta-reduces a lambda applied to arguments, as E_subst.normalize does.
|
|
67
63
|
export const normalizeApply = (operator: Expr, args: Expr[]): ExprCore => {
|
|
68
64
|
if (operator.kind === "Lambda") {
|
|
69
65
|
if (operator.params.length !== args.length) throw new TlaProofError("Arity mismatch");
|
|
@@ -96,7 +92,7 @@ export const substituteDefn = (substitution: Substitution, definition: Defn): De
|
|
|
96
92
|
instance: {
|
|
97
93
|
...definition.instance,
|
|
98
94
|
substitutions: definition.instance.substitutions.map((entry) => ({
|
|
99
|
-
|
|
95
|
+
...entry,
|
|
100
96
|
expression: substituteExpr(inner, entry.expression),
|
|
101
97
|
})),
|
|
102
98
|
},
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// tlapm's expansions of temporal operators (Expr.Tla_norm), constant detection (Expr.Constness), and
|
|
2
|
-
// the time of a fact (Expr.Temporal_props): a fact holds always when it is closed under [].
|
|
3
|
-
|
|
4
1
|
import {
|
|
5
2
|
adjoin,
|
|
6
3
|
adjoinAll,
|
|
@@ -9,6 +6,8 @@ import {
|
|
|
9
6
|
getFresh,
|
|
10
7
|
getLocalDefn,
|
|
11
8
|
getScopeAt,
|
|
9
|
+
getTrue,
|
|
10
|
+
isBuiltinApply,
|
|
12
11
|
mapChildren,
|
|
13
12
|
type Builtin,
|
|
14
13
|
type Expr,
|
|
@@ -27,17 +26,15 @@ const applyUnchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expressi
|
|
|
27
26
|
const getEquality = (expression: Expr) =>
|
|
28
27
|
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
29
28
|
|
|
30
|
-
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
31
29
|
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
32
30
|
const flatten = (inner: Expr): Expr[] =>
|
|
33
31
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
34
32
|
const items = flatten(expression);
|
|
35
|
-
if (items.length === 0) return
|
|
33
|
+
if (items.length === 0) return getTrue(expression);
|
|
36
34
|
if (items.length === 1) return getEquality(items[0]);
|
|
37
35
|
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
38
36
|
};
|
|
39
37
|
|
|
40
|
-
// Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
|
|
41
38
|
const rewrite =
|
|
42
39
|
(match: (expression: Expr, recurse: (inner: Expr) => Expr) => Expr | undefined) =>
|
|
43
40
|
(expression: Expr): Expr => {
|
|
@@ -46,7 +43,7 @@ const rewrite =
|
|
|
46
43
|
};
|
|
47
44
|
|
|
48
45
|
export const expandLeadsto = rewrite((expression, recurse) =>
|
|
49
|
-
|
|
46
|
+
isBuiltinApply(expression, "Leadsto")
|
|
50
47
|
? applyBuiltin(
|
|
51
48
|
"BoxTrue",
|
|
52
49
|
[
|
|
@@ -105,11 +102,8 @@ export const expandAction = rewrite((expression, recurse) => {
|
|
|
105
102
|
return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
|
|
106
103
|
});
|
|
107
104
|
|
|
108
|
-
// Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
|
|
109
105
|
const expandUnchanged = rewrite((expression) =>
|
|
110
|
-
expression
|
|
111
|
-
? rewriteUnchanged(expression.args[0])
|
|
112
|
-
: undefined,
|
|
106
|
+
isBuiltinApply(expression, "UNCHANGED") ? rewriteUnchanged(expression.args[0]) : undefined,
|
|
113
107
|
);
|
|
114
108
|
|
|
115
109
|
const TEMPORAL_BUILTINS: Builtin[] = [
|
|
@@ -127,6 +121,11 @@ const TEMPORAL_BUILTINS: Builtin[] = [
|
|
|
127
121
|
|
|
128
122
|
const constantBodies = new WeakMap<Expr, boolean>();
|
|
129
123
|
|
|
124
|
+
interface ConstnessState {
|
|
125
|
+
scope: Scope | undefined;
|
|
126
|
+
isGood: boolean;
|
|
127
|
+
}
|
|
128
|
+
|
|
130
129
|
const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
|
|
131
130
|
switch (hyp.kind) {
|
|
132
131
|
case "Fresh":
|
|
@@ -183,10 +182,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
183
182
|
expression.body,
|
|
184
183
|
);
|
|
185
184
|
case "Sequent": {
|
|
186
|
-
const inner = expression.sequent.context.reduce<
|
|
187
|
-
scope: Scope | undefined;
|
|
188
|
-
isGood: boolean;
|
|
189
|
-
}>(
|
|
185
|
+
const inner = expression.sequent.context.reduce<ConstnessState>(
|
|
190
186
|
(state, hyp) => ({
|
|
191
187
|
scope: adjoin(state.scope, hyp),
|
|
192
188
|
isGood: state.isGood && isConstantHyp(state.scope, hyp),
|
|
@@ -203,7 +199,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
203
199
|
case "Apply":
|
|
204
200
|
return recurse(expression.operator) && expression.args.every(recurse);
|
|
205
201
|
case "Let": {
|
|
206
|
-
const inner = expression.definitions.reduce<
|
|
202
|
+
const inner = expression.definitions.reduce<ConstnessState>(
|
|
207
203
|
(state, definition) => ({
|
|
208
204
|
scope: adjoin(state.scope, getLocalDefn(definition)),
|
|
209
205
|
isGood:
|
|
@@ -275,8 +271,6 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
275
271
|
}
|
|
276
272
|
};
|
|
277
273
|
|
|
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
274
|
const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): boolean => {
|
|
281
275
|
if (isConstant(scope, expression)) return true;
|
|
282
276
|
if (expression.kind === "Internal")
|
|
@@ -313,8 +307,6 @@ export const getTime = (scope: Scope | undefined, expression: Expr): Time =>
|
|
|
313
307
|
? "Always"
|
|
314
308
|
: "Now";
|
|
315
309
|
|
|
316
|
-
// Temporal_props.check_time_change: a proof stays in the always scope while no fact it assumes
|
|
317
|
-
// holds only now.
|
|
318
310
|
export const getScopeTime = (context: Hyp[], time: Time): Time =>
|
|
319
311
|
time === "Always" && context.some((hyp) => hyp.kind === "Fact" && hyp.time === "Now")
|
|
320
312
|
? "Now"
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// tlapm's E_tuply_declarations: declarations such as <<x, y>> \in S become declarations of names.
|
|
2
|
-
|
|
3
1
|
import type { Bound, BoundDomain, Defn, Expr } from "./expression";
|
|
4
2
|
|
|
5
3
|
export type TuplyBound =
|
|
@@ -25,7 +23,6 @@ export const getUnbounded = (names: string[]): Bound[] =>
|
|
|
25
23
|
const getFactors = (domain: Expr | undefined, names: string[]) =>
|
|
26
24
|
domain?.kind === "Product" && domain.factors.length === names.length ? domain.factors : undefined;
|
|
27
25
|
|
|
28
|
-
// Each name is the matching item of the tuple: x == t[1], y == t[2].
|
|
29
26
|
const getItemDefinitions = (tuple: string, names: string[]): Defn[] =>
|
|
30
27
|
names.map((name, index) => ({
|
|
31
28
|
kind: "Operator",
|
|
@@ -50,8 +47,6 @@ const getNamedBound = (bound: Extract<TuplyBound, { kind: "Name" }>): Bound => (
|
|
|
50
47
|
domain: bound.domain,
|
|
51
48
|
});
|
|
52
49
|
|
|
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
50
|
export const expandQuant = (
|
|
56
51
|
quantifier: "Forall" | "Exists",
|
|
57
52
|
bounds: TuplyBound[],
|
|
@@ -91,8 +86,6 @@ export const expandQuant = (
|
|
|
91
86
|
}, body);
|
|
92
87
|
};
|
|
93
88
|
|
|
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
89
|
export const expandChoose = (
|
|
97
90
|
binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
|
|
98
91
|
names: string[],
|
|
@@ -117,8 +110,6 @@ export const expandChoose = (
|
|
|
117
110
|
};
|
|
118
111
|
};
|
|
119
112
|
|
|
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
113
|
const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boolean) => {
|
|
123
114
|
const expanded = bounds.map((bound): { bounds: Bound[]; definitions: Defn[] } => {
|
|
124
115
|
if (bound.kind === "Name") return { bounds: [getNamedBound(bound)], definitions: [] };
|
|
@@ -153,7 +144,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
|
|
|
153
144
|
const definitions = expanded.flatMap((item) => item.definitions);
|
|
154
145
|
return {
|
|
155
146
|
bounds: expanded.flatMap((item) => item.bounds),
|
|
156
|
-
value:
|
|
147
|
+
value:
|
|
148
|
+
definitions.length === 0 ? value : ({ kind: "Let", definitions, body: value } satisfies Expr),
|
|
157
149
|
};
|
|
158
150
|
};
|
|
159
151
|
|
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
|
|