tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +29 -1
- 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 +106 -10
- package/dist/index.d.ts +106 -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 +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- 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 +596 -339
- 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 +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- 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 +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- 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 +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- 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 +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -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 +780 -337
- 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);
|
|
@@ -149,6 +165,21 @@ const getThunk = (expression: Expression, scope: Scope | undefined) => {
|
|
|
149
165
|
return binding?.kind === "Thunk" ? binding : undefined;
|
|
150
166
|
};
|
|
151
167
|
|
|
168
|
+
const unwrapBinding = (
|
|
169
|
+
expression: Expression,
|
|
170
|
+
scope: Scope | undefined,
|
|
171
|
+
environment: Environment,
|
|
172
|
+
) => {
|
|
173
|
+
if (expression.kind === "Let") {
|
|
174
|
+
return {
|
|
175
|
+
expression: expression.body,
|
|
176
|
+
scope: bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
const thunk = getThunk(expression, scope);
|
|
180
|
+
return thunk && { expression: thunk.expression, scope: thunk.scope };
|
|
181
|
+
};
|
|
182
|
+
|
|
152
183
|
const getParameters = (closure: Closure | undefined, scope: Scope | undefined) =>
|
|
153
184
|
(closure?.params ?? []).flatMap((param): [string, Value][] => {
|
|
154
185
|
const binding = lookupScope(scope, param.name);
|
|
@@ -175,9 +206,10 @@ const getInstanceActions = (
|
|
|
175
206
|
const callAction = (): SpecAction[] => [
|
|
176
207
|
{ name: instanceAction.name, location: expression.location, parameters: [], expression, scope },
|
|
177
208
|
];
|
|
178
|
-
if (
|
|
179
|
-
return [{ ...instanceAction, parameters: [], expression, scope }];
|
|
209
|
+
if (called && args.length === 0) {
|
|
210
|
+
return [{ ...instanceAction, parameters: [], expression: called.body, scope: called.scope }];
|
|
180
211
|
}
|
|
212
|
+
if (!called) return [{ ...instanceAction, parameters: [], expression, scope }];
|
|
181
213
|
if (args.some((arg) => getLevel(arg, scope, environment) !== CONSTANT_LEVEL)) {
|
|
182
214
|
return callAction();
|
|
183
215
|
}
|
|
@@ -211,6 +243,14 @@ const getActions = (
|
|
|
211
243
|
expression,
|
|
212
244
|
scope,
|
|
213
245
|
});
|
|
246
|
+
if (LITERAL_KINDS.has(expression.kind)) {
|
|
247
|
+
throw setExitCode(
|
|
248
|
+
new TlaEvaluationError(
|
|
249
|
+
`${UNEXPECTED_EXCEPTION}The next state relation is not a boolean expression.\n${describeNode(expression)}`,
|
|
250
|
+
),
|
|
251
|
+
EXIT_STATUS.error,
|
|
252
|
+
);
|
|
253
|
+
}
|
|
214
254
|
switch (expression.kind) {
|
|
215
255
|
case "Let":
|
|
216
256
|
return getActions(
|
|
@@ -253,7 +293,6 @@ const getActions = (
|
|
|
253
293
|
return getInstanceActions(instanceAction, expression, scope, called, environment);
|
|
254
294
|
if (!called) return [createSplitAction()];
|
|
255
295
|
const args = getArguments(expression);
|
|
256
|
-
// TLC names an action after the operator it applies, as SANY names it in the spec.
|
|
257
296
|
const calledName = isLocallyResolved(expression)
|
|
258
297
|
? called.name
|
|
259
298
|
: (environment.instanceNames.get(getOperatorName(expression) ?? "") ?? called.name);
|
|
@@ -291,36 +330,36 @@ const describeSpecification = (
|
|
|
291
330
|
scope: Scope | undefined,
|
|
292
331
|
environment: Environment,
|
|
293
332
|
description: SpecDescription,
|
|
294
|
-
next:
|
|
333
|
+
next: NextItem[],
|
|
334
|
+
frames: Expression[] = [],
|
|
295
335
|
): void => {
|
|
296
|
-
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
297
|
-
describeSpecification(inner, innerScope, environment, description, next);
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
);
|
|
303
|
-
return;
|
|
304
|
-
}
|
|
305
|
-
const thunk = getThunk(expression, scope);
|
|
306
|
-
if (thunk) {
|
|
307
|
-
recurse(thunk.expression, thunk.scope);
|
|
336
|
+
const recurse = (inner: Expression, innerScope: Scope | undefined, innerFrames = frames) =>
|
|
337
|
+
describeSpecification(inner, innerScope, environment, description, next, innerFrames);
|
|
338
|
+
const createConjunct = (name: string, conjunct: Expression, conjunctScope: Scope | undefined) =>
|
|
339
|
+
createAction(name, withSubstitutionFrames(conjunct, frames), conjunctScope);
|
|
340
|
+
const unwrapped = unwrapBinding(expression, scope, environment);
|
|
341
|
+
if (unwrapped) {
|
|
342
|
+
recurse(unwrapped.expression, unwrapped.scope);
|
|
308
343
|
return;
|
|
309
344
|
}
|
|
310
345
|
const called = resolveClosure(expression, scope, environment);
|
|
311
346
|
if (called && isConstantDefinition(called, environment)) return;
|
|
347
|
+
const calledFrames = called
|
|
348
|
+
? [...frames, ...(substitutionFrames.get(called.body) ?? [])]
|
|
349
|
+
: frames;
|
|
312
350
|
if (called && called.params.length === 0) {
|
|
313
351
|
if (getLevel(called.body, called.scope, environment) === VARIABLE_LEVEL) {
|
|
314
|
-
description.inits.push(
|
|
352
|
+
description.inits.push(createConjunct(called.name, called.body, called.scope));
|
|
315
353
|
return;
|
|
316
354
|
}
|
|
317
|
-
recurse(called.body, called.scope);
|
|
355
|
+
recurse(called.body, called.scope, calledFrames);
|
|
318
356
|
return;
|
|
319
357
|
}
|
|
320
358
|
if (called && expression.kind === "Apply" && called.params.length === expression.args.length) {
|
|
321
359
|
recurse(
|
|
322
360
|
called.body,
|
|
323
361
|
bindOperatorArguments(called, expression.args, getConstantContext(environment, scope)),
|
|
362
|
+
calledFrames,
|
|
324
363
|
);
|
|
325
364
|
return;
|
|
326
365
|
}
|
|
@@ -330,16 +369,17 @@ const describeSpecification = (
|
|
|
330
369
|
}
|
|
331
370
|
if (expression.kind === "Always") {
|
|
332
371
|
if (expression.expression.kind === "BoxAction") {
|
|
333
|
-
next.push({ expression: expression.expression.action, scope });
|
|
372
|
+
next.push({ expression: expression.expression.action, scope, frames });
|
|
334
373
|
return;
|
|
335
374
|
}
|
|
336
|
-
description.temporals.push(
|
|
375
|
+
description.temporals.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
337
376
|
return;
|
|
338
377
|
}
|
|
339
378
|
const level = getLevel(expression, scope, environment);
|
|
340
|
-
if (level <= VARIABLE_LEVEL)
|
|
341
|
-
|
|
342
|
-
|
|
379
|
+
if (level <= VARIABLE_LEVEL) {
|
|
380
|
+
description.inits.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
381
|
+
} else if (level === TEMPORAL_LEVEL) {
|
|
382
|
+
description.temporals.push(createConjunct(UNNAMED_ACTION, expression, scope));
|
|
343
383
|
}
|
|
344
384
|
};
|
|
345
385
|
|
|
@@ -352,16 +392,9 @@ const describeProperty = (
|
|
|
352
392
|
): void => {
|
|
353
393
|
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
354
394
|
describeProperty(configName, inner, innerScope, environment, description);
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
|
|
359
|
-
);
|
|
360
|
-
return;
|
|
361
|
-
}
|
|
362
|
-
const thunk = getThunk(expression, scope);
|
|
363
|
-
if (thunk) {
|
|
364
|
-
recurse(thunk.expression, thunk.scope);
|
|
395
|
+
const unwrapped = unwrapBinding(expression, scope, environment);
|
|
396
|
+
if (unwrapped) {
|
|
397
|
+
recurse(unwrapped.expression, unwrapped.scope);
|
|
365
398
|
return;
|
|
366
399
|
}
|
|
367
400
|
const called = resolveClosure(expression, scope, environment);
|
|
@@ -432,7 +465,7 @@ const getSpecDescription = (
|
|
|
432
465
|
impliedActions: [],
|
|
433
466
|
impliedTemporals: [],
|
|
434
467
|
};
|
|
435
|
-
const next:
|
|
468
|
+
const next: NextItem[] = [];
|
|
436
469
|
const specification =
|
|
437
470
|
config.specification === undefined
|
|
438
471
|
? undefined
|
|
@@ -441,7 +474,17 @@ const getSpecDescription = (
|
|
|
441
474
|
describeSpecification(specification.body, undefined, environment, description, next);
|
|
442
475
|
next.forEach((item) =>
|
|
443
476
|
description.actions.push(
|
|
444
|
-
...
|
|
477
|
+
...(item.frames.length > 0
|
|
478
|
+
? [
|
|
479
|
+
{
|
|
480
|
+
name: UNNAMED_ACTION,
|
|
481
|
+
location: item.frames[0].location,
|
|
482
|
+
parameters: [],
|
|
483
|
+
expression: withSubstitutionFrames(item.expression, item.frames),
|
|
484
|
+
scope: item.scope,
|
|
485
|
+
},
|
|
486
|
+
]
|
|
487
|
+
: getActions(item.expression, item.scope, undefined, environment, instanceActions)),
|
|
445
488
|
),
|
|
446
489
|
);
|
|
447
490
|
}
|
|
@@ -461,25 +504,68 @@ const getSpecDescription = (
|
|
|
461
504
|
),
|
|
462
505
|
);
|
|
463
506
|
}
|
|
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
507
|
return description;
|
|
473
508
|
};
|
|
474
509
|
|
|
475
|
-
|
|
510
|
+
export const getSubscriptVariables = (
|
|
511
|
+
subscript: Expression,
|
|
512
|
+
scope: Scope | undefined,
|
|
513
|
+
environment: Environment,
|
|
514
|
+
) => {
|
|
515
|
+
const variables: string[] = [];
|
|
516
|
+
const collect = (expression: Expression, innerScope: Scope | undefined): boolean => {
|
|
517
|
+
if (
|
|
518
|
+
expression.kind === "Number" ||
|
|
519
|
+
expression.kind === "Decimal" ||
|
|
520
|
+
expression.kind === "String"
|
|
521
|
+
) {
|
|
522
|
+
return false;
|
|
523
|
+
}
|
|
524
|
+
if (expression.kind === "Tuple") {
|
|
525
|
+
return expression.elements.every((element) => collect(element, innerScope));
|
|
526
|
+
}
|
|
527
|
+
if (expression.kind === "Label") return collect(expression.body, innerScope);
|
|
528
|
+
const unwrapped = unwrapBinding(expression, innerScope, environment);
|
|
529
|
+
if (unwrapped) return collect(unwrapped.expression, unwrapped.scope);
|
|
530
|
+
const argument =
|
|
531
|
+
expression.kind === "Identifier" && isLocallyResolved(expression)
|
|
532
|
+
? lookupScope(innerScope, expression.name)
|
|
533
|
+
: undefined;
|
|
534
|
+
if (argument?.kind === "Value" && argument.argument) {
|
|
535
|
+
return collect(argument.argument, innerScope);
|
|
536
|
+
}
|
|
537
|
+
if (
|
|
538
|
+
expression.kind === "Identifier" &&
|
|
539
|
+
!isLocallyResolved(expression) &&
|
|
540
|
+
environment.variableIndex.has(expression.name)
|
|
541
|
+
) {
|
|
542
|
+
variables.push(expression.name);
|
|
543
|
+
return true;
|
|
544
|
+
}
|
|
545
|
+
const called = resolveClosure(expression, innerScope, environment);
|
|
546
|
+
if (!called || called.params.length !== getArguments(expression).length) return true;
|
|
547
|
+
const definition = getDefinition(called.name, environment);
|
|
548
|
+
if (definition?.body === called.body && isStartupValue(definition, environment)) return true;
|
|
549
|
+
return collect(
|
|
550
|
+
called.body,
|
|
551
|
+
expression.kind === "Apply"
|
|
552
|
+
? bindOperatorArguments(
|
|
553
|
+
called,
|
|
554
|
+
expression.args,
|
|
555
|
+
getConstantContext(environment, innerScope),
|
|
556
|
+
)
|
|
557
|
+
: called.scope,
|
|
558
|
+
);
|
|
559
|
+
};
|
|
560
|
+
return collect(subscript, scope) ? variables : undefined;
|
|
561
|
+
};
|
|
562
|
+
|
|
476
563
|
export const getInitActions = (
|
|
477
564
|
config: ModelConfig,
|
|
478
565
|
environment: Environment,
|
|
479
566
|
instanceActions: Map<string, InstanceAction>,
|
|
480
567
|
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
481
568
|
|
|
482
|
-
// TLC's split of the next-state relation into the actions it names in a behavior.
|
|
483
569
|
export const getNextActions = (
|
|
484
570
|
config: ModelConfig,
|
|
485
571
|
environment: Environment,
|
|
@@ -491,11 +577,9 @@ const formatParameters = (action: SpecAction) =>
|
|
|
491
577
|
? ""
|
|
492
578
|
: `(${action.parameters.map((parameter) => formatValue(parameter[1])).join(",")})`;
|
|
493
579
|
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
`${action.name === UNNAMED_ACTION ? "Action" : action.name}${version === "1.7.4" ? "" : formatParameters(action)} ${formatRange(action.location.range ?? BUILTIN_RANGE)}`;
|
|
580
|
+
export const getActionLabel = (action: SpecAction, version?: TlcVersion, isInitial = false) =>
|
|
581
|
+
`${action.name === UNNAMED_ACTION ? (isInitial ? "Initial predicate" : "Action") : action.name}${version === "1.7.4" ? "" : formatParameters(action)} ${formatRange(action.location.range ?? BUILTIN_RANGE)}`;
|
|
497
582
|
|
|
498
|
-
// TLC's Action.getInvocationSignature, which names the action and the values of its parameters.
|
|
499
583
|
export const getActionSignature = (action: SpecAction) =>
|
|
500
584
|
`${action.name}${formatParameters(action)}`;
|
|
501
585
|
|
|
@@ -506,7 +590,22 @@ export const getSpecificationValue = (
|
|
|
506
590
|
instanceActions: Map<string, InstanceAction>,
|
|
507
591
|
): Value => {
|
|
508
592
|
const description = getSpecDescription(config, environment, instanceActions);
|
|
509
|
-
|
|
593
|
+
config.invariants.forEach((name) => {
|
|
594
|
+
const definition = getOperatorDefinition(name, environment);
|
|
595
|
+
if (definition) description.invariants.push(createAction(name, definition.body));
|
|
596
|
+
});
|
|
597
|
+
config.properties.forEach((name) => {
|
|
598
|
+
const definition = getOperatorDefinition(name, environment);
|
|
599
|
+
if (definition) describeProperty(name, definition.body, undefined, environment, description);
|
|
600
|
+
});
|
|
601
|
+
const coverage = environment.coverage;
|
|
602
|
+
const toSet = (actions: SpecAction[], kind?: CoverageKind) =>
|
|
603
|
+
createSet(
|
|
604
|
+
actions.map((action) => {
|
|
605
|
+
const counts = coverage && kind && getCoverageCounts(coverage, kind, action.expression);
|
|
606
|
+
return toActionValue(action, counts && createRecord(counts));
|
|
607
|
+
}),
|
|
608
|
+
);
|
|
510
609
|
const toDefinitionSet = (names: string[]) =>
|
|
511
610
|
createSet(
|
|
512
611
|
names.flatMap((name) => {
|
|
@@ -522,12 +621,12 @@ export const getSpecificationValue = (
|
|
|
522
621
|
}),
|
|
523
622
|
);
|
|
524
623
|
return createRecord([
|
|
525
|
-
["inits", toSet(description.inits)],
|
|
526
|
-
["actions", toSet(description.actions)],
|
|
624
|
+
["inits", toSet(description.inits, "init")],
|
|
625
|
+
["actions", toSet(description.actions, "next")],
|
|
527
626
|
["temporals", toSet(description.temporals)],
|
|
528
|
-
["invariants", toSet(description.invariants)],
|
|
529
|
-
["impliedinits", toSet(description.impliedInits)],
|
|
530
|
-
["impliedactions", toSet(description.impliedActions)],
|
|
627
|
+
["invariants", toSet(description.invariants, "invariant")],
|
|
628
|
+
["impliedinits", toSet(description.impliedInits, "implied")],
|
|
629
|
+
["impliedactions", toSet(description.impliedActions, "implied")],
|
|
531
630
|
["impliedtemporals", toSet(description.impliedTemporals)],
|
|
532
631
|
[
|
|
533
632
|
"variables",
|
|
@@ -536,6 +635,14 @@ export const getSpecificationValue = (
|
|
|
536
635
|
createRecord([
|
|
537
636
|
["name", name],
|
|
538
637
|
["location", toLocationValue(variableLocations[index])],
|
|
638
|
+
...(coverage
|
|
639
|
+
? [
|
|
640
|
+
[
|
|
641
|
+
"coverage",
|
|
642
|
+
createRecord([["distinct", getDistinctCount(coverage, index)]]),
|
|
643
|
+
] satisfies [string, Value],
|
|
644
|
+
]
|
|
645
|
+
: []),
|
|
539
646
|
]),
|
|
540
647
|
),
|
|
541
648
|
),
|
|
@@ -1,10 +1,6 @@
|
|
|
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 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
|
-
|
|
8
4
|
type Signature =
|
|
9
5
|
| [string, number, number[], number[], number[]]
|
|
10
6
|
| [string, number, number[], number[], number[], number[][], string[]];
|