tla-ts 0.0.9 → 0.0.10-dev.b4a856304
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 +72 -10
- package/dist/index.d.ts +72 -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 +576 -300
- package/src/cli/options.ts +11 -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 +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 +630 -297
- 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 +29 -39
- package/src/parallel.ts +29 -13
- 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 +119 -169
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +1 -8
- 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 +494 -154
- 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 +826 -276
- package/src/worker.ts +7 -8
package/src/tlc/summary.ts
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
// holds every count from 31 up.
|
|
3
3
|
export const OUT_DEGREE_BUCKETS = 32;
|
|
4
4
|
|
|
5
|
-
// TLC's optimistic estimate of a fingerprint collision, from AbstractChecker.
|
|
6
5
|
export const getOptimisticProbability = (distinctStates: number, generatedStates: number) =>
|
|
7
6
|
distinctStates * ((generatedStates - distinctStates) / 2 ** 64);
|
|
8
7
|
|
|
@@ -56,7 +55,6 @@ export const formatProbability = (value: number) => {
|
|
|
56
55
|
return text;
|
|
57
56
|
};
|
|
58
57
|
|
|
59
|
-
// Adds one to the last digit and carries it over nines and the decimal point.
|
|
60
58
|
const roundUp = (digits: string): string => {
|
|
61
59
|
const position = digits.length - 1;
|
|
62
60
|
if (position < 0) return "1";
|
|
@@ -87,8 +85,8 @@ export const getFingerprintDistance = (
|
|
|
87
85
|
const probability = getOptimisticProbability(distinctStates, generatedStates);
|
|
88
86
|
if (probability < ACTUAL_PROBABILITY_THRESHOLD) return undefined;
|
|
89
87
|
const fingerprints = getFingerprints().sort();
|
|
90
|
-
//
|
|
91
|
-
//
|
|
88
|
+
// A gap whose high words differ by at most 2^20 is below 2^53, so a number holds it exactly and
|
|
89
|
+
// only wider gaps need a BigInt.
|
|
92
90
|
const words = new Int32Array(fingerprints.buffer);
|
|
93
91
|
const nearest = { narrow: Number.POSITIVE_INFINITY, wide: 0x7fff_ffff_ffff_ffffn };
|
|
94
92
|
for (let index = 1; index < fingerprints.length; index++) {
|
package/src/tlc/tlc-operators.ts
CHANGED
|
@@ -7,15 +7,13 @@ import {
|
|
|
7
7
|
defineHigherOrderOperator,
|
|
8
8
|
defineLazyOperator,
|
|
9
9
|
defineOperator,
|
|
10
|
+
createModuleArgumentError,
|
|
10
11
|
defineStateOperator,
|
|
11
|
-
getElements,
|
|
12
|
-
getEnumerableSet,
|
|
13
|
-
getFunction,
|
|
14
12
|
getOperator,
|
|
15
|
-
getSequence,
|
|
16
13
|
getThunk,
|
|
17
14
|
getValue,
|
|
18
15
|
overrideWithJava,
|
|
16
|
+
toEnumeratedSet,
|
|
19
17
|
} from "../builtins";
|
|
20
18
|
import { getNamedRegisters, NAMED_REGISTER_PREFIX, type CheckerRuntime } from "../runtime";
|
|
21
19
|
import { createActionRecord, setTlcValue } from "./tlcext-operators";
|
|
@@ -23,16 +21,22 @@ import { getRandomElement } from "./random";
|
|
|
23
21
|
import {
|
|
24
22
|
ANY_SET,
|
|
25
23
|
createFunction,
|
|
26
|
-
createRecord,
|
|
27
24
|
createSet,
|
|
28
25
|
createTuple,
|
|
29
26
|
createWrittenFunction,
|
|
27
|
+
formatNormalizedCopies,
|
|
30
28
|
formatValue,
|
|
29
|
+
getSequenceElements,
|
|
31
30
|
getWrittenPairs,
|
|
31
|
+
isEqualLikeTlc,
|
|
32
|
+
isFunctionValue,
|
|
33
|
+
toFiniteFunction,
|
|
32
34
|
toFiniteSet,
|
|
33
35
|
type Value,
|
|
34
36
|
rankString,
|
|
37
|
+
setFunctionClass,
|
|
35
38
|
} from "../values";
|
|
39
|
+
import { getFingerprintPolynomial } from "./fingerprint";
|
|
36
40
|
|
|
37
41
|
const padTime = (value: number) => String(value).padStart(2, "0");
|
|
38
42
|
|
|
@@ -42,9 +46,13 @@ const formatCalendarVersion = (date: Date) =>
|
|
|
42
46
|
const getRegisterFunction = <Key extends Value>(registers: Map<Key, Value>) =>
|
|
43
47
|
createFunction([...registers].map(([key, value]): [Value, Value] => [key, createTuple([value])]));
|
|
44
48
|
|
|
49
|
+
// TLC doesn't normalize the records it builds, so they keep their written order.
|
|
50
|
+
const createTlcRecord = (fields: [string, Value][]) =>
|
|
51
|
+
setFunctionClass(createWrittenFunction(fields), "record");
|
|
52
|
+
|
|
45
53
|
// TLC creates its model checker after it processes the spec, so these are undefined before then.
|
|
54
|
+
|
|
46
55
|
const CHECKER_KEYS = new Set(["diameter", "generated", "distinct", "queue", "stats", "config"]);
|
|
47
|
-
// The keys of TLC 1.7.4's TLCGet, and those it can't read before it creates its model checker.
|
|
48
56
|
const TLC_174_KEYS = new Set(["diameter", "distinct", "queue", "duration", "level"]);
|
|
49
57
|
const CHECKER_KEYS_174 = new Set(["diameter", "distinct", "queue", "level"]);
|
|
50
58
|
|
|
@@ -58,6 +66,8 @@ const getRuntimeValue = (
|
|
|
58
66
|
? !TLC_174_KEYS.has(key) || (!runtime.isStarted && CHECKER_KEYS_174.has(key))
|
|
59
67
|
: !runtime.isStarted && CHECKER_KEYS.has(key);
|
|
60
68
|
if (isUndefined) throw new TlaModuleError(`TLCGet(${key}) was undefined.`);
|
|
69
|
+
const simulated = runtime.getSimulationValue?.(key, state);
|
|
70
|
+
if (simulated !== undefined) return simulated;
|
|
61
71
|
const duration = Math.floor((Date.now() - runtime.startedAt) / 1000);
|
|
62
72
|
switch (key) {
|
|
63
73
|
case "level":
|
|
@@ -73,7 +83,7 @@ const getRuntimeValue = (
|
|
|
73
83
|
case "duration":
|
|
74
84
|
return duration;
|
|
75
85
|
case "stats":
|
|
76
|
-
return
|
|
86
|
+
return createTlcRecord([
|
|
77
87
|
["queue", runtime.queueSize],
|
|
78
88
|
["distinct", runtime.distinctStates],
|
|
79
89
|
["initial", runtime.initialStates],
|
|
@@ -83,17 +93,17 @@ const getRuntimeValue = (
|
|
|
83
93
|
["worker", 0],
|
|
84
94
|
]);
|
|
85
95
|
case "config":
|
|
86
|
-
return
|
|
96
|
+
return createTlcRecord([
|
|
87
97
|
["mode", "bfs"],
|
|
88
98
|
["deadlock", runtime.checkDeadlock],
|
|
89
99
|
["worker", 1],
|
|
90
100
|
["seed", String(runtime.seed)],
|
|
91
|
-
["fingerprint",
|
|
101
|
+
["fingerprint", String(BigInt.asIntN(64, getFingerprintPolynomial()))],
|
|
92
102
|
["install", "unknown"],
|
|
93
103
|
]);
|
|
94
104
|
case "revision": {
|
|
95
105
|
const now = new Date();
|
|
96
|
-
return
|
|
106
|
+
return createTlcRecord([
|
|
97
107
|
["count", 0],
|
|
98
108
|
["timestamp", Math.floor(now.getTime() / 1000)],
|
|
99
109
|
["date", rankString(`${now.toISOString().slice(0, 19)}.${now.getUTCMilliseconds()}Z`)],
|
|
@@ -152,18 +162,36 @@ const normalizeDeeply = (value: Value): void => {
|
|
|
152
162
|
if (value.kind === "Function") value.range.forEach(normalizeDeeply);
|
|
153
163
|
};
|
|
154
164
|
|
|
165
|
+
const convertLikeTlcEval = (value: Value): Value => {
|
|
166
|
+
if (typeof value !== "object") return value;
|
|
167
|
+
switch (value.kind) {
|
|
168
|
+
case "ModelValue":
|
|
169
|
+
case "Function":
|
|
170
|
+
case "MixedSet":
|
|
171
|
+
case "InfiniteSet":
|
|
172
|
+
case "SequenceSet":
|
|
173
|
+
return value;
|
|
174
|
+
case "LazyFunction":
|
|
175
|
+
return toFiniteFunction(value);
|
|
176
|
+
default:
|
|
177
|
+
return toFiniteSet(value);
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
|
|
155
181
|
export const createTlcOperators = (
|
|
156
182
|
print: (text: string) => void,
|
|
157
183
|
runtime: CheckerRuntime,
|
|
158
184
|
): Builtin[] => [
|
|
159
185
|
defineOperator("Print", 2, (args) => {
|
|
160
186
|
print(
|
|
161
|
-
|
|
187
|
+
formatNormalizedCopies([getValue(args, 0, "Print"), getValue(args, 1, "Print")])
|
|
188
|
+
.map(prettyPrint)
|
|
189
|
+
.join(" "),
|
|
162
190
|
);
|
|
163
191
|
return getValue(args, 1, "Print");
|
|
164
192
|
}),
|
|
165
193
|
defineOperator("PrintT", 1, (args) => {
|
|
166
|
-
print(prettyPrint(
|
|
194
|
+
print(prettyPrint(formatNormalizedCopies([getValue(args, 0, "PrintT")])[0]));
|
|
167
195
|
return true;
|
|
168
196
|
}),
|
|
169
197
|
defineOperator("Assert", 2, (args) => {
|
|
@@ -179,21 +207,34 @@ export const createTlcOperators = (
|
|
|
179
207
|
defineOperator(":>", 2, (args) =>
|
|
180
208
|
createFunction([[getValue(args, 0, ":>"), getValue(args, 1, ":>")]]),
|
|
181
209
|
),
|
|
210
|
+
// CombineFcn converts both arguments before it checks either.
|
|
182
211
|
defineOperator("@@", 2, (args) => {
|
|
183
|
-
const
|
|
184
|
-
const
|
|
185
|
-
|
|
212
|
+
const leftValue = getValue(args, 0, "@@");
|
|
213
|
+
const rightValue = getValue(args, 1, "@@");
|
|
214
|
+
const left = isFunctionValue(leftValue) ? toFiniteFunction(leftValue) : undefined;
|
|
215
|
+
const right = isFunctionValue(rightValue) ? toFiniteFunction(rightValue) : undefined;
|
|
216
|
+
if (!left) throw createModuleArgumentError("first", "@@", "function", leftValue);
|
|
217
|
+
if (!right) throw createModuleArgumentError("second", "@@", "function", rightValue);
|
|
218
|
+
const leftPairs = getWrittenPairs(left);
|
|
219
|
+
const addedPairs = getWrittenPairs(right).filter(
|
|
220
|
+
(pair) => !leftPairs.some((leftPair) => isEqualLikeTlc(pair[0], leftPair[0])),
|
|
221
|
+
);
|
|
222
|
+
return createWrittenFunction([...leftPairs, ...addedPairs]);
|
|
186
223
|
}),
|
|
187
224
|
defineOperator("ToString", 1, (args) =>
|
|
188
225
|
rankString(formatValue(getValue(args, 0, "ToString"), true)),
|
|
189
226
|
),
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
227
|
+
// The checker passes no context where TLC caches the value, which it then sorts.
|
|
228
|
+
{
|
|
229
|
+
...defineLazyOperator("TLCEval", 1, (args, context) => {
|
|
230
|
+
const value = convertLikeTlcEval(getThunk(args, 0, "TLCEval")());
|
|
231
|
+
if (context === undefined) normalizeDeeply(value);
|
|
232
|
+
return value;
|
|
233
|
+
}),
|
|
234
|
+
isStateLevel: false,
|
|
235
|
+
},
|
|
195
236
|
defineOperator("Permutations", 1, (args) => {
|
|
196
|
-
const elements =
|
|
237
|
+
const elements = toEnumeratedSet(getValue(args, 0, "Permutations"), "Permutations").elements;
|
|
197
238
|
return createSet(
|
|
198
239
|
getPermutations(elements).map((permutation) =>
|
|
199
240
|
createFunction(
|
|
@@ -203,21 +244,25 @@ export const createTlcOperators = (
|
|
|
203
244
|
);
|
|
204
245
|
}),
|
|
205
246
|
defineHigherOrderOperator("SortSeq", 2, (args) => {
|
|
206
|
-
const
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
);
|
|
247
|
+
const sequence = getValue(args, 0, "SortSeq");
|
|
248
|
+
const elements = getSequenceElements(sequence);
|
|
249
|
+
if (!elements) throw createModuleArgumentError("first", "SortSeq", "natural number", sequence);
|
|
250
|
+
const operator = getOperator(args, 1, "SortSeq");
|
|
251
|
+
const precedes = (left: Value, right: Value) => {
|
|
252
|
+
const result = operator.call([left, right]);
|
|
253
|
+
if (typeof result === "boolean") return result;
|
|
254
|
+
throw createModuleArgumentError("second", "SortSeq", "boolean function", result);
|
|
255
|
+
};
|
|
256
|
+
// TLC's insertion sort moves each element back past the ones it precedes.
|
|
257
|
+
const sorted = elements.slice(0, 1);
|
|
258
|
+
elements.slice(1).forEach((element) => {
|
|
259
|
+
const position = { index: sorted.length };
|
|
260
|
+
while (position.index > 0 && precedes(element, sorted[position.index - 1])) position.index--;
|
|
261
|
+
sorted.splice(position.index, 0, element);
|
|
262
|
+
});
|
|
263
|
+
return createTuple(sorted);
|
|
217
264
|
}),
|
|
218
|
-
// TLC
|
|
219
|
-
// the argument's too, as a failure of that method. TLC 1.7.4 calls TLC.TLCGet with the value of
|
|
220
|
-
// its argument.
|
|
265
|
+
// TLC reports a failure of TLCGet, its argument's too, as one of TLCGetSet.TLCGetEval.
|
|
221
266
|
runtime.version === "1.7.4"
|
|
222
267
|
? overrideWithJava(
|
|
223
268
|
{
|
|
@@ -242,6 +287,6 @@ export const createTlcOperators = (
|
|
|
242
287
|
}),
|
|
243
288
|
defineConstant("Any", ANY_SET),
|
|
244
289
|
defineOperator("RandomElement", 1, (args) =>
|
|
245
|
-
getRandomElement(
|
|
290
|
+
getRandomElement(getValue(args, 0, "RandomElement"), runtime.getRandom()),
|
|
246
291
|
),
|
|
247
292
|
];
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
import {
|
|
2
|
-
createJavaOverrideError,
|
|
3
|
-
defineHigherOrderOperator,
|
|
4
2
|
defineLazyOperator,
|
|
5
3
|
defineOperator,
|
|
6
4
|
defineStateOperator,
|
|
5
|
+
getKindString,
|
|
7
6
|
getOperator,
|
|
8
7
|
getThunk,
|
|
9
8
|
getValue,
|
|
10
9
|
} from "../builtins";
|
|
11
|
-
import { TlaEvaluationError, TlaModuleError
|
|
10
|
+
import { formatRange, TlaEndOfInputError, TlaEvaluationError, TlaModuleError } from "../errors";
|
|
12
11
|
import { getTlcFingerprint } from "./fingerprint";
|
|
13
|
-
import { formatNestedMessage } from "./messages";
|
|
12
|
+
import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
|
|
14
13
|
import {
|
|
14
|
+
describeRange,
|
|
15
15
|
evaluate,
|
|
16
|
-
expectBoolean,
|
|
17
16
|
getDefinition,
|
|
18
17
|
type Builtin,
|
|
19
18
|
type Environment,
|
|
20
19
|
} from "../evaluate";
|
|
21
20
|
import { getChildren, isLocallyResolved, type Definition, type Expression } from "../ast";
|
|
21
|
+
import { ACTION_LEVEL, CONSTANT_LEVEL, VARIABLE_LEVEL } from "../levels";
|
|
22
22
|
import {
|
|
23
23
|
getNamedRegisters,
|
|
24
24
|
getPossibleCounts,
|
|
@@ -32,25 +32,13 @@ import {
|
|
|
32
32
|
createSet,
|
|
33
33
|
createTuple,
|
|
34
34
|
formatValue,
|
|
35
|
-
|
|
35
|
+
getFingerprintError,
|
|
36
36
|
getSequenceElements,
|
|
37
37
|
getValueKey,
|
|
38
|
-
isFunctionValue,
|
|
39
38
|
toFiniteSet,
|
|
40
|
-
valuesEqual,
|
|
41
39
|
type Value,
|
|
42
40
|
} from "../values";
|
|
43
41
|
|
|
44
|
-
const OVERRIDE_PARAMETERS =
|
|
45
|
-
"tlc2.tool.impl.Tool,tla2sany.semantic.ExprOrOpArgNode[],tlc2.util.Context,tlc2.tool.TLCState,tlc2.tool.TLCState,int,tlc2.tool.coverage.CostModel";
|
|
46
|
-
|
|
47
|
-
const ASSERT_ERROR_METHOD = `public static synchronized tlc2.value.impl.Value tlc2.module.TLCExt.assertError(${OVERRIDE_PARAMETERS})`;
|
|
48
|
-
|
|
49
|
-
const TRACE_METHOD = `public static tlc2.value.impl.TupleValue tlc2.module.TLCExt.getTrace(${OVERRIDE_PARAMETERS}) throws java.io.IOException`;
|
|
50
|
-
|
|
51
|
-
const PICK_SUCCESSOR_METHOD = `public static synchronized tlc2.value.impl.Value tlc2.module.TLCExt.pickSuccessor(${OVERRIDE_PARAMETERS})`;
|
|
52
|
-
|
|
53
|
-
// TLC's record for an action it doesn't store, such as every action in breadth-first search.
|
|
54
42
|
export const createActionRecord = (action: string | undefined) =>
|
|
55
43
|
createRecord([
|
|
56
44
|
["name", action ?? "UnnamedAction"],
|
|
@@ -66,9 +54,18 @@ export const createActionRecord = (action: string | undefined) =>
|
|
|
66
54
|
],
|
|
67
55
|
]);
|
|
68
56
|
|
|
69
|
-
// TLC's CounterExample is
|
|
70
|
-
|
|
71
|
-
|
|
57
|
+
// TLC's CounterExample is its own class, so ToTrace refuses a record that only looks like one.
|
|
58
|
+
const counterExamples = new WeakSet<Value & object>();
|
|
59
|
+
|
|
60
|
+
const createCounterExampleRecord = (action: Value[], states: Value[]) => {
|
|
61
|
+
const counterExample = createRecord([
|
|
62
|
+
["action", createSet(action)],
|
|
63
|
+
["state", createSet(states)],
|
|
64
|
+
]);
|
|
65
|
+
counterExamples.add(counterExample);
|
|
66
|
+
return counterExample;
|
|
67
|
+
};
|
|
68
|
+
|
|
72
69
|
export const createCounterExample = (
|
|
73
70
|
stateRecords: Record<string, Value>[],
|
|
74
71
|
actions: Value[],
|
|
@@ -83,10 +80,7 @@ export const createCounterExample = (
|
|
|
83
80
|
const closing = loop
|
|
84
81
|
? [createTuple([states[states.length - 1], loop.action, states[loop.start]])]
|
|
85
82
|
: [];
|
|
86
|
-
return
|
|
87
|
-
["action", createSet([...steps, ...closing])],
|
|
88
|
-
["state", createSet(states)],
|
|
89
|
-
]);
|
|
83
|
+
return createCounterExampleRecord([...steps, ...closing], states);
|
|
90
84
|
};
|
|
91
85
|
|
|
92
86
|
const getRegister = (runtime: CheckerRuntime, key: Value) => {
|
|
@@ -97,7 +91,6 @@ const getRegister = (runtime: CheckerRuntime, key: Value) => {
|
|
|
97
91
|
return undefined;
|
|
98
92
|
};
|
|
99
93
|
|
|
100
|
-
// TLC's TLCSet. TLCExt's TLCGetAndSet is a TLA+ definition that calls it.
|
|
101
94
|
export const setTlcValue = (
|
|
102
95
|
runtime: CheckerRuntime,
|
|
103
96
|
print: (text: string) => void,
|
|
@@ -113,7 +106,7 @@ export const setTlcValue = (
|
|
|
113
106
|
return;
|
|
114
107
|
}
|
|
115
108
|
if (key === "pause") {
|
|
116
|
-
if (value !== true) return;
|
|
109
|
+
if (value !== true || !runtime.pause) return;
|
|
117
110
|
print("Press enter to resume model checking.");
|
|
118
111
|
runtime.pause();
|
|
119
112
|
return;
|
|
@@ -131,33 +124,39 @@ export const setTlcValue = (
|
|
|
131
124
|
);
|
|
132
125
|
};
|
|
133
126
|
|
|
127
|
+
const describeNode = (expression: Expression) =>
|
|
128
|
+
expression.kind === "Number"
|
|
129
|
+
? (expression.text ?? String(expression.value))
|
|
130
|
+
: expression.kind === "Decimal"
|
|
131
|
+
? expression.text
|
|
132
|
+
: describeRange(expression);
|
|
133
|
+
|
|
134
134
|
const isCompleteState = (state: (Value | undefined)[]): state is Value[] =>
|
|
135
135
|
state.every((value) => value !== undefined);
|
|
136
136
|
|
|
137
|
-
const
|
|
138
|
-
createRecord(environment.variables.map((name, index): [string, Value] => [name, state[index]]));
|
|
139
|
-
|
|
140
|
-
const mentionsVariables = (
|
|
137
|
+
const getMentionedLevel = (
|
|
141
138
|
expression: Expression,
|
|
142
139
|
environment: Environment,
|
|
143
140
|
visited: Set<Definition>,
|
|
144
|
-
):
|
|
141
|
+
): number => {
|
|
142
|
+
if (expression.kind === "Prime" || expression.kind === "Unchanged") return ACTION_LEVEL;
|
|
145
143
|
const name =
|
|
146
144
|
expression.kind === "Identifier"
|
|
147
145
|
? expression.name
|
|
148
146
|
: expression.kind === "Apply"
|
|
149
147
|
? expression.operator
|
|
150
148
|
: undefined;
|
|
151
|
-
|
|
152
|
-
if (
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
149
|
+
const isGlobal = name !== undefined && !isLocallyResolved(expression);
|
|
150
|
+
if (isGlobal && environment.variableIndex.has(name)) return VARIABLE_LEVEL;
|
|
151
|
+
const levels = getChildren(expression).map((child) =>
|
|
152
|
+
getMentionedLevel(child, environment, visited),
|
|
153
|
+
);
|
|
154
|
+
const definition = isGlobal ? getDefinition(name, environment) : undefined;
|
|
155
|
+
if (definition && !visited.has(definition)) {
|
|
156
|
+
visited.add(definition);
|
|
157
|
+
levels.push(getMentionedLevel(definition.body, environment, visited));
|
|
159
158
|
}
|
|
160
|
-
return
|
|
159
|
+
return Math.max(CONSTANT_LEVEL, ...levels);
|
|
161
160
|
};
|
|
162
161
|
|
|
163
162
|
export const createTlcExtOperators = (
|
|
@@ -172,23 +171,11 @@ export const createTlcExtOperators = (
|
|
|
172
171
|
return caches;
|
|
173
172
|
};
|
|
174
173
|
return [
|
|
175
|
-
defineOperator("AssertEq", 2, (args) => {
|
|
176
|
-
const left = getValue(args, 0, "AssertEq");
|
|
177
|
-
const right = getValue(args, 1, "AssertEq");
|
|
178
|
-
const isEqual = valuesEqual(left, right);
|
|
179
|
-
if (!isEqual) {
|
|
180
|
-
print(formatValue("Assertion failed", true));
|
|
181
|
-
print(formatValue(left, true));
|
|
182
|
-
print(formatValue(right, true));
|
|
183
|
-
}
|
|
184
|
-
return isEqual;
|
|
185
|
-
}),
|
|
186
174
|
defineLazyOperator("AssertError", 2, (args) => {
|
|
187
175
|
const message = getOperator(args, 0, "AssertError").expression;
|
|
188
176
|
if (message && message.kind !== "String") {
|
|
189
|
-
throw
|
|
190
|
-
|
|
191
|
-
`In computing AssertError, a non-string expression (line ${message.location.line}, col ${message.location.column}) was used as the err of an AssertError(err, exp).`,
|
|
177
|
+
throw new TlaEvaluationError(
|
|
178
|
+
`In computing AssertError, a non-string expression (${describeNode(message)}) was used as the err of an AssertError(err, exp).`,
|
|
192
179
|
);
|
|
193
180
|
}
|
|
194
181
|
const expected = getThunk(args, 0, "AssertError")();
|
|
@@ -206,53 +193,38 @@ export const createTlcExtOperators = (
|
|
|
206
193
|
const key = getValue(args, 0, "TLCGetOrDefault");
|
|
207
194
|
return getRegister(runtime, key) ?? getValue(args, 1, "TLCGetOrDefault");
|
|
208
195
|
}),
|
|
209
|
-
{
|
|
210
|
-
...defineHigherOrderOperator("TLCGetAndSet", 4, (args) => {
|
|
211
|
-
const key = getValue(args, 0, "TLCGetAndSet");
|
|
212
|
-
const previous = getRegister(runtime, key) ?? getValue(args, 3, "TLCGetAndSet");
|
|
213
|
-
const update = getOperator(args, 1, "TLCGetAndSet");
|
|
214
|
-
setTlcValue(
|
|
215
|
-
runtime,
|
|
216
|
-
print,
|
|
217
|
-
key,
|
|
218
|
-
update.call([previous, getValue(args, 2, "TLCGetAndSet")]),
|
|
219
|
-
);
|
|
220
|
-
return previous;
|
|
221
|
-
}),
|
|
222
|
-
isStateLevel: true,
|
|
223
|
-
},
|
|
224
196
|
defineStateOperator("Trace", 0, (_, context) => {
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
);
|
|
230
|
-
throw
|
|
231
|
-
TRACE_METHOD,
|
|
197
|
+
const variables = context?.environment.variables ?? [];
|
|
198
|
+
// TLC evaluates an assumption in an empty state, which assigns none of the variables.
|
|
199
|
+
const state = context?.state ?? variables.map(() => undefined);
|
|
200
|
+
if (!context || !isCompleteState(state)) {
|
|
201
|
+
const unassigned = variables.filter((_, index) => state[index] === undefined);
|
|
202
|
+
throw new TlaEvaluationError(
|
|
232
203
|
`In evaluating TLCExt!Trace, the state is not completely specified yet (variable${unassigned.length > 1 ? "s" : ""} ${unassigned.join(", ")} undefined).`,
|
|
233
204
|
);
|
|
234
205
|
}
|
|
206
|
+
if (!context.state) return createTuple([createRecord([])]);
|
|
235
207
|
return createTuple(
|
|
236
|
-
runtime.getBehavior(state).map((step) =>
|
|
208
|
+
runtime.getBehavior(state).map((step) => {
|
|
209
|
+
const fields = context.environment.variables.map((name, index): [string, Value] => [
|
|
210
|
+
name,
|
|
211
|
+
step[index],
|
|
212
|
+
]);
|
|
213
|
+
// A simulated behavior's states also record their actions.
|
|
214
|
+
const action = runtime.getSimulationValue?.("action", step);
|
|
215
|
+
return createRecord(action === undefined ? fields : [["_action", action], ...fields]);
|
|
216
|
+
}),
|
|
237
217
|
);
|
|
238
218
|
}),
|
|
239
219
|
defineStateOperator(
|
|
240
220
|
"CounterExample",
|
|
241
221
|
0,
|
|
242
|
-
() =>
|
|
243
|
-
runtime.counterExample ??
|
|
244
|
-
createRecord([
|
|
245
|
-
["action", createSet([])],
|
|
246
|
-
["state", createSet([])],
|
|
247
|
-
]),
|
|
222
|
+
() => runtime.counterExample ?? createCounterExampleRecord([], []),
|
|
248
223
|
),
|
|
249
224
|
defineOperator("ToTrace", 1, (args) => {
|
|
250
225
|
const counterExample = getValue(args, 0, "ToTrace");
|
|
251
|
-
if (
|
|
252
|
-
|
|
253
|
-
!valuesEqual(getDomain(counterExample), createSet(["action", "state"]))
|
|
254
|
-
) {
|
|
255
|
-
throw new TlaEvaluationError(
|
|
226
|
+
if (typeof counterExample !== "object" || !counterExamples.has(counterExample)) {
|
|
227
|
+
throw new TlaModuleError(
|
|
256
228
|
`The argument of ToTrace should be a CounterExample, but instead it is:\n${formatValue(counterExample)}`,
|
|
257
229
|
);
|
|
258
230
|
}
|
|
@@ -272,31 +244,62 @@ export const createTlcExtOperators = (
|
|
|
272
244
|
}
|
|
273
245
|
return createModelValue(name);
|
|
274
246
|
}),
|
|
275
|
-
//
|
|
276
|
-
defineLazyOperator("TLCDefer", 1, () =>
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
PICK_SUCCESSOR_METHOD,
|
|
283
|
-
'Cannot invoke "tlc2.value.IValue.fingerPrint(long)" because "minVals[i]" is null',
|
|
284
|
-
);
|
|
285
|
-
}
|
|
286
|
-
if (runtime.isSeen(next)) return true;
|
|
287
|
-
if (expectBoolean(getThunk(args, 0, "PickSuccessor")(), "the condition of PickSuccessor")) {
|
|
288
|
-
return true;
|
|
247
|
+
// Only simulation runs the deferred expression, for the successor it chooses.
|
|
248
|
+
defineLazyOperator("TLCDefer", 1, (args, context) => {
|
|
249
|
+
const expression = getOperator(args, 0, "TLCDefer").expression;
|
|
250
|
+
if (context && expression) {
|
|
251
|
+
runtime.deferred = (next) => {
|
|
252
|
+
evaluate(expression, { ...context, next });
|
|
253
|
+
};
|
|
289
254
|
}
|
|
290
|
-
|
|
291
|
-
"PickSuccessor needs interactive input to extend the behavior with a new state",
|
|
292
|
-
);
|
|
255
|
+
return true;
|
|
293
256
|
}),
|
|
257
|
+
defineOperator("TLCNoOp", 1, (args) => getValue(args, 0, "TLCNoOp")),
|
|
258
|
+
{
|
|
259
|
+
...defineLazyOperator("PickSuccessor", 1, (args, context) => {
|
|
260
|
+
// Outside an action, TLC's successor is an empty state, which assigns none of the variables.
|
|
261
|
+
// TLCExt.tla promises TRUE for a successor not fully determined, where TLCExt#pickSuccessor
|
|
262
|
+
// fingerprints it first and fails.
|
|
263
|
+
const next = context?.next ?? (context?.environment.variables ?? []).map(() => undefined);
|
|
264
|
+
if (!isCompleteState(next)) return true;
|
|
265
|
+
if (context?.next && runtime.isSeen(next)) return true;
|
|
266
|
+
const guard = getOperator(args, 0, "PickSuccessor");
|
|
267
|
+
const isPicked = guard.call([]);
|
|
268
|
+
if (typeof isPicked !== "boolean") {
|
|
269
|
+
throw new TlaEvaluationError(
|
|
270
|
+
`In evaluating TLCExt!PickSuccessor, a non-boolean expression (${getKindString(isPicked)}) was used as the condition of an IF.\n${guard.expression ? describeNode(guard.expression) : ""}`,
|
|
271
|
+
);
|
|
272
|
+
}
|
|
273
|
+
if (isPicked || !context?.next || !context.state || !isCompleteState(context.state)) {
|
|
274
|
+
return true;
|
|
275
|
+
}
|
|
276
|
+
const action = runtime.getSuccessorAction(context.state, next);
|
|
277
|
+
print(
|
|
278
|
+
formatMessage(
|
|
279
|
+
runtime.isTool,
|
|
280
|
+
MESSAGE_CODE.moduleOverrideStdout,
|
|
281
|
+
MESSAGE_LEVEL.none,
|
|
282
|
+
`Extend behavior of length ${runtime.getLevel(context.state)} with a "${action?.name}" step [<Action ${action?.location.range && formatRange(action.location.range)}>]? (Yes/no/explored/states/diff):`,
|
|
283
|
+
),
|
|
284
|
+
);
|
|
285
|
+
// tla-ts gives PickSuccessor no standard input to read an answer from.
|
|
286
|
+
throw new TlaEndOfInputError();
|
|
287
|
+
}),
|
|
288
|
+
isActionLevel: true,
|
|
289
|
+
},
|
|
294
290
|
defineLazyOperator("TLCCache", 2, (args, context) => {
|
|
295
291
|
const expression = getOperator(args, 0, "TLCCache");
|
|
296
292
|
const closure = getValueKey(getThunk(args, 1, "TLCCache")());
|
|
297
293
|
const source = expression.expression;
|
|
298
294
|
if (!source || !context) return expression.call([]);
|
|
299
|
-
const
|
|
295
|
+
const level = getMentionedLevel(source, context.environment, new Set());
|
|
296
|
+
if (level === ACTION_LEVEL) return expression.call([]);
|
|
297
|
+
const isStateLevel = level === VARIABLE_LEVEL;
|
|
298
|
+
// TLC's model checker keeps no cache in a state, so its TLA+ definition evaluates it again.
|
|
299
|
+
if (isStateLevel && context.state && runtime.getSimulationValue === undefined) {
|
|
300
|
+
expression.call([]);
|
|
301
|
+
return expression.call([]);
|
|
302
|
+
}
|
|
300
303
|
const caches = isStateLevel && context.state ? getStateCaches(context.state) : globalCaches;
|
|
301
304
|
const cache = caches.get(source) ?? new Map<string, Value>();
|
|
302
305
|
caches.set(source, cache);
|
|
@@ -306,24 +309,42 @@ export const createTlcExtOperators = (
|
|
|
306
309
|
cache.set(closure, value);
|
|
307
310
|
return value;
|
|
308
311
|
}),
|
|
309
|
-
defineOperator("TLCFP", 1, (args) =>
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
312
|
+
defineOperator("TLCFP", 1, (args) => {
|
|
313
|
+
const value = getValue(args, 0, "TLCFP");
|
|
314
|
+
const error = getFingerprintError(value);
|
|
315
|
+
if (error) throw error;
|
|
316
|
+
return Number(BigInt.asIntN(32, getTlcFingerprint([value])));
|
|
317
|
+
}),
|
|
318
|
+
defineLazyOperator("TLCEvalDefinition", 1, (args, context) => {
|
|
319
|
+
const name = getThunk(args, 0, "TLCEvalDefinition")();
|
|
320
|
+
if (typeof name !== "string") {
|
|
321
|
+
throw new TlaModuleError(
|
|
322
|
+
`The argument of TLCEvalDefinition should be a string, but instead it is:\n${formatValue(name)}`,
|
|
323
|
+
);
|
|
324
|
+
}
|
|
325
|
+
const definition = context ? getDefinition(name, context.environment) : undefined;
|
|
326
|
+
// A definition that TLC overrides with Java has the Java method's value, not its body's.
|
|
327
|
+
const builtin = definition ? undefined : context?.environment.builtins.get(name);
|
|
328
|
+
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
329
|
+
if (!definition || !context) {
|
|
317
330
|
throw new TlaModuleError(
|
|
318
331
|
`The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${formatValue(name)}`,
|
|
319
332
|
);
|
|
320
333
|
}
|
|
321
334
|
if (definition.kind === "Operator" && definition.params.length > 0) {
|
|
335
|
+
const parameters = definition.params.map((param) =>
|
|
336
|
+
param.arity === 0
|
|
337
|
+
? param.name
|
|
338
|
+
: `${param.name}(${Array.from({ length: param.arity }, () => "_").join(",")})`,
|
|
339
|
+
);
|
|
340
|
+
// TLC's message template puts another "a" before the expected kind.
|
|
322
341
|
throw new TlaModuleError(
|
|
323
|
-
`The argument of TLCEvalDefinition should be a zero-arity definition, but instead it is:\n${name}`,
|
|
342
|
+
`The argument of TLCEvalDefinition should be a a zero-arity definition, but instead it is:\n${name}(${parameters.join(", ")})`,
|
|
324
343
|
);
|
|
325
344
|
}
|
|
326
|
-
return
|
|
345
|
+
return definition.kind === "Operator"
|
|
346
|
+
? evaluate(definition.body, context)
|
|
347
|
+
: evaluate({ kind: "Identifier", name, location: definition.location }, context);
|
|
327
348
|
}),
|
|
328
349
|
];
|
|
329
350
|
};
|