tla-ts 0.0.8-dev.d9bffda → 0.0.9-dev.0493be549
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -0
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +80 -10
- package/dist/index.d.ts +80 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +128 -103
- package/dist/transfer.js +128 -103
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +605 -311
- package/src/cli/options.ts +12 -6
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -0
- package/src/cli/tlc.ts +545 -218
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +632 -298
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +17 -26
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +121 -49
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +31 -38
- package/src/parallel.ts +41 -17
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +128 -176
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +31 -29
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +533 -174
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +166 -48
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +267 -77
- package/src/symmetry.ts +31 -8
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -61
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +33 -38
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +563 -211
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -255
- package/src/worker.ts +7 -8
package/src/spec-description.ts
CHANGED
|
@@ -7,11 +7,15 @@ import {
|
|
|
7
7
|
type SourceRange,
|
|
8
8
|
} from "./ast";
|
|
9
9
|
import type { ModelConfig } from "./config";
|
|
10
|
+
import { getCoverageCounts, getDistinctCount, type CoverageKind } from "./coverage";
|
|
11
|
+
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
12
|
+
import { substitutionFrames, withSubstitutionFrames } from "./instances";
|
|
10
13
|
import type { InstanceAction } from "./environment";
|
|
11
|
-
import { formatRange, TlaError } from "./errors";
|
|
14
|
+
import { formatRange, TlaError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
12
15
|
import {
|
|
13
16
|
bindDefinitions,
|
|
14
17
|
bindOperatorArguments,
|
|
18
|
+
describeNode,
|
|
15
19
|
evaluate,
|
|
16
20
|
forEachBinding,
|
|
17
21
|
getDefinition,
|
|
@@ -24,6 +28,7 @@ import {
|
|
|
24
28
|
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
25
29
|
import { getLevel } from "./liveness";
|
|
26
30
|
import { createRecord, createSet, createTuple, formatValue, type Value } from "./values";
|
|
31
|
+
import { LITERAL_KINDS } from "./tlc/replay";
|
|
27
32
|
import type { TlcVersion } from "./tlc/version";
|
|
28
33
|
|
|
29
34
|
export interface SpecAction {
|
|
@@ -44,6 +49,12 @@ interface SpecDescription {
|
|
|
44
49
|
impliedTemporals: SpecAction[];
|
|
45
50
|
}
|
|
46
51
|
|
|
52
|
+
interface NextItem {
|
|
53
|
+
expression: Expression;
|
|
54
|
+
scope: Scope | undefined;
|
|
55
|
+
frames: Expression[];
|
|
56
|
+
}
|
|
57
|
+
|
|
47
58
|
const UNNAMED_ACTION = "UnnamedAction";
|
|
48
59
|
|
|
49
60
|
const BUILTIN_RANGE: SourceRange = {
|
|
@@ -63,26 +74,27 @@ const toLocationValue = (location: SourceLocation) => {
|
|
|
63
74
|
]);
|
|
64
75
|
};
|
|
65
76
|
|
|
66
|
-
|
|
67
|
-
export const toActionValue = (action: SpecAction) => {
|
|
77
|
+
export const toActionValue = (action: SpecAction, coverage?: Value) => {
|
|
68
78
|
const fields: [string, Value][] = [
|
|
69
79
|
["name", action.name],
|
|
70
80
|
["location", toLocationValue(action.location)],
|
|
71
81
|
];
|
|
72
|
-
if (action.parameters.length
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
82
|
+
if (action.parameters.length > 0) {
|
|
83
|
+
fields.push(
|
|
84
|
+
["context", createRecord(action.parameters)],
|
|
85
|
+
["parameters", createTuple(action.parameters.map((parameter) => parameter[0]))],
|
|
86
|
+
);
|
|
87
|
+
}
|
|
88
|
+
if (coverage !== undefined) fields.push(["coverage", coverage]);
|
|
89
|
+
return createRecord(fields);
|
|
78
90
|
};
|
|
79
91
|
|
|
80
|
-
const createAction = (name: string, expression: Expression): SpecAction => ({
|
|
92
|
+
const createAction = (name: string, expression: Expression, scope?: Scope): SpecAction => ({
|
|
81
93
|
name,
|
|
82
94
|
location: expression.location,
|
|
83
95
|
parameters: [],
|
|
84
96
|
expression,
|
|
85
|
-
scope
|
|
97
|
+
scope,
|
|
86
98
|
});
|
|
87
99
|
|
|
88
100
|
const getConstantContext = (environment: Environment, scope: Scope | undefined) => ({
|
|
@@ -130,14 +142,18 @@ const isEvaluable = (expression: Expression, environment: Environment) => {
|
|
|
130
142
|
}
|
|
131
143
|
};
|
|
132
144
|
|
|
133
|
-
const
|
|
145
|
+
const isStartupValue = (definition: Definition | undefined, environment: Environment) =>
|
|
134
146
|
definition?.kind === "Operator" &&
|
|
135
147
|
definition.params.length === 0 &&
|
|
136
|
-
definition.body.kind !== "Number" &&
|
|
137
|
-
definition.body.kind !== "String" &&
|
|
138
148
|
isConstantLevel(definition, environment) &&
|
|
139
149
|
isEvaluable(definition.body, environment);
|
|
140
150
|
|
|
151
|
+
const isConstantValue = (definition: Definition | undefined, environment: Environment) =>
|
|
152
|
+
definition?.kind === "Operator" &&
|
|
153
|
+
definition.body.kind !== "Number" &&
|
|
154
|
+
definition.body.kind !== "String" &&
|
|
155
|
+
isStartupValue(definition, environment);
|
|
156
|
+
|
|
141
157
|
const isConstantDefinition = (closure: Closure, environment: Environment) => {
|
|
142
158
|
const definition = getDefinition(closure.name, environment);
|
|
143
159
|
return definition?.body === closure.body && isConstantValue(definition, environment);
|
|
@@ -175,9 +191,11 @@ const getInstanceActions = (
|
|
|
175
191
|
const callAction = (): SpecAction[] => [
|
|
176
192
|
{ name: instanceAction.name, location: expression.location, parameters: [], expression, scope },
|
|
177
193
|
];
|
|
178
|
-
|
|
179
|
-
|
|
194
|
+
// TLC's action is the SubstInNode the instance puts around the operator's body.
|
|
195
|
+
if (called && args.length === 0) {
|
|
196
|
+
return [{ ...instanceAction, parameters: [], expression: called.body, scope: called.scope }];
|
|
180
197
|
}
|
|
198
|
+
if (!called) return [{ ...instanceAction, parameters: [], expression, scope }];
|
|
181
199
|
if (args.some((arg) => getLevel(arg, scope, environment) !== CONSTANT_LEVEL)) {
|
|
182
200
|
return callAction();
|
|
183
201
|
}
|
|
@@ -211,6 +229,14 @@ const getActions = (
|
|
|
211
229
|
expression,
|
|
212
230
|
scope,
|
|
213
231
|
});
|
|
232
|
+
if (LITERAL_KINDS.has(expression.kind)) {
|
|
233
|
+
throw setExitCode(
|
|
234
|
+
new TlaEvaluationError(
|
|
235
|
+
`${UNEXPECTED_EXCEPTION}The next state relation is not a boolean expression.\n${describeNode(expression)}`,
|
|
236
|
+
),
|
|
237
|
+
EXIT_STATUS.error,
|
|
238
|
+
);
|
|
239
|
+
}
|
|
214
240
|
switch (expression.kind) {
|
|
215
241
|
case "Let":
|
|
216
242
|
return getActions(
|
|
@@ -291,10 +317,14 @@ const describeSpecification = (
|
|
|
291
317
|
scope: Scope | undefined,
|
|
292
318
|
environment: Environment,
|
|
293
319
|
description: SpecDescription,
|
|
294
|
-
next:
|
|
320
|
+
next: NextItem[],
|
|
321
|
+
frames: Expression[] = [],
|
|
295
322
|
): void => {
|
|
296
|
-
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
297
|
-
describeSpecification(inner, innerScope, environment, description, next);
|
|
323
|
+
const recurse = (inner: Expression, innerScope: Scope | undefined, innerFrames = frames) =>
|
|
324
|
+
describeSpecification(inner, innerScope, environment, description, next, innerFrames);
|
|
325
|
+
// TLC wraps each conjunct it takes from an instance in the instance's SubstInNode.
|
|
326
|
+
const createConjunct = (name: string, conjunct: Expression, conjunctScope: Scope | undefined) =>
|
|
327
|
+
createAction(name, withSubstitutionFrames(conjunct, frames), conjunctScope);
|
|
298
328
|
if (expression.kind === "Let") {
|
|
299
329
|
recurse(
|
|
300
330
|
expression.body,
|
|
@@ -309,18 +339,22 @@ const describeSpecification = (
|
|
|
309
339
|
}
|
|
310
340
|
const called = resolveClosure(expression, scope, environment);
|
|
311
341
|
if (called && isConstantDefinition(called, environment)) return;
|
|
342
|
+
const calledFrames = called
|
|
343
|
+
? [...frames, ...(substitutionFrames.get(called.body) ?? [])]
|
|
344
|
+
: frames;
|
|
312
345
|
if (called && called.params.length === 0) {
|
|
313
346
|
if (getLevel(called.body, called.scope, environment) === VARIABLE_LEVEL) {
|
|
314
|
-
description.inits.push(
|
|
347
|
+
description.inits.push(createConjunct(called.name, called.body, called.scope));
|
|
315
348
|
return;
|
|
316
349
|
}
|
|
317
|
-
recurse(called.body, called.scope);
|
|
350
|
+
recurse(called.body, called.scope, calledFrames);
|
|
318
351
|
return;
|
|
319
352
|
}
|
|
320
353
|
if (called && expression.kind === "Apply" && called.params.length === expression.args.length) {
|
|
321
354
|
recurse(
|
|
322
355
|
called.body,
|
|
323
356
|
bindOperatorArguments(called, expression.args, getConstantContext(environment, scope)),
|
|
357
|
+
calledFrames,
|
|
324
358
|
);
|
|
325
359
|
return;
|
|
326
360
|
}
|
|
@@ -330,16 +364,17 @@ const describeSpecification = (
|
|
|
330
364
|
}
|
|
331
365
|
if (expression.kind === "Always") {
|
|
332
366
|
if (expression.expression.kind === "BoxAction") {
|
|
333
|
-
next.push({ expression: expression.expression.action, scope });
|
|
367
|
+
next.push({ expression: expression.expression.action, scope, frames });
|
|
334
368
|
return;
|
|
335
369
|
}
|
|
336
|
-
description.temporals.push(
|
|
370
|
+
description.temporals.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
337
371
|
return;
|
|
338
372
|
}
|
|
339
373
|
const level = getLevel(expression, scope, environment);
|
|
340
|
-
if (level <= VARIABLE_LEVEL)
|
|
341
|
-
|
|
342
|
-
|
|
374
|
+
if (level <= VARIABLE_LEVEL) {
|
|
375
|
+
description.inits.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
376
|
+
} else if (level === TEMPORAL_LEVEL) {
|
|
377
|
+
description.temporals.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
343
378
|
}
|
|
344
379
|
};
|
|
345
380
|
|
|
@@ -432,7 +467,7 @@ const getSpecDescription = (
|
|
|
432
467
|
impliedActions: [],
|
|
433
468
|
impliedTemporals: [],
|
|
434
469
|
};
|
|
435
|
-
const next:
|
|
470
|
+
const next: NextItem[] = [];
|
|
436
471
|
const specification =
|
|
437
472
|
config.specification === undefined
|
|
438
473
|
? undefined
|
|
@@ -441,7 +476,18 @@ const getSpecDescription = (
|
|
|
441
476
|
describeSpecification(specification.body, undefined, environment, description, next);
|
|
442
477
|
next.forEach((item) =>
|
|
443
478
|
description.actions.push(
|
|
444
|
-
|
|
479
|
+
// TLC takes an instance's SubstInNode as one action, located at the instance.
|
|
480
|
+
...(item.frames.length > 0
|
|
481
|
+
? [
|
|
482
|
+
{
|
|
483
|
+
name: UNNAMED_ACTION,
|
|
484
|
+
location: item.frames[0].location,
|
|
485
|
+
parameters: [],
|
|
486
|
+
expression: withSubstitutionFrames(item.expression, item.frames),
|
|
487
|
+
scope: item.scope,
|
|
488
|
+
},
|
|
489
|
+
]
|
|
490
|
+
: getActions(item.expression, item.scope, undefined, environment, instanceActions)),
|
|
445
491
|
),
|
|
446
492
|
);
|
|
447
493
|
}
|
|
@@ -461,25 +507,74 @@ const getSpecDescription = (
|
|
|
461
507
|
),
|
|
462
508
|
);
|
|
463
509
|
}
|
|
464
|
-
config.invariants.forEach((name) => {
|
|
465
|
-
const definition = getOperatorDefinition(name, environment);
|
|
466
|
-
if (definition) description.invariants.push(createAction(name, definition.body));
|
|
467
|
-
});
|
|
468
|
-
config.properties.forEach((name) => {
|
|
469
|
-
const definition = getOperatorDefinition(name, environment);
|
|
470
|
-
if (definition) describeProperty(name, definition.body, undefined, environment, description);
|
|
471
|
-
});
|
|
472
510
|
return description;
|
|
473
511
|
};
|
|
474
512
|
|
|
475
|
-
|
|
513
|
+
export const getSubscriptVariables = (
|
|
514
|
+
subscript: Expression,
|
|
515
|
+
scope: Scope | undefined,
|
|
516
|
+
environment: Environment,
|
|
517
|
+
) => {
|
|
518
|
+
const variables: string[] = [];
|
|
519
|
+
const collect = (expression: Expression, innerScope: Scope | undefined): boolean => {
|
|
520
|
+
if (
|
|
521
|
+
expression.kind === "Number" ||
|
|
522
|
+
expression.kind === "Decimal" ||
|
|
523
|
+
expression.kind === "String"
|
|
524
|
+
) {
|
|
525
|
+
return false;
|
|
526
|
+
}
|
|
527
|
+
if (expression.kind === "Tuple") {
|
|
528
|
+
return expression.elements.every((element) => collect(element, innerScope));
|
|
529
|
+
}
|
|
530
|
+
if (expression.kind === "Label") return collect(expression.body, innerScope);
|
|
531
|
+
if (expression.kind === "Let") {
|
|
532
|
+
return collect(
|
|
533
|
+
expression.body,
|
|
534
|
+
bindDefinitions(expression.definitions, getConstantContext(environment, innerScope)),
|
|
535
|
+
);
|
|
536
|
+
}
|
|
537
|
+
const thunk = getThunk(expression, innerScope);
|
|
538
|
+
if (thunk) return collect(thunk.expression, thunk.scope);
|
|
539
|
+
const argument =
|
|
540
|
+
expression.kind === "Identifier" && isLocallyResolved(expression)
|
|
541
|
+
? lookupScope(innerScope, expression.name)
|
|
542
|
+
: undefined;
|
|
543
|
+
if (argument?.kind === "Value" && argument.argument) {
|
|
544
|
+
return collect(argument.argument, innerScope);
|
|
545
|
+
}
|
|
546
|
+
if (
|
|
547
|
+
expression.kind === "Identifier" &&
|
|
548
|
+
!isLocallyResolved(expression) &&
|
|
549
|
+
environment.variableIndex.has(expression.name)
|
|
550
|
+
) {
|
|
551
|
+
variables.push(expression.name);
|
|
552
|
+
return true;
|
|
553
|
+
}
|
|
554
|
+
const called = resolveClosure(expression, innerScope, environment);
|
|
555
|
+
if (!called || called.params.length !== getArguments(expression).length) return true;
|
|
556
|
+
const definition = getDefinition(called.name, environment);
|
|
557
|
+
if (definition?.body === called.body && isStartupValue(definition, environment)) return true;
|
|
558
|
+
return collect(
|
|
559
|
+
called.body,
|
|
560
|
+
expression.kind === "Apply"
|
|
561
|
+
? bindOperatorArguments(
|
|
562
|
+
called,
|
|
563
|
+
expression.args,
|
|
564
|
+
getConstantContext(environment, innerScope),
|
|
565
|
+
)
|
|
566
|
+
: called.scope,
|
|
567
|
+
);
|
|
568
|
+
};
|
|
569
|
+
return collect(subscript, scope) ? variables : undefined;
|
|
570
|
+
};
|
|
571
|
+
|
|
476
572
|
export const getInitActions = (
|
|
477
573
|
config: ModelConfig,
|
|
478
574
|
environment: Environment,
|
|
479
575
|
instanceActions: Map<string, InstanceAction>,
|
|
480
576
|
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
481
577
|
|
|
482
|
-
// TLC's split of the next-state relation into the actions it names in a behavior.
|
|
483
578
|
export const getNextActions = (
|
|
484
579
|
config: ModelConfig,
|
|
485
580
|
environment: Environment,
|
|
@@ -491,11 +586,9 @@ const formatParameters = (action: SpecAction) =>
|
|
|
491
586
|
? ""
|
|
492
587
|
: `(${action.parameters.map((parameter) => formatValue(parameter[1])).join(",")})`;
|
|
493
588
|
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
`${action.name === UNNAMED_ACTION ? "Action" : action.name}${version === "1.7.4" ? "" : formatParameters(action)} ${formatRange(action.location.range ?? BUILTIN_RANGE)}`;
|
|
589
|
+
export const getActionLabel = (action: SpecAction, version?: TlcVersion, isInitial = false) =>
|
|
590
|
+
`${action.name === UNNAMED_ACTION ? (isInitial ? "Initial predicate" : "Action") : action.name}${version === "1.7.4" ? "" : formatParameters(action)} ${formatRange(action.location.range ?? BUILTIN_RANGE)}`;
|
|
497
591
|
|
|
498
|
-
// TLC's Action.getInvocationSignature, which names the action and the values of its parameters.
|
|
499
592
|
export const getActionSignature = (action: SpecAction) =>
|
|
500
593
|
`${action.name}${formatParameters(action)}`;
|
|
501
594
|
|
|
@@ -506,7 +599,24 @@ export const getSpecificationValue = (
|
|
|
506
599
|
instanceActions: Map<string, InstanceAction>,
|
|
507
600
|
): Value => {
|
|
508
601
|
const description = getSpecDescription(config, environment, instanceActions);
|
|
509
|
-
|
|
602
|
+
// Describing a checked formula evaluates the constant definitions it names, so only
|
|
603
|
+
// TLCGet("spec") describes them, not the actions TLC splits at startup.
|
|
604
|
+
config.invariants.forEach((name) => {
|
|
605
|
+
const definition = getOperatorDefinition(name, environment);
|
|
606
|
+
if (definition) description.invariants.push(createAction(name, definition.body));
|
|
607
|
+
});
|
|
608
|
+
config.properties.forEach((name) => {
|
|
609
|
+
const definition = getOperatorDefinition(name, environment);
|
|
610
|
+
if (definition) describeProperty(name, definition.body, undefined, environment, description);
|
|
611
|
+
});
|
|
612
|
+
const coverage = environment.coverage;
|
|
613
|
+
const toSet = (actions: SpecAction[], kind?: CoverageKind) =>
|
|
614
|
+
createSet(
|
|
615
|
+
actions.map((action) => {
|
|
616
|
+
const counts = coverage && kind && getCoverageCounts(coverage, kind, action.expression);
|
|
617
|
+
return toActionValue(action, counts && createRecord(counts));
|
|
618
|
+
}),
|
|
619
|
+
);
|
|
510
620
|
const toDefinitionSet = (names: string[]) =>
|
|
511
621
|
createSet(
|
|
512
622
|
names.flatMap((name) => {
|
|
@@ -522,12 +632,12 @@ export const getSpecificationValue = (
|
|
|
522
632
|
}),
|
|
523
633
|
);
|
|
524
634
|
return createRecord([
|
|
525
|
-
["inits", toSet(description.inits)],
|
|
526
|
-
["actions", toSet(description.actions)],
|
|
635
|
+
["inits", toSet(description.inits, "init")],
|
|
636
|
+
["actions", toSet(description.actions, "next")],
|
|
527
637
|
["temporals", toSet(description.temporals)],
|
|
528
|
-
["invariants", toSet(description.invariants)],
|
|
529
|
-
["impliedinits", toSet(description.impliedInits)],
|
|
530
|
-
["impliedactions", toSet(description.impliedActions)],
|
|
638
|
+
["invariants", toSet(description.invariants, "invariant")],
|
|
639
|
+
["impliedinits", toSet(description.impliedInits, "implied")],
|
|
640
|
+
["impliedactions", toSet(description.impliedActions, "implied")],
|
|
531
641
|
["impliedtemporals", toSet(description.impliedTemporals)],
|
|
532
642
|
[
|
|
533
643
|
"variables",
|
|
@@ -536,6 +646,14 @@ export const getSpecificationValue = (
|
|
|
536
646
|
createRecord([
|
|
537
647
|
["name", name],
|
|
538
648
|
["location", toLocationValue(variableLocations[index])],
|
|
649
|
+
...(coverage
|
|
650
|
+
? [
|
|
651
|
+
[
|
|
652
|
+
"coverage",
|
|
653
|
+
createRecord([["distinct", getDistinctCount(coverage, index)]]),
|
|
654
|
+
] satisfies [string, Value],
|
|
655
|
+
]
|
|
656
|
+
: []),
|
|
539
657
|
]),
|
|
540
658
|
),
|
|
541
659
|
),
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import type { SourceRange } from "./ast";
|
|
2
2
|
import type { OperatorLevels } from "./levels";
|
|
3
3
|
|
|
4
|
-
// SANY's view of the dummy definitions in tla2sany/StandardModules of the operators
|
|
5
|
-
// implements natively:
|
|
6
|
-
// defines one again.
|
|
4
|
+
// SANY's view of the dummy definitions in tla2sany/StandardModules of the operators tla-ts
|
|
5
|
+
// implements natively: their levels, and where SANY reports a spec that defines one again.
|
|
7
6
|
|
|
8
7
|
type Signature =
|
|
9
8
|
| [string, number, number[], number[], number[]]
|