tla-ts 0.0.4-dev.6dec595 → 0.0.4-dev.7714e32
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 +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 -1154
- 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} +112 -718
- 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 +109 -108
- 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 +16 -19
- 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 -213
- 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/transfer.ts +32 -32
- package/src/values.ts +80 -70
- 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/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/spec-description.ts
CHANGED
|
@@ -21,10 +21,10 @@ import {
|
|
|
21
21
|
type Environment,
|
|
22
22
|
type Scope,
|
|
23
23
|
} from "./evaluate";
|
|
24
|
-
import { TEMPORAL_LEVEL } from "./levels";
|
|
24
|
+
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
25
25
|
import { getLevel } from "./liveness";
|
|
26
26
|
import { createRecord, createSet, createTuple, formatValue, type Value } from "./values";
|
|
27
|
-
import type { TlcVersion } from "./tlc
|
|
27
|
+
import type { TlcVersion } from "./tlc/version";
|
|
28
28
|
|
|
29
29
|
export interface SpecAction {
|
|
30
30
|
name: string;
|
|
@@ -178,7 +178,9 @@ const getInstanceActions = (
|
|
|
178
178
|
if (!called || args.length === 0) {
|
|
179
179
|
return [{ ...instanceAction, parameters: [], expression, scope }];
|
|
180
180
|
}
|
|
181
|
-
if (args.some((arg) => getLevel(arg, scope, environment) !==
|
|
181
|
+
if (args.some((arg) => getLevel(arg, scope, environment) !== CONSTANT_LEVEL)) {
|
|
182
|
+
return callAction();
|
|
183
|
+
}
|
|
182
184
|
return tryCollect(
|
|
183
185
|
() => [
|
|
184
186
|
{
|
|
@@ -259,7 +261,9 @@ const getActions = (
|
|
|
259
261
|
{ name: calledName, location: expression.location, parameters: [], expression, scope },
|
|
260
262
|
];
|
|
261
263
|
if (isConstantDefinition(called, environment)) return callAction();
|
|
262
|
-
if (args.some((arg) => getLevel(arg, scope, environment) !==
|
|
264
|
+
if (args.some((arg) => getLevel(arg, scope, environment) !== CONSTANT_LEVEL)) {
|
|
265
|
+
return callAction();
|
|
266
|
+
}
|
|
263
267
|
return tryCollect(() => {
|
|
264
268
|
const boundScope = args.reduce<Scope | undefined>(
|
|
265
269
|
(current, arg, index) => ({
|
|
@@ -306,7 +310,7 @@ const describeSpecification = (
|
|
|
306
310
|
const called = resolveClosure(expression, scope, environment);
|
|
307
311
|
if (called && isConstantDefinition(called, environment)) return;
|
|
308
312
|
if (called && called.params.length === 0) {
|
|
309
|
-
if (getLevel(called.body, called.scope, environment) ===
|
|
313
|
+
if (getLevel(called.body, called.scope, environment) === VARIABLE_LEVEL) {
|
|
310
314
|
description.inits.push(createAction(called.name, called.body));
|
|
311
315
|
return;
|
|
312
316
|
}
|
|
@@ -333,7 +337,7 @@ const describeSpecification = (
|
|
|
333
337
|
return;
|
|
334
338
|
}
|
|
335
339
|
const level = getLevel(expression, scope, environment);
|
|
336
|
-
if (level <=
|
|
340
|
+
if (level <= VARIABLE_LEVEL) description.inits.push(createAction(UNNAMED_ACTION, expression));
|
|
337
341
|
else if (level === TEMPORAL_LEVEL) {
|
|
338
342
|
description.temporals.push(createAction(UNNAMED_ACTION, expression));
|
|
339
343
|
}
|
|
@@ -392,7 +396,7 @@ const describeProperty = (
|
|
|
392
396
|
const inner = expression.expression;
|
|
393
397
|
if (inner.kind === "BoxAction") {
|
|
394
398
|
description.impliedActions.push(createAction(configName, inner));
|
|
395
|
-
} else if (getLevel(inner, scope, environment) <
|
|
399
|
+
} else if (getLevel(inner, scope, environment) < ACTION_LEVEL) {
|
|
396
400
|
description.invariants.push(createAction(configName, inner));
|
|
397
401
|
} else {
|
|
398
402
|
description.impliedTemporals.push(createAction(configName, expression));
|
|
@@ -400,8 +404,9 @@ const describeProperty = (
|
|
|
400
404
|
return;
|
|
401
405
|
}
|
|
402
406
|
const level = getLevel(expression, scope, environment);
|
|
403
|
-
if (level <=
|
|
404
|
-
|
|
407
|
+
if (level <= VARIABLE_LEVEL) {
|
|
408
|
+
description.impliedInits.push(createAction(configName, expression));
|
|
409
|
+
} else if (level === TEMPORAL_LEVEL) {
|
|
405
410
|
description.impliedTemporals.push(createAction(configName, expression));
|
|
406
411
|
}
|
|
407
412
|
};
|
|
@@ -413,13 +418,7 @@ const getOperatorDefinition = (name: string, environment: Environment) => {
|
|
|
413
418
|
: undefined;
|
|
414
419
|
};
|
|
415
420
|
|
|
416
|
-
const
|
|
417
|
-
createRecord([
|
|
418
|
-
["name", definition.name],
|
|
419
|
-
["location", toLocationValue(definition.location)],
|
|
420
|
-
]);
|
|
421
|
-
|
|
422
|
-
const describe = (
|
|
421
|
+
const getSpecDescription = (
|
|
423
422
|
config: ModelConfig,
|
|
424
423
|
environment: Environment,
|
|
425
424
|
instanceActions: Map<string, InstanceAction>,
|
|
@@ -478,14 +477,14 @@ export const getInitActions = (
|
|
|
478
477
|
config: ModelConfig,
|
|
479
478
|
environment: Environment,
|
|
480
479
|
instanceActions: Map<string, InstanceAction>,
|
|
481
|
-
) =>
|
|
480
|
+
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
482
481
|
|
|
483
482
|
// TLC's split of the next-state relation into the actions it names in a behavior.
|
|
484
483
|
export const getNextActions = (
|
|
485
484
|
config: ModelConfig,
|
|
486
485
|
environment: Environment,
|
|
487
486
|
instanceActions: Map<string, InstanceAction>,
|
|
488
|
-
) =>
|
|
487
|
+
) => getSpecDescription(config, environment, instanceActions).actions;
|
|
489
488
|
|
|
490
489
|
const formatParameters = (action: SpecAction) =>
|
|
491
490
|
action.parameters.length === 0
|
|
@@ -506,13 +505,20 @@ export const getSpecificationValue = (
|
|
|
506
505
|
variableLocations: SourceLocation[],
|
|
507
506
|
instanceActions: Map<string, InstanceAction>,
|
|
508
507
|
): Value => {
|
|
509
|
-
const description =
|
|
508
|
+
const description = getSpecDescription(config, environment, instanceActions);
|
|
510
509
|
const toSet = (actions: SpecAction[]) => createSet(actions.map(toActionValue));
|
|
511
510
|
const toDefinitionSet = (names: string[]) =>
|
|
512
511
|
createSet(
|
|
513
512
|
names.flatMap((name) => {
|
|
514
513
|
const definition = getOperatorDefinition(name, environment);
|
|
515
|
-
return definition
|
|
514
|
+
return definition
|
|
515
|
+
? [
|
|
516
|
+
createRecord([
|
|
517
|
+
["name", definition.name],
|
|
518
|
+
["location", toLocationValue(definition.location)],
|
|
519
|
+
]),
|
|
520
|
+
]
|
|
521
|
+
: [];
|
|
516
522
|
}),
|
|
517
523
|
);
|
|
518
524
|
return createRecord([
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
import type { SourceRange } from "./ast";
|
|
1
2
|
import type { OperatorLevels } from "./levels";
|
|
2
3
|
|
|
4
|
+
// SANY's view of the dummy definitions in tla2sany/StandardModules of the operators that tla-ts
|
|
5
|
+
// implements natively: the levels it computes for them, and where it reports them when a spec
|
|
6
|
+
// defines one again.
|
|
7
|
+
|
|
3
8
|
type Signature =
|
|
4
9
|
| [string, number, number[], number[], number[]]
|
|
5
10
|
| [string, number, number[], number[], number[], number[][], string[]];
|
|
6
11
|
|
|
7
|
-
// The levels SANY computes for the dummy definitions in tla2sany/StandardModules of the operators
|
|
8
|
-
// that tla-ts implements natively.
|
|
9
12
|
const SIGNATURES: Signature[] = [
|
|
10
13
|
["Nat", 0, [], [], []],
|
|
11
14
|
["+", 0, [0, 0], [2, 2], [1, 1]],
|
|
@@ -103,3 +106,116 @@ export const STANDARD_LEVELS = new Map(
|
|
|
103
106
|
},
|
|
104
107
|
]),
|
|
105
108
|
);
|
|
109
|
+
|
|
110
|
+
const RANGES: Record<string, Record<string, [number, number, number, number]>> = {
|
|
111
|
+
Naturals: {
|
|
112
|
+
Nat: [14, 1, 14, 16],
|
|
113
|
+
"+": [15, 1, 15, 19],
|
|
114
|
+
"-": [17, 1, 17, 33],
|
|
115
|
+
"*": [18, 1, 18, 17],
|
|
116
|
+
"^": [19, 1, 19, 19],
|
|
117
|
+
"<": [20, 1, 20, 19],
|
|
118
|
+
">": [21, 1, 21, 19],
|
|
119
|
+
"<=": [22, 1, 22, 19],
|
|
120
|
+
">=": [23, 1, 23, 19],
|
|
121
|
+
"%": [33, 1, 33, 20],
|
|
122
|
+
"\\div": [34, 1, 34, 20],
|
|
123
|
+
"..": [35, 1, 35, 20],
|
|
124
|
+
},
|
|
125
|
+
Integers: {
|
|
126
|
+
Int: [18, 1, 18, 12],
|
|
127
|
+
"-.": [22, 1, 22, 13],
|
|
128
|
+
},
|
|
129
|
+
Sequences: {
|
|
130
|
+
Seq: [20, 1, 20, 41],
|
|
131
|
+
Len: [25, 1, 25, 44],
|
|
132
|
+
"\\o": [30, 1, 31, 76],
|
|
133
|
+
Append: [36, 1, 36, 26],
|
|
134
|
+
Head: [41, 1, 41, 15],
|
|
135
|
+
Tail: [42, 1, 42, 61],
|
|
136
|
+
SubSeq: [48, 1, 48, 50],
|
|
137
|
+
SelectSeq: [53, 1, 65, 14],
|
|
138
|
+
},
|
|
139
|
+
FiniteSets: {
|
|
140
|
+
IsFiniteSet: [14, 1, 19, 68],
|
|
141
|
+
Cardinality: [21, 1, 27, 11],
|
|
142
|
+
},
|
|
143
|
+
Bags: {
|
|
144
|
+
IsABag: [20, 1, 24, 41],
|
|
145
|
+
BagToSet: [26, 1, 26, 23],
|
|
146
|
+
SetToBag: [31, 1, 31, 30],
|
|
147
|
+
BagIn: [36, 1, 36, 31],
|
|
148
|
+
EmptyBag: [41, 1, 41, 24],
|
|
149
|
+
"\\oplus": [43, 1, 49, 46],
|
|
150
|
+
"\\ominus": [51, 1, 60, 50],
|
|
151
|
+
BagUnion: [74, 1, 79, 58],
|
|
152
|
+
"\\sqsubseteq": [81, 1, 87, 42],
|
|
153
|
+
SubBag: [89, 1, 110, 11],
|
|
154
|
+
BagOfAll: [122, 1, 130, 66],
|
|
155
|
+
BagCardinality: [132, 1, 138, 8],
|
|
156
|
+
CopiesIn: [140, 1, 145, 33],
|
|
157
|
+
},
|
|
158
|
+
TLC: {
|
|
159
|
+
Print: [17, 1, 17, 22],
|
|
160
|
+
PrintT: [18, 1, 18, 19],
|
|
161
|
+
Assert: [24, 1, 25, 54],
|
|
162
|
+
JavaTime: [26, 1, 26, 32],
|
|
163
|
+
TLCGet: [75, 1, 75, 28],
|
|
164
|
+
TLCSet: [76, 1, 76, 20],
|
|
165
|
+
":>": [78, 1, 78, 27],
|
|
166
|
+
"@@": [79, 1, 80, 50],
|
|
167
|
+
Permutations: [81, 1, 82, 54],
|
|
168
|
+
SortSeq: [88, 1, 92, 40],
|
|
169
|
+
RandomElement: [110, 1, 110, 41],
|
|
170
|
+
Any: [119, 1, 119, 22],
|
|
171
|
+
ToString: [121, 1, 121, 58],
|
|
172
|
+
TLCEval: [145, 1, 145, 15],
|
|
173
|
+
},
|
|
174
|
+
TLCExt: {
|
|
175
|
+
AssertEq: [14, 1, 20, 14],
|
|
176
|
+
AssertError: [23, 1, 26, 72],
|
|
177
|
+
TLCGetOrDefault: [30, 1, 31, 17],
|
|
178
|
+
TLCGetAndSet: [33, 1, 35, 57],
|
|
179
|
+
Trace: [41, 1, 57, 6],
|
|
180
|
+
CounterExample: [61, 1, 75, 8],
|
|
181
|
+
ToTrace: [77, 1, 87, 12],
|
|
182
|
+
TLCModelValue: [91, 1, 120, 29],
|
|
183
|
+
TLCDefer: [122, 1, 134, 6],
|
|
184
|
+
TLCNoOp: [138, 1, 145, 5],
|
|
185
|
+
PickSuccessor: [148, 1, 162, 37],
|
|
186
|
+
TLCCache: [166, 1, 173, 12],
|
|
187
|
+
TLCFP: [175, 1, 181, 24],
|
|
188
|
+
TLCEvalDefinition: [185, 1, 190, 6],
|
|
189
|
+
},
|
|
190
|
+
Randomization: {
|
|
191
|
+
RandomSubset: [30, 1, 30, 64],
|
|
192
|
+
RandomSetOfSubsets: [48, 1, 49, 67],
|
|
193
|
+
TestRandomSetOfSubsets: [61, 1, 62, 71],
|
|
194
|
+
},
|
|
195
|
+
Json: {
|
|
196
|
+
ToJson: [46, 1, 55, 37],
|
|
197
|
+
ToJsonArray: [57, 1, 64, 42],
|
|
198
|
+
ToJsonObject: [66, 1, 73, 43],
|
|
199
|
+
JsonSerialize: [75, 1, 80, 6],
|
|
200
|
+
JsonDeserialize: [82, 1, 87, 19],
|
|
201
|
+
ndJsonSerialize: [89, 1, 95, 6],
|
|
202
|
+
ndJsonDeserialize: [97, 1, 103, 19],
|
|
203
|
+
},
|
|
204
|
+
_Possible: {
|
|
205
|
+
_Track: [10, 1, 17, 38],
|
|
206
|
+
_Counts: [24, 1, 30, 14],
|
|
207
|
+
_CheckName: [32, 1, 35, 35],
|
|
208
|
+
_PrintCounts: [37, 1, 37, 31],
|
|
209
|
+
},
|
|
210
|
+
};
|
|
211
|
+
|
|
212
|
+
export const getStandardRange = (module: string, name: string): SourceRange | undefined => {
|
|
213
|
+
const range = RANGES[module]?.[name];
|
|
214
|
+
return (
|
|
215
|
+
range && {
|
|
216
|
+
module,
|
|
217
|
+
start: { line: range[0], column: range[1] },
|
|
218
|
+
end: { line: range[2], column: range[3] },
|
|
219
|
+
}
|
|
220
|
+
);
|
|
221
|
+
};
|
package/src/standard-modules.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TlaEvaluationError, TlaModuleError } from "./errors";
|
|
2
2
|
import {
|
|
3
|
+
createModuleArgumentError,
|
|
3
4
|
createOverflowError,
|
|
4
5
|
defineArithmetic,
|
|
5
6
|
defineBinary,
|
|
@@ -22,18 +23,18 @@ import type { CheckerRuntime } from "./runtime";
|
|
|
22
23
|
import { createBagsOperators } from "./bags";
|
|
23
24
|
import { createJsonOperators, type FileSystem } from "./json";
|
|
24
25
|
import { createRandomizationOperators } from "./randomization";
|
|
25
|
-
import { createPossibleOperators, createTlcExtOperators } from "./tlc-
|
|
26
|
-
import { createTlcOperators } from "./tlc-
|
|
27
|
-
import { TLC_JAVA_METHODS } from "./tlc-
|
|
26
|
+
import { createPossibleOperators, createTlcExtOperators } from "./tlc/tlcext-operators";
|
|
27
|
+
import { createTlcOperators } from "./tlc/tlc-operators";
|
|
28
|
+
import { TLC_JAVA_METHODS } from "./tlc/jar-data";
|
|
28
29
|
import {
|
|
29
30
|
createSet,
|
|
30
31
|
describeKind,
|
|
31
32
|
createTuple,
|
|
32
|
-
|
|
33
|
+
getSortedDifference,
|
|
33
34
|
formatValue,
|
|
34
35
|
getCardinality,
|
|
35
36
|
getDomain,
|
|
36
|
-
|
|
37
|
+
getSortedIntersection,
|
|
37
38
|
isElementOf,
|
|
38
39
|
getSequenceElements,
|
|
39
40
|
isEmptySet,
|
|
@@ -45,7 +46,7 @@ import {
|
|
|
45
46
|
markStreamedSet,
|
|
46
47
|
isSetValue,
|
|
47
48
|
toFiniteSet,
|
|
48
|
-
|
|
49
|
+
getSortedUnion,
|
|
49
50
|
isEqualLikeTlc,
|
|
50
51
|
createEnumeratedSet,
|
|
51
52
|
EMPTY_SET,
|
|
@@ -57,7 +58,7 @@ import {
|
|
|
57
58
|
type Value,
|
|
58
59
|
rankString,
|
|
59
60
|
} from "./values";
|
|
60
|
-
import type { TlcVersion } from "./tlc
|
|
61
|
+
import type { TlcVersion } from "./tlc/version";
|
|
61
62
|
|
|
62
63
|
interface StandardModule {
|
|
63
64
|
extends: string[];
|
|
@@ -71,10 +72,10 @@ const BOOLEAN_SET = createSet([false, true]);
|
|
|
71
72
|
|
|
72
73
|
// Merging the sets pairwise in a balanced tree compares each element about log2 of their count
|
|
73
74
|
// times.
|
|
74
|
-
const
|
|
75
|
+
const getBalancedUnion = (sets: SetValue[], start: number, end: number): SetValue => {
|
|
75
76
|
if (end - start === 1) return sets[start];
|
|
76
77
|
const middle = (start + end) >> 1;
|
|
77
|
-
return
|
|
78
|
+
return getSortedUnion(getBalancedUnion(sets, start, middle), getBalancedUnion(sets, middle, end));
|
|
78
79
|
};
|
|
79
80
|
|
|
80
81
|
const SET_OPERATORS: SetOperationValue["operator"][] = ["\\cup", "\\cap", "\\"];
|
|
@@ -83,9 +84,6 @@ type ReducibleSet = SetValue | MixedSetValue | IntervalValue;
|
|
|
83
84
|
|
|
84
85
|
const isMixedSet = (value: Value) => typeof value === "object" && value.kind === "MixedSet";
|
|
85
86
|
|
|
86
|
-
const getReducibleElements = (set: ReducibleSet) =>
|
|
87
|
-
set.kind === "Interval" ? toFiniteSet(set).elements : set.elements;
|
|
88
|
-
|
|
89
87
|
// TLC combines a set enumeration or an interval with another set element by element, testing each
|
|
90
88
|
// element for membership in the other set.
|
|
91
89
|
const combineReducible = (
|
|
@@ -93,7 +91,7 @@ const combineReducible = (
|
|
|
93
91
|
set: ReducibleSet,
|
|
94
92
|
other: Value,
|
|
95
93
|
): Value => {
|
|
96
|
-
const elements =
|
|
94
|
+
const elements = set.kind === "Interval" ? toFiniteSet(set).elements : set.elements;
|
|
97
95
|
if (operator !== "\\cup") {
|
|
98
96
|
const isKept = operator === "\\cap";
|
|
99
97
|
return createEnumeratedSet(
|
|
@@ -156,10 +154,10 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
156
154
|
if (operator === "\\cup" && isEmptySet(left)) return right;
|
|
157
155
|
const merge =
|
|
158
156
|
operator === "\\cup"
|
|
159
|
-
?
|
|
157
|
+
? getSortedUnion
|
|
160
158
|
: operator === "\\cap"
|
|
161
|
-
?
|
|
162
|
-
:
|
|
159
|
+
? getSortedIntersection
|
|
160
|
+
: getSortedDifference;
|
|
163
161
|
// The merge compares the elements, which TLC tests for membership one by one instead.
|
|
164
162
|
return computeLikeTlcOnFailure(
|
|
165
163
|
(finiteLeft, finiteRight) => merge(toFiniteSet(finiteLeft), toFiniteSet(finiteRight)),
|
|
@@ -191,7 +189,7 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
191
189
|
);
|
|
192
190
|
return createEnumeratedSet(union.elements);
|
|
193
191
|
}
|
|
194
|
-
return sets.length === 0 ? EMPTY_SET :
|
|
192
|
+
return sets.length === 0 ? EMPTY_SET : getBalancedUnion(sets.map(toFiniteSet), 0, sets.length);
|
|
195
193
|
}),
|
|
196
194
|
defineOperator("DOMAIN", 1, (args) => {
|
|
197
195
|
const value = getValue(args, 0, "DOMAIN");
|
|
@@ -383,9 +381,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
383
381
|
(element) => {
|
|
384
382
|
const result = test.call([element]);
|
|
385
383
|
if (typeof result !== "boolean") {
|
|
386
|
-
throw
|
|
387
|
-
`The second argument of SelectSeq should be a operator, but instead it is:\n${formatValue(result)}`,
|
|
388
|
-
);
|
|
384
|
+
throw createModuleArgumentError("second", "SelectSeq", "operator", result);
|
|
389
385
|
}
|
|
390
386
|
return result;
|
|
391
387
|
},
|
package/src/state-graph.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// A port of TLC's -dump writers, tlc2.util.StateWriter and tlc2.util.DotStateWriter.
|
|
2
2
|
|
|
3
|
-
import type { TlcVersion } from "./tlc
|
|
3
|
+
import type { TlcVersion } from "./tlc/version";
|
|
4
4
|
|
|
5
5
|
export interface StateDump {
|
|
6
6
|
path: string;
|
|
@@ -18,7 +18,7 @@ export interface GraphState {
|
|
|
18
18
|
getText: () => string;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
interface GraphAction {
|
|
22
22
|
name: string;
|
|
23
23
|
signature: string;
|
|
24
24
|
}
|
|
@@ -68,9 +68,10 @@ const getStringHash = (text: string) =>
|
|
|
68
68
|
0,
|
|
69
69
|
);
|
|
70
70
|
|
|
71
|
-
const
|
|
71
|
+
const escapeDotString = (text: string) =>
|
|
72
|
+
text.replaceAll("\\", "\\\\").replaceAll('"', '\\"').trim();
|
|
72
73
|
|
|
73
|
-
const
|
|
74
|
+
const toDotLabel = (text: string) => escapeDotString(text).replaceAll("\n", "\\n");
|
|
74
75
|
|
|
75
76
|
const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter => {
|
|
76
77
|
const states: string[] = [];
|
|
@@ -144,21 +145,21 @@ const createDotWriter = (
|
|
|
144
145
|
};
|
|
145
146
|
return {
|
|
146
147
|
writeInitialState: (state) => {
|
|
147
|
-
lines.push(`${state.fingerprint} [label="${
|
|
148
|
+
lines.push(`${state.fingerprint} [label="${toDotLabel(state.getLabel())}",style = filled]\n`);
|
|
148
149
|
addRank(state);
|
|
149
150
|
writeSnapshot();
|
|
150
151
|
},
|
|
151
152
|
writeSuccessor: (state, successor, isSeen, action) => {
|
|
152
153
|
const color = dump.colorize ? String(getColor(action)) : "black";
|
|
153
154
|
const label =
|
|
154
|
-
dump.actionLabels && action ?
|
|
155
|
+
dump.actionLabels && action ? escapeDotString(is174 ? action.name : action.signature) : "";
|
|
155
156
|
lines.push(
|
|
156
157
|
`${state.fingerprint} -> ${successor.fingerprint} [label="${label}",color="${color}",fontcolor="${color}"];\n`,
|
|
157
158
|
);
|
|
158
159
|
if (!isSeen) {
|
|
159
|
-
const tooltip = is174 ? "" : `,tooltip="${
|
|
160
|
+
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
160
161
|
lines.push(
|
|
161
|
-
`${successor.fingerprint} [label="${
|
|
162
|
+
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}];\n`,
|
|
162
163
|
);
|
|
163
164
|
}
|
|
164
165
|
addRank(state);
|
|
@@ -5,10 +5,10 @@ import {
|
|
|
5
5
|
analyzeAssumeProve,
|
|
6
6
|
createLevelAnalyzer,
|
|
7
7
|
getArgumentKey,
|
|
8
|
-
MAX_LEVEL,
|
|
9
8
|
parseArgumentParamKey,
|
|
10
9
|
putArgConstraint,
|
|
11
10
|
putConstraint,
|
|
11
|
+
TEMPORAL_LEVEL,
|
|
12
12
|
type OperatorLevels,
|
|
13
13
|
type Scope,
|
|
14
14
|
} from "./levels";
|
|
@@ -47,7 +47,7 @@ interface Substituted {
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
const getMaxLevel = (operator: OperatorLevels, index: number) =>
|
|
50
|
-
operator.maxLevels[index] ??
|
|
50
|
+
operator.maxLevels[index] ?? TEMPORAL_LEVEL;
|
|
51
51
|
|
|
52
52
|
export const createInstanceChecker = (getModule: (name: string) => ModuleContext) => {
|
|
53
53
|
const analyzers = new Map<string, ReturnType<typeof createLevelAnalyzer>>();
|
package/src/successors.ts
CHANGED
|
@@ -38,7 +38,7 @@ import {
|
|
|
38
38
|
type State,
|
|
39
39
|
} from "./evaluate";
|
|
40
40
|
import { mapChildren } from "./instances";
|
|
41
|
-
import { isAssignedShortcut, LITERAL_KINDS, replayEnabled } from "./tlc
|
|
41
|
+
import { isAssignedShortcut, LITERAL_KINDS, replayEnabled } from "./tlc/replay";
|
|
42
42
|
import {
|
|
43
43
|
formatValue,
|
|
44
44
|
getStreamedElements,
|
|
@@ -131,8 +131,8 @@ const getIfConditionMessage = (run: Run, value: Value, expression: Expression) =
|
|
|
131
131
|
return `In computing ${getComputation(run)}, a non-boolean expression (${kind}) was used as the condition of an IF.${run.isInit ? "\n" : ""}${range}`;
|
|
132
132
|
};
|
|
133
133
|
|
|
134
|
-
const holds = (run: Run, expression: Expression, context: Context
|
|
135
|
-
holdsValue(run, expression, evaluate(expression, context)
|
|
134
|
+
const holds = (run: Run, expression: Expression, context: Context) =>
|
|
135
|
+
holdsValue(run, expression, evaluate(expression, context));
|
|
136
136
|
|
|
137
137
|
const holdsValue = (run: Run, expression: Expression, value: Value, isWalked = true) => {
|
|
138
138
|
if (typeof value === "boolean") return value;
|
|
@@ -758,14 +758,14 @@ const compileAction = (
|
|
|
758
758
|
environment: Environment,
|
|
759
759
|
isInit: boolean,
|
|
760
760
|
): Runner => {
|
|
761
|
-
const
|
|
761
|
+
const getChildRunner = (node: Expression) => getRunner(node, environment, isInit);
|
|
762
762
|
switch (expression.kind) {
|
|
763
763
|
case "And":
|
|
764
764
|
return compileConjunction(expression.operands, environment, isInit);
|
|
765
765
|
case "Or":
|
|
766
766
|
return compileDisjunction(expression.operands, environment, isInit);
|
|
767
767
|
case "Exists": {
|
|
768
|
-
const body =
|
|
768
|
+
const body = getChildRunner(expression.body);
|
|
769
769
|
const bound = expression.bounds[0];
|
|
770
770
|
if (expression.bounds.length === 1 && bound.pattern.kind === "Name") {
|
|
771
771
|
const name = bound.pattern.name;
|
|
@@ -826,7 +826,7 @@ const compileAction = (
|
|
|
826
826
|
};
|
|
827
827
|
}
|
|
828
828
|
case "Forall": {
|
|
829
|
-
const body =
|
|
829
|
+
const body = getChildRunner(expression.body);
|
|
830
830
|
const readLocals =
|
|
831
831
|
!isInit &&
|
|
832
832
|
getReadVariables(expression, environment) !== undefined &&
|
|
@@ -872,8 +872,8 @@ const compileAction = (
|
|
|
872
872
|
};
|
|
873
873
|
}
|
|
874
874
|
case "If": {
|
|
875
|
-
const consequent =
|
|
876
|
-
const alternative =
|
|
875
|
+
const consequent = getChildRunner(expression.consequent);
|
|
876
|
+
const alternative = getChildRunner(expression.alternative);
|
|
877
877
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
878
878
|
const condition = evaluate(expression.condition, getContext(run, scope, partial));
|
|
879
879
|
if (typeof condition !== "boolean") {
|
|
@@ -887,9 +887,9 @@ const compileAction = (
|
|
|
887
887
|
const arms = expression.arms.map((arm) => ({
|
|
888
888
|
condition: arm.condition,
|
|
889
889
|
source: arm.body,
|
|
890
|
-
body:
|
|
890
|
+
body: getChildRunner(arm.body),
|
|
891
891
|
}));
|
|
892
|
-
const other = expression.other ?
|
|
892
|
+
const other = expression.other ? getChildRunner(expression.other) : undefined;
|
|
893
893
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
894
894
|
const context = getContext(run, scope, partial);
|
|
895
895
|
const arm = arms.find((candidate) => {
|
|
@@ -912,7 +912,7 @@ const compileAction = (
|
|
|
912
912
|
};
|
|
913
913
|
}
|
|
914
914
|
case "Let": {
|
|
915
|
-
const body =
|
|
915
|
+
const body = getChildRunner(expression.body);
|
|
916
916
|
const reevaluated = getReevaluatedDefinitions(expression.definitions, environment);
|
|
917
917
|
return (run, scope, partial, action, isFixed, onComplete) =>
|
|
918
918
|
body(
|
|
@@ -934,7 +934,7 @@ const compileAction = (
|
|
|
934
934
|
}
|
|
935
935
|
return compileUnchanged(expression.expression, environment);
|
|
936
936
|
case "AngleAction": {
|
|
937
|
-
const body =
|
|
937
|
+
const body = getChildRunner(expression.action);
|
|
938
938
|
const unchanged = getUnchangedWrapper(expression.subscript);
|
|
939
939
|
const isUnchanged = (run: Run, scope: Scope | undefined, nextPartial: State) => {
|
|
940
940
|
try {
|
|
@@ -951,13 +951,13 @@ const compileAction = (
|
|
|
951
951
|
});
|
|
952
952
|
}
|
|
953
953
|
case "BoxAction":
|
|
954
|
-
return
|
|
954
|
+
return getChildRunner({
|
|
955
955
|
kind: "Or",
|
|
956
956
|
operands: [expression.action, getUnchangedWrapper(expression.subscript)],
|
|
957
957
|
location: expression.location,
|
|
958
958
|
});
|
|
959
959
|
case "Label":
|
|
960
|
-
return
|
|
960
|
+
return getChildRunner(expression.body);
|
|
961
961
|
case "Identifier":
|
|
962
962
|
return compileIdentifier(expression, environment, isInit);
|
|
963
963
|
case "FunctionApplication":
|
|
@@ -975,7 +975,7 @@ const compileAction = (
|
|
|
975
975
|
}
|
|
976
976
|
}
|
|
977
977
|
if (expression.operator === "=>") {
|
|
978
|
-
const right =
|
|
978
|
+
const right = getChildRunner(args[1]);
|
|
979
979
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
980
980
|
const condition = evaluate(args[0], getContext(run, scope, partial));
|
|
981
981
|
const isTrue =
|
|
@@ -1006,9 +1006,6 @@ const getEmptyState = (environment: Environment) => {
|
|
|
1006
1006
|
return state;
|
|
1007
1007
|
};
|
|
1008
1008
|
|
|
1009
|
-
const getMissingVariables = (partial: State, environment: Environment) =>
|
|
1010
|
-
environment.variables.filter((_, index) => partial[index] === undefined);
|
|
1011
|
-
|
|
1012
1009
|
const isComplete = (partial: State): partial is Value[] => {
|
|
1013
1010
|
for (let index = 0; index < partial.length; index++) {
|
|
1014
1011
|
if (partial[index] === undefined) return false;
|
|
@@ -1120,7 +1117,7 @@ export const forEachSuccessor = (
|
|
|
1120
1117
|
(partial, action) => {
|
|
1121
1118
|
if (run.isStopped) return;
|
|
1122
1119
|
if (!isComplete(partial)) {
|
|
1123
|
-
const missing =
|
|
1120
|
+
const missing = environment.variables.filter((_, index) => partial[index] === undefined);
|
|
1124
1121
|
throw new TlaIncompleteSuccessorError(
|
|
1125
1122
|
`Successor state is not completely specified by action ${action ?? "Next"}. The following variables are not assigned: ${missing.join(", ")}`,
|
|
1126
1123
|
partial,
|
package/src/symmetry.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { Expression } from "./ast";
|
|
|
2
2
|
import type { Substitution } from "./config";
|
|
3
3
|
import { TlaConfigError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
4
4
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
5
|
-
import { MESSAGE_CODE } from "./tlc
|
|
5
|
+
import { MESSAGE_CODE } from "./tlc/messages";
|
|
6
6
|
import { evaluate, type Environment } from "./evaluate";
|
|
7
7
|
import {
|
|
8
8
|
compareValues,
|
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
|
}
|