tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- 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 +194 -8
- package/dist/index.d.ts +194 -8
- 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 +1006 -0
- package/dist/prove.js +1006 -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 +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +174 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
package/src/symmetry.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Expression } from "./ast";
|
|
2
|
+
import type { Substitution } from "./config";
|
|
3
|
+
import { TlaConfigError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
4
|
+
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
5
|
+
import { MESSAGE_CODE } from "./tlc/messages";
|
|
2
6
|
import { evaluate, type Environment } from "./evaluate";
|
|
3
7
|
import {
|
|
4
8
|
compareValues,
|
|
@@ -9,6 +13,7 @@ import {
|
|
|
9
13
|
isEnumerable,
|
|
10
14
|
isFunctionValue,
|
|
11
15
|
isModelValue,
|
|
16
|
+
isSameValue,
|
|
12
17
|
isSetValue,
|
|
13
18
|
toFiniteFunction,
|
|
14
19
|
toFiniteSet,
|
|
@@ -29,6 +34,20 @@ interface Permutation {
|
|
|
29
34
|
cacheLimit: number;
|
|
30
35
|
}
|
|
31
36
|
|
|
37
|
+
// The images of one value under every permutation, the identity first, and how each image compares
|
|
38
|
+
// with the image of each permutation the search has held as the smallest.
|
|
39
|
+
interface Orbit {
|
|
40
|
+
images: Value[];
|
|
41
|
+
comparisons: (Int8Array | undefined)[];
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
interface SymmetryGroup {
|
|
45
|
+
permutations: Permutation[];
|
|
46
|
+
orbits: WeakMap<ObjectValue, Orbit>;
|
|
47
|
+
orbitCount: number;
|
|
48
|
+
orbitLimit: number;
|
|
49
|
+
}
|
|
50
|
+
|
|
32
51
|
const getPermutationKey = (permutation: Images) =>
|
|
33
52
|
[...permutation]
|
|
34
53
|
.map(([name, image]) => `${name}>${image.name}`)
|
|
@@ -46,40 +65,90 @@ const composePermutations = (first: Images, second: Images) => {
|
|
|
46
65
|
return composed;
|
|
47
66
|
};
|
|
48
67
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
}
|
|
68
|
+
// Tool#getSymmetryPerms fails with a RuntimeException as TLC starts, which TLC reports as one it
|
|
69
|
+
// did not expect.
|
|
70
|
+
const createSymmetryError = (message: string) =>
|
|
71
|
+
setExitCode(new TlaEvaluationError(`${UNEXPECTED_EXCEPTION}${message}`), EXIT_STATUS.error);
|
|
72
|
+
|
|
73
|
+
const toImages = (value: Value) => {
|
|
53
74
|
const functionValue = toFiniteFunction(value);
|
|
54
75
|
const permutation: Images = new Map();
|
|
55
76
|
functionValue.domain.forEach((key, index) => {
|
|
56
77
|
const image = functionValue.range[index];
|
|
57
78
|
if (!isModelValue(key) || !isModelValue(image)) {
|
|
58
|
-
throw
|
|
79
|
+
throw createSymmetryError("Symmetry function must have model values as domain and range.");
|
|
59
80
|
}
|
|
60
81
|
if (key.name !== image.name) permutation.set(key.name, image);
|
|
61
82
|
});
|
|
62
83
|
return permutation;
|
|
63
84
|
};
|
|
64
85
|
|
|
65
|
-
|
|
86
|
+
// SyntaxTreeNode.getHumanReadableImage, which joins the tokens of an expression without spaces.
|
|
87
|
+
const getExpressionImage = (expression: Expression): string => {
|
|
88
|
+
if (expression.kind === "Identifier") return expression.name;
|
|
89
|
+
if (expression.kind !== "Apply") return "";
|
|
90
|
+
const args = expression.args.map(getExpressionImage);
|
|
91
|
+
return /^[A-Za-z_]/.test(expression.operator)
|
|
92
|
+
? `${expression.operator}(${args.join(",")})`
|
|
93
|
+
: args.join(expression.operator);
|
|
94
|
+
};
|
|
95
|
+
|
|
96
|
+
const isPermutations = (
|
|
97
|
+
expression: Expression,
|
|
98
|
+
): expression is Expression & { kind: "Apply"; args: [Expression] } =>
|
|
99
|
+
expression.kind === "Apply" &&
|
|
100
|
+
expression.operator === "Permutations" &&
|
|
101
|
+
expression.args.length === 1;
|
|
102
|
+
|
|
103
|
+
export const getSymmetryGroup = (
|
|
104
|
+
name: string,
|
|
105
|
+
environment: Environment,
|
|
106
|
+
substitutions: Substitution[],
|
|
107
|
+
): SymmetryGroup | undefined => {
|
|
66
108
|
const definition = environment.definitions.get(name);
|
|
109
|
+
if (definition === undefined && !environment.constants.has(name)) {
|
|
110
|
+
throw new TlaConfigError(
|
|
111
|
+
`The symmetry function ${name} specified in the configuration file\nis not defined in the specification.`,
|
|
112
|
+
);
|
|
113
|
+
}
|
|
67
114
|
if (definition?.kind !== "Operator" || definition.params.length > 0) {
|
|
68
|
-
throw
|
|
115
|
+
throw createSymmetryError(`The symmetry function ${name} must specify a set of permutations.`);
|
|
69
116
|
}
|
|
70
|
-
const
|
|
71
|
-
environment,
|
|
72
|
-
|
|
73
|
-
state: undefined,
|
|
74
|
-
next: undefined,
|
|
75
|
-
});
|
|
117
|
+
const evaluateConstant = (expression: Expression) =>
|
|
118
|
+
evaluate(expression, { environment, scope: undefined, state: undefined, next: undefined });
|
|
119
|
+
const value = evaluateConstant(definition.body);
|
|
76
120
|
if (!isSetValue(value) || !isEnumerable(value)) {
|
|
77
|
-
throw
|
|
121
|
+
throw createSymmetryError("The symmetry operator must specify a set of functions.");
|
|
122
|
+
}
|
|
123
|
+
const elements = toFiniteSet(value).elements;
|
|
124
|
+
if (!elements.every(isFunctionValue)) {
|
|
125
|
+
throw createSymmetryError("The symmetry values must be function records.");
|
|
126
|
+
}
|
|
127
|
+
const permutations = elements.map(toImages);
|
|
128
|
+
// Tool#getSymmetryPerms warns about each permuted set with fewer than two elements, by the name
|
|
129
|
+
// the config substitutes for it. As many permuted sets as permutations means none has two.
|
|
130
|
+
const permutedSets = definition.body.kind === "Apply" ? definition.body.args : [];
|
|
131
|
+
const configNames = new Map(
|
|
132
|
+
substitutions
|
|
133
|
+
.filter((substitution) => substitution.module === undefined)
|
|
134
|
+
.map((substitution) => [substitution.target, substitution.name]),
|
|
135
|
+
);
|
|
136
|
+
const warnSmallSets = (offenders: Expression[]) => {
|
|
137
|
+
if (offenders.length === 0) return;
|
|
138
|
+
const names = offenders.map((offender) => {
|
|
139
|
+
const image = getExpressionImage(isPermutations(offender) ? offender.args[0] : offender);
|
|
140
|
+
return configNames.get(image) ?? image;
|
|
141
|
+
});
|
|
142
|
+
const isPlural = offenders.length > 1;
|
|
143
|
+
environment.runtime.warn(
|
|
144
|
+
MESSAGE_CODE.symmetrySetTooSmall,
|
|
145
|
+
`The set${isPlural ? "s" : ""} ${names.join(", and ")} ${isPlural ? "have" : "has"} been defined to be a symmetry set but contain${isPlural ? "" : "s"} less than two elements.`,
|
|
146
|
+
);
|
|
147
|
+
};
|
|
148
|
+
if (permutedSets.length >= elements.length) {
|
|
149
|
+
warnSmallSets(permutedSets);
|
|
150
|
+
return undefined;
|
|
78
151
|
}
|
|
79
|
-
const permutations = toFiniteSet(value).elements.map((element) => toImages(element, name));
|
|
80
|
-
const isDisabled =
|
|
81
|
-
definition.body.kind === "Apply" && definition.body.args.length >= permutations.length;
|
|
82
|
-
if (isDisabled) return [];
|
|
83
152
|
const group = new Map<string, Images>();
|
|
84
153
|
permutations.forEach((permutation) => {
|
|
85
154
|
if (permutation.size > 0) group.set(getPermutationKey(permutation), permutation);
|
|
@@ -98,13 +167,38 @@ export const getSymmetryGroup = (name: string, environment: Environment): Permut
|
|
|
98
167
|
);
|
|
99
168
|
frontier.start = end;
|
|
100
169
|
}
|
|
170
|
+
const movedNames = new Set(
|
|
171
|
+
[...group.values()].flatMap((images) => [...images.values()].map((image) => image.name)),
|
|
172
|
+
);
|
|
173
|
+
// Only a permutation of a constant that TLC holds as an enumerated set is checked. TLC binds a
|
|
174
|
+
// constant the config substitutes with <- to the definition, which it skips.
|
|
175
|
+
const substitutedNames = new Set(substitutions.map((substitution) => substitution.name));
|
|
176
|
+
warnSmallSets(
|
|
177
|
+
permutedSets.filter((node) => {
|
|
178
|
+
if (!isPermutations(node)) return false;
|
|
179
|
+
const operand = node.args[0];
|
|
180
|
+
if (operand.kind !== "Identifier" || substitutedNames.has(operand.name)) return false;
|
|
181
|
+
const set = evaluateConstant(operand);
|
|
182
|
+
return (
|
|
183
|
+
typeof set === "object" &&
|
|
184
|
+
set.kind === "Set" &&
|
|
185
|
+
!set.elements.some((element) => isModelValue(element) && movedNames.has(element.name))
|
|
186
|
+
);
|
|
187
|
+
}),
|
|
188
|
+
);
|
|
189
|
+
if (group.size === 0) return undefined;
|
|
101
190
|
const cacheLimit = Math.max(256, Math.floor(CACHE_LIMIT / group.size));
|
|
102
|
-
return
|
|
103
|
-
images
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
191
|
+
return {
|
|
192
|
+
permutations: [...group.values()].map((images) => ({
|
|
193
|
+
images,
|
|
194
|
+
cache: new WeakMap<ObjectValue, Value>(),
|
|
195
|
+
cacheSize: 0,
|
|
196
|
+
cacheLimit,
|
|
197
|
+
})),
|
|
198
|
+
orbits: new WeakMap(),
|
|
199
|
+
orbitCount: 0,
|
|
200
|
+
orbitLimit: cacheLimit,
|
|
201
|
+
};
|
|
108
202
|
};
|
|
109
203
|
|
|
110
204
|
const permuteElements = (elements: Value[], permutation: Permutation) => {
|
|
@@ -163,7 +257,10 @@ const permuteValue = (value: Value, permutation: Permutation): Value => {
|
|
|
163
257
|
if (size === 0 || size > CACHED_SIZE_LIMIT) return computePermutedValue(value, permutation);
|
|
164
258
|
const cached = permutation.cache.get(value);
|
|
165
259
|
if (cached !== undefined) return cached;
|
|
166
|
-
const
|
|
260
|
+
const computed = computePermutedValue(value, permutation);
|
|
261
|
+
// A permutation often maps a value to an equal one. Keeping the original lets the comparison
|
|
262
|
+
// with the smallest state so far stop at identity.
|
|
263
|
+
const permuted = computed !== value && isSameValue(computed, value) ? value : computed;
|
|
167
264
|
if (permutation.cacheSize >= permutation.cacheLimit) {
|
|
168
265
|
permutation.cache = new WeakMap();
|
|
169
266
|
permutation.cacheSize = 0;
|
|
@@ -184,7 +281,15 @@ const computePermutedValue = (value: ObjectValue, permutation: Permutation) => {
|
|
|
184
281
|
const domain = permuteElements(functionValue.domain, permutation);
|
|
185
282
|
const range = permuteElements(functionValue.range, permutation) ?? functionValue.range;
|
|
186
283
|
if (domain) {
|
|
187
|
-
|
|
284
|
+
const permuted = createFunction(
|
|
285
|
+
domain.map((key, index): [Value, Value] => [key, range[index]]),
|
|
286
|
+
);
|
|
287
|
+
// A permutation often maps the domain to itself, such as a function over the symmetric set.
|
|
288
|
+
// Sharing the original domain array lets comparisons with other images skip the domain.
|
|
289
|
+
const isSameDomain = permuted.domain.every(
|
|
290
|
+
(key, index) => key === functionValue.domain[index],
|
|
291
|
+
);
|
|
292
|
+
return isSameDomain ? createSortedFunction(functionValue.domain, permuted.range) : permuted;
|
|
188
293
|
}
|
|
189
294
|
return range === functionValue.range
|
|
190
295
|
? functionValue
|
|
@@ -196,41 +301,76 @@ const computePermutedValue = (value: ObjectValue, permutation: Permutation) => {
|
|
|
196
301
|
return elements ? createSet(elements) : set;
|
|
197
302
|
};
|
|
198
303
|
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
304
|
+
const getOrbit = (value: ObjectValue, group: SymmetryGroup) => {
|
|
305
|
+
const cached = group.orbits.get(value);
|
|
306
|
+
if (cached !== undefined) return cached;
|
|
307
|
+
if (group.orbitCount >= group.orbitLimit) {
|
|
308
|
+
group.orbits = new WeakMap();
|
|
309
|
+
group.orbitCount = 0;
|
|
202
310
|
}
|
|
203
|
-
|
|
311
|
+
const orbit: Orbit = { images: [value], comparisons: [] };
|
|
312
|
+
group.orbits.set(value, orbit);
|
|
313
|
+
group.orbitCount++;
|
|
314
|
+
return orbit;
|
|
315
|
+
};
|
|
316
|
+
|
|
317
|
+
const getImage = (orbit: Orbit, permutation: number, group: SymmetryGroup) =>
|
|
318
|
+
(orbit.images[permutation] ??= permuteValue(
|
|
319
|
+
orbit.images[0],
|
|
320
|
+
group.permutations[permutation - 1],
|
|
321
|
+
));
|
|
322
|
+
|
|
323
|
+
// Two images of a value compare the same way every time, and comparing them again changes nothing,
|
|
324
|
+
// so an orbit compares each pair once.
|
|
325
|
+
const compareImages = (
|
|
326
|
+
value: ObjectValue,
|
|
327
|
+
permutation: number,
|
|
328
|
+
minimum: number,
|
|
329
|
+
group: SymmetryGroup,
|
|
330
|
+
) => {
|
|
331
|
+
const orbit = getOrbit(value, group);
|
|
332
|
+
const comparisons = (orbit.comparisons[minimum] ??= new Int8Array(group.permutations.length + 1));
|
|
333
|
+
if (comparisons[permutation] === 0) {
|
|
334
|
+
const comparison = compareValues(
|
|
335
|
+
getImage(orbit, permutation, group),
|
|
336
|
+
getImage(orbit, minimum, group),
|
|
337
|
+
);
|
|
338
|
+
comparisons[permutation] = Math.sign(comparison) + 2;
|
|
339
|
+
}
|
|
340
|
+
return comparisons[permutation] - 2;
|
|
204
341
|
};
|
|
205
342
|
|
|
206
|
-
const
|
|
343
|
+
const isSmallerImage = (
|
|
207
344
|
state: Value[],
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
345
|
+
permutation: number,
|
|
346
|
+
minimum: number,
|
|
347
|
+
group: SymmetryGroup,
|
|
348
|
+
order: number[],
|
|
211
349
|
) => {
|
|
212
|
-
const
|
|
213
|
-
|
|
214
|
-
const
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
if (comparison > 0) return undefined;
|
|
218
|
-
if (!order) permuted.push(value);
|
|
219
|
-
if (comparison < 0) {
|
|
220
|
-
return order
|
|
221
|
-
? state.map((item) => permuteValue(item, permutation))
|
|
222
|
-
: permuteRemaining(state, permuted, permutation);
|
|
223
|
-
}
|
|
350
|
+
for (const index of order) {
|
|
351
|
+
const value = state[index];
|
|
352
|
+
const comparison =
|
|
353
|
+
typeof value === "object" ? compareImages(value, permutation, minimum, group) : 0;
|
|
354
|
+
if (comparison !== 0) return comparison < 0;
|
|
224
355
|
}
|
|
225
|
-
return
|
|
356
|
+
return false;
|
|
226
357
|
};
|
|
227
358
|
|
|
359
|
+
// TLC keeps the smallest image of the state in its variable order, replacing it only with a
|
|
360
|
+
// strictly smaller one.
|
|
228
361
|
export const getRepresentative = (
|
|
229
362
|
state: Value[],
|
|
230
|
-
group:
|
|
231
|
-
order
|
|
232
|
-
): Value[] =>
|
|
233
|
-
group.reduce(
|
|
234
|
-
(
|
|
235
|
-
|
|
363
|
+
group: SymmetryGroup,
|
|
364
|
+
order: number[],
|
|
365
|
+
): Value[] => {
|
|
366
|
+
const minimum = group.permutations.reduce(
|
|
367
|
+
(smallest, _, index) =>
|
|
368
|
+
isSmallerImage(state, index + 1, smallest, group, order) ? index + 1 : smallest,
|
|
369
|
+
0,
|
|
236
370
|
);
|
|
371
|
+
return minimum === 0
|
|
372
|
+
? state
|
|
373
|
+
: state.map((value) =>
|
|
374
|
+
typeof value === "object" ? getImage(getOrbit(value, group), minimum, group) : value,
|
|
375
|
+
);
|
|
376
|
+
};
|
package/src/tableau.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Expression } from "./ast";
|
|
2
2
|
import { TlaEvaluationError } from "./errors";
|
|
3
3
|
import type { Scope } from "./evaluate";
|
|
4
|
-
import { ACTION_LEVEL, TEMPORAL_LEVEL } from "./levels";
|
|
4
|
+
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
5
5
|
|
|
6
6
|
interface LiveBoolean {
|
|
7
7
|
kind: "Boolean";
|
|
@@ -84,7 +84,6 @@ interface Triple {
|
|
|
84
84
|
second: LiveExpression;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
-
const STATE_LEVEL = 1;
|
|
88
87
|
const MAXIMUM_DISJUNCTS = 2147483647;
|
|
89
88
|
|
|
90
89
|
const TRUE: LiveBoolean = { kind: "Boolean", value: true };
|
|
@@ -122,10 +121,10 @@ export const createJunction = (
|
|
|
122
121
|
export const getLiveLevel = (expression: LiveExpression): number => {
|
|
123
122
|
switch (expression.kind) {
|
|
124
123
|
case "Boolean":
|
|
125
|
-
return
|
|
124
|
+
return CONSTANT_LEVEL;
|
|
126
125
|
case "State":
|
|
127
126
|
case "Enabled":
|
|
128
|
-
return
|
|
127
|
+
return VARIABLE_LEVEL;
|
|
129
128
|
case "Action":
|
|
130
129
|
case "Next":
|
|
131
130
|
return ACTION_LEVEL;
|
|
@@ -138,7 +137,7 @@ export const getLiveLevel = (expression: LiveExpression): number => {
|
|
|
138
137
|
case "Or":
|
|
139
138
|
return expression.operands.reduce(
|
|
140
139
|
(level, operand) => Math.max(level, getLiveLevel(operand)),
|
|
141
|
-
|
|
140
|
+
CONSTANT_LEVEL,
|
|
142
141
|
);
|
|
143
142
|
}
|
|
144
143
|
};
|
|
@@ -162,22 +161,39 @@ const containsAction = (expression: LiveExpression): boolean => {
|
|
|
162
161
|
}
|
|
163
162
|
};
|
|
164
163
|
|
|
165
|
-
const
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
164
|
+
const termKeys = new WeakMap<LiveExpression, string>();
|
|
165
|
+
const atoms = { count: 0 };
|
|
166
|
+
|
|
167
|
+
// A term's structure as a string in which each atom stands for itself, so equal terms share a key.
|
|
168
|
+
export const getTermKey = (expression: LiveExpression): string => {
|
|
169
|
+
const cached = termKeys.get(expression);
|
|
170
|
+
if (cached !== undefined) return cached;
|
|
171
|
+
const key = (() => {
|
|
172
|
+
switch (expression.kind) {
|
|
173
|
+
case "Boolean":
|
|
174
|
+
return String(expression.value);
|
|
175
|
+
case "State":
|
|
176
|
+
case "Enabled":
|
|
177
|
+
case "Action":
|
|
178
|
+
return `#${atoms.count++}`;
|
|
179
|
+
case "And":
|
|
180
|
+
case "Or":
|
|
181
|
+
return `${expression.kind}(${expression.operands.map(getTermKey).join(",")})`;
|
|
182
|
+
default:
|
|
183
|
+
return `${expression.kind}(${getTermKey(expression.body)})`;
|
|
184
|
+
}
|
|
185
|
+
})();
|
|
186
|
+
termKeys.set(expression, key);
|
|
187
|
+
return key;
|
|
177
188
|
};
|
|
178
189
|
|
|
179
|
-
const
|
|
180
|
-
|
|
190
|
+
const isEqual = (left: LiveExpression, right: LiveExpression) =>
|
|
191
|
+
left === right || getTermKey(left) === getTermKey(right);
|
|
192
|
+
|
|
193
|
+
const isMember = (items: LiveExpression[], expression: LiveExpression) => {
|
|
194
|
+
const key = getTermKey(expression);
|
|
195
|
+
return items.some((item) => item === expression || getTermKey(item) === key);
|
|
196
|
+
};
|
|
181
197
|
|
|
182
198
|
const getDual = (kind: LiveJunction["kind"]) => (kind === "And" ? "Or" : "And");
|
|
183
199
|
|
|
@@ -272,7 +288,7 @@ const toDisjunctiveNormalForm = (expression: LiveExpression): LiveExpression =>
|
|
|
272
288
|
total.value *= normal.operands.length;
|
|
273
289
|
if (total.value > MAXIMUM_DISJUNCTS) {
|
|
274
290
|
throw new TlaEvaluationError(
|
|
275
|
-
"TLC cannot handle the temporal formula because it exceeds the maximum supported size in disjunctive normal form",
|
|
291
|
+
"TLC cannot handle the temporal formula because it exceeds the maximum supported size in disjunctive normal form.",
|
|
276
292
|
);
|
|
277
293
|
}
|
|
278
294
|
}
|
|
@@ -446,13 +462,14 @@ const getTriples = (
|
|
|
446
462
|
return parts ? [{ whole: term, first: parts.first, second: parts.second }] : [];
|
|
447
463
|
});
|
|
448
464
|
|
|
449
|
-
|
|
450
|
-
|
|
465
|
+
// A particle is a set of terms, so its key ignores order and repeats.
|
|
466
|
+
const getParticleKey = (particle: LiveExpression[]) =>
|
|
467
|
+
[...new Set(particle.map(getTermKey))].sort().join("|");
|
|
451
468
|
|
|
452
|
-
const unionParticles = (left: LiveExpression[][], right: LiveExpression[][]) =>
|
|
453
|
-
|
|
454
|
-
...right
|
|
455
|
-
|
|
469
|
+
const unionParticles = (left: LiveExpression[][], right: LiveExpression[][]) => {
|
|
470
|
+
const rightKeys = new Set(right.map(getParticleKey));
|
|
471
|
+
return [...left.filter((particle) => !rightKeys.has(getParticleKey(particle))), ...right];
|
|
472
|
+
};
|
|
456
473
|
|
|
457
474
|
const getParticleClosure = (terms: LiveExpression[]) => {
|
|
458
475
|
const closure = getPositiveClosure(terms);
|
|
@@ -510,20 +527,31 @@ const getParticleClosure = (terms: LiveExpression[]) => {
|
|
|
510
527
|
const createTableauNode = (particle: LiveExpression[]): TableauNode => ({
|
|
511
528
|
particle,
|
|
512
529
|
successors: [],
|
|
513
|
-
|
|
530
|
+
// Constant terms count, as after TLC 1.7.4. That version checks only state atoms, so a node with a
|
|
531
|
+
// FALSE term stays in the graph and yields a bogus counterexample (tlaplus#604).
|
|
532
|
+
statePredicates: particle.filter((term) => getLiveLevel(term) <= VARIABLE_LEVEL),
|
|
514
533
|
});
|
|
515
534
|
|
|
516
535
|
const createTableau = (formula: LiveExpression) => {
|
|
517
536
|
const nodes = getParticleClosure([formula]).map(createTableauNode);
|
|
518
537
|
const initialCount = nodes.length;
|
|
538
|
+
const indices = new Map<string, number>();
|
|
539
|
+
nodes.forEach((node, index) => {
|
|
540
|
+
const key = getParticleKey(node.particle);
|
|
541
|
+
if (!indices.has(key)) indices.set(key, index);
|
|
542
|
+
});
|
|
519
543
|
for (let index = 0; index < nodes.length; index++) {
|
|
520
544
|
const implied = nodes[index].particle.flatMap((term) =>
|
|
521
545
|
term.kind === "Next" ? [term.body] : [],
|
|
522
546
|
);
|
|
523
547
|
for (const particle of getParticleClosure(implied)) {
|
|
524
|
-
const
|
|
525
|
-
|
|
526
|
-
|
|
548
|
+
const key = getParticleKey(particle);
|
|
549
|
+
const existing = indices.get(key);
|
|
550
|
+
if (existing === undefined) {
|
|
551
|
+
indices.set(key, nodes.length);
|
|
552
|
+
nodes.push(createTableauNode(particle));
|
|
553
|
+
}
|
|
554
|
+
nodes[index].successors.push(existing ?? nodes.length - 1);
|
|
527
555
|
}
|
|
528
556
|
}
|
|
529
557
|
return { nodes, initialCount };
|
|
@@ -544,7 +572,7 @@ const classify = (expression: LiveExpression, classification: Classification) =>
|
|
|
544
572
|
const infinitelyOften = getInfinitelyOftenBody(expression);
|
|
545
573
|
if (infinitelyOften) {
|
|
546
574
|
const level = getLiveLevel(infinitelyOften);
|
|
547
|
-
if (level <=
|
|
575
|
+
if (level <= VARIABLE_LEVEL) {
|
|
548
576
|
classification.infinitelyOftenStates.push(infinitelyOften);
|
|
549
577
|
return;
|
|
550
578
|
}
|
|
@@ -555,7 +583,7 @@ const classify = (expression: LiveExpression, classification: Classification) =>
|
|
|
555
583
|
}
|
|
556
584
|
if (containsAction(expression)) {
|
|
557
585
|
throw new TlaEvaluationError(
|
|
558
|
-
"
|
|
586
|
+
"Temporal formulas containing actions must be of forms <>[]A or []<>A.",
|
|
559
587
|
);
|
|
560
588
|
}
|
|
561
589
|
classification.formulas.push(expression);
|