tla-ts 0.0.9 → 0.0.10
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/standard-modules.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TlaEvaluationError, TlaModuleError } from "./errors";
|
|
1
|
+
import { TlaEvaluationError, TlaModuleError, TlaSetBoundError } from "./errors";
|
|
2
2
|
import {
|
|
3
3
|
createModuleArgumentError,
|
|
4
4
|
createOverflowError,
|
|
@@ -9,25 +9,32 @@ import {
|
|
|
9
9
|
defineHigherOrderOperator,
|
|
10
10
|
defineOperator,
|
|
11
11
|
getBoolean,
|
|
12
|
-
getNumber,
|
|
13
12
|
getOperator,
|
|
14
|
-
|
|
13
|
+
getThunk,
|
|
15
14
|
getJavaSignature,
|
|
16
15
|
getJavaInteger,
|
|
17
16
|
getValue,
|
|
18
17
|
isOutOfRange,
|
|
19
18
|
overrideWithJava,
|
|
20
19
|
} from "./builtins";
|
|
21
|
-
import type { Builtin, BuiltinArgument } from "./evaluate";
|
|
20
|
+
import type { Builtin, BuiltinArgument, Context } from "./evaluate";
|
|
22
21
|
import type { CheckerRuntime } from "./runtime";
|
|
23
22
|
import { createBagsOperators } from "./bags";
|
|
24
|
-
import { createJsonOperators, type FileSystem } from "./json";
|
|
25
|
-
import {
|
|
23
|
+
import { createIoUtilsOperators, createJsonOperators, type FileSystem } from "./json";
|
|
24
|
+
import { createTlcTraceOperators } from "./tlc/value-stream";
|
|
25
|
+
import { createRandomizationOperators, createRandomSubsetSet } from "./randomization";
|
|
26
26
|
import { createPossibleOperators, createTlcExtOperators } from "./tlc/tlcext-operators";
|
|
27
27
|
import { createTlcOperators } from "./tlc/tlc-operators";
|
|
28
28
|
import { TLC_JAVA_METHODS } from "./tlc/jar-data";
|
|
29
29
|
import {
|
|
30
|
+
addBoundedElement,
|
|
31
|
+
ANY_SET,
|
|
32
|
+
createUnsortedCopy,
|
|
33
|
+
forEachElement,
|
|
34
|
+
isBeyondSetBound,
|
|
30
35
|
createSet,
|
|
36
|
+
createSortedSet,
|
|
37
|
+
compareValues,
|
|
31
38
|
describeKind,
|
|
32
39
|
createTuple,
|
|
33
40
|
getSortedDifference,
|
|
@@ -35,20 +42,26 @@ import {
|
|
|
35
42
|
getCardinality,
|
|
36
43
|
getDomain,
|
|
37
44
|
getSortedIntersection,
|
|
45
|
+
someStreamedElement,
|
|
38
46
|
isElementOf,
|
|
39
47
|
getSequenceElements,
|
|
40
48
|
isEmptySet,
|
|
41
49
|
isEnumerable,
|
|
42
50
|
isFiniteSet,
|
|
43
51
|
isFunctionValue,
|
|
52
|
+
isOverriddenSet,
|
|
44
53
|
computeLikeTlcOnFailure,
|
|
45
54
|
isReducibleSet,
|
|
55
|
+
markNormalized,
|
|
46
56
|
markStreamedSet,
|
|
47
57
|
isSetValue,
|
|
48
58
|
toFiniteSet,
|
|
49
59
|
getSortedUnion,
|
|
60
|
+
getValueKey,
|
|
61
|
+
getWrittenElements,
|
|
50
62
|
isEqualLikeTlc,
|
|
51
63
|
createEnumeratedSet,
|
|
64
|
+
createNormalizedSet,
|
|
52
65
|
EMPTY_SET,
|
|
53
66
|
isEnumeratedSet,
|
|
54
67
|
type IntervalValue,
|
|
@@ -57,8 +70,11 @@ import {
|
|
|
57
70
|
type SetValue,
|
|
58
71
|
type Value,
|
|
59
72
|
rankString,
|
|
73
|
+
getMaximumSetSize,
|
|
74
|
+
getSetBoundMessage,
|
|
60
75
|
} from "./values";
|
|
61
76
|
import type { TlcVersion } from "./tlc/version";
|
|
77
|
+
import { getSanyStandardModules } from "./sany/modules";
|
|
62
78
|
|
|
63
79
|
interface StandardModule {
|
|
64
80
|
extends: string[];
|
|
@@ -69,9 +85,9 @@ const isSubsetOf = (left: Value[], right: Value) =>
|
|
|
69
85
|
left.every((element) => isElementOf(element, right));
|
|
70
86
|
|
|
71
87
|
const BOOLEAN_SET = createSet([false, true]);
|
|
88
|
+
markNormalized(BOOLEAN_SET);
|
|
72
89
|
|
|
73
|
-
//
|
|
74
|
-
// times.
|
|
90
|
+
// A balanced merge compares each element about log2 of the set count times.
|
|
75
91
|
const getBalancedUnion = (sets: SetValue[], start: number, end: number): SetValue => {
|
|
76
92
|
if (end - start === 1) return sets[start];
|
|
77
93
|
const middle = (start + end) >> 1;
|
|
@@ -84,26 +100,49 @@ type ReducibleSet = SetValue | MixedSetValue | IntervalValue;
|
|
|
84
100
|
|
|
85
101
|
const isMixedSet = (value: Value) => typeof value === "object" && value.kind === "MixedSet";
|
|
86
102
|
|
|
87
|
-
//
|
|
88
|
-
|
|
103
|
+
// These keep the intersection and difference they compute normalized.
|
|
104
|
+
const isNormalizedReducible = (set: ReducibleSet) =>
|
|
105
|
+
set.kind === "Interval" || (set.kind === "Set" && set.isNormalized);
|
|
106
|
+
|
|
107
|
+
// TLC combines a set enumeration or an interval with a set by testing each element's membership.
|
|
89
108
|
const combineReducible = (
|
|
90
109
|
operator: SetOperationValue["operator"],
|
|
91
110
|
set: ReducibleSet,
|
|
92
111
|
other: Value,
|
|
93
112
|
): Value => {
|
|
94
|
-
|
|
113
|
+
if (set.kind === "Interval") getCardinality(set);
|
|
114
|
+
const elements = set.kind === "Interval" ? set : getWrittenElements(set);
|
|
95
115
|
if (operator !== "\\cup") {
|
|
96
116
|
const isKept = operator === "\\cap";
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
117
|
+
const kept: Value[] = [];
|
|
118
|
+
forEachElement(elements, (element) => {
|
|
119
|
+
if (isElementOf(element, other) === isKept) addBoundedElement(kept, element);
|
|
120
|
+
});
|
|
121
|
+
return isNormalizedReducible(set) ? createNormalizedSet(kept) : createEnumeratedSet(kept);
|
|
100
122
|
}
|
|
101
|
-
if (
|
|
123
|
+
if (isEmptySet(set)) return other;
|
|
102
124
|
if (!isReducibleSet(other)) {
|
|
103
125
|
return markStreamedSet({ kind: "SetOperation", operator, left: set, right: other });
|
|
104
126
|
}
|
|
105
|
-
const
|
|
106
|
-
|
|
127
|
+
const union: Value[] = [];
|
|
128
|
+
forEachElement(elements, (element) => addBoundedElement(union, element));
|
|
129
|
+
forEachElement(other.kind === "Interval" ? other : toFiniteSet(other).elements, (element) => {
|
|
130
|
+
if (!isElementOf(element, set)) addBoundedElement(union, element);
|
|
131
|
+
});
|
|
132
|
+
return createEnumeratedSet(union);
|
|
133
|
+
};
|
|
134
|
+
|
|
135
|
+
const defineShortCircuit = (
|
|
136
|
+
name: string,
|
|
137
|
+
compute: (left: boolean, right: () => boolean) => boolean,
|
|
138
|
+
): Builtin => {
|
|
139
|
+
const getArgument = (args: BuiltinArgument[], index: number) =>
|
|
140
|
+
getBoolean([getThunk(args, index, name)()], 0, name);
|
|
141
|
+
return {
|
|
142
|
+
...defineOperator(name, 2, (args) => compute(getArgument(args, 0), () => getArgument(args, 1))),
|
|
143
|
+
evaluateBinary: undefined,
|
|
144
|
+
isLazy: true,
|
|
145
|
+
};
|
|
107
146
|
};
|
|
108
147
|
|
|
109
148
|
export const CORE_OPERATORS: Builtin[] = [
|
|
@@ -115,9 +154,9 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
115
154
|
defineBinary("#", (left, right) => !isEqualLikeTlc(left, right)),
|
|
116
155
|
defineOperator("~", 1, (args) => !getBoolean(args, 0, "~")),
|
|
117
156
|
defineOperator("<=>", 2, (args) => getBoolean(args, 0, "<=>") === getBoolean(args, 1, "<=>")),
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
157
|
+
defineShortCircuit("/\\", (left, right) => left && right()),
|
|
158
|
+
defineShortCircuit("\\/", (left, right) => left || right()),
|
|
159
|
+
defineShortCircuit("=>", (left, right) => !left || right()),
|
|
121
160
|
defineOperator("\\in", 2, (args) =>
|
|
122
161
|
isElementOf(getValue(args, 0, "\\in"), getValue(args, 1, "\\in")),
|
|
123
162
|
),
|
|
@@ -126,10 +165,11 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
126
165
|
2,
|
|
127
166
|
(args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
|
|
128
167
|
),
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
168
|
+
// TLC tests each element of the left set for membership in the right value.
|
|
169
|
+
defineBinary("\\subseteq", (left, right) => {
|
|
170
|
+
if (!isSetValue(left)) {
|
|
171
|
+
throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
|
|
172
|
+
}
|
|
133
173
|
const isPowerSets =
|
|
134
174
|
typeof left === "object" &&
|
|
135
175
|
left.kind === "Subset" &&
|
|
@@ -137,19 +177,39 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
137
177
|
right.kind === "Subset" &&
|
|
138
178
|
isEnumerable(left.base);
|
|
139
179
|
if (isPowerSets) return isSubsetOf(toFiniteSet(left.base).elements, right.base);
|
|
140
|
-
|
|
180
|
+
if (typeof left === "object" && left.kind === "Interval") {
|
|
181
|
+
const isWithin =
|
|
182
|
+
typeof right === "object" &&
|
|
183
|
+
right.kind === "Interval" &&
|
|
184
|
+
right.low <= left.low &&
|
|
185
|
+
right.high >= left.high;
|
|
186
|
+
if (isWithin) return true;
|
|
187
|
+
for (let element = left.low; element <= left.high; element++) {
|
|
188
|
+
if (!isElementOf(element, right)) return false;
|
|
189
|
+
}
|
|
190
|
+
return true;
|
|
191
|
+
}
|
|
192
|
+
return !someStreamedElement(left, (element) => !isElementOf(element, right));
|
|
141
193
|
}),
|
|
142
|
-
// TLC defers
|
|
143
|
-
// tests of the result.
|
|
194
|
+
// TLC defers set operations on non-sets to enumerating or testing membership in the result.
|
|
144
195
|
...SET_OPERATORS.map((operator) =>
|
|
145
196
|
defineOperator(operator, 2, (args) => {
|
|
146
197
|
const left = getValue(args, 0, operator);
|
|
147
198
|
const right = getValue(args, 1, operator);
|
|
199
|
+
const isFilteredByInterval =
|
|
200
|
+
operator !== "\\cup" &&
|
|
201
|
+
typeof right === "object" &&
|
|
202
|
+
right.kind === "Interval" &&
|
|
203
|
+
typeof left === "object" &&
|
|
204
|
+
left.kind !== "Interval";
|
|
148
205
|
if (
|
|
149
206
|
isReducibleSet(left) &&
|
|
150
207
|
isReducibleSet(right) &&
|
|
151
208
|
!isMixedSet(left) &&
|
|
152
|
-
!isMixedSet(right)
|
|
209
|
+
!isMixedSet(right) &&
|
|
210
|
+
!isFilteredByInterval &&
|
|
211
|
+
!isBeyondSetBound(left) &&
|
|
212
|
+
!isBeyondSetBound(right)
|
|
153
213
|
) {
|
|
154
214
|
if (operator === "\\cup" && isEmptySet(left)) return right;
|
|
155
215
|
const merge =
|
|
@@ -160,7 +220,34 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
160
220
|
: getSortedDifference;
|
|
161
221
|
// The merge compares the elements, which TLC tests for membership one by one instead.
|
|
162
222
|
return computeLikeTlcOnFailure(
|
|
163
|
-
(finiteLeft, finiteRight) =>
|
|
223
|
+
(finiteLeft, finiteRight) => {
|
|
224
|
+
const leftSet = toFiniteSet(finiteLeft);
|
|
225
|
+
const rightSet = toFiniteSet(finiteRight);
|
|
226
|
+
const merged = merge(leftSet, rightSet);
|
|
227
|
+
if (operator === "\\cup") {
|
|
228
|
+
// TLC appends the right set's new elements to the left set's, unsorted.
|
|
229
|
+
const written = getWrittenElements(leftSet);
|
|
230
|
+
const added = getSortedDifference(rightSet, leftSet).elements;
|
|
231
|
+
const isSorted =
|
|
232
|
+
written === leftSet.elements &&
|
|
233
|
+
(added.length === 0 || compareValues(written[written.length - 1], added[0]) < 0);
|
|
234
|
+
if (written.length + added.length > getMaximumSetSize()) {
|
|
235
|
+
throw new TlaSetBoundError(getSetBoundMessage());
|
|
236
|
+
}
|
|
237
|
+
if (isSorted && !leftSet.isNormalized) return merged;
|
|
238
|
+
const union = merged === leftSet ? createSortedSet(merged.elements) : merged;
|
|
239
|
+
if (!isSorted) union.writtenElements = [...written, ...added];
|
|
240
|
+
return union;
|
|
241
|
+
}
|
|
242
|
+
if (merged === finiteLeft) return merged;
|
|
243
|
+
merged.isNormalized = isNormalizedReducible(finiteLeft);
|
|
244
|
+
if (leftSet.writtenElements && !leftSet.isNormalized) {
|
|
245
|
+
merged.writtenElements = leftSet.writtenElements.filter((element) =>
|
|
246
|
+
isElementOf(element, merged),
|
|
247
|
+
);
|
|
248
|
+
}
|
|
249
|
+
return merged;
|
|
250
|
+
},
|
|
164
251
|
(reducibleLeft, reducibleRight) =>
|
|
165
252
|
combineReducible(operator, reducibleLeft, reducibleRight),
|
|
166
253
|
left,
|
|
@@ -175,21 +262,30 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
175
262
|
),
|
|
176
263
|
defineOperator("SUBSET", 1, (args) => ({ kind: "Subset", base: getValue(args, 0, "SUBSET") })),
|
|
177
264
|
defineOperator("UNION", 1, (args) => {
|
|
178
|
-
const outer =
|
|
179
|
-
const
|
|
180
|
-
|
|
265
|
+
const outer = getValue(args, 0, "UNION");
|
|
266
|
+
const written = isEnumeratedSet(outer) ? getWrittenElements(outer) : [];
|
|
267
|
+
const sets = written.filter(isEnumeratedSet);
|
|
268
|
+
if (!isEnumeratedSet(outer) || sets.length !== written.length) {
|
|
181
269
|
return markStreamedSet({ kind: "Union", base: outer });
|
|
182
270
|
}
|
|
183
|
-
|
|
271
|
+
// TLC adds each set's elements in written order, and only those not yet in the union.
|
|
272
|
+
const added = sets.flatMap(getWrittenElements);
|
|
273
|
+
const getUnionLikeTlc = () => {
|
|
184
274
|
const union: MixedSetValue = { kind: "MixedSet", elements: [] };
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}),
|
|
189
|
-
);
|
|
275
|
+
added.forEach((member) => {
|
|
276
|
+
if (!isElementOf(member, union)) addBoundedElement(union.elements, member);
|
|
277
|
+
});
|
|
190
278
|
return createEnumeratedSet(union.elements);
|
|
191
|
-
}
|
|
192
|
-
|
|
279
|
+
};
|
|
280
|
+
if (isMixedSet(outer) || sets.some(isMixedSet)) return getUnionLikeTlc();
|
|
281
|
+
if (sets.length === 0) return EMPTY_SET;
|
|
282
|
+
return computeLikeTlcOnFailure(
|
|
283
|
+
(finiteSets: SetValue[]) =>
|
|
284
|
+
createUnsortedCopy(getBalancedUnion(finiteSets, 0, finiteSets.length), added),
|
|
285
|
+
getUnionLikeTlc,
|
|
286
|
+
sets.map(toFiniteSet),
|
|
287
|
+
undefined,
|
|
288
|
+
);
|
|
193
289
|
}),
|
|
194
290
|
defineOperator("DOMAIN", 1, (args) => {
|
|
195
291
|
const value = getValue(args, 0, "DOMAIN");
|
|
@@ -202,8 +298,7 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
202
298
|
|
|
203
299
|
const NEG_SIGNATURE = getJavaSignature("Integers", "Neg", "IntValue", 1);
|
|
204
300
|
|
|
205
|
-
// TLC
|
|
206
|
-
// those of tlc2.module.Integers when the spec loads Integers, and names the method in an error.
|
|
301
|
+
// TLC computes this arithmetic in tlc2.module.Naturals, or Integers if loaded, named in errors.
|
|
207
302
|
const createArithmeticOperators = (module: string) => {
|
|
208
303
|
const dotDotSignature = getJavaSignature(module, "DotDot", "IntervalValue", 2);
|
|
209
304
|
return [
|
|
@@ -221,12 +316,6 @@ const createArithmeticOperators = (module: string) => {
|
|
|
221
316
|
}),
|
|
222
317
|
defineArithmetic(module, "\\div", "Divide", (left, right) => {
|
|
223
318
|
if (right === 0) throw new TlaModuleError("The second argument of \\div is 0.");
|
|
224
|
-
// tlc2.module.Naturals#Divide floors only a quotient Java truncates below 0, and lets
|
|
225
|
-
// -2147483648 \div -1 overflow.
|
|
226
|
-
if (module === "Naturals") {
|
|
227
|
-
const truncated = Math.trunc(left / right) | 0;
|
|
228
|
-
return truncated < 0 && Math.imul(truncated, right) !== left ? truncated - 1 : truncated;
|
|
229
|
-
}
|
|
230
319
|
const quotient = Math.floor(left / right);
|
|
231
320
|
if (isOutOfRange(quotient)) throw createOverflowError(`${left} \\div ${right}`);
|
|
232
321
|
return quotient;
|
|
@@ -239,11 +328,12 @@ const createArithmeticOperators = (module: string) => {
|
|
|
239
328
|
}
|
|
240
329
|
return ((left % right) + right) % right;
|
|
241
330
|
}),
|
|
242
|
-
defineOperator("..", 2, (args) =>
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
high
|
|
246
|
-
|
|
331
|
+
defineOperator("..", 2, (args) => {
|
|
332
|
+
const low = getValue(args, 0, "..");
|
|
333
|
+
// TLC's MethodHandle casts the last argument first.
|
|
334
|
+
const high = getJavaInteger(getValue(args, 1, ".."), dotDotSignature);
|
|
335
|
+
return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high };
|
|
336
|
+
}),
|
|
247
337
|
];
|
|
248
338
|
};
|
|
249
339
|
|
|
@@ -251,28 +341,48 @@ const NATURALS_ARITHMETIC = createArithmeticOperators("Naturals");
|
|
|
251
341
|
|
|
252
342
|
const INTEGERS_ARITHMETIC = createArithmeticOperators("Integers");
|
|
253
343
|
|
|
254
|
-
//
|
|
255
|
-
// loads Integers for its trace exploration spec, by the operator each replaces.
|
|
344
|
+
// TLC loads Integers for a trace exploration spec, whose methods then replace these.
|
|
256
345
|
export const getTraceSpecArithmetic = (builtin: Builtin) => {
|
|
257
346
|
const index = NATURALS_ARITHMETIC.indexOf(builtin);
|
|
258
347
|
return index === -1 ? undefined : INTEGERS_ARITHMETIC[index];
|
|
259
348
|
};
|
|
260
349
|
|
|
350
|
+
// Naturals#GEQ names itself > in its errors, and Integers#GT returns a BoolValue. Only a
|
|
351
|
+
// spec that extends Integers gets Integers' comparisons.
|
|
352
|
+
const createComparisonOperators = (module: string) => {
|
|
353
|
+
const getSignature = (method: string, result = "tlc2.value.IBoolValue") =>
|
|
354
|
+
`public static ${result} tlc2.module.${module}.${method}(tlc2.value.impl.Value,tlc2.value.impl.Value)`;
|
|
355
|
+
const isIntegers = module === "Integers";
|
|
356
|
+
return [
|
|
357
|
+
overrideWithJava(
|
|
358
|
+
defineComparison("<", (left, right) => left < right),
|
|
359
|
+
getSignature("LT"),
|
|
360
|
+
),
|
|
361
|
+
overrideWithJava(
|
|
362
|
+
defineComparison(">", (left, right) => left > right),
|
|
363
|
+
isIntegers ? getSignature("GT", "tlc2.value.impl.BoolValue") : getSignature("GT"),
|
|
364
|
+
),
|
|
365
|
+
overrideWithJava(
|
|
366
|
+
defineComparison("<=", (left, right) => left <= right),
|
|
367
|
+
getSignature("LE"),
|
|
368
|
+
),
|
|
369
|
+
overrideWithJava(
|
|
370
|
+
defineComparison(">=", (left, right) => left >= right, isIntegers ? ">=" : ">"),
|
|
371
|
+
getSignature("GEQ"),
|
|
372
|
+
),
|
|
373
|
+
];
|
|
374
|
+
};
|
|
375
|
+
|
|
261
376
|
const NATURALS_OPERATORS = [
|
|
262
377
|
defineConstant("Nat", { kind: "InfiniteSet", name: "Nat" }),
|
|
263
378
|
...NATURALS_ARITHMETIC,
|
|
264
|
-
|
|
265
|
-
defineComparison(">", (left, right) => left > right),
|
|
266
|
-
defineComparison("<=", (left, right) => left <= right),
|
|
267
|
-
// tlc2.module.Naturals#GEQ names itself > in its errors. Only a spec that extends Integers gets
|
|
268
|
-
// the GEQ of tlc2.module.Integers, not one that loads Integers for its trace exploration spec.
|
|
269
|
-
defineComparison(">=", (left, right) => left >= right, ">"),
|
|
379
|
+
...createComparisonOperators("Naturals"),
|
|
270
380
|
];
|
|
271
381
|
|
|
272
382
|
const INTEGERS_OPERATORS = [
|
|
273
383
|
defineConstant("Int", { kind: "InfiniteSet", name: "Int" }),
|
|
274
384
|
...INTEGERS_ARITHMETIC,
|
|
275
|
-
|
|
385
|
+
...createComparisonOperators("Integers"),
|
|
276
386
|
defineOperator("-.", 1, (args) => {
|
|
277
387
|
const value = getJavaInteger(getValue(args, 0, "-"), NEG_SIGNATURE);
|
|
278
388
|
if (isOutOfRange(-value)) throw createOverflowError(`-${value}`);
|
|
@@ -292,6 +402,14 @@ const getSequenceOrString = (args: BuiltinArgument[], index: number, message: st
|
|
|
292
402
|
return typeof value === "string" ? value : getSequenceArgument(args, index, message);
|
|
293
403
|
};
|
|
294
404
|
|
|
405
|
+
const getSubSeqIndex = (args: BuiltinArgument[], index: number, position: string) => {
|
|
406
|
+
const value = getValue(args, index, "SubSeq");
|
|
407
|
+
if (typeof value !== "number") {
|
|
408
|
+
throw createModuleArgumentError(position, "SubSeq", "natural number", value);
|
|
409
|
+
}
|
|
410
|
+
return value;
|
|
411
|
+
};
|
|
412
|
+
|
|
295
413
|
const sliceSequence = (sequence: string | Value[], start: number, end?: number) =>
|
|
296
414
|
typeof sequence === "string"
|
|
297
415
|
? rankString(sequence.slice(start, end))
|
|
@@ -358,8 +476,8 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
358
476
|
}),
|
|
359
477
|
defineOperator("SubSeq", 3, (args) => {
|
|
360
478
|
const sequence = getSequenceOrString(args, 0, getSequenceMessage("first ", "SubSeq"));
|
|
361
|
-
const start =
|
|
362
|
-
const end =
|
|
479
|
+
const start = getSubSeqIndex(args, 1, "second");
|
|
480
|
+
const end = getSubSeqIndex(args, 2, "third");
|
|
363
481
|
if (start > end) return sliceSequence(sequence, 0, 0);
|
|
364
482
|
const outOfDomain =
|
|
365
483
|
start < 1 || start > sequence.length
|
|
@@ -381,7 +499,9 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
381
499
|
(element) => {
|
|
382
500
|
const result = test.call([element]);
|
|
383
501
|
if (typeof result !== "boolean") {
|
|
384
|
-
throw
|
|
502
|
+
throw new TlaModuleError(
|
|
503
|
+
`The second argument of SelectSeq should be a boolean-valued operator, but instead it is:\n<Operator ${test.name}>`,
|
|
504
|
+
);
|
|
385
505
|
}
|
|
386
506
|
return result;
|
|
387
507
|
},
|
|
@@ -416,7 +536,80 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
|
416
536
|
}),
|
|
417
537
|
]);
|
|
418
538
|
|
|
419
|
-
|
|
539
|
+
const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
540
|
+
overrideWithJava(
|
|
541
|
+
defineOperator("Warshall", 1, (args) => {
|
|
542
|
+
const relation = getValue(args, 0, "Warshall");
|
|
543
|
+
if (!isSetValue(relation) || isOverriddenSet(relation)) {
|
|
544
|
+
throw new TlaModuleError(
|
|
545
|
+
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${formatValue(relation)}`,
|
|
546
|
+
);
|
|
547
|
+
}
|
|
548
|
+
// TLC sizes the relation, which normalizes it.
|
|
549
|
+
getCardinality(relation);
|
|
550
|
+
const nodes: Value[] = [];
|
|
551
|
+
const nodeIndices = new Map<string, number>();
|
|
552
|
+
const getNodeIndex = (node: Value) => {
|
|
553
|
+
const key = getValueKey(node);
|
|
554
|
+
const index = nodeIndices.get(key) ?? nodes.length;
|
|
555
|
+
if (index === nodes.length) {
|
|
556
|
+
nodeIndices.set(key, index);
|
|
557
|
+
nodes.push(node);
|
|
558
|
+
}
|
|
559
|
+
return index;
|
|
560
|
+
};
|
|
561
|
+
const edges = toFiniteSet(relation).elements.map((edge) => {
|
|
562
|
+
const ends = getSequenceElements(edge);
|
|
563
|
+
if (ends?.length !== 2) {
|
|
564
|
+
throw new TlaModuleError(
|
|
565
|
+
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${formatValue(edge)}`,
|
|
566
|
+
);
|
|
567
|
+
}
|
|
568
|
+
return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];
|
|
569
|
+
});
|
|
570
|
+
const matrix = nodes.map(() => nodes.map(() => false));
|
|
571
|
+
edges.forEach((edge) => {
|
|
572
|
+
matrix[edge[0]][edge[1]] = true;
|
|
573
|
+
});
|
|
574
|
+
for (let middle = 0; middle < nodes.length; middle++) {
|
|
575
|
+
for (let from = 0; from < nodes.length; from++) {
|
|
576
|
+
if (!matrix[from][middle]) continue;
|
|
577
|
+
for (let to = 0; to < nodes.length; to++) {
|
|
578
|
+
if (matrix[middle][to]) matrix[from][to] = true;
|
|
579
|
+
}
|
|
580
|
+
}
|
|
581
|
+
}
|
|
582
|
+
return createEnumeratedSet(
|
|
583
|
+
nodes.flatMap((from, fromIndex) =>
|
|
584
|
+
nodes.flatMap((to, toIndex) =>
|
|
585
|
+
matrix[fromIndex][toIndex] ? [createTuple([from, to])] : [],
|
|
586
|
+
),
|
|
587
|
+
),
|
|
588
|
+
);
|
|
589
|
+
}),
|
|
590
|
+
"public static tlc2.value.impl.Value tlc2.module.TransitiveClosure.Warshall(tlc2.value.impl.Value)",
|
|
591
|
+
),
|
|
592
|
+
];
|
|
593
|
+
|
|
594
|
+
export const getJavaOverrides = (
|
|
595
|
+
name: string,
|
|
596
|
+
print: (text: string) => void,
|
|
597
|
+
runtime: CheckerRuntime,
|
|
598
|
+
files: FileSystem,
|
|
599
|
+
builtins: ReadonlyMap<string, Builtin>,
|
|
600
|
+
evaluateReplaced: (name: string, args: BuiltinArgument[], context: Context | undefined) => Value,
|
|
601
|
+
) => {
|
|
602
|
+
if (name === "TransitiveClosure") return TRANSITIVE_CLOSURE_OPERATORS;
|
|
603
|
+
if (name === "AnySet") return [defineConstant("ANY", ANY_SET)];
|
|
604
|
+
if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
|
|
605
|
+
if (name === "_TLCTrace") return createTlcTraceOperators(files);
|
|
606
|
+
if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
|
|
607
|
+
const operators = getStandardModule(name, print, runtime, files, builtins)?.operators;
|
|
608
|
+
return name === "Randomization" && operators
|
|
609
|
+
? [...operators, createRandomSubsetSet(runtime)]
|
|
610
|
+
: operators;
|
|
611
|
+
};
|
|
612
|
+
|
|
420
613
|
export const STANDARD_DEPENDENCIES = new Map([
|
|
421
614
|
["Integers", ["Naturals"]],
|
|
422
615
|
["Sequences", ["Naturals"]],
|
|
@@ -454,9 +647,12 @@ export const getStandardModule = (
|
|
|
454
647
|
case "Json":
|
|
455
648
|
return { extends: [], operators: createJsonOperators(files) };
|
|
456
649
|
case "Bags":
|
|
457
|
-
return { extends: [], operators: createBagsOperators(builtins) };
|
|
650
|
+
return { extends: [], operators: withJavaMethods("Bags", createBagsOperators(builtins)) };
|
|
458
651
|
case "TLCExt":
|
|
459
|
-
return {
|
|
652
|
+
return {
|
|
653
|
+
extends: [],
|
|
654
|
+
operators: withJavaMethods("TLCExt", createTlcExtOperators(print, runtime)),
|
|
655
|
+
};
|
|
460
656
|
default:
|
|
461
657
|
return undefined;
|
|
462
658
|
}
|
package/src/state-graph.ts
CHANGED
|
@@ -8,12 +8,14 @@ export interface StateDump {
|
|
|
8
8
|
colorize?: boolean;
|
|
9
9
|
actionLabels?: boolean;
|
|
10
10
|
snapshot?: boolean;
|
|
11
|
+
constrained?: boolean;
|
|
12
|
+
stuttering?: boolean;
|
|
13
|
+
strict?: boolean;
|
|
11
14
|
}
|
|
12
15
|
|
|
13
16
|
export interface GraphState {
|
|
14
17
|
fingerprint: bigint;
|
|
15
18
|
level: number;
|
|
16
|
-
// The state as TLC prints it after evaluating the alias, and as it prints it without the alias.
|
|
17
19
|
getLabel: () => string;
|
|
18
20
|
getText: () => string;
|
|
19
21
|
}
|
|
@@ -31,7 +33,12 @@ export interface StateWriter {
|
|
|
31
33
|
isSeen: boolean,
|
|
32
34
|
action: GraphAction | undefined,
|
|
33
35
|
) => void;
|
|
34
|
-
|
|
36
|
+
writeConstrained: (
|
|
37
|
+
state: GraphState,
|
|
38
|
+
successor: GraphState,
|
|
39
|
+
action: GraphAction | undefined,
|
|
40
|
+
constraint: string,
|
|
41
|
+
) => void;
|
|
35
42
|
writeStuttering: (state: GraphState) => void;
|
|
36
43
|
close: () => void;
|
|
37
44
|
}
|
|
@@ -82,6 +89,7 @@ const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter =
|
|
|
82
89
|
writeSuccessor: (_state, successor, isSeen) => {
|
|
83
90
|
if (!isSeen) writeState(successor);
|
|
84
91
|
},
|
|
92
|
+
writeConstrained: () => {},
|
|
85
93
|
// TLC 1.7.4 writes the state again, as it takes the stuttering step for one to a new state.
|
|
86
94
|
writeStuttering: writeState,
|
|
87
95
|
close: () => writeFile?.(dump.path, states.join("")),
|
|
@@ -106,6 +114,16 @@ const createDotWriter = (
|
|
|
106
114
|
];
|
|
107
115
|
const ranks = new Map<number, Set<bigint>>();
|
|
108
116
|
const colors = new Map<string, number>();
|
|
117
|
+
// TLC's DotStateWriter keys an edge by the XOR of its fingerprints, which merges every
|
|
118
|
+
// stuttering step and an edge with its reverse, so tla-ts keys it by both.
|
|
119
|
+
const edges = new Set<string>();
|
|
120
|
+
const isDuplicate = (state: GraphState, successor: GraphState) => {
|
|
121
|
+
if (!dump.strict) return false;
|
|
122
|
+
const key = `${state.fingerprint} ${successor.fingerprint}`;
|
|
123
|
+
if (edges.has(key)) return true;
|
|
124
|
+
edges.add(key);
|
|
125
|
+
return false;
|
|
126
|
+
};
|
|
109
127
|
const addRank = (state: GraphState) => {
|
|
110
128
|
const rank = ranks.get(state.level) ?? new Set();
|
|
111
129
|
ranks.set(state.level, rank.add(state.fingerprint));
|
|
@@ -143,30 +161,45 @@ const createDotWriter = (
|
|
|
143
161
|
writeFile?.(dump.path.replaceAll(".dot", "_snapshot.dot"), lines.join("") + getEnding());
|
|
144
162
|
}
|
|
145
163
|
};
|
|
164
|
+
const writeEdge = (
|
|
165
|
+
state: GraphState,
|
|
166
|
+
successor: GraphState,
|
|
167
|
+
isSeen: boolean,
|
|
168
|
+
action: GraphAction | undefined,
|
|
169
|
+
constraint?: string,
|
|
170
|
+
) => {
|
|
171
|
+
if (isDuplicate(state, successor)) return;
|
|
172
|
+
const color = dump.colorize ? String(getColor(action)) : "black";
|
|
173
|
+
const name =
|
|
174
|
+
dump.actionLabels && action ? escapeDotString(is174 ? action.name : action.signature) : "";
|
|
175
|
+
const label = constraint === undefined ? name : `${name}\n${constraint}`;
|
|
176
|
+
lines.push(
|
|
177
|
+
`${state.fingerprint} -> ${successor.fingerprint} [label="${label}",color="${color}",fontcolor="${color}"];\n`,
|
|
178
|
+
);
|
|
179
|
+
if (!isSeen) {
|
|
180
|
+
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
181
|
+
const fill = constraint === undefined ? "" : ",style = filled, fillcolor=lightyellow";
|
|
182
|
+
lines.push(
|
|
183
|
+
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}${fill}];\n`,
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
addRank(state);
|
|
187
|
+
writeSnapshot();
|
|
188
|
+
};
|
|
146
189
|
return {
|
|
147
190
|
writeInitialState: (state) => {
|
|
148
191
|
lines.push(`${state.fingerprint} [label="${toDotLabel(state.getLabel())}",style = filled]\n`);
|
|
149
192
|
addRank(state);
|
|
150
193
|
writeSnapshot();
|
|
151
194
|
},
|
|
152
|
-
writeSuccessor:
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
195
|
+
writeSuccessor: writeEdge,
|
|
196
|
+
writeConstrained: (state, successor, action, constraint) =>
|
|
197
|
+
writeEdge(state, successor, false, action, constraint),
|
|
198
|
+
writeStuttering: (state) => {
|
|
199
|
+
if (isDuplicate(state, state)) return;
|
|
156
200
|
lines.push(
|
|
157
|
-
`${state.fingerprint} -> ${
|
|
201
|
+
`${state.fingerprint} -> ${state.fingerprint} [style="dashed"${is174 ? "" : ',color="lightgray"'}];\n`,
|
|
158
202
|
);
|
|
159
|
-
if (!isSeen) {
|
|
160
|
-
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
161
|
-
lines.push(
|
|
162
|
-
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}];\n`,
|
|
163
|
-
);
|
|
164
|
-
}
|
|
165
|
-
addRank(state);
|
|
166
|
-
writeSnapshot();
|
|
167
|
-
},
|
|
168
|
-
writeStuttering: (state) => {
|
|
169
|
-
lines.push(`${state.fingerprint} -> ${state.fingerprint} [style="dashed"];\n`);
|
|
170
203
|
addRank(state);
|
|
171
204
|
writeSnapshot();
|
|
172
205
|
},
|