tla-ts 0.0.4-dev.0be9567 → 0.0.4-dev.22c041b
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 +77 -122
- 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 +44 -12
- package/dist/index.d.ts +44 -12
- 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 +76 -92
- package/dist/transfer.js +76 -92
- 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/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1153
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +115 -721
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +97 -35
- package/src/evaluate.ts +135 -120
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +10 -0
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- 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} +172 -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 +39 -51
- package/src/parallel.ts +39 -66
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- 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 +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +38 -22
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -190
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/{tlc-version.ts → tlc/version.ts} +8 -7
- package/src/transfer.ts +32 -32
- package/src/values.ts +119 -71
- package/src/worker.ts +62 -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/canonical.ts +0 -40
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
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
|
};
|
|
@@ -530,7 +529,7 @@ const createTableauNode = (particle: LiveExpression[]): TableauNode => ({
|
|
|
530
529
|
successors: [],
|
|
531
530
|
// Constant terms count, as after TLC 1.7.4. That version checks only state atoms, so a node with a
|
|
532
531
|
// FALSE term stays in the graph and yields a bogus counterexample (tlaplus#604).
|
|
533
|
-
statePredicates: particle.filter((term) => getLiveLevel(term) <=
|
|
532
|
+
statePredicates: particle.filter((term) => getLiveLevel(term) <= VARIABLE_LEVEL),
|
|
534
533
|
});
|
|
535
534
|
|
|
536
535
|
const createTableau = (formula: LiveExpression) => {
|
|
@@ -573,7 +572,7 @@ const classify = (expression: LiveExpression, classification: Classification) =>
|
|
|
573
572
|
const infinitelyOften = getInfinitelyOftenBody(expression);
|
|
574
573
|
if (infinitelyOften) {
|
|
575
574
|
const level = getLiveLevel(infinitelyOften);
|
|
576
|
-
if (level <=
|
|
575
|
+
if (level <= VARIABLE_LEVEL) {
|
|
577
576
|
classification.infinitelyOftenStates.push(infinitelyOften);
|
|
578
577
|
return;
|
|
579
578
|
}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getStringRank,
|
|
3
|
+
isFunctionValue,
|
|
4
|
+
isModelValue,
|
|
5
|
+
toFiniteFunction,
|
|
6
|
+
toFiniteSet,
|
|
7
|
+
type Value,
|
|
8
|
+
} from "../values";
|
|
9
|
+
|
|
10
|
+
// FP64 with TLC's first irreducible polynomial, FP64.Polys[0], which `-fp 0` selects.
|
|
11
|
+
const IRREDUCIBLE_POLYNOMIAL = 0x911498ae0e66bad6n;
|
|
12
|
+
|
|
13
|
+
const BYTE_MOD_TABLE = (() => {
|
|
14
|
+
const powers: bigint[] = [];
|
|
15
|
+
for (let power = 1n << 63n; powers.length < 72;) {
|
|
16
|
+
powers.push(power);
|
|
17
|
+
power = (power >> 1n) ^ ((power & 1n) === 0n ? 0n : IRREDUCIBLE_POLYNOMIAL);
|
|
18
|
+
}
|
|
19
|
+
return Array.from({ length: 256 }, (_, byte) =>
|
|
20
|
+
powers
|
|
21
|
+
.slice(64, 72)
|
|
22
|
+
.reverse()
|
|
23
|
+
.reduce((value, power, bit) => ((byte >> bit) & 1 ? value ^ power : value), 0n),
|
|
24
|
+
);
|
|
25
|
+
})();
|
|
26
|
+
|
|
27
|
+
const BYTE_MOD_HIGH = Int32Array.from(BYTE_MOD_TABLE, (entry) =>
|
|
28
|
+
Number(BigInt.asIntN(32, entry >> 32n)),
|
|
29
|
+
);
|
|
30
|
+
const BYTE_MOD_LOW = Int32Array.from(BYTE_MOD_TABLE, (entry) => Number(BigInt.asIntN(32, entry)));
|
|
31
|
+
|
|
32
|
+
// The fingerprint being extended, as its high and low 32 bits, which avoids a BigInt operation
|
|
33
|
+
// for every byte.
|
|
34
|
+
const INITIAL_HIGH = Number(BigInt.asIntN(32, IRREDUCIBLE_POLYNOMIAL >> 32n));
|
|
35
|
+
const INITIAL_LOW = Number(BigInt.asIntN(32, IRREDUCIBLE_POLYNOMIAL));
|
|
36
|
+
let high = INITIAL_HIGH;
|
|
37
|
+
let low = INITIAL_LOW;
|
|
38
|
+
|
|
39
|
+
const extendByte = (byte: number) => {
|
|
40
|
+
const index = (byte ^ low) & 0xff;
|
|
41
|
+
low = ((low >>> 8) | (high << 24)) ^ BYTE_MOD_LOW[index];
|
|
42
|
+
high = (high >>> 8) ^ BYTE_MOD_HIGH[index];
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
const extendInt = (value: number) => {
|
|
46
|
+
for (let shift = 0; shift < 32; shift += 8) extendByte(value >>> shift);
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
const BOOL_VALUE = 0;
|
|
50
|
+
const INT_VALUE = 1;
|
|
51
|
+
const STRING_VALUE = 3;
|
|
52
|
+
const SET_ENUM_VALUE = 5;
|
|
53
|
+
const FCN_RCD_VALUE = 9;
|
|
54
|
+
const MODEL_VALUE = 21;
|
|
55
|
+
|
|
56
|
+
// Value#fingerPrint for each of TLC's value classes. A model value extends the fingerprint with
|
|
57
|
+
// its UniqueString token, and TLC numbers tokens from 1 in intern order.
|
|
58
|
+
const extendValue = (value: Value) => {
|
|
59
|
+
if (typeof value === "boolean") {
|
|
60
|
+
extendByte(BOOL_VALUE);
|
|
61
|
+
extendByte(value ? 116 : 102);
|
|
62
|
+
} else if (typeof value === "number") {
|
|
63
|
+
extendByte(INT_VALUE);
|
|
64
|
+
extendInt(value);
|
|
65
|
+
} else if (typeof value === "string") {
|
|
66
|
+
extendByte(STRING_VALUE);
|
|
67
|
+
extendInt(value.length);
|
|
68
|
+
for (let index = 0; index < value.length; index++) {
|
|
69
|
+
extendByte(value.charCodeAt(index));
|
|
70
|
+
}
|
|
71
|
+
} else if (isModelValue(value)) {
|
|
72
|
+
extendByte(MODEL_VALUE);
|
|
73
|
+
extendInt(getStringRank(value.name) + 1);
|
|
74
|
+
} else if (isFunctionValue(value)) {
|
|
75
|
+
const functionValue = toFiniteFunction(value);
|
|
76
|
+
extendByte(FCN_RCD_VALUE);
|
|
77
|
+
extendInt(functionValue.domain.length);
|
|
78
|
+
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
79
|
+
extendValue(functionValue.domain[index]);
|
|
80
|
+
extendValue(functionValue.range[index]);
|
|
81
|
+
}
|
|
82
|
+
} else {
|
|
83
|
+
const elements = toFiniteSet(value).elements;
|
|
84
|
+
extendByte(SET_ENUM_VALUE);
|
|
85
|
+
extendInt(elements.length);
|
|
86
|
+
for (const element of elements) extendValue(element);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
// TLCStateMut#fingerPrint of variable values in TLC's variable order. Evaluating a lazy value can
|
|
91
|
+
// fingerprint another, so this restores the fingerprint it interrupts.
|
|
92
|
+
export const getTlcFingerprint = (state: Value[]) => {
|
|
93
|
+
const outer = { high, low };
|
|
94
|
+
high = INITIAL_HIGH;
|
|
95
|
+
low = INITIAL_LOW;
|
|
96
|
+
for (const value of state) extendValue(value);
|
|
97
|
+
const fingerprint = (BigInt(high >>> 0) << 32n) | BigInt(low >>> 0);
|
|
98
|
+
high = outer.high;
|
|
99
|
+
low = outer.low;
|
|
100
|
+
return fingerprint;
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
const getFingerprintLength = (value: Value): number => {
|
|
104
|
+
if (typeof value === "boolean") return 2;
|
|
105
|
+
if (typeof value === "number" || isModelValue(value)) return 5;
|
|
106
|
+
if (typeof value === "string") return 5 + value.length;
|
|
107
|
+
if (isFunctionValue(value)) {
|
|
108
|
+
const functionValue = toFiniteFunction(value);
|
|
109
|
+
return functionValue.domain.reduce<number>(
|
|
110
|
+
(length, key, index) =>
|
|
111
|
+
length + getFingerprintLength(key) + getFingerprintLength(functionValue.range[index]),
|
|
112
|
+
5,
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
return toFiniteSet(value).elements.reduce<number>(
|
|
116
|
+
(length, element) => length + getFingerprintLength(element),
|
|
117
|
+
5,
|
|
118
|
+
);
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
// The fingerprint after `length` zero bytes, as one table per byte of the fingerprint it shifts.
|
|
122
|
+
const createShiftTable = (length: number) => {
|
|
123
|
+
const table = new Int32Array(8 * 256 * 2);
|
|
124
|
+
for (let bit = 0; bit < 64; bit++) {
|
|
125
|
+
high = bit < 32 ? 0 : 1 << (bit - 32);
|
|
126
|
+
low = bit < 32 ? 1 << bit : 0;
|
|
127
|
+
for (let step = 0; step < length; step++) extendByte(0);
|
|
128
|
+
const position = bit >> 3;
|
|
129
|
+
const mask = 1 << (bit & 7);
|
|
130
|
+
for (let byte = mask; byte < 2 * mask; byte++) {
|
|
131
|
+
const entry = (position * 256 + byte) * 2;
|
|
132
|
+
const rest = (position * 256 + byte - mask) * 2;
|
|
133
|
+
table[entry] = table[rest] ^ high;
|
|
134
|
+
table[entry + 1] = table[rest + 1] ^ low;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return table;
|
|
138
|
+
};
|
|
139
|
+
|
|
140
|
+
// Extending a fingerprint by a byte is linear over GF(2), so extending it by a value's bytes
|
|
141
|
+
// XORs the value's own fingerprint from zero into the fingerprint shifted by their length.
|
|
142
|
+
// The fingerprinter caches each distinct function or set it meets, nested ones included, for one
|
|
143
|
+
// pass over the stored states, as states share most of their values. It reads a state's variables
|
|
144
|
+
// in `order` and writes each fingerprint's low and high words into `words`, an Int32Array over a
|
|
145
|
+
// little-endian BigInt64Array.
|
|
146
|
+
export const createTlcFingerprinter = (order: number[], words: Int32Array) => {
|
|
147
|
+
const shiftTables = new Map<number, Int32Array>();
|
|
148
|
+
const indices = new Map<Value, number>();
|
|
149
|
+
const contributions: number[] = [];
|
|
150
|
+
const getShiftTable = (length: number) => {
|
|
151
|
+
const cached = shiftTables.get(length);
|
|
152
|
+
if (cached) return cached;
|
|
153
|
+
const table = createShiftTable(length);
|
|
154
|
+
shiftTables.set(length, table);
|
|
155
|
+
return table;
|
|
156
|
+
};
|
|
157
|
+
// Extends the fingerprint by a value's bytes and returns how many there are.
|
|
158
|
+
const extendElement = (value: Value): number => {
|
|
159
|
+
if (typeof value !== "object" || isModelValue(value)) {
|
|
160
|
+
extendValue(value);
|
|
161
|
+
return getFingerprintLength(value);
|
|
162
|
+
}
|
|
163
|
+
const contribution = getContribution(value);
|
|
164
|
+
const shifted = { high, low };
|
|
165
|
+
const table = getShiftTable(contributions[contribution]);
|
|
166
|
+
high = contributions[contribution + 1];
|
|
167
|
+
low = contributions[contribution + 2];
|
|
168
|
+
for (let position = 0; position < 8; position++) {
|
|
169
|
+
const word = position < 4 ? shifted.low : shifted.high;
|
|
170
|
+
const entry = (position * 256 + ((word >>> ((position & 3) * 8)) & 0xff)) * 2;
|
|
171
|
+
high ^= table[entry];
|
|
172
|
+
low ^= table[entry + 1];
|
|
173
|
+
}
|
|
174
|
+
return contributions[contribution];
|
|
175
|
+
};
|
|
176
|
+
const getContribution = (value: Value) => {
|
|
177
|
+
const cached = indices.get(value);
|
|
178
|
+
if (cached !== undefined) return cached;
|
|
179
|
+
const outer = { high, low };
|
|
180
|
+
high = 0;
|
|
181
|
+
low = 0;
|
|
182
|
+
const length = { value: 5 };
|
|
183
|
+
if (isFunctionValue(value)) {
|
|
184
|
+
const functionValue = toFiniteFunction(value);
|
|
185
|
+
extendByte(FCN_RCD_VALUE);
|
|
186
|
+
extendInt(functionValue.domain.length);
|
|
187
|
+
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
188
|
+
length.value += extendElement(functionValue.domain[index]);
|
|
189
|
+
length.value += extendElement(functionValue.range[index]);
|
|
190
|
+
}
|
|
191
|
+
} else {
|
|
192
|
+
const elements = toFiniteSet(value).elements;
|
|
193
|
+
extendByte(SET_ENUM_VALUE);
|
|
194
|
+
extendInt(elements.length);
|
|
195
|
+
for (const element of elements) length.value += extendElement(element);
|
|
196
|
+
}
|
|
197
|
+
const contribution = contributions.length;
|
|
198
|
+
indices.set(value, contribution);
|
|
199
|
+
contributions.push(length.value, high, low);
|
|
200
|
+
high = outer.high;
|
|
201
|
+
low = outer.low;
|
|
202
|
+
return contribution;
|
|
203
|
+
};
|
|
204
|
+
return (state: Value[], position: number) => {
|
|
205
|
+
const outer = { high, low };
|
|
206
|
+
high = INITIAL_HIGH;
|
|
207
|
+
low = INITIAL_LOW;
|
|
208
|
+
for (const index of order) extendElement(state[index]);
|
|
209
|
+
words[2 * position] = low;
|
|
210
|
+
words[2 * position + 1] = high;
|
|
211
|
+
high = outer.high;
|
|
212
|
+
low = outer.low;
|
|
213
|
+
};
|
|
214
|
+
};
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
getErrorExitCode,
|
|
3
|
+
STACK_OVERFLOW_MESSAGE,
|
|
4
|
+
TlaEvaluationError,
|
|
5
|
+
TlaModuleError,
|
|
6
|
+
UNEXPECTED_EVAL_EXCEPTION,
|
|
7
|
+
UNEXPECTED_EXCEPTION,
|
|
8
|
+
} from "../errors";
|
|
9
|
+
import { setExitCode } from "../exit-codes";
|
|
10
|
+
import type { TlcVersion } from "./version";
|
|
3
11
|
|
|
4
12
|
// TLC's codes for the messages it prints, from tlc2.output.EC.
|
|
5
13
|
export const MESSAGE_CODE = {
|
|
@@ -312,18 +320,122 @@ export const formatNestedMessage = (text: string, isTool: boolean): string => {
|
|
|
312
320
|
: `@!@!@STARTMSG ${code}:${MESSAGE_LEVEL.none} @!@!@\n${formatInnerMessage(code, text, isTool)}\n@!@!@ENDMSG ${code} @!@!@`;
|
|
313
321
|
};
|
|
314
322
|
|
|
315
|
-
const
|
|
323
|
+
const zeroPad = (value: number) => String(value).padStart(2, "0");
|
|
316
324
|
|
|
317
325
|
// TLC's convertRuntimeToHumanReadable: a duration in its two largest units.
|
|
318
326
|
export const formatTlcDuration = (milliseconds: number) => {
|
|
319
327
|
const seconds = Math.floor(milliseconds / 1000) % 60;
|
|
320
328
|
const minutes = Math.floor(milliseconds / 60_000) % 60;
|
|
321
329
|
const hours = Math.floor(milliseconds / 3_600_000);
|
|
322
|
-
if (milliseconds > 86_400_000) return `${Math.floor(hours / 24)}d ${
|
|
323
|
-
if (milliseconds > 3_600_000) return `${
|
|
324
|
-
return milliseconds > 60_000
|
|
330
|
+
if (milliseconds > 86_400_000) return `${Math.floor(hours / 24)}d ${zeroPad(hours % 24)}h`;
|
|
331
|
+
if (milliseconds > 3_600_000) return `${zeroPad(hours % 24)}h ${zeroPad(minutes)}min`;
|
|
332
|
+
return milliseconds > 60_000
|
|
333
|
+
? `${zeroPad(minutes)}min ${zeroPad(seconds)}s`
|
|
334
|
+
: `${zeroPad(seconds)}s`;
|
|
325
335
|
};
|
|
326
336
|
|
|
327
337
|
// TLC's SimpleDateFormat("yyyy-MM-dd HH:mm:ss") in the local time zone.
|
|
328
338
|
export const formatTlcDate = (date: Date) =>
|
|
329
|
-
`${date.getFullYear()}-${
|
|
339
|
+
`${date.getFullYear()}-${zeroPad(date.getMonth() + 1)}-${zeroPad(date.getDate())} ${zeroPad(date.getHours())}:${zeroPad(date.getMinutes())}:${zeroPad(date.getSeconds())}`;
|
|
340
|
+
|
|
341
|
+
// An error that TLC reports with a message of its own, by that message's code and first line, and
|
|
342
|
+
// the error whose message follows.
|
|
343
|
+
interface HeadedError {
|
|
344
|
+
code: number;
|
|
345
|
+
headline: string;
|
|
346
|
+
inner: TlaEvaluationError;
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
const headedErrors = new WeakMap<Error, HeadedError>();
|
|
350
|
+
|
|
351
|
+
export const withHeadline = (error: unknown, code: number, headline: string) => {
|
|
352
|
+
if (!(error instanceof TlaEvaluationError)) return error;
|
|
353
|
+
const headed = setExitCode(
|
|
354
|
+
new TlaEvaluationError(`${headline}\n${error.message}`, error),
|
|
355
|
+
getErrorExitCode(error),
|
|
356
|
+
);
|
|
357
|
+
headedErrors.set(headed, { code, headline, inner: error });
|
|
358
|
+
return headed;
|
|
359
|
+
};
|
|
360
|
+
|
|
361
|
+
export const isHeadedError = (error: Error) => headedErrors.has(error);
|
|
362
|
+
|
|
363
|
+
const UNEXPECTED_HEADLINE = UNEXPECTED_EXCEPTION.slice(0, UNEXPECTED_EXCEPTION.indexOf("\n"));
|
|
364
|
+
|
|
365
|
+
// TLC 1.7.4's Worker wraps an error in adding a successor in a RuntimeException, whose message
|
|
366
|
+
// names the class of the error.
|
|
367
|
+
const WRAPPED_EVAL_EXCEPTION = `${UNEXPECTED_EXCEPTION}tlc2.tool.EvalException: `;
|
|
368
|
+
const WRAPPED_RUNTIME_EXCEPTION = `${UNEXPECTED_EXCEPTION}util.Assert$TLCRuntimeException: `;
|
|
369
|
+
|
|
370
|
+
export const getWrappedException = (error: TlaEvaluationError) =>
|
|
371
|
+
isEvalException(error) ? WRAPPED_EVAL_EXCEPTION : WRAPPED_RUNTIME_EXCEPTION;
|
|
372
|
+
|
|
373
|
+
// TLC reports an EvalException, or a TLCRuntimeException without a message of its own, as an
|
|
374
|
+
// exception it didn't expect.
|
|
375
|
+
export const withUnexpectedException = <Result>(compute: () => Result) => {
|
|
376
|
+
try {
|
|
377
|
+
return compute();
|
|
378
|
+
} catch (error) {
|
|
379
|
+
if (!(error instanceof TlaEvaluationError)) throw error;
|
|
380
|
+
if (isEvalException(error)) {
|
|
381
|
+
throw new TlaEvaluationError(`${UNEXPECTED_EVAL_EXCEPTION}${error.message}`);
|
|
382
|
+
}
|
|
383
|
+
if (getCodedMessage(error.message)) throw error;
|
|
384
|
+
throw new TlaEvaluationError(`${UNEXPECTED_EXCEPTION}${error.message}`);
|
|
385
|
+
}
|
|
386
|
+
};
|
|
387
|
+
|
|
388
|
+
const UNEXPECTED_EXCEPTION_PREFIXES = [
|
|
389
|
+
WRAPPED_EVAL_EXCEPTION,
|
|
390
|
+
WRAPPED_RUNTIME_EXCEPTION,
|
|
391
|
+
UNEXPECTED_EXCEPTION,
|
|
392
|
+
UNEXPECTED_EVAL_EXCEPTION,
|
|
393
|
+
];
|
|
394
|
+
|
|
395
|
+
// The text of an error's message, with the message of a coded error inside it marked in -tool
|
|
396
|
+
// output as TLC marks it.
|
|
397
|
+
const formatErrorMessage = (error: TlaEvaluationError, isTool: boolean): string => {
|
|
398
|
+
const headed = headedErrors.get(error);
|
|
399
|
+
if (headed) return `${headed.headline}\n${formatErrorMessage(headed.inner, isTool)}`;
|
|
400
|
+
const message = error.message;
|
|
401
|
+
const prefix = UNEXPECTED_EXCEPTION_PREFIXES.find((start) => message.startsWith(start)) ?? "";
|
|
402
|
+
return `${prefix}${formatNestedMessage(message.slice(prefix.length), isTool)}`;
|
|
403
|
+
};
|
|
404
|
+
|
|
405
|
+
// How TLC reports an error: with the code of its own message for an error that it reports with a
|
|
406
|
+
// headline; and, when the error escapes the computation of next states, with the code of an
|
|
407
|
+
// EvalException, or as an unexpected exception for any other error.
|
|
408
|
+
export interface FailureMessage {
|
|
409
|
+
code: number;
|
|
410
|
+
message: string;
|
|
411
|
+
toolMessage: string;
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
export const getFailureMessage = (
|
|
415
|
+
error: TlaEvaluationError,
|
|
416
|
+
isNextState: boolean,
|
|
417
|
+
): FailureMessage => {
|
|
418
|
+
const headed = headedErrors.get(error);
|
|
419
|
+
const message = error.message;
|
|
420
|
+
if (headed) {
|
|
421
|
+
return {
|
|
422
|
+
code: headed.code,
|
|
423
|
+
message,
|
|
424
|
+
toolMessage: formatErrorMessage(error, true),
|
|
425
|
+
};
|
|
426
|
+
}
|
|
427
|
+
if (isNextState && isEvalException(error)) {
|
|
428
|
+
return {
|
|
429
|
+
code: getCodedMessage(message)?.code ?? MESSAGE_CODE.general,
|
|
430
|
+
message,
|
|
431
|
+
toolMessage: message,
|
|
432
|
+
};
|
|
433
|
+
}
|
|
434
|
+
const isUnexpected = isNextState && !message.startsWith(UNEXPECTED_HEADLINE);
|
|
435
|
+
const prefix = isUnexpected ? UNEXPECTED_EXCEPTION : "";
|
|
436
|
+
return {
|
|
437
|
+
code: MESSAGE_CODE.general,
|
|
438
|
+
message: `${prefix}${message}`,
|
|
439
|
+
toolMessage: `${prefix}${formatErrorMessage(error, true)}`,
|
|
440
|
+
};
|
|
441
|
+
};
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// TLC orders strings and model values by when it first interned their text, and compares a
|
|
2
2
|
// state's variables in the order of SANY's symbol table. This reproduces both orders.
|
|
3
|
-
import type { Module, SourceLocation } from "
|
|
4
|
-
import type { ConfigValue, ModelConfig } from "
|
|
5
|
-
import { createMissingModuleError } from "
|
|
6
|
-
import { tokenize, type Token } from "
|
|
7
|
-
import { extractModule, parseModule } from "
|
|
8
|
-
import { isBefore } from "
|
|
3
|
+
import type { Module, SourceLocation } from "../ast";
|
|
4
|
+
import type { ConfigValue, ModelConfig } from "../config";
|
|
5
|
+
import { createMissingModuleError } from "../errors";
|
|
6
|
+
import { tokenize, type Token } from "../lexer";
|
|
7
|
+
import { extractModule, parseModule } from "../parser";
|
|
8
|
+
import { isBefore } from "../resolve";
|
|
9
9
|
import {
|
|
10
10
|
SANY_BUILTINS,
|
|
11
11
|
SANY_NODE_NAMES,
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
TLC_RUNTIME_STRINGS,
|
|
15
15
|
TLC_STARTUP_STRINGS,
|
|
16
16
|
USER_STANDARD_MODULES,
|
|
17
|
-
} from "./
|
|
17
|
+
} from "./jar-data";
|
|
18
18
|
|
|
19
19
|
type SymbolKind = "builtin" | "constant" | "variable" | "definition" | "theorem" | "module";
|
|
20
20
|
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
import { TlaEvaluationError } from "
|
|
2
|
-
import type { TlcVersion } from "./
|
|
1
|
+
import { TlaEvaluationError } from "../errors";
|
|
2
|
+
import type { TlcVersion } from "./version";
|
|
3
3
|
import {
|
|
4
4
|
createRecord,
|
|
5
5
|
createSortedFunction,
|
|
6
6
|
createTuple,
|
|
7
7
|
getFunctionDomain,
|
|
8
|
-
getStringRank,
|
|
9
8
|
isEmptySet,
|
|
10
|
-
isFunctionValue,
|
|
11
|
-
isModelValue,
|
|
12
|
-
toFiniteFunction,
|
|
13
9
|
toFiniteSet,
|
|
14
10
|
type Value,
|
|
15
|
-
} from "
|
|
11
|
+
} from "../values";
|
|
16
12
|
|
|
17
13
|
export interface JavaRandom {
|
|
18
14
|
setSeed: (seed: bigint) => void;
|
|
@@ -50,189 +46,6 @@ export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
|
50
46
|
};
|
|
51
47
|
};
|
|
52
48
|
|
|
53
|
-
// FP64 with TLC's first irreducible polynomial, FP64.Polys[0], which `-fp 0` selects.
|
|
54
|
-
const IRREDUCIBLE_POLYNOMIAL = 0x911498ae0e66bad6n;
|
|
55
|
-
|
|
56
|
-
const BYTE_MOD_TABLE = (() => {
|
|
57
|
-
const powers: bigint[] = [];
|
|
58
|
-
for (let power = 1n << 63n; powers.length < 72;) {
|
|
59
|
-
powers.push(power);
|
|
60
|
-
power = (power >> 1n) ^ ((power & 1n) === 0n ? 0n : IRREDUCIBLE_POLYNOMIAL);
|
|
61
|
-
}
|
|
62
|
-
return Array.from({ length: 256 }, (_, byte) =>
|
|
63
|
-
powers
|
|
64
|
-
.slice(64, 72)
|
|
65
|
-
.reverse()
|
|
66
|
-
.reduce((value, power, bit) => ((byte >> bit) & 1 ? value ^ power : value), 0n),
|
|
67
|
-
);
|
|
68
|
-
})();
|
|
69
|
-
|
|
70
|
-
const BYTE_MOD_HIGH = Int32Array.from(BYTE_MOD_TABLE, (entry) =>
|
|
71
|
-
Number(BigInt.asIntN(32, entry >> 32n)),
|
|
72
|
-
);
|
|
73
|
-
const BYTE_MOD_LOW = Int32Array.from(BYTE_MOD_TABLE, (entry) => Number(BigInt.asIntN(32, entry)));
|
|
74
|
-
|
|
75
|
-
// The fingerprint being extended, as its high and low 32 bits, which avoids a BigInt operation
|
|
76
|
-
// for every byte.
|
|
77
|
-
const INITIAL_HIGH = Number(BigInt.asIntN(32, IRREDUCIBLE_POLYNOMIAL >> 32n));
|
|
78
|
-
const INITIAL_LOW = Number(BigInt.asIntN(32, IRREDUCIBLE_POLYNOMIAL));
|
|
79
|
-
let high = INITIAL_HIGH;
|
|
80
|
-
let low = INITIAL_LOW;
|
|
81
|
-
|
|
82
|
-
const extendByte = (byte: number) => {
|
|
83
|
-
const index = (byte ^ low) & 0xff;
|
|
84
|
-
low = ((low >>> 8) | (high << 24)) ^ BYTE_MOD_LOW[index];
|
|
85
|
-
high = (high >>> 8) ^ BYTE_MOD_HIGH[index];
|
|
86
|
-
};
|
|
87
|
-
|
|
88
|
-
const extendInt = (value: number) => {
|
|
89
|
-
for (let shift = 0; shift < 32; shift += 8) extendByte(value >>> shift);
|
|
90
|
-
};
|
|
91
|
-
|
|
92
|
-
const BOOL_VALUE = 0;
|
|
93
|
-
const INT_VALUE = 1;
|
|
94
|
-
const STRING_VALUE = 3;
|
|
95
|
-
const SET_ENUM_VALUE = 5;
|
|
96
|
-
const FCN_RCD_VALUE = 9;
|
|
97
|
-
const MODEL_VALUE = 21;
|
|
98
|
-
|
|
99
|
-
// Value#fingerPrint for each of TLC's value classes. A model value extends the fingerprint with
|
|
100
|
-
// its UniqueString token, and TLC numbers tokens from 1 in intern order.
|
|
101
|
-
const extendValue = (value: Value) => {
|
|
102
|
-
if (typeof value === "boolean") {
|
|
103
|
-
extendByte(BOOL_VALUE);
|
|
104
|
-
extendByte(value ? 116 : 102);
|
|
105
|
-
} else if (typeof value === "number") {
|
|
106
|
-
extendByte(INT_VALUE);
|
|
107
|
-
extendInt(value);
|
|
108
|
-
} else if (typeof value === "string") {
|
|
109
|
-
extendByte(STRING_VALUE);
|
|
110
|
-
extendInt(value.length);
|
|
111
|
-
for (let index = 0; index < value.length; index++) {
|
|
112
|
-
extendByte(value.charCodeAt(index));
|
|
113
|
-
}
|
|
114
|
-
} else if (isModelValue(value)) {
|
|
115
|
-
extendByte(MODEL_VALUE);
|
|
116
|
-
extendInt(getStringRank(value.name) + 1);
|
|
117
|
-
} else if (isFunctionValue(value)) {
|
|
118
|
-
const functionValue = toFiniteFunction(value);
|
|
119
|
-
extendByte(FCN_RCD_VALUE);
|
|
120
|
-
extendInt(functionValue.domain.length);
|
|
121
|
-
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
122
|
-
extendValue(functionValue.domain[index]);
|
|
123
|
-
extendValue(functionValue.range[index]);
|
|
124
|
-
}
|
|
125
|
-
} else {
|
|
126
|
-
const elements = toFiniteSet(value).elements;
|
|
127
|
-
extendByte(SET_ENUM_VALUE);
|
|
128
|
-
extendInt(elements.length);
|
|
129
|
-
for (const element of elements) extendValue(element);
|
|
130
|
-
}
|
|
131
|
-
};
|
|
132
|
-
|
|
133
|
-
// TLCStateMut#fingerPrint of variable values in TLC's variable order. Evaluating a lazy value can
|
|
134
|
-
// fingerprint another, so this restores the fingerprint it interrupts.
|
|
135
|
-
export const getTlcFingerprint = (state: Value[]) => {
|
|
136
|
-
const outer = { high, low };
|
|
137
|
-
high = INITIAL_HIGH;
|
|
138
|
-
low = INITIAL_LOW;
|
|
139
|
-
for (const value of state) extendValue(value);
|
|
140
|
-
const fingerprint = (BigInt(high >>> 0) << 32n) | BigInt(low >>> 0);
|
|
141
|
-
high = outer.high;
|
|
142
|
-
low = outer.low;
|
|
143
|
-
return fingerprint;
|
|
144
|
-
};
|
|
145
|
-
|
|
146
|
-
const getFingerprintLength = (value: Value): number => {
|
|
147
|
-
if (typeof value === "boolean") return 2;
|
|
148
|
-
if (typeof value === "number" || isModelValue(value)) return 5;
|
|
149
|
-
if (typeof value === "string") return 5 + value.length;
|
|
150
|
-
if (isFunctionValue(value)) {
|
|
151
|
-
const functionValue = toFiniteFunction(value);
|
|
152
|
-
return functionValue.domain.reduce<number>(
|
|
153
|
-
(length, key, index) =>
|
|
154
|
-
length + getFingerprintLength(key) + getFingerprintLength(functionValue.range[index]),
|
|
155
|
-
5,
|
|
156
|
-
);
|
|
157
|
-
}
|
|
158
|
-
return toFiniteSet(value).elements.reduce<number>(
|
|
159
|
-
(length, element) => length + getFingerprintLength(element),
|
|
160
|
-
5,
|
|
161
|
-
);
|
|
162
|
-
};
|
|
163
|
-
|
|
164
|
-
// The fingerprint after `length` zero bytes, as one table per byte of the fingerprint it shifts.
|
|
165
|
-
const createShiftTable = (length: number) => {
|
|
166
|
-
const table = new Int32Array(8 * 256 * 2);
|
|
167
|
-
for (let bit = 0; bit < 64; bit++) {
|
|
168
|
-
high = bit < 32 ? 0 : 1 << (bit - 32);
|
|
169
|
-
low = bit < 32 ? 1 << bit : 0;
|
|
170
|
-
for (let step = 0; step < length; step++) extendByte(0);
|
|
171
|
-
const position = bit >> 3;
|
|
172
|
-
const mask = 1 << (bit & 7);
|
|
173
|
-
for (let byte = mask; byte < 2 * mask; byte++) {
|
|
174
|
-
const entry = (position * 256 + byte) * 2;
|
|
175
|
-
const rest = (position * 256 + byte - mask) * 2;
|
|
176
|
-
table[entry] = table[rest] ^ high;
|
|
177
|
-
table[entry + 1] = table[rest + 1] ^ low;
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
return table;
|
|
181
|
-
};
|
|
182
|
-
|
|
183
|
-
// Extending a fingerprint by a byte is linear over GF(2), so extending it by a value's bytes
|
|
184
|
-
// XORs the value's own fingerprint from zero into the fingerprint shifted by their length.
|
|
185
|
-
// The fingerprinter caches each distinct variable value for one pass over the stored states. It
|
|
186
|
-
// reads a state's variables in `order` and writes each fingerprint's low and high words into
|
|
187
|
-
// `words`, an Int32Array over a little-endian BigInt64Array.
|
|
188
|
-
export const createTlcFingerprinter = (order: number[], words: Int32Array) => {
|
|
189
|
-
const shiftTables = new Map<number, Int32Array>();
|
|
190
|
-
const indices = new Map<Value, number>();
|
|
191
|
-
const contributions: number[] = [];
|
|
192
|
-
const getContribution = (value: Value) => {
|
|
193
|
-
const cached = indices.get(value);
|
|
194
|
-
if (cached !== undefined) return cached;
|
|
195
|
-
const length = getFingerprintLength(value);
|
|
196
|
-
high = 0;
|
|
197
|
-
low = 0;
|
|
198
|
-
extendValue(value);
|
|
199
|
-
indices.set(value, contributions.length);
|
|
200
|
-
contributions.push(length, high, low);
|
|
201
|
-
return contributions.length - 3;
|
|
202
|
-
};
|
|
203
|
-
const getShiftTable = (length: number) => {
|
|
204
|
-
const cached = shiftTables.get(length);
|
|
205
|
-
if (cached) return cached;
|
|
206
|
-
const table = createShiftTable(length);
|
|
207
|
-
shiftTables.set(length, table);
|
|
208
|
-
return table;
|
|
209
|
-
};
|
|
210
|
-
return (state: Value[], position: number) => {
|
|
211
|
-
const outer = { high, low };
|
|
212
|
-
const fingerprint = { high: INITIAL_HIGH, low: INITIAL_LOW };
|
|
213
|
-
for (const index of order) {
|
|
214
|
-
const contribution = getContribution(state[index]);
|
|
215
|
-
const table = getShiftTable(contributions[contribution]);
|
|
216
|
-
const extended = {
|
|
217
|
-
high: contributions[contribution + 1],
|
|
218
|
-
low: contributions[contribution + 2],
|
|
219
|
-
};
|
|
220
|
-
for (let position = 0; position < 8; position++) {
|
|
221
|
-
const word = position < 4 ? fingerprint.low : fingerprint.high;
|
|
222
|
-
const entry = (position * 256 + ((word >>> ((position & 3) * 8)) & 0xff)) * 2;
|
|
223
|
-
extended.high ^= table[entry];
|
|
224
|
-
extended.low ^= table[entry + 1];
|
|
225
|
-
}
|
|
226
|
-
fingerprint.high = extended.high;
|
|
227
|
-
fingerprint.low = extended.low;
|
|
228
|
-
}
|
|
229
|
-
high = outer.high;
|
|
230
|
-
low = outer.low;
|
|
231
|
-
words[2 * position] = fingerprint.low;
|
|
232
|
-
words[2 * position + 1] = fingerprint.high;
|
|
233
|
-
};
|
|
234
|
-
};
|
|
235
|
-
|
|
236
49
|
// RandomGenerator.primes holds the 1341 consecutive primes from 1277011 to 1295953.
|
|
237
50
|
const PRIMES: number[] = [];
|
|
238
51
|
|