tla-ts 0.0.4-dev.4c0ab96 → 0.0.4-dev.55f2117
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 +37 -126
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +33 -1
- package/dist/index.d.ts +33 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +996 -0
- package/dist/prove.js +996 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +38 -44
- package/dist/transfer.js +38 -44
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/ast.ts +2 -2
- package/src/check.ts +7 -7
- package/src/{cli-options.ts → cli/options.ts} +1 -1
- package/src/{run-cli.ts → cli/run.ts} +293 -91
- package/src/cli.ts +1 -1
- package/src/config.ts +2 -2
- package/src/environment.ts +9 -9
- package/src/errors.ts +89 -30
- package/src/evaluate.ts +32 -11
- package/src/index.ts +10 -0
- package/src/levels.ts +1 -1
- package/src/live-check.ts +1 -1
- package/src/liveness.ts +1 -1
- package/src/{obligation-action.ts → obligations/action.ts} +247 -69
- package/src/{obligation-anon.ts → obligations/anon.ts} +49 -47
- package/src/obligations/ctx.ts +64 -0
- package/src/{obligation-deref.ts → obligations/deref.ts} +51 -92
- package/src/{obligation-expression.ts → obligations/expression.ts} +117 -57
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/{obligation-generate.ts → obligations/generate.ts} +170 -192
- package/src/{obligations.ts → obligations/index.ts} +32 -16
- package/src/{obligation-levels.ts → obligations/levels.ts} +26 -28
- package/src/{obligation-module.ts → obligations/module.ts} +113 -121
- package/src/obligations/pickle.ts +98 -0
- package/src/obligations/pragma.ts +189 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +22 -80
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/{obligation-source.ts → obligations/source.ts} +154 -99
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +4 -20
- package/src/parallel.ts +13 -46
- package/src/parser.ts +1 -1
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -2
- package/src/{pcal-parse.ts → pcal/parse.ts} +3 -3
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +2 -2
- package/src/{pcal-translate.ts → pcal/translate.ts} +2 -2
- package/src/{pcal-validate.ts → pcal/validate.ts} +6 -6
- package/src/prove/decide-pool.ts +95 -0
- package/src/prove/deciders.ts +33 -0
- package/src/prove/first-order.ts +78 -0
- package/src/prove/isabelle/LICENSE +36 -0
- package/src/prove/isabelle/LICENSE-tlapm +26 -0
- package/src/prove/isabelle/decide.ts +47 -0
- package/src/prove/isabelle/encode.ts +446 -0
- package/src/prove/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prove/isabelle/isar/method.ts +367 -0
- package/src/prove/isabelle/isar/proof.ts +28 -0
- package/src/prove/isabelle/isar/statement.ts +57 -0
- package/src/prove/isabelle/isar/theory.ts +192 -0
- package/src/prove/isabelle/isar/type-check.ts +278 -0
- package/src/prove/isabelle/provers/blast/blast.ts +258 -0
- package/src/prove/isabelle/provers/blast/branch.ts +322 -0
- package/src/prove/isabelle/provers/blast/prove.ts +347 -0
- package/src/prove/isabelle/provers/blast/rules.ts +330 -0
- package/src/prove/isabelle/provers/blast/state.ts +180 -0
- package/src/prove/isabelle/provers/blast/term.ts +546 -0
- package/src/prove/isabelle/provers/clasimp.ts +150 -0
- package/src/prove/isabelle/provers/classical.ts +389 -0
- package/src/prove/isabelle/provers/hypsubst.ts +433 -0
- package/src/prove/isabelle/pure/bicompose.ts +174 -0
- package/src/prove/isabelle/pure/consts.ts +32 -0
- package/src/prove/isabelle/pure/conv.ts +79 -0
- package/src/prove/isabelle/pure/drule.ts +264 -0
- package/src/prove/isabelle/pure/envir.ts +331 -0
- package/src/prove/isabelle/pure/goal.ts +53 -0
- package/src/prove/isabelle/pure/interrupt.ts +16 -0
- package/src/prove/isabelle/pure/list.ts +12 -0
- package/src/prove/isabelle/pure/logic.ts +330 -0
- package/src/prove/isabelle/pure/name.ts +98 -0
- package/src/prove/isabelle/pure/net.ts +215 -0
- package/src/prove/isabelle/pure/object-logic.ts +41 -0
- package/src/prove/isabelle/pure/pattern.ts +631 -0
- package/src/prove/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prove/isabelle/pure/rewriter.ts +602 -0
- package/src/prove/isabelle/pure/search.ts +68 -0
- package/src/prove/isabelle/pure/seq.ts +133 -0
- package/src/prove/isabelle/pure/simplifier.ts +106 -0
- package/src/prove/isabelle/pure/table.ts +201 -0
- package/src/prove/isabelle/pure/tactic.ts +168 -0
- package/src/prove/isabelle/pure/tactical.ts +264 -0
- package/src/prove/isabelle/pure/term-ord.ts +105 -0
- package/src/prove/isabelle/pure/term.ts +688 -0
- package/src/prove/isabelle/pure/thm.ts +783 -0
- package/src/prove/isabelle/pure/type.ts +121 -0
- package/src/prove/isabelle/pure/unify.ts +753 -0
- package/src/prove/isabelle/pure/variable.ts +25 -0
- package/src/prove/isabelle/tla/classical-setup.ts +101 -0
- package/src/prove/isabelle/tla/context.ts +74 -0
- package/src/prove/isabelle/tla/logic-data.ts +5 -0
- package/src/prove/isabelle/tla/logic.ts +215 -0
- package/src/prove/isabelle/tla/simpdata.ts +241 -0
- package/src/prove/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prove/ocaml.ts +22 -0
- package/src/prove/prep/action.ts +508 -0
- package/src/prove/prep/defs.ts +33 -0
- package/src/prove/prep/elab.ts +156 -0
- package/src/prove/prep/enabled-axioms.ts +189 -0
- package/src/prove/prep/enabled.ts +43 -0
- package/src/prove/prep/fingerprint.ts +388 -0
- package/src/prove/prep/flatten.ts +70 -0
- package/src/prove/prep/level-comparison.ts +529 -0
- package/src/prove/prep/md5.ts +67 -0
- package/src/prove/prep/pragma.ts +221 -0
- package/src/prove/prep/trivial.ts +22 -0
- package/src/prove/prove-worker.ts +22 -0
- package/src/prove/prove.ts +498 -0
- package/src/prove/ptl/decide.ts +68 -0
- package/src/prove/ptl/encode.ts +255 -0
- package/src/prove/ptl/sat.ts +151 -0
- package/src/prove/ptl/tableau.ts +276 -0
- package/src/prove/smt/axiomatize.ts +69 -0
- package/src/prove/smt/axioms.ts +209 -0
- package/src/prove/smt/context.ts +108 -0
- package/src/prove/smt/data.ts +636 -0
- package/src/prove/smt/encode.ts +164 -0
- package/src/prove/smt/extensionality.ts +65 -0
- package/src/prove/smt/flatten.ts +112 -0
- package/src/prove/smt/format.ts +154 -0
- package/src/prove/smt/instances.ts +181 -0
- package/src/prove/smt/rewrite.ts +772 -0
- package/src/prove/smt/simplify.ts +57 -0
- package/src/prove/smt/solver/act-cache.ts +265 -0
- package/src/prove/smt/solver/arith-rewriter.ts +962 -0
- package/src/prove/smt/solver/array.ts +22 -0
- package/src/prove/smt/solver/asserted-formulas.ts +469 -0
- package/src/prove/smt/solver/ast-lt.ts +157 -0
- package/src/prove/smt/solver/ast-util.ts +91 -0
- package/src/prove/smt/solver/ast.ts +1315 -0
- package/src/prove/smt/solver/auf-solver.ts +572 -0
- package/src/prove/smt/solver/case-split-queue.ts +178 -0
- package/src/prove/smt/solver/cg-table.ts +175 -0
- package/src/prove/smt/solver/clause.ts +276 -0
- package/src/prove/smt/solver/conflict-resolution.ts +343 -0
- package/src/prove/smt/solver/context.ts +1292 -0
- package/src/prove/smt/solver/ctx-simplify.ts +334 -0
- package/src/prove/smt/solver/der.ts +224 -0
- package/src/prove/smt/solver/dyn-ack.ts +141 -0
- package/src/prove/smt/solver/e-matching.ts +659 -0
- package/src/prove/smt/solver/enode.ts +259 -0
- package/src/prove/smt/solver/expr-ref.ts +21 -0
- package/src/prove/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prove/smt/solver/fingerprints.ts +92 -0
- package/src/prove/smt/solver/flat-literals.ts +51 -0
- package/src/prove/smt/solver/goal.ts +138 -0
- package/src/prove/smt/solver/hash.ts +173 -0
- package/src/prove/smt/solver/hashtable.ts +166 -0
- package/src/prove/smt/solver/internalizer.ts +1381 -0
- package/src/prove/smt/solver/lbool.ts +5 -0
- package/src/prove/smt/solver/literal.ts +24 -0
- package/src/prove/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prove/smt/solver/lp/constraints.ts +78 -0
- package/src/prove/smt/solver/lp/containers.ts +296 -0
- package/src/prove/smt/solver/lp/core-solver.ts +504 -0
- package/src/prove/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prove/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prove/smt/solver/lp/dependency.ts +51 -0
- package/src/prove/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prove/smt/solver/lp/explanation.ts +46 -0
- package/src/prove/smt/solver/lp/gomory.ts +255 -0
- package/src/prove/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prove/smt/solver/lp/hnf.ts +281 -0
- package/src/prove/smt/solver/lp/int-cube.ts +295 -0
- package/src/prove/smt/solver/lp/int-solver.ts +514 -0
- package/src/prove/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prove/smt/solver/lp/lar-term.ts +62 -0
- package/src/prove/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prove/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prove/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prove/smt/solver/lp/nex.ts +120 -0
- package/src/prove/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prove/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prove/smt/solver/lp/nla-core.ts +968 -0
- package/src/prove/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prove/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prove/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prove/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prove/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prove/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prove/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prove/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prove/smt/solver/lp/nla-order.ts +307 -0
- package/src/prove/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prove/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prove/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prove/smt/solver/lp/nla-types.ts +124 -0
- package/src/prove/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prove/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prove/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prove/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prove/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prove/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prove/smt/solver/lp/pdd.ts +971 -0
- package/src/prove/smt/solver/lp/random-updater.ts +138 -0
- package/src/prove/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prove/smt/solver/lp/union-find.ts +96 -0
- package/src/prove/smt/solver/mam-compiler.ts +847 -0
- package/src/prove/smt/solver/mam-interpreter.ts +400 -0
- package/src/prove/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prove/smt/solver/model-checker.ts +347 -0
- package/src/prove/smt/solver/model-evaluator.ts +262 -0
- package/src/prove/smt/solver/model-finder.ts +155 -0
- package/src/prove/smt/solver/model-generator.ts +97 -0
- package/src/prove/smt/solver/model-macro-solver.ts +728 -0
- package/src/prove/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prove/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prove/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prove/smt/solver/nlsat/explain.ts +607 -0
- package/src/prove/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prove/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prove/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prove/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prove/smt/solver/nlsat/solver.ts +911 -0
- package/src/prove/smt/solver/nlsat/types.ts +43 -0
- package/src/prove/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prove/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prove/smt/solver/nnf.ts +469 -0
- package/src/prove/smt/solver/pattern-inference.ts +351 -0
- package/src/prove/smt/solver/poly-rewriter.ts +477 -0
- package/src/prove/smt/solver/propagate-values.ts +83 -0
- package/src/prove/smt/solver/proto-model.ts +551 -0
- package/src/prove/smt/solver/pull-quant.ts +139 -0
- package/src/prove/smt/solver/qe-lite-der.ts +526 -0
- package/src/prove/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prove/smt/solver/qe-lite.ts +381 -0
- package/src/prove/smt/solver/qi-queue.ts +362 -0
- package/src/prove/smt/solver/quant-tactics.ts +117 -0
- package/src/prove/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prove/smt/solver/quantifier-manager.ts +186 -0
- package/src/prove/smt/solver/random-gen.ts +10 -0
- package/src/prove/smt/solver/rational.ts +165 -0
- package/src/prove/smt/solver/ref-vector.ts +62 -0
- package/src/prove/smt/solver/relevancy.ts +247 -0
- package/src/prove/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prove/smt/solver/rewriter.ts +843 -0
- package/src/prove/smt/solver/rlimit.ts +79 -0
- package/src/prove/smt/solver/smtlib-parser.ts +526 -0
- package/src/prove/smt/solver/solver.ts +71 -0
- package/src/prove/smt/solver/sort.ts +35 -0
- package/src/prove/smt/solver/sticky-generations.ts +69 -0
- package/src/prove/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prove/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prove/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prove/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prove/smt/solver/theory-lra-model.ts +243 -0
- package/src/prove/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prove/smt/solver/theory-lra-state.ts +43 -0
- package/src/prove/smt/solver/theory-lra.ts +56 -0
- package/src/prove/smt/solver/var-subst.ts +258 -0
- package/src/prove/smt/solver/z3-license.txt +10 -0
- package/src/prove/smt/table.ts +170 -0
- package/src/prove/tlapm/cache.ts +236 -0
- package/src/prove/tlapm/ocaml-marshal.ts +166 -0
- package/src/prove/tlapm/tlapm.ts +96 -0
- package/src/prove/tlaps-module.ts +510 -0
- package/src/prove/verdict.ts +18 -0
- package/src/prove/zenon/LICENSE +32 -0
- package/src/prove/zenon/check/check.ts +105 -0
- package/src/prove/zenon/check/definitions.ts +144 -0
- package/src/prove/zenon/check/equality.ts +182 -0
- package/src/prove/zenon/check/functions.ts +62 -0
- package/src/prove/zenon/check/keys.ts +125 -0
- package/src/prove/zenon/check/propositional.ts +104 -0
- package/src/prove/zenon/check/records.ts +188 -0
- package/src/prove/zenon/check/relations.ts +121 -0
- package/src/prove/zenon/check/rewrites.ts +224 -0
- package/src/prove/zenon/check/sets.ts +302 -0
- package/src/prove/zenon/check/terms.ts +127 -0
- package/src/prove/zenon/check/tla.ts +126 -0
- package/src/prove/zenon/decide.ts +113 -0
- package/src/prove/zenon/encode.ts +379 -0
- package/src/prove/zenon/eqrel.ts +300 -0
- package/src/prove/zenon/equality-rules.ts +435 -0
- package/src/prove/zenon/expr.ts +551 -0
- package/src/prove/zenon/index-table.ts +350 -0
- package/src/prove/zenon/isar-case.ts +513 -0
- package/src/prove/zenon/isar.ts +1249 -0
- package/src/prove/zenon/limits.ts +15 -0
- package/src/prove/zenon/llproof.ts +173 -0
- package/src/prove/zenon/mltoll.ts +1566 -0
- package/src/prove/zenon/node.ts +297 -0
- package/src/prove/zenon/ocaml.ts +169 -0
- package/src/prove/zenon/parse.ts +247 -0
- package/src/prove/zenon/phrase.ts +191 -0
- package/src/prove/zenon/proof.ts +198 -0
- package/src/prove/zenon/propositional-rules.ts +387 -0
- package/src/prove/zenon/rules.ts +94 -0
- package/src/prove/zenon/search.ts +288 -0
- package/src/prove/zenon/tla/functions.ts +151 -0
- package/src/prove/zenon/tla/llproof.ts +480 -0
- package/src/prove/zenon/tla/records.ts +225 -0
- package/src/prove/zenon/tla/rewrites.ts +447 -0
- package/src/prove/zenon/tla/sets.ts +304 -0
- package/src/prove/zenon/tla/terms.ts +162 -0
- package/src/prove/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +1 -1
- package/src/resolve.ts +1 -1
- package/src/runtime.ts +2 -2
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +14 -14
- package/src/{sany-levels.ts → sany/levels.ts} +2 -2
- package/src/{sany-lexer.ts → sany/lexer.ts} +1 -1
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +15 -15
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -3
- package/src/{sany-source.ts → sany/source.ts} +6 -6
- package/src/{sany-xml.ts → sany/xml.ts} +5 -5
- package/src/spec-description.ts +1 -1
- package/src/{standard-levels.ts → standard/levels.ts} +1 -1
- package/src/{standard-modules.ts → standard/modules.ts} +12 -12
- package/src/{standard-ranges.ts → standard/ranges.ts} +1 -1
- package/src/state-graph.ts +1 -1
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +1 -1
- package/src/{tlc-messages.ts → tlc/messages.ts} +2 -2
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -3
- package/src/{tlc-replay.ts → tlc/replay.ts} +5 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +14 -8
- package/src/values.ts +1 -1
- package/src/worker.ts +65 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -55
- package/dist/run-cli.js +0 -55
- package/src/value-sources.ts +0 -29
- /package/src/{sany-nodes.ts → sany/nodes.ts} +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
|
@@ -0,0 +1,321 @@
|
|
|
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
|
+
import {
|
|
5
|
+
adjoin,
|
|
6
|
+
adjoinAll,
|
|
7
|
+
applyBuiltin,
|
|
8
|
+
at,
|
|
9
|
+
getFresh,
|
|
10
|
+
getLocalDefn,
|
|
11
|
+
getScopeAt,
|
|
12
|
+
mapChildren,
|
|
13
|
+
type Builtin,
|
|
14
|
+
type Expr,
|
|
15
|
+
type Hyp,
|
|
16
|
+
type Scope,
|
|
17
|
+
type Time,
|
|
18
|
+
} from "./expression";
|
|
19
|
+
|
|
20
|
+
const isApplied = (expression: Expr, builtins: Builtin[]) =>
|
|
21
|
+
expression.kind === "Apply" &&
|
|
22
|
+
expression.operator.kind === "Internal" &&
|
|
23
|
+
builtins.includes(expression.operator.builtin);
|
|
24
|
+
|
|
25
|
+
const unchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expression], expression);
|
|
26
|
+
|
|
27
|
+
const getEquality = (expression: Expr) =>
|
|
28
|
+
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
29
|
+
|
|
30
|
+
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
31
|
+
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
32
|
+
const flatten = (inner: Expr): Expr[] =>
|
|
33
|
+
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
34
|
+
const items = flatten(expression);
|
|
35
|
+
if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
|
|
36
|
+
if (items.length === 1) return getEquality(items[0]);
|
|
37
|
+
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
// Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
|
|
41
|
+
const rewrite =
|
|
42
|
+
(match: (expression: Expr, recurse: (inner: Expr) => Expr) => Expr | undefined) =>
|
|
43
|
+
(expression: Expr): Expr => {
|
|
44
|
+
const recurse = rewrite(match);
|
|
45
|
+
return match(expression, recurse) ?? mapChildren(expression, recurse);
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
export const expandLeadsto = rewrite((expression, recurse) =>
|
|
49
|
+
expression.kind === "Apply" && isApplied(expression, ["Leadsto"])
|
|
50
|
+
? applyBuiltin(
|
|
51
|
+
"BoxTrue",
|
|
52
|
+
[
|
|
53
|
+
applyBuiltin(
|
|
54
|
+
"Implies",
|
|
55
|
+
[
|
|
56
|
+
recurse(expression.args[0]),
|
|
57
|
+
applyBuiltin("Diamond", [recurse(expression.args[1])], expression),
|
|
58
|
+
],
|
|
59
|
+
expression,
|
|
60
|
+
),
|
|
61
|
+
],
|
|
62
|
+
expression,
|
|
63
|
+
)
|
|
64
|
+
: undefined,
|
|
65
|
+
);
|
|
66
|
+
|
|
67
|
+
export const expandFairness = rewrite((expression) => {
|
|
68
|
+
if (expression.kind !== "Fair") return undefined;
|
|
69
|
+
const action = expression.action;
|
|
70
|
+
const subscript = expression.subscript;
|
|
71
|
+
const enabled = applyBuiltin(
|
|
72
|
+
"ENABLED",
|
|
73
|
+
[at({ kind: "Sub", modal: "Dia", action, subscript }, action)],
|
|
74
|
+
action,
|
|
75
|
+
);
|
|
76
|
+
const outer = expression.fairness === "Weak" ? "Diamond" : "BoxTrue";
|
|
77
|
+
const inner = expression.fairness === "Weak" ? "BoxTrue" : "Diamond";
|
|
78
|
+
return applyBuiltin(
|
|
79
|
+
"Implies",
|
|
80
|
+
[
|
|
81
|
+
applyBuiltin(outer, [applyBuiltin(inner, [enabled], action)], action),
|
|
82
|
+
applyBuiltin(
|
|
83
|
+
"BoxTrue",
|
|
84
|
+
[at({ kind: "Tsub", modal: "Dia", action, subscript }, action)],
|
|
85
|
+
action,
|
|
86
|
+
),
|
|
87
|
+
],
|
|
88
|
+
action,
|
|
89
|
+
);
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
export const expandAction = rewrite((expression, recurse) => {
|
|
93
|
+
if (expression.kind !== "Sub" && expression.kind !== "Tsub") return undefined;
|
|
94
|
+
const action = recurse(expression.action);
|
|
95
|
+
const subscript = recurse(expression.subscript);
|
|
96
|
+
const step =
|
|
97
|
+
expression.modal === "Box"
|
|
98
|
+
? applyBuiltin("Disj", [action, unchanged(subscript)], expression)
|
|
99
|
+
: applyBuiltin(
|
|
100
|
+
"Conj",
|
|
101
|
+
[action, applyBuiltin("Neg", [unchanged(subscript)], expression)],
|
|
102
|
+
expression,
|
|
103
|
+
);
|
|
104
|
+
if (expression.kind === "Sub") return step;
|
|
105
|
+
return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
// Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
|
|
109
|
+
const expandUnchanged = rewrite((expression) =>
|
|
110
|
+
expression.kind === "Apply" && isApplied(expression, ["UNCHANGED"])
|
|
111
|
+
? rewriteUnchanged(expression.args[0])
|
|
112
|
+
: undefined,
|
|
113
|
+
);
|
|
114
|
+
|
|
115
|
+
const TEMPORAL_BUILTINS: Builtin[] = [
|
|
116
|
+
"Prime",
|
|
117
|
+
"StrongPrime",
|
|
118
|
+
"Leadsto",
|
|
119
|
+
"ENABLED",
|
|
120
|
+
"UNCHANGED",
|
|
121
|
+
"Cdot",
|
|
122
|
+
"Actplus",
|
|
123
|
+
"BoxTrue",
|
|
124
|
+
"BoxFalse",
|
|
125
|
+
"Diamond",
|
|
126
|
+
];
|
|
127
|
+
|
|
128
|
+
const constantBodies = new WeakMap<Expr, boolean>();
|
|
129
|
+
|
|
130
|
+
const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
|
|
131
|
+
switch (hyp.kind) {
|
|
132
|
+
case "Fresh":
|
|
133
|
+
return hyp.level === "Constant";
|
|
134
|
+
case "Defn":
|
|
135
|
+
return hyp.definition.kind === "Operator" && isConstant(scope, hyp.definition.body);
|
|
136
|
+
case "Fact":
|
|
137
|
+
return isConstant(scope, hyp.expression);
|
|
138
|
+
case "Flex":
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
};
|
|
142
|
+
|
|
143
|
+
const bindConstants = (scope: Scope | undefined, names: string[]) =>
|
|
144
|
+
adjoinAll(
|
|
145
|
+
scope,
|
|
146
|
+
names.map((name) => getFresh(name, "Constant")),
|
|
147
|
+
);
|
|
148
|
+
|
|
149
|
+
export const isConstant = (scope: Scope | undefined, expression: Expr): boolean => {
|
|
150
|
+
const recurse = (inner: Expr) => isConstant(scope, inner);
|
|
151
|
+
switch (expression.kind) {
|
|
152
|
+
case "Ix": {
|
|
153
|
+
const found = getScopeAt(scope, expression.index - 1);
|
|
154
|
+
const hyp = found?.hyp;
|
|
155
|
+
if (hyp?.kind === "Fresh") return hyp.level === "Constant";
|
|
156
|
+
if (hyp?.kind !== "Defn" || hyp.definition.kind !== "Operator" || hyp.isConstnessUnset)
|
|
157
|
+
return false;
|
|
158
|
+
const body = hyp.definition.body;
|
|
159
|
+
const cached = constantBodies.get(body);
|
|
160
|
+
if (cached !== undefined) return cached;
|
|
161
|
+
const result = isConstant(found?.rest, body);
|
|
162
|
+
constantBodies.set(body, result);
|
|
163
|
+
return result;
|
|
164
|
+
}
|
|
165
|
+
case "Opaque":
|
|
166
|
+
case "String":
|
|
167
|
+
case "Num":
|
|
168
|
+
case "At":
|
|
169
|
+
return true;
|
|
170
|
+
case "Internal":
|
|
171
|
+
return !TEMPORAL_BUILTINS.includes(expression.builtin);
|
|
172
|
+
case "Tquant":
|
|
173
|
+
case "Sub":
|
|
174
|
+
case "Tsub":
|
|
175
|
+
case "Fair":
|
|
176
|
+
return false;
|
|
177
|
+
case "Lambda":
|
|
178
|
+
return isConstant(
|
|
179
|
+
bindConstants(
|
|
180
|
+
scope,
|
|
181
|
+
expression.params.map((param) => param.name),
|
|
182
|
+
),
|
|
183
|
+
expression.body,
|
|
184
|
+
);
|
|
185
|
+
case "Sequent": {
|
|
186
|
+
const inner = expression.sequent.context.reduce<{
|
|
187
|
+
scope: Scope | undefined;
|
|
188
|
+
isGood: boolean;
|
|
189
|
+
}>(
|
|
190
|
+
(state, hyp) => ({
|
|
191
|
+
scope: adjoin(state.scope, hyp),
|
|
192
|
+
isGood: state.isGood && isConstantHyp(state.scope, hyp),
|
|
193
|
+
}),
|
|
194
|
+
{ scope, isGood: true },
|
|
195
|
+
);
|
|
196
|
+
return inner.isGood && isConstant(inner.scope, expression.sequent.active);
|
|
197
|
+
}
|
|
198
|
+
case "Bang":
|
|
199
|
+
case "With":
|
|
200
|
+
case "Dot":
|
|
201
|
+
case "Parens":
|
|
202
|
+
return recurse(expression.expression);
|
|
203
|
+
case "Apply":
|
|
204
|
+
return recurse(expression.operator) && expression.args.every(recurse);
|
|
205
|
+
case "Let": {
|
|
206
|
+
const inner = expression.definitions.reduce<{ scope: Scope | undefined; isGood: boolean }>(
|
|
207
|
+
(state, definition) => ({
|
|
208
|
+
scope: adjoin(state.scope, getLocalDefn(definition)),
|
|
209
|
+
isGood:
|
|
210
|
+
state.isGood &&
|
|
211
|
+
definition.kind === "Operator" &&
|
|
212
|
+
isConstant(state.scope, definition.body),
|
|
213
|
+
}),
|
|
214
|
+
{ scope, isGood: true },
|
|
215
|
+
);
|
|
216
|
+
return inner.isGood && isConstant(inner.scope, expression.body);
|
|
217
|
+
}
|
|
218
|
+
case "Quant":
|
|
219
|
+
case "Fcn":
|
|
220
|
+
case "SetOf": {
|
|
221
|
+
const body = expression.kind === "SetOf" ? expression.element : expression.body;
|
|
222
|
+
return (
|
|
223
|
+
expression.bounds.every(
|
|
224
|
+
(bound) => bound.domain.kind !== "Domain" || recurse(bound.domain.expression),
|
|
225
|
+
) &&
|
|
226
|
+
isConstant(
|
|
227
|
+
bindConstants(
|
|
228
|
+
scope,
|
|
229
|
+
expression.bounds.map((bound) => bound.name),
|
|
230
|
+
),
|
|
231
|
+
body,
|
|
232
|
+
)
|
|
233
|
+
);
|
|
234
|
+
}
|
|
235
|
+
case "Choose":
|
|
236
|
+
case "SetSt":
|
|
237
|
+
return (
|
|
238
|
+
(expression.domain === undefined || recurse(expression.domain)) &&
|
|
239
|
+
isConstant(bindConstants(scope, [expression.name]), expression.body)
|
|
240
|
+
);
|
|
241
|
+
case "If":
|
|
242
|
+
return (
|
|
243
|
+
recurse(expression.condition) &&
|
|
244
|
+
recurse(expression.consequent) &&
|
|
245
|
+
recurse(expression.alternative)
|
|
246
|
+
);
|
|
247
|
+
case "List":
|
|
248
|
+
return expression.items.every(recurse);
|
|
249
|
+
case "Tuple":
|
|
250
|
+
case "SetEnum":
|
|
251
|
+
return expression.elements.every(recurse);
|
|
252
|
+
case "Product":
|
|
253
|
+
return expression.factors.every(recurse);
|
|
254
|
+
case "FcnApp":
|
|
255
|
+
return recurse(expression.function) && expression.args.every(recurse);
|
|
256
|
+
case "Rect":
|
|
257
|
+
case "Record":
|
|
258
|
+
return expression.fields.every((field) => recurse(field.value));
|
|
259
|
+
case "Arrow":
|
|
260
|
+
return recurse(expression.domain) && recurse(expression.range);
|
|
261
|
+
case "Except":
|
|
262
|
+
return (
|
|
263
|
+
recurse(expression.function) &&
|
|
264
|
+
expression.specs.every(
|
|
265
|
+
(spec) =>
|
|
266
|
+
spec.trail.every((point) => point.kind === "Dot" || recurse(point.expression)) &&
|
|
267
|
+
recurse(spec.value),
|
|
268
|
+
)
|
|
269
|
+
);
|
|
270
|
+
case "Case":
|
|
271
|
+
return (
|
|
272
|
+
expression.arms.every((arm) => recurse(arm.condition) && recurse(arm.body)) &&
|
|
273
|
+
(expression.other === undefined || recurse(expression.other))
|
|
274
|
+
);
|
|
275
|
+
}
|
|
276
|
+
};
|
|
277
|
+
|
|
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
|
+
const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): boolean => {
|
|
281
|
+
if (isConstant(scope, expression)) return true;
|
|
282
|
+
if (expression.kind === "Internal")
|
|
283
|
+
return ["Eq", "Neq", "UNCHANGED", "TRUE", "FALSE"].includes(expression.builtin);
|
|
284
|
+
if (expression.kind === "List")
|
|
285
|
+
return expression.items.every((item) => isClosed(scope, item, isBox));
|
|
286
|
+
if (expression.kind === "Sequent") {
|
|
287
|
+
return isClosed(adjoinAll(scope, expression.sequent.context), expression.sequent.active, isBox);
|
|
288
|
+
}
|
|
289
|
+
if (expression.kind !== "Apply") return false;
|
|
290
|
+
const args = expression.args;
|
|
291
|
+
if (isApplied(expression, ["BoxTrue", "BoxFalse"]) && isBox) return true;
|
|
292
|
+
if (isApplied(expression, ["Diamond"]) && !isBox) return true;
|
|
293
|
+
if (args.length === 1 && isApplied(expression, ["BoxTrue", "BoxFalse", "Diamond", "Prime"]))
|
|
294
|
+
return isClosed(scope, args[0], isBox);
|
|
295
|
+
if (args.length === 1 && isApplied(expression, ["Neg"])) return isClosed(scope, args[0], !isBox);
|
|
296
|
+
if (args.length === 2 && isApplied(expression, ["Conj", "Disj"]))
|
|
297
|
+
return isClosed(scope, args[0], isBox) && isClosed(scope, args[1], isBox);
|
|
298
|
+
if (args.length === 2 && isApplied(expression, ["Implies"]))
|
|
299
|
+
return isClosed(scope, args[0], !isBox) && isClosed(scope, args[1], isBox);
|
|
300
|
+
if (args.length === 2 && isApplied(expression, ["Equiv"]))
|
|
301
|
+
return [true, false].every(
|
|
302
|
+
(isFlipped) =>
|
|
303
|
+
isClosed(scope, args[0], isBox !== isFlipped) &&
|
|
304
|
+
isClosed(scope, args[1], isBox === isFlipped),
|
|
305
|
+
);
|
|
306
|
+
return (
|
|
307
|
+
isClosed(scope, expression.operator, isBox) && args.every((arg) => isClosed(scope, arg, isBox))
|
|
308
|
+
);
|
|
309
|
+
};
|
|
310
|
+
|
|
311
|
+
export const getTime = (scope: Scope | undefined, expression: Expr): Time =>
|
|
312
|
+
isClosed(scope, expandLeadsto(expandFairness(expandAction(expandUnchanged(expression)))), true)
|
|
313
|
+
? "Always"
|
|
314
|
+
: "Now";
|
|
315
|
+
|
|
316
|
+
// Temporal_props.check_time_change: a proof stays in the always scope while no fact it assumes
|
|
317
|
+
// holds only now.
|
|
318
|
+
export const getScopeTime = (context: Hyp[], time: Time): Time =>
|
|
319
|
+
time === "Always" && context.some((hyp) => hyp.kind === "Fact" && hyp.time === "Now")
|
|
320
|
+
? "Now"
|
|
321
|
+
: time;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// tlapm's E_tuply_declarations: declarations such as <<x, y>> \in S become declarations of names.
|
|
2
2
|
|
|
3
|
-
import type { Bound, BoundDomain, Defn, Expr } from "./
|
|
3
|
+
import type { Bound, BoundDomain, Defn, Expr } from "./expression";
|
|
4
4
|
|
|
5
5
|
export type TuplyBound =
|
|
6
6
|
| { kind: "Name"; name: string; domain: BoundDomain }
|
|
@@ -63,74 +63,58 @@ export const expandQuant = (
|
|
|
63
63
|
else groups.push([bound]);
|
|
64
64
|
});
|
|
65
65
|
return groups.reduceRight((inner: Expr, group): Expr => {
|
|
66
|
+
const quantify = (quantified: Bound[], quantifiedBody = inner): Expr => ({
|
|
67
|
+
kind: "Quant",
|
|
68
|
+
quantifier,
|
|
69
|
+
bounds: quantified,
|
|
70
|
+
body: quantifiedBody,
|
|
71
|
+
location: inner.location,
|
|
72
|
+
});
|
|
66
73
|
const first = group[0];
|
|
67
74
|
if (first.kind === "Name") {
|
|
68
|
-
return
|
|
69
|
-
kind
|
|
70
|
-
|
|
71
|
-
bounds: group.flatMap((bound) => (bound.kind === "Name" ? [getNamedBound(bound)] : [])),
|
|
72
|
-
body: inner,
|
|
73
|
-
location: inner.location,
|
|
74
|
-
};
|
|
75
|
+
return quantify(
|
|
76
|
+
group.flatMap((bound) => (bound.kind === "Name" ? [getNamedBound(bound)] : [])),
|
|
77
|
+
);
|
|
75
78
|
}
|
|
76
79
|
const factors = getFactors(first.domain, first.names);
|
|
77
|
-
if (factors)
|
|
78
|
-
return {
|
|
79
|
-
kind: "Quant",
|
|
80
|
-
quantifier,
|
|
81
|
-
bounds: getFactorBounds(first.names, factors),
|
|
82
|
-
body: inner,
|
|
83
|
-
location: inner.location,
|
|
84
|
-
};
|
|
85
|
-
}
|
|
80
|
+
if (factors) return quantify(getFactorBounds(first.names, factors));
|
|
86
81
|
const membership: Expr = {
|
|
87
82
|
kind: "Apply",
|
|
88
83
|
operator: { kind: "Internal", builtin: quantifier === "Exists" ? "Mem" : "Notmem" },
|
|
89
84
|
args: [getNamesTuple(first.names), first.domain],
|
|
90
85
|
};
|
|
91
|
-
return {
|
|
92
|
-
kind: "
|
|
93
|
-
quantifier,
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
kind: "List",
|
|
97
|
-
bullet: quantifier === "Exists" ? "And" : "Or",
|
|
98
|
-
items: [membership, inner],
|
|
99
|
-
},
|
|
100
|
-
location: inner.location,
|
|
101
|
-
};
|
|
86
|
+
return quantify(getUnbounded(first.names), {
|
|
87
|
+
kind: "List",
|
|
88
|
+
bullet: quantifier === "Exists" ? "And" : "Or",
|
|
89
|
+
items: [membership, inner],
|
|
90
|
+
});
|
|
102
91
|
}, body);
|
|
103
92
|
};
|
|
104
93
|
|
|
105
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
|
|
106
|
-
// domain binds t with \E x, y: t = <<x, y>> /\ P.
|
|
107
|
-
const
|
|
108
|
-
|
|
95
|
+
// domain binds t with \E x, y: t = <<x, y>> /\ P. {<<x, y>> \in S: P} binds t the same way.
|
|
96
|
+
export const expandChoose = (
|
|
97
|
+
binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
|
|
109
98
|
names: string[],
|
|
110
|
-
domain: Expr | undefined,
|
|
111
99
|
body: Expr,
|
|
112
|
-
): Expr =>
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
kind: "
|
|
121
|
-
|
|
122
|
-
|
|
100
|
+
): Expr => {
|
|
101
|
+
const name = `${binder.kind.toLowerCase()}#${names[0]}`;
|
|
102
|
+
return {
|
|
103
|
+
...binder,
|
|
104
|
+
name,
|
|
105
|
+
body: getFactors(binder.domain, names)
|
|
106
|
+
? { kind: "Let", definitions: getItemDefinitions(name, names), body }
|
|
107
|
+
: {
|
|
108
|
+
kind: "Quant",
|
|
109
|
+
quantifier: "Exists",
|
|
110
|
+
bounds: getUnbounded(names),
|
|
111
|
+
body: {
|
|
112
|
+
kind: "List",
|
|
113
|
+
bullet: "And",
|
|
114
|
+
items: [getEquality(getOpaque(name), getNamesTuple(names)), body],
|
|
115
|
+
},
|
|
123
116
|
},
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
export const expandChoose = (names: string[], domain: Expr | undefined, body: Expr): Expr => {
|
|
127
|
-
const name = `choose#${names[0]}`;
|
|
128
|
-
return { kind: "Choose", name, domain, body: getChooseBody(name, names, domain, body) };
|
|
129
|
-
};
|
|
130
|
-
|
|
131
|
-
export const expandSetSt = (names: string[], domain: Expr, body: Expr): Expr => {
|
|
132
|
-
const name = `setst#${names[0]}`;
|
|
133
|
-
return { kind: "SetSt", name, domain, body: getChooseBody(name, names, domain, body) };
|
|
117
|
+
};
|
|
134
118
|
};
|
|
135
119
|
|
|
136
120
|
// A set or function constructor binds each tuple as fcn#x, with its names defined in a LET around
|
|
@@ -157,8 +141,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
|
|
|
157
141
|
kind: "Operator",
|
|
158
142
|
name: choice,
|
|
159
143
|
body: expandChoose(
|
|
144
|
+
{ kind: "Choose", domain: undefined },
|
|
160
145
|
bound.names,
|
|
161
|
-
undefined,
|
|
162
146
|
getEquality(getOpaque(name), getNamesTuple(bound.names)),
|
|
163
147
|
),
|
|
164
148
|
},
|
package/src/parallel-worker.ts
CHANGED
|
@@ -7,20 +7,14 @@ import {
|
|
|
7
7
|
isSharedFingerprintsFull,
|
|
8
8
|
writeStateFingerprint,
|
|
9
9
|
} from "./fingerprints";
|
|
10
|
-
import type {
|
|
11
|
-
CoordinatorMessage,
|
|
12
|
-
LevelMessage,
|
|
13
|
-
Port,
|
|
14
|
-
StartMessage,
|
|
15
|
-
WorkerMessage,
|
|
16
|
-
} from "./parallel";
|
|
10
|
+
import type { CoordinatorMessage, LevelMessage, StartMessage, WorkerMessage } from "./parallel";
|
|
17
11
|
import { getSuccessors, type Successor } from "./successors";
|
|
18
|
-
import { getTlcStringOrder, getTlcDeclarationOrder } from "./tlc
|
|
19
|
-
import { OUT_DEGREE_BUCKETS } from "./tlc
|
|
12
|
+
import { getTlcStringOrder, getTlcDeclarationOrder } from "./tlc/order";
|
|
13
|
+
import { OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
20
14
|
import { createStateDecoder, createStateEncoder, type EncodedStates } from "./transfer";
|
|
21
15
|
import { getRankedStringCount, setStringOrder, setValueVersion, type Value } from "./values";
|
|
16
|
+
import { getParentPort, type Port } from "./worker";
|
|
22
17
|
|
|
23
|
-
const WORKER_THREADS_MODULE = "node:worker_threads";
|
|
24
18
|
const LOCKED = -1;
|
|
25
19
|
|
|
26
20
|
interface Expansion {
|
|
@@ -36,16 +30,6 @@ interface Expansion {
|
|
|
36
30
|
fingerprintStates: Value[][];
|
|
37
31
|
}
|
|
38
32
|
|
|
39
|
-
const getParentPort = async () => {
|
|
40
|
-
if (typeof (globalThis as { postMessage?: unknown }).postMessage === "function") {
|
|
41
|
-
return globalThis as unknown as Port;
|
|
42
|
-
}
|
|
43
|
-
const threads: typeof import("node:worker_threads") = await import(
|
|
44
|
-
/* @vite-ignore */ /* webpackIgnore: true */ WORKER_THREADS_MODULE
|
|
45
|
-
);
|
|
46
|
-
return threads.parentPort as unknown as Port;
|
|
47
|
-
};
|
|
48
|
-
|
|
49
33
|
const run = (start: StartMessage, parent: Port) => {
|
|
50
34
|
const modules = new Map(start.modules);
|
|
51
35
|
const loadModule = (name: string) => modules.get(name);
|
package/src/parallel.ts
CHANGED
|
@@ -24,20 +24,12 @@ import {
|
|
|
24
24
|
type SharedFingerprints,
|
|
25
25
|
} from "./fingerprints";
|
|
26
26
|
import { getInitialStates } from "./successors";
|
|
27
|
-
import { getTlcStringOrder, getTlcVariableOrder } from "./tlc
|
|
28
|
-
import { getFingerprintDistance, OUT_DEGREE_BUCKETS } from "./tlc
|
|
27
|
+
import { getTlcStringOrder, getTlcVariableOrder } from "./tlc/order";
|
|
28
|
+
import { getFingerprintDistance, OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
29
29
|
import { createStateEncoder, type EncodedStates } from "./transfer";
|
|
30
|
-
import type { TlcVersion } from "./tlc
|
|
30
|
+
import type { TlcVersion } from "./tlc/version";
|
|
31
31
|
import { getRankedStringCount, setStringOrder, setValueVersion, type Value } from "./values";
|
|
32
|
-
|
|
33
|
-
const WORKER_THREADS_MODULE = "node:worker_threads";
|
|
34
|
-
|
|
35
|
-
export interface Port {
|
|
36
|
-
postMessage: (message: unknown, transfer?: unknown[]) => void;
|
|
37
|
-
addEventListener: (type: "message", listener: (event: { data: unknown }) => void) => void;
|
|
38
|
-
removeEventListener?: (type: "message", listener: (event: { data: unknown }) => void) => void;
|
|
39
|
-
start?: () => void;
|
|
40
|
-
}
|
|
32
|
+
import { spawnWorker, type Port } from "./worker";
|
|
41
33
|
|
|
42
34
|
export interface StartMessage {
|
|
43
35
|
type: "start";
|
|
@@ -76,39 +68,6 @@ export type CoordinatorMessage =
|
|
|
76
68
|
| { type: "level"; level: number }
|
|
77
69
|
| { type: "resize"; fingerprints: SharedFingerprints };
|
|
78
70
|
|
|
79
|
-
interface WorkerHandle {
|
|
80
|
-
postMessage: (message: unknown, transfer?: unknown[]) => void;
|
|
81
|
-
terminate: () => void;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
interface WebWorker {
|
|
85
|
-
postMessage: (message: unknown, transfer?: unknown[]) => void;
|
|
86
|
-
addEventListener: (type: string, listener: (event: { data: unknown }) => void) => void;
|
|
87
|
-
terminate: () => void;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
declare const Worker: new (url: URL, options: { type: "module" }) => WebWorker;
|
|
91
|
-
|
|
92
|
-
const spawnWorker = async (onMessage: (message: WorkerMessage) => void): Promise<WorkerHandle> => {
|
|
93
|
-
if (typeof Worker === "function") {
|
|
94
|
-
const worker = new Worker(new URL("./parallel-worker.js", import.meta.url), { type: "module" });
|
|
95
|
-
worker.addEventListener("message", (event) => onMessage(event.data as WorkerMessage));
|
|
96
|
-
worker.addEventListener("error", () => onMessage({ type: "abort" }));
|
|
97
|
-
return worker;
|
|
98
|
-
}
|
|
99
|
-
const threads: typeof import("node:worker_threads") = await import(
|
|
100
|
-
/* @vite-ignore */ /* webpackIgnore: true */ WORKER_THREADS_MODULE
|
|
101
|
-
);
|
|
102
|
-
const worker = new threads.Worker(new URL("./parallel-worker.js", import.meta.url));
|
|
103
|
-
worker.on("message", onMessage);
|
|
104
|
-
worker.on("error", () => onMessage({ type: "abort" }));
|
|
105
|
-
return {
|
|
106
|
-
postMessage: (message, transfer) =>
|
|
107
|
-
worker.postMessage(message, transfer as Parameters<typeof worker.postMessage>[1]),
|
|
108
|
-
terminate: () => void worker.terminate(),
|
|
109
|
-
};
|
|
110
|
-
};
|
|
111
|
-
|
|
112
71
|
export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
113
72
|
const config =
|
|
114
73
|
typeof options.config === "string"
|
|
@@ -290,7 +249,15 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
290
249
|
const ready = waitForReports(count);
|
|
291
250
|
const requests = new Int32Array(new SharedArrayBuffer(count * 4));
|
|
292
251
|
const remaining = new Int32Array(new SharedArrayBuffer(count * 4));
|
|
293
|
-
const workers = await Promise.all(
|
|
252
|
+
const workers = await Promise.all(
|
|
253
|
+
Array.from({ length: count }, () =>
|
|
254
|
+
spawnWorker(
|
|
255
|
+
new URL("./parallel-worker.js", import.meta.url),
|
|
256
|
+
(message) => onMessage(message as WorkerMessage),
|
|
257
|
+
() => onMessage({ type: "abort" }),
|
|
258
|
+
),
|
|
259
|
+
),
|
|
260
|
+
);
|
|
294
261
|
const terminate = () => workers.forEach((worker) => worker.terminate());
|
|
295
262
|
const channels = new Map<string, MessageChannel>();
|
|
296
263
|
const getPort = (from: number, to: number) => {
|
package/src/parser.ts
CHANGED
|
@@ -24,7 +24,7 @@ import type {
|
|
|
24
24
|
} from "./ast";
|
|
25
25
|
import { createSanyError, formatRange, TlaSyntaxError } from "./errors";
|
|
26
26
|
import { getNumeralValue, readAtAsIdentifier, tokenize, type Token } from "./lexer";
|
|
27
|
-
import { getSanyParseError } from "./sany
|
|
27
|
+
import { getSanyParseError } from "./sany/parse-error";
|
|
28
28
|
|
|
29
29
|
interface Precedence {
|
|
30
30
|
low: number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PcalBugError, PcalError, PcalRuntimeError } from "
|
|
2
|
-
import type { TlcVersion } from "
|
|
1
|
+
import { PcalBugError, PcalError, PcalRuntimeError } from "../errors";
|
|
2
|
+
import type { TlcVersion } from "../tlc/version";
|
|
3
3
|
|
|
4
4
|
// TLAToken's types.
|
|
5
5
|
export const PCAL_TOKEN = { builtin: 1, number: 2, string: 3, ident: 4, added: 5 } as const;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PcalError, PcalRuntimeError, PcalBugError } from "
|
|
1
|
+
import { PcalError, PcalRuntimeError, PcalBugError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
clonePcalExpr,
|
|
4
4
|
createNormalizedPcalExpr,
|
|
@@ -34,7 +34,7 @@ import {
|
|
|
34
34
|
type PcalWith,
|
|
35
35
|
createPcalExpr,
|
|
36
36
|
createPcalToken,
|
|
37
|
-
} from "./
|
|
37
|
+
} from "./ast";
|
|
38
38
|
import {
|
|
39
39
|
createPcalTokenizerState,
|
|
40
40
|
getPcalAlgorithmToken,
|
|
@@ -42,7 +42,7 @@ import {
|
|
|
42
42
|
tokenizePcalExpr,
|
|
43
43
|
type PcalCharReader,
|
|
44
44
|
type PcalTokenizerState,
|
|
45
|
-
} from "./
|
|
45
|
+
} from "./tokenize";
|
|
46
46
|
|
|
47
47
|
// The translator's state that its Java code keeps in static fields, which SANY never resets
|
|
48
48
|
// between the modules it validates: the options, the tokenizer's state, ParseAlgorithm's
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PcalError, PcalBugError } from "
|
|
2
|
-
import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./
|
|
1
|
+
import { PcalError, PcalBugError } from "../errors";
|
|
2
|
+
import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./ast";
|
|
3
3
|
|
|
4
4
|
// PcalCharReader: reads the algorithm's characters from the lines between a start and an end
|
|
5
5
|
// position, returning "\n" at the end of each line and "\t" at the end of the input. Columns count
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PcalError, PcalBugError } from "
|
|
1
|
+
import { PcalError, PcalBugError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
createNormalizedPcalExpr,
|
|
4
4
|
createPcalBase,
|
|
@@ -29,7 +29,7 @@ import {
|
|
|
29
29
|
type PcalVarDecl,
|
|
30
30
|
type PcalWhen,
|
|
31
31
|
type PcalWhile,
|
|
32
|
-
} from "./
|
|
32
|
+
} from "./ast";
|
|
33
33
|
|
|
34
34
|
// PcalSymTab's symbol types, which index PCAL_SYMBOL_TYPE_NAMES.
|
|
35
35
|
const PCAL_SYMBOL = {
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { PcalError, PcalRuntimeError } from "
|
|
1
|
+
import { PcalError, PcalRuntimeError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
formatPcalNode,
|
|
4
4
|
getPcalLocation,
|
|
5
5
|
getPcalVersionNumber,
|
|
6
6
|
PCAL_VERSION_WEIGHT,
|
|
7
7
|
type PcalAlgorithm,
|
|
8
|
-
} from "./
|
|
9
|
-
import { parsePcalAlgorithm, type PcalSession } from "./
|
|
10
|
-
import { createPcalCharReader } from "./
|
|
11
|
-
import { translatePcalAlgorithm } from "./
|
|
12
|
-
import type { TlcVersion } from "
|
|
8
|
+
} from "./ast";
|
|
9
|
+
import { parsePcalAlgorithm, type PcalSession } from "./parse";
|
|
10
|
+
import { createPcalCharReader } from "./tokenize";
|
|
11
|
+
import { translatePcalAlgorithm } from "./translate";
|
|
12
|
+
import type { TlcVersion } from "../tlc/version";
|
|
13
13
|
|
|
14
14
|
// Validator.ValidationResult.
|
|
15
15
|
type PcalValidationResult =
|