tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -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 +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +564 -366
- package/src/cli/options.ts +10 -5
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +525 -216
- package/src/cli/typescript.ts +0 -3
- 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 +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +77 -117
- package/src/liveness.ts +106 -62
- 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 +24 -33
- package/src/parallel.ts +48 -40
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +1 -16
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +260 -91
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- 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,8 @@ 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
|
-
// Merging the sets pairwise in a balanced tree compares each element about log2 of their count
|
|
74
|
-
// times.
|
|
75
90
|
const getBalancedUnion = (sets: SetValue[], start: number, end: number): SetValue => {
|
|
76
91
|
if (end - start === 1) return sets[start];
|
|
77
92
|
const middle = (start + end) >> 1;
|
|
@@ -84,26 +99,47 @@ type ReducibleSet = SetValue | MixedSetValue | IntervalValue;
|
|
|
84
99
|
|
|
85
100
|
const isMixedSet = (value: Value) => typeof value === "object" && value.kind === "MixedSet";
|
|
86
101
|
|
|
87
|
-
|
|
88
|
-
|
|
102
|
+
const isNormalizedReducible = (set: ReducibleSet) =>
|
|
103
|
+
set.kind === "Interval" || (set.kind === "Set" && set.isNormalized);
|
|
104
|
+
|
|
89
105
|
const combineReducible = (
|
|
90
106
|
operator: SetOperationValue["operator"],
|
|
91
107
|
set: ReducibleSet,
|
|
92
108
|
other: Value,
|
|
93
109
|
): Value => {
|
|
94
|
-
|
|
110
|
+
if (set.kind === "Interval") getCardinality(set);
|
|
111
|
+
const elements = set.kind === "Interval" ? set : getWrittenElements(set);
|
|
95
112
|
if (operator !== "\\cup") {
|
|
96
113
|
const isKept = operator === "\\cap";
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
114
|
+
const kept: Value[] = [];
|
|
115
|
+
forEachElement(elements, (element) => {
|
|
116
|
+
if (isElementOf(element, other) === isKept) addBoundedElement(kept, element);
|
|
117
|
+
});
|
|
118
|
+
return isNormalizedReducible(set) ? createNormalizedSet(kept) : createEnumeratedSet(kept);
|
|
100
119
|
}
|
|
101
|
-
if (
|
|
120
|
+
if (isEmptySet(set)) return other;
|
|
102
121
|
if (!isReducibleSet(other)) {
|
|
103
122
|
return markStreamedSet({ kind: "SetOperation", operator, left: set, right: other });
|
|
104
123
|
}
|
|
105
|
-
const
|
|
106
|
-
|
|
124
|
+
const union: Value[] = [];
|
|
125
|
+
forEachElement(elements, (element) => addBoundedElement(union, element));
|
|
126
|
+
forEachElement(other.kind === "Interval" ? other : toFiniteSet(other).elements, (element) => {
|
|
127
|
+
if (!isElementOf(element, set)) addBoundedElement(union, element);
|
|
128
|
+
});
|
|
129
|
+
return createEnumeratedSet(union);
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
const defineShortCircuit = (
|
|
133
|
+
name: string,
|
|
134
|
+
compute: (left: boolean, right: () => boolean) => boolean,
|
|
135
|
+
): Builtin => {
|
|
136
|
+
const getArgument = (args: BuiltinArgument[], index: number) =>
|
|
137
|
+
getBoolean([getThunk(args, index, name)()], 0, name);
|
|
138
|
+
return {
|
|
139
|
+
...defineOperator(name, 2, (args) => compute(getArgument(args, 0), () => getArgument(args, 1))),
|
|
140
|
+
evaluateBinary: undefined,
|
|
141
|
+
isLazy: true,
|
|
142
|
+
};
|
|
107
143
|
};
|
|
108
144
|
|
|
109
145
|
export const CORE_OPERATORS: Builtin[] = [
|
|
@@ -115,9 +151,9 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
115
151
|
defineBinary("#", (left, right) => !isEqualLikeTlc(left, right)),
|
|
116
152
|
defineOperator("~", 1, (args) => !getBoolean(args, 0, "~")),
|
|
117
153
|
defineOperator("<=>", 2, (args) => getBoolean(args, 0, "<=>") === getBoolean(args, 1, "<=>")),
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
154
|
+
defineShortCircuit("/\\", (left, right) => left && right()),
|
|
155
|
+
defineShortCircuit("\\/", (left, right) => left || right()),
|
|
156
|
+
defineShortCircuit("=>", (left, right) => !left || right()),
|
|
121
157
|
defineOperator("\\in", 2, (args) =>
|
|
122
158
|
isElementOf(getValue(args, 0, "\\in"), getValue(args, 1, "\\in")),
|
|
123
159
|
),
|
|
@@ -126,10 +162,10 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
126
162
|
2,
|
|
127
163
|
(args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
|
|
128
164
|
),
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
165
|
+
defineBinary("\\subseteq", (left, right) => {
|
|
166
|
+
if (!isSetValue(left)) {
|
|
167
|
+
throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
|
|
168
|
+
}
|
|
133
169
|
const isPowerSets =
|
|
134
170
|
typeof left === "object" &&
|
|
135
171
|
left.kind === "Subset" &&
|
|
@@ -137,19 +173,38 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
137
173
|
right.kind === "Subset" &&
|
|
138
174
|
isEnumerable(left.base);
|
|
139
175
|
if (isPowerSets) return isSubsetOf(toFiniteSet(left.base).elements, right.base);
|
|
140
|
-
|
|
176
|
+
if (typeof left === "object" && left.kind === "Interval") {
|
|
177
|
+
const isWithin =
|
|
178
|
+
typeof right === "object" &&
|
|
179
|
+
right.kind === "Interval" &&
|
|
180
|
+
right.low <= left.low &&
|
|
181
|
+
right.high >= left.high;
|
|
182
|
+
if (isWithin) return true;
|
|
183
|
+
for (let element = left.low; element <= left.high; element++) {
|
|
184
|
+
if (!isElementOf(element, right)) return false;
|
|
185
|
+
}
|
|
186
|
+
return true;
|
|
187
|
+
}
|
|
188
|
+
return !someStreamedElement(left, (element) => !isElementOf(element, right));
|
|
141
189
|
}),
|
|
142
|
-
// TLC defers the set operations of values that aren't sets to the enumeration or the membership
|
|
143
|
-
// tests of the result.
|
|
144
190
|
...SET_OPERATORS.map((operator) =>
|
|
145
191
|
defineOperator(operator, 2, (args) => {
|
|
146
192
|
const left = getValue(args, 0, operator);
|
|
147
193
|
const right = getValue(args, 1, operator);
|
|
194
|
+
const isFilteredByInterval =
|
|
195
|
+
operator !== "\\cup" &&
|
|
196
|
+
typeof right === "object" &&
|
|
197
|
+
right.kind === "Interval" &&
|
|
198
|
+
typeof left === "object" &&
|
|
199
|
+
left.kind !== "Interval";
|
|
148
200
|
if (
|
|
149
201
|
isReducibleSet(left) &&
|
|
150
202
|
isReducibleSet(right) &&
|
|
151
203
|
!isMixedSet(left) &&
|
|
152
|
-
!isMixedSet(right)
|
|
204
|
+
!isMixedSet(right) &&
|
|
205
|
+
!isFilteredByInterval &&
|
|
206
|
+
!isBeyondSetBound(left) &&
|
|
207
|
+
!isBeyondSetBound(right)
|
|
153
208
|
) {
|
|
154
209
|
if (operator === "\\cup" && isEmptySet(left)) return right;
|
|
155
210
|
const merge =
|
|
@@ -158,9 +213,34 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
158
213
|
: operator === "\\cap"
|
|
159
214
|
? getSortedIntersection
|
|
160
215
|
: getSortedDifference;
|
|
161
|
-
// The merge compares the elements, which TLC tests for membership one by one instead.
|
|
162
216
|
return computeLikeTlcOnFailure(
|
|
163
|
-
(finiteLeft, finiteRight) =>
|
|
217
|
+
(finiteLeft, finiteRight) => {
|
|
218
|
+
const leftSet = toFiniteSet(finiteLeft);
|
|
219
|
+
const rightSet = toFiniteSet(finiteRight);
|
|
220
|
+
const merged = merge(leftSet, rightSet);
|
|
221
|
+
if (operator === "\\cup") {
|
|
222
|
+
const written = getWrittenElements(leftSet);
|
|
223
|
+
const added = getSortedDifference(rightSet, leftSet).elements;
|
|
224
|
+
const isSorted =
|
|
225
|
+
written === leftSet.elements &&
|
|
226
|
+
(added.length === 0 || compareValues(written[written.length - 1], added[0]) < 0);
|
|
227
|
+
if (written.length + added.length > getMaximumSetSize()) {
|
|
228
|
+
throw new TlaSetBoundError(getSetBoundMessage());
|
|
229
|
+
}
|
|
230
|
+
if (isSorted && !leftSet.isNormalized) return merged;
|
|
231
|
+
const union = merged === leftSet ? createSortedSet(merged.elements) : merged;
|
|
232
|
+
if (!isSorted) union.writtenElements = [...written, ...added];
|
|
233
|
+
return union;
|
|
234
|
+
}
|
|
235
|
+
if (merged === finiteLeft) return merged;
|
|
236
|
+
merged.isNormalized = isNormalizedReducible(finiteLeft);
|
|
237
|
+
if (leftSet.writtenElements && !leftSet.isNormalized) {
|
|
238
|
+
merged.writtenElements = leftSet.writtenElements.filter((element) =>
|
|
239
|
+
isElementOf(element, merged),
|
|
240
|
+
);
|
|
241
|
+
}
|
|
242
|
+
return merged;
|
|
243
|
+
},
|
|
164
244
|
(reducibleLeft, reducibleRight) =>
|
|
165
245
|
combineReducible(operator, reducibleLeft, reducibleRight),
|
|
166
246
|
left,
|
|
@@ -175,21 +255,29 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
175
255
|
),
|
|
176
256
|
defineOperator("SUBSET", 1, (args) => ({ kind: "Subset", base: getValue(args, 0, "SUBSET") })),
|
|
177
257
|
defineOperator("UNION", 1, (args) => {
|
|
178
|
-
const outer =
|
|
179
|
-
const
|
|
180
|
-
|
|
258
|
+
const outer = getValue(args, 0, "UNION");
|
|
259
|
+
const written = isEnumeratedSet(outer) ? getWrittenElements(outer) : [];
|
|
260
|
+
const sets = written.filter(isEnumeratedSet);
|
|
261
|
+
if (!isEnumeratedSet(outer) || sets.length !== written.length) {
|
|
181
262
|
return markStreamedSet({ kind: "Union", base: outer });
|
|
182
263
|
}
|
|
183
|
-
|
|
264
|
+
const added = sets.flatMap(getWrittenElements);
|
|
265
|
+
const getUnionLikeTlc = () => {
|
|
184
266
|
const union: MixedSetValue = { kind: "MixedSet", elements: [] };
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}),
|
|
189
|
-
);
|
|
267
|
+
added.forEach((member) => {
|
|
268
|
+
if (!isElementOf(member, union)) addBoundedElement(union.elements, member);
|
|
269
|
+
});
|
|
190
270
|
return createEnumeratedSet(union.elements);
|
|
191
|
-
}
|
|
192
|
-
|
|
271
|
+
};
|
|
272
|
+
if (isMixedSet(outer) || sets.some(isMixedSet)) return getUnionLikeTlc();
|
|
273
|
+
if (sets.length === 0) return EMPTY_SET;
|
|
274
|
+
return computeLikeTlcOnFailure(
|
|
275
|
+
(finiteSets: SetValue[]) =>
|
|
276
|
+
createUnsortedCopy(getBalancedUnion(finiteSets, 0, finiteSets.length), added),
|
|
277
|
+
getUnionLikeTlc,
|
|
278
|
+
sets.map(toFiniteSet),
|
|
279
|
+
undefined,
|
|
280
|
+
);
|
|
193
281
|
}),
|
|
194
282
|
defineOperator("DOMAIN", 1, (args) => {
|
|
195
283
|
const value = getValue(args, 0, "DOMAIN");
|
|
@@ -202,8 +290,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
202
290
|
|
|
203
291
|
const NEG_SIGNATURE = getJavaSignature("Integers", "Neg", "IntValue", 1);
|
|
204
292
|
|
|
205
|
-
// TLC overrides the arithmetic of Naturals with the Java methods of tlc2.module.Naturals, or with
|
|
206
|
-
// those of tlc2.module.Integers when the spec loads Integers, and names the method in an error.
|
|
207
293
|
const createArithmeticOperators = (module: string) => {
|
|
208
294
|
const dotDotSignature = getJavaSignature(module, "DotDot", "IntervalValue", 2);
|
|
209
295
|
return [
|
|
@@ -221,12 +307,6 @@ const createArithmeticOperators = (module: string) => {
|
|
|
221
307
|
}),
|
|
222
308
|
defineArithmetic(module, "\\div", "Divide", (left, right) => {
|
|
223
309
|
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
310
|
const quotient = Math.floor(left / right);
|
|
231
311
|
if (isOutOfRange(quotient)) throw createOverflowError(`${left} \\div ${right}`);
|
|
232
312
|
return quotient;
|
|
@@ -239,11 +319,12 @@ const createArithmeticOperators = (module: string) => {
|
|
|
239
319
|
}
|
|
240
320
|
return ((left % right) + right) % right;
|
|
241
321
|
}),
|
|
242
|
-
defineOperator("..", 2, (args) =>
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
high
|
|
246
|
-
|
|
322
|
+
defineOperator("..", 2, (args) => {
|
|
323
|
+
const low = getValue(args, 0, "..");
|
|
324
|
+
// TLC's MethodHandle casts the last argument first.
|
|
325
|
+
const high = getJavaInteger(getValue(args, 1, ".."), dotDotSignature);
|
|
326
|
+
return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high };
|
|
327
|
+
}),
|
|
247
328
|
];
|
|
248
329
|
};
|
|
249
330
|
|
|
@@ -251,28 +332,46 @@ const NATURALS_ARITHMETIC = createArithmeticOperators("Naturals");
|
|
|
251
332
|
|
|
252
333
|
const INTEGERS_ARITHMETIC = createArithmeticOperators("Integers");
|
|
253
334
|
|
|
254
|
-
// The operators of Naturals that TLC overrides with the methods of tlc2.module.Integers when it
|
|
255
|
-
// loads Integers for its trace exploration spec, by the operator each replaces.
|
|
256
335
|
export const getTraceSpecArithmetic = (builtin: Builtin) => {
|
|
257
336
|
const index = NATURALS_ARITHMETIC.indexOf(builtin);
|
|
258
337
|
return index === -1 ? undefined : INTEGERS_ARITHMETIC[index];
|
|
259
338
|
};
|
|
260
339
|
|
|
340
|
+
// Naturals#GEQ names itself > in its errors, and Integers#GT returns a BoolValue.
|
|
341
|
+
const createComparisonOperators = (module: string) => {
|
|
342
|
+
const getSignature = (method: string, result = "tlc2.value.IBoolValue") =>
|
|
343
|
+
`public static ${result} tlc2.module.${module}.${method}(tlc2.value.impl.Value,tlc2.value.impl.Value)`;
|
|
344
|
+
const isIntegers = module === "Integers";
|
|
345
|
+
return [
|
|
346
|
+
overrideWithJava(
|
|
347
|
+
defineComparison("<", (left, right) => left < right),
|
|
348
|
+
getSignature("LT"),
|
|
349
|
+
),
|
|
350
|
+
overrideWithJava(
|
|
351
|
+
defineComparison(">", (left, right) => left > right),
|
|
352
|
+
isIntegers ? getSignature("GT", "tlc2.value.impl.BoolValue") : getSignature("GT"),
|
|
353
|
+
),
|
|
354
|
+
overrideWithJava(
|
|
355
|
+
defineComparison("<=", (left, right) => left <= right),
|
|
356
|
+
getSignature("LE"),
|
|
357
|
+
),
|
|
358
|
+
overrideWithJava(
|
|
359
|
+
defineComparison(">=", (left, right) => left >= right, isIntegers ? ">=" : ">"),
|
|
360
|
+
getSignature("GEQ"),
|
|
361
|
+
),
|
|
362
|
+
];
|
|
363
|
+
};
|
|
364
|
+
|
|
261
365
|
const NATURALS_OPERATORS = [
|
|
262
366
|
defineConstant("Nat", { kind: "InfiniteSet", name: "Nat" }),
|
|
263
367
|
...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, ">"),
|
|
368
|
+
...createComparisonOperators("Naturals"),
|
|
270
369
|
];
|
|
271
370
|
|
|
272
371
|
const INTEGERS_OPERATORS = [
|
|
273
372
|
defineConstant("Int", { kind: "InfiniteSet", name: "Int" }),
|
|
274
373
|
...INTEGERS_ARITHMETIC,
|
|
275
|
-
|
|
374
|
+
...createComparisonOperators("Integers"),
|
|
276
375
|
defineOperator("-.", 1, (args) => {
|
|
277
376
|
const value = getJavaInteger(getValue(args, 0, "-"), NEG_SIGNATURE);
|
|
278
377
|
if (isOutOfRange(-value)) throw createOverflowError(`-${value}`);
|
|
@@ -292,6 +391,14 @@ const getSequenceOrString = (args: BuiltinArgument[], index: number, message: st
|
|
|
292
391
|
return typeof value === "string" ? value : getSequenceArgument(args, index, message);
|
|
293
392
|
};
|
|
294
393
|
|
|
394
|
+
const getSubSeqIndex = (args: BuiltinArgument[], index: number, position: string) => {
|
|
395
|
+
const value = getValue(args, index, "SubSeq");
|
|
396
|
+
if (typeof value !== "number") {
|
|
397
|
+
throw createModuleArgumentError(position, "SubSeq", "natural number", value);
|
|
398
|
+
}
|
|
399
|
+
return value;
|
|
400
|
+
};
|
|
401
|
+
|
|
295
402
|
const sliceSequence = (sequence: string | Value[], start: number, end?: number) =>
|
|
296
403
|
typeof sequence === "string"
|
|
297
404
|
? rankString(sequence.slice(start, end))
|
|
@@ -358,8 +465,8 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
358
465
|
}),
|
|
359
466
|
defineOperator("SubSeq", 3, (args) => {
|
|
360
467
|
const sequence = getSequenceOrString(args, 0, getSequenceMessage("first ", "SubSeq"));
|
|
361
|
-
const start =
|
|
362
|
-
const end =
|
|
468
|
+
const start = getSubSeqIndex(args, 1, "second");
|
|
469
|
+
const end = getSubSeqIndex(args, 2, "third");
|
|
363
470
|
if (start > end) return sliceSequence(sequence, 0, 0);
|
|
364
471
|
const outOfDomain =
|
|
365
472
|
start < 1 || start > sequence.length
|
|
@@ -381,7 +488,9 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
381
488
|
(element) => {
|
|
382
489
|
const result = test.call([element]);
|
|
383
490
|
if (typeof result !== "boolean") {
|
|
384
|
-
throw
|
|
491
|
+
throw new TlaModuleError(
|
|
492
|
+
`The second argument of SelectSeq should be a boolean-valued operator, but instead it is:\n<Operator ${test.name}>`,
|
|
493
|
+
);
|
|
385
494
|
}
|
|
386
495
|
return result;
|
|
387
496
|
},
|
|
@@ -416,7 +525,80 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
|
416
525
|
}),
|
|
417
526
|
]);
|
|
418
527
|
|
|
419
|
-
|
|
528
|
+
const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
529
|
+
overrideWithJava(
|
|
530
|
+
defineOperator("Warshall", 1, (args) => {
|
|
531
|
+
const relation = getValue(args, 0, "Warshall");
|
|
532
|
+
if (!isSetValue(relation) || isOverriddenSet(relation)) {
|
|
533
|
+
throw new TlaModuleError(
|
|
534
|
+
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${formatValue(relation)}`,
|
|
535
|
+
);
|
|
536
|
+
}
|
|
537
|
+
// TLC sizes the relation, which normalizes it.
|
|
538
|
+
getCardinality(relation);
|
|
539
|
+
const nodes: Value[] = [];
|
|
540
|
+
const nodeIndices = new Map<string, number>();
|
|
541
|
+
const getNodeIndex = (node: Value) => {
|
|
542
|
+
const key = getValueKey(node);
|
|
543
|
+
const index = nodeIndices.get(key) ?? nodes.length;
|
|
544
|
+
if (index === nodes.length) {
|
|
545
|
+
nodeIndices.set(key, index);
|
|
546
|
+
nodes.push(node);
|
|
547
|
+
}
|
|
548
|
+
return index;
|
|
549
|
+
};
|
|
550
|
+
const edges = toFiniteSet(relation).elements.map((edge) => {
|
|
551
|
+
const ends = getSequenceElements(edge);
|
|
552
|
+
if (ends?.length !== 2) {
|
|
553
|
+
throw new TlaModuleError(
|
|
554
|
+
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${formatValue(edge)}`,
|
|
555
|
+
);
|
|
556
|
+
}
|
|
557
|
+
return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];
|
|
558
|
+
});
|
|
559
|
+
const matrix = nodes.map(() => nodes.map(() => false));
|
|
560
|
+
edges.forEach((edge) => {
|
|
561
|
+
matrix[edge[0]][edge[1]] = true;
|
|
562
|
+
});
|
|
563
|
+
for (let middle = 0; middle < nodes.length; middle++) {
|
|
564
|
+
for (let from = 0; from < nodes.length; from++) {
|
|
565
|
+
if (!matrix[from][middle]) continue;
|
|
566
|
+
for (let to = 0; to < nodes.length; to++) {
|
|
567
|
+
if (matrix[middle][to]) matrix[from][to] = true;
|
|
568
|
+
}
|
|
569
|
+
}
|
|
570
|
+
}
|
|
571
|
+
return createEnumeratedSet(
|
|
572
|
+
nodes.flatMap((from, fromIndex) =>
|
|
573
|
+
nodes.flatMap((to, toIndex) =>
|
|
574
|
+
matrix[fromIndex][toIndex] ? [createTuple([from, to])] : [],
|
|
575
|
+
),
|
|
576
|
+
),
|
|
577
|
+
);
|
|
578
|
+
}),
|
|
579
|
+
"public static tlc2.value.impl.Value tlc2.module.TransitiveClosure.Warshall(tlc2.value.impl.Value)",
|
|
580
|
+
),
|
|
581
|
+
];
|
|
582
|
+
|
|
583
|
+
export const getJavaOverrides = (
|
|
584
|
+
name: string,
|
|
585
|
+
print: (text: string) => void,
|
|
586
|
+
runtime: CheckerRuntime,
|
|
587
|
+
files: FileSystem,
|
|
588
|
+
builtins: ReadonlyMap<string, Builtin>,
|
|
589
|
+
evaluateReplaced: (name: string, args: BuiltinArgument[], context: Context | undefined) => Value,
|
|
590
|
+
) => {
|
|
591
|
+
if (name === "TransitiveClosure") return TRANSITIVE_CLOSURE_OPERATORS;
|
|
592
|
+
if (name === "AnySet") return [defineConstant("ANY", ANY_SET)];
|
|
593
|
+
if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
|
|
594
|
+
if (name === "_TLCTrace") return createTlcTraceOperators(files);
|
|
595
|
+
if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
|
|
596
|
+
const operators = getStandardModule(name, print, runtime, files, builtins)?.operators;
|
|
597
|
+
return name === "Randomization" && operators
|
|
598
|
+
? [...operators, createRandomSubsetSet(runtime)]
|
|
599
|
+
: operators;
|
|
600
|
+
};
|
|
601
|
+
|
|
420
602
|
export const STANDARD_DEPENDENCIES = new Map([
|
|
421
603
|
["Integers", ["Naturals"]],
|
|
422
604
|
["Sequences", ["Naturals"]],
|
|
@@ -454,9 +636,12 @@ export const getStandardModule = (
|
|
|
454
636
|
case "Json":
|
|
455
637
|
return { extends: [], operators: createJsonOperators(files) };
|
|
456
638
|
case "Bags":
|
|
457
|
-
return { extends: [], operators: createBagsOperators(builtins) };
|
|
639
|
+
return { extends: [], operators: withJavaMethods("Bags", createBagsOperators(builtins)) };
|
|
458
640
|
case "TLCExt":
|
|
459
|
-
return {
|
|
641
|
+
return {
|
|
642
|
+
extends: [],
|
|
643
|
+
operators: withJavaMethods("TLCExt", createTlcExtOperators(print, runtime)),
|
|
644
|
+
};
|
|
460
645
|
default:
|
|
461
646
|
return undefined;
|
|
462
647
|
}
|
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
|
}
|
|
@@ -45,8 +52,6 @@ const INITIAL_CAPACITY = 16;
|
|
|
45
52
|
const getCapacity = (size: number, capacity = INITIAL_CAPACITY): number =>
|
|
46
53
|
size <= capacity * LOAD_FACTOR ? capacity : getCapacity(size, capacity * 2);
|
|
47
54
|
|
|
48
|
-
// The order in which a java.util.HashMap iterates over keys put in this order: by bucket, and in
|
|
49
|
-
// insertion order within a bucket. A bucket only becomes a tree once 8 keys collide in it.
|
|
50
55
|
const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
51
56
|
const mask = getCapacity(keys.length) - 1;
|
|
52
57
|
const getBucket = (key: Key) => {
|
|
@@ -82,14 +87,12 @@ const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter =
|
|
|
82
87
|
writeSuccessor: (_state, successor, isSeen) => {
|
|
83
88
|
if (!isSeen) writeState(successor);
|
|
84
89
|
},
|
|
85
|
-
|
|
90
|
+
writeConstrained: () => {},
|
|
86
91
|
writeStuttering: writeState,
|
|
87
92
|
close: () => writeFile?.(dump.path, states.join("")),
|
|
88
93
|
};
|
|
89
94
|
};
|
|
90
95
|
|
|
91
|
-
// TLC 1.7.4 draws its nodes as ellipses, gives them no tooltip, and labels an edge with the name
|
|
92
|
-
// of its action alone.
|
|
93
96
|
const createDotWriter = (
|
|
94
97
|
dump: StateDump,
|
|
95
98
|
writeFile: WriteFile,
|
|
@@ -106,11 +109,19 @@ const createDotWriter = (
|
|
|
106
109
|
];
|
|
107
110
|
const ranks = new Map<number, Set<bigint>>();
|
|
108
111
|
const colors = new Map<string, number>();
|
|
112
|
+
// Deviation from TLC: it keys an edge by the XOR of its fingerprints, which merges distinct edges.
|
|
113
|
+
const edges = new Set<string>();
|
|
114
|
+
const isDuplicate = (state: GraphState, successor: GraphState) => {
|
|
115
|
+
if (!dump.strict) return false;
|
|
116
|
+
const key = `${state.fingerprint} ${successor.fingerprint}`;
|
|
117
|
+
if (edges.has(key)) return true;
|
|
118
|
+
edges.add(key);
|
|
119
|
+
return false;
|
|
120
|
+
};
|
|
109
121
|
const addRank = (state: GraphState) => {
|
|
110
122
|
const rank = ranks.get(state.level) ?? new Set();
|
|
111
123
|
ranks.set(state.level, rank.add(state.fingerprint));
|
|
112
124
|
};
|
|
113
|
-
// TLC colors an edge by the name of its action, numbering the names from 2 as it finds them.
|
|
114
125
|
const getColor = (action: GraphAction | undefined) => {
|
|
115
126
|
if (!action) return 1;
|
|
116
127
|
const color = colors.get(action.name) ?? colors.size + 2;
|
|
@@ -143,30 +154,45 @@ const createDotWriter = (
|
|
|
143
154
|
writeFile?.(dump.path.replaceAll(".dot", "_snapshot.dot"), lines.join("") + getEnding());
|
|
144
155
|
}
|
|
145
156
|
};
|
|
157
|
+
const writeEdge = (
|
|
158
|
+
state: GraphState,
|
|
159
|
+
successor: GraphState,
|
|
160
|
+
isSeen: boolean,
|
|
161
|
+
action: GraphAction | undefined,
|
|
162
|
+
constraint?: string,
|
|
163
|
+
) => {
|
|
164
|
+
if (isDuplicate(state, successor)) return;
|
|
165
|
+
const color = dump.colorize ? String(getColor(action)) : "black";
|
|
166
|
+
const name =
|
|
167
|
+
dump.actionLabels && action ? escapeDotString(is174 ? action.name : action.signature) : "";
|
|
168
|
+
const label = constraint === undefined ? name : `${name}\n${constraint}`;
|
|
169
|
+
lines.push(
|
|
170
|
+
`${state.fingerprint} -> ${successor.fingerprint} [label="${label}",color="${color}",fontcolor="${color}"];\n`,
|
|
171
|
+
);
|
|
172
|
+
if (!isSeen) {
|
|
173
|
+
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
174
|
+
const fill = constraint === undefined ? "" : ",style = filled, fillcolor=lightyellow";
|
|
175
|
+
lines.push(
|
|
176
|
+
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}${fill}];\n`,
|
|
177
|
+
);
|
|
178
|
+
}
|
|
179
|
+
addRank(state);
|
|
180
|
+
writeSnapshot();
|
|
181
|
+
};
|
|
146
182
|
return {
|
|
147
183
|
writeInitialState: (state) => {
|
|
148
184
|
lines.push(`${state.fingerprint} [label="${toDotLabel(state.getLabel())}",style = filled]\n`);
|
|
149
185
|
addRank(state);
|
|
150
186
|
writeSnapshot();
|
|
151
187
|
},
|
|
152
|
-
writeSuccessor:
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
188
|
+
writeSuccessor: writeEdge,
|
|
189
|
+
writeConstrained: (state, successor, action, constraint) =>
|
|
190
|
+
writeEdge(state, successor, false, action, constraint),
|
|
191
|
+
writeStuttering: (state) => {
|
|
192
|
+
if (isDuplicate(state, state)) return;
|
|
156
193
|
lines.push(
|
|
157
|
-
`${state.fingerprint} -> ${
|
|
194
|
+
`${state.fingerprint} -> ${state.fingerprint} [style="dashed"${is174 ? "" : ',color="lightgray"'}];\n`,
|
|
158
195
|
);
|
|
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
196
|
addRank(state);
|
|
171
197
|
writeSnapshot();
|
|
172
198
|
},
|