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
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// the time of a fact (Expr.Temporal_props): a fact holds always when it is closed under [].
|
|
1
|
+
// A port of tlapm's Expr.Tla_norm, Expr.Constness and Expr.Temporal_props.
|
|
3
2
|
|
|
4
3
|
import {
|
|
5
4
|
adjoin,
|
|
@@ -27,7 +26,6 @@ const applyUnchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expressi
|
|
|
27
26
|
const getEquality = (expression: Expr) =>
|
|
28
27
|
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
29
28
|
|
|
30
|
-
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
31
29
|
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
32
30
|
const flatten = (inner: Expr): Expr[] =>
|
|
33
31
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
@@ -37,7 +35,6 @@ export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
|
37
35
|
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
38
36
|
};
|
|
39
37
|
|
|
40
|
-
// Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
|
|
41
38
|
const rewrite =
|
|
42
39
|
(match: (expression: Expr, recurse: (inner: Expr) => Expr) => Expr | undefined) =>
|
|
43
40
|
(expression: Expr): Expr => {
|
|
@@ -105,7 +102,6 @@ export const expandAction = rewrite((expression, recurse) => {
|
|
|
105
102
|
return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
|
|
106
103
|
});
|
|
107
104
|
|
|
108
|
-
// Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
|
|
109
105
|
const expandUnchanged = rewrite((expression) =>
|
|
110
106
|
expression.kind === "Apply" && isApplied(expression, ["UNCHANGED"])
|
|
111
107
|
? rewriteUnchanged(expression.args[0])
|
|
@@ -127,6 +123,11 @@ const TEMPORAL_BUILTINS: Builtin[] = [
|
|
|
127
123
|
|
|
128
124
|
const constantBodies = new WeakMap<Expr, boolean>();
|
|
129
125
|
|
|
126
|
+
interface ConstnessState {
|
|
127
|
+
scope: Scope | undefined;
|
|
128
|
+
isGood: boolean;
|
|
129
|
+
}
|
|
130
|
+
|
|
130
131
|
const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
|
|
131
132
|
switch (hyp.kind) {
|
|
132
133
|
case "Fresh":
|
|
@@ -183,10 +184,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
183
184
|
expression.body,
|
|
184
185
|
);
|
|
185
186
|
case "Sequent": {
|
|
186
|
-
const inner = expression.sequent.context.reduce<
|
|
187
|
-
scope: Scope | undefined;
|
|
188
|
-
isGood: boolean;
|
|
189
|
-
}>(
|
|
187
|
+
const inner = expression.sequent.context.reduce<ConstnessState>(
|
|
190
188
|
(state, hyp) => ({
|
|
191
189
|
scope: adjoin(state.scope, hyp),
|
|
192
190
|
isGood: state.isGood && isConstantHyp(state.scope, hyp),
|
|
@@ -203,7 +201,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
203
201
|
case "Apply":
|
|
204
202
|
return recurse(expression.operator) && expression.args.every(recurse);
|
|
205
203
|
case "Let": {
|
|
206
|
-
const inner = expression.definitions.reduce<
|
|
204
|
+
const inner = expression.definitions.reduce<ConstnessState>(
|
|
207
205
|
(state, definition) => ({
|
|
208
206
|
scope: adjoin(state.scope, getLocalDefn(definition)),
|
|
209
207
|
isGood:
|
|
@@ -275,8 +273,6 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
275
273
|
}
|
|
276
274
|
};
|
|
277
275
|
|
|
278
|
-
// Temporal_props.box_closure: whether the formula is equivalent to [] of itself, judged by its
|
|
279
|
-
// shape. Under a negation or on the left of =>, <> takes the place of [].
|
|
280
276
|
const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): boolean => {
|
|
281
277
|
if (isConstant(scope, expression)) return true;
|
|
282
278
|
if (expression.kind === "Internal")
|
|
@@ -313,8 +309,6 @@ export const getTime = (scope: Scope | undefined, expression: Expr): Time =>
|
|
|
313
309
|
? "Always"
|
|
314
310
|
: "Now";
|
|
315
311
|
|
|
316
|
-
// Temporal_props.check_time_change: a proof stays in the always scope while no fact it assumes
|
|
317
|
-
// holds only now.
|
|
318
312
|
export const getScopeTime = (context: Hyp[], time: Time): Time =>
|
|
319
313
|
time === "Always" && context.some((hyp) => hyp.kind === "Fact" && hyp.time === "Now")
|
|
320
314
|
? "Now"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's E_tuply_declarations
|
|
1
|
+
// A port of tlapm's E_tuply_declarations.
|
|
2
2
|
|
|
3
3
|
import type { Bound, BoundDomain, Defn, Expr } from "./expression";
|
|
4
4
|
|
|
@@ -25,7 +25,6 @@ export const getUnbounded = (names: string[]): Bound[] =>
|
|
|
25
25
|
const getFactors = (domain: Expr | undefined, names: string[]) =>
|
|
26
26
|
domain?.kind === "Product" && domain.factors.length === names.length ? domain.factors : undefined;
|
|
27
27
|
|
|
28
|
-
// Each name is the matching item of the tuple: x == t[1], y == t[2].
|
|
29
28
|
const getItemDefinitions = (tuple: string, names: string[]): Defn[] =>
|
|
30
29
|
names.map((name, index) => ({
|
|
31
30
|
kind: "Operator",
|
|
@@ -50,8 +49,6 @@ const getNamedBound = (bound: Extract<TuplyBound, { kind: "Name" }>): Bound => (
|
|
|
50
49
|
domain: bound.domain,
|
|
51
50
|
});
|
|
52
51
|
|
|
53
|
-
// \E <<x, y>> \in A \X B: P becomes \E x \in A, y \in B: P, and \E <<x, y>> \in S: P becomes
|
|
54
|
-
// \E x, y: <<x, y>> \in S /\ P. Each domain quantifies separately, the last one innermost.
|
|
55
52
|
export const expandQuant = (
|
|
56
53
|
quantifier: "Forall" | "Exists",
|
|
57
54
|
bounds: TuplyBound[],
|
|
@@ -91,8 +88,6 @@ export const expandQuant = (
|
|
|
91
88
|
}, body);
|
|
92
89
|
};
|
|
93
90
|
|
|
94
|
-
// CHOOSE <<x, y>> \in A \X B: P binds t \in A \X B with x == t[1], y == t[2], and any other
|
|
95
|
-
// domain binds t with \E x, y: t = <<x, y>> /\ P. {<<x, y>> \in S: P} binds t the same way.
|
|
96
91
|
export const expandChoose = (
|
|
97
92
|
binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
|
|
98
93
|
names: string[],
|
|
@@ -117,8 +112,6 @@ export const expandChoose = (
|
|
|
117
112
|
};
|
|
118
113
|
};
|
|
119
114
|
|
|
120
|
-
// A set or function constructor binds each tuple as fcn#x, with its names defined in a LET around
|
|
121
|
-
// the value. A set constructor over a matching product binds the names to its factors instead.
|
|
122
115
|
const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boolean) => {
|
|
123
116
|
const expanded = bounds.map((bound): { bounds: Bound[]; definitions: Defn[] } => {
|
|
124
117
|
if (bound.kind === "Name") return { bounds: [getNamedBound(bound)], definitions: [] };
|
|
@@ -153,7 +146,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
|
|
|
153
146
|
const definitions = expanded.flatMap((item) => item.definitions);
|
|
154
147
|
return {
|
|
155
148
|
bounds: expanded.flatMap((item) => item.bounds),
|
|
156
|
-
value:
|
|
149
|
+
value:
|
|
150
|
+
definitions.length === 0 ? value : ({ kind: "Let", definitions, body: value } satisfies Expr),
|
|
157
151
|
};
|
|
158
152
|
};
|
|
159
153
|
|
package/src/parallel-worker.ts
CHANGED
|
@@ -8,15 +8,16 @@ import {
|
|
|
8
8
|
import type { CoordinatorMessage, StartMessage, WorkerMessage } from "./parallel";
|
|
9
9
|
import { createSearch } from "./search";
|
|
10
10
|
import { getSuccessors, type Successor } from "./successors";
|
|
11
|
+
import { setFingerprintPolynomial } from "./tlc/fingerprint";
|
|
11
12
|
import { createTlcOrder } from "./tlc/order";
|
|
12
13
|
import { OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
13
14
|
import { createStateDecoder, createStateEncoder, type EncodedStates } from "./transfer";
|
|
14
15
|
import {
|
|
15
16
|
createCanonicalizer,
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
freezeStringOrder,
|
|
18
|
+
getUnorderedString,
|
|
18
19
|
setStringOrder,
|
|
19
|
-
|
|
20
|
+
setValueOptions,
|
|
20
21
|
type Value,
|
|
21
22
|
} from "./values";
|
|
22
23
|
import { createBreak, getParentPort, type Port } from "./worker";
|
|
@@ -44,22 +45,23 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
44
45
|
const classes = new Map(start.classes);
|
|
45
46
|
const order = createTlcOrder(start.source, loadModule);
|
|
46
47
|
setStringOrder(order.getStringOrder(start.config));
|
|
47
|
-
|
|
48
|
-
|
|
48
|
+
setValueOptions(start);
|
|
49
|
+
setFingerprintPolynomial(start.fingerprintPolynomial ?? 0);
|
|
50
|
+
freezeStringOrder();
|
|
49
51
|
const specification = createEnvironment(start.config, {
|
|
50
52
|
source: start.source,
|
|
51
53
|
loadModule,
|
|
52
54
|
order,
|
|
53
55
|
loadClass: (name) => classes.get(name),
|
|
54
56
|
print: () => {},
|
|
55
|
-
files: { readFile: undefined, writeFile: undefined },
|
|
57
|
+
files: { readFile: undefined, writeFile: undefined, makeDirectory: undefined },
|
|
56
58
|
isTool: start.isTool,
|
|
57
|
-
|
|
59
|
+
traceFile: start.traceFile,
|
|
58
60
|
isWarningEnabled: start.isWarningEnabled,
|
|
59
61
|
version: start.version,
|
|
60
62
|
});
|
|
61
63
|
const environment = specification.environment;
|
|
62
|
-
const search = createSearch(start.config, environment, () =>
|
|
64
|
+
const search = createSearch(start.config, environment, specification.variableLocations, () =>
|
|
63
65
|
order.getDeclarationOrder("variable"),
|
|
64
66
|
);
|
|
65
67
|
const nextAction = search?.spec.next;
|
|
@@ -68,24 +70,20 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
68
70
|
const workerIndex = start.index;
|
|
69
71
|
const canonicalize = createCanonicalizer();
|
|
70
72
|
const decode = createStateDecoder(environment.variables.length);
|
|
71
|
-
|
|
73
|
+
let sharedFingerprints = start.fingerprints;
|
|
72
74
|
const requests = start.requests;
|
|
73
75
|
const remaining = start.remaining;
|
|
74
|
-
// Under symmetry, a successor the worker generated before has the representative it had then,
|
|
75
|
-
// so the worker skips the search for one.
|
|
76
76
|
const generatedStates = search.isSymmetric ? createFingerprintTable() : undefined;
|
|
77
77
|
const fingerprint = new Int32Array(2);
|
|
78
|
-
|
|
78
|
+
let resumeLevel = () => {};
|
|
79
|
+
let receiveLoot = (_states: EncodedStates) => {};
|
|
79
80
|
start.ports.forEach((port) => {
|
|
80
|
-
port?.addEventListener("message", (event) =>
|
|
81
|
+
port?.addEventListener("message", (event) => receiveLoot(event.data as EncodedStates));
|
|
81
82
|
port?.start?.();
|
|
82
83
|
});
|
|
83
|
-
|
|
84
|
+
let frontier = decode(start.seed).map(canonicalize);
|
|
84
85
|
const takeBreak = createBreak();
|
|
85
86
|
|
|
86
|
-
// A worker that runs out of states asks a peer for some by writing its index + 1 to the peer's
|
|
87
|
-
// request word. The peer sends half of the states it hasn't started, keeps expanding, and wakes
|
|
88
|
-
// the workers waiting to ask it next.
|
|
89
87
|
const answerRequest = (expansion: Expansion, request: number) => {
|
|
90
88
|
const thief = Atomics.load(requests, workerIndex) - 1;
|
|
91
89
|
const given = Math.floor((expansion.end - expansion.origin - 1) / 2);
|
|
@@ -99,8 +97,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
99
97
|
Atomics.notify(requests, workerIndex);
|
|
100
98
|
};
|
|
101
99
|
|
|
102
|
-
// A worker answers any request before it pauses or runs out of states, and takes no more until
|
|
103
|
-
// it resumes.
|
|
104
100
|
const lockRequests = (expansion: Expansion) => {
|
|
105
101
|
Atomics.store(remaining, workerIndex, 0);
|
|
106
102
|
if (Atomics.compareExchange(requests, workerIndex, 0, LOCKED) === 0) return;
|
|
@@ -112,7 +108,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
112
108
|
Atomics.store(requests, workerIndex, 0);
|
|
113
109
|
};
|
|
114
110
|
|
|
115
|
-
// The worker pauses before a successor when the shared table needs to grow, and resumes there.
|
|
116
111
|
const expand = (expansion: Expansion) => {
|
|
117
112
|
for (; expansion.origin < expansion.end; expansion.origin++) {
|
|
118
113
|
const state = expansion.states[expansion.origin];
|
|
@@ -126,7 +121,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
126
121
|
}
|
|
127
122
|
const successors = expansion.successors;
|
|
128
123
|
for (; expansion.index < successors.length; expansion.index++) {
|
|
129
|
-
if (isSharedFingerprintsFull(
|
|
124
|
+
if (isSharedFingerprintsFull(sharedFingerprints)) return "paused";
|
|
130
125
|
const successor = successors[expansion.index];
|
|
131
126
|
if (search.findViolatedActionProperty(state, successor.state)) return undefined;
|
|
132
127
|
if (!search.satisfiesActionConstraints(state, successor.state)) {
|
|
@@ -141,7 +136,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
141
136
|
canonicalize(successor.state);
|
|
142
137
|
const fingerprintState = search.getFingerprintState(successor.state);
|
|
143
138
|
writeStateFingerprint(fingerprintState, fingerprint);
|
|
144
|
-
if (!insertSharedFingerprint(
|
|
139
|
+
if (!insertSharedFingerprint(sharedFingerprints, fingerprint[0], fingerprint[1])) continue;
|
|
145
140
|
if (search.findViolatedInvariant(successor.state, state)) return undefined;
|
|
146
141
|
if (!search.satisfiesConstraints(successor.state, state)) continue;
|
|
147
142
|
expansion.next.push(successor.state);
|
|
@@ -156,9 +151,6 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
156
151
|
return "done";
|
|
157
152
|
};
|
|
158
153
|
|
|
159
|
-
// Each attempt asks the peer with the most states left. While another worker's request to that
|
|
160
|
-
// peer is open, the worker waits for the peer to answer it. The worker stops once no peer that
|
|
161
|
-
// takes requests has two states left.
|
|
162
154
|
const steal = async (expansion: Expansion) => {
|
|
163
155
|
const skipped = new Set<number>();
|
|
164
156
|
for (;;) {
|
|
@@ -173,7 +165,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
173
165
|
if (request === LOCKED) skipped.add(victim);
|
|
174
166
|
if (request > 0) Atomics.wait(requests, victim, request);
|
|
175
167
|
if (request !== 0) continue;
|
|
176
|
-
const loot = await new Promise<EncodedStates>((resolve) => (
|
|
168
|
+
const loot = await new Promise<EncodedStates>((resolve) => (receiveLoot = resolve));
|
|
177
169
|
if (loot.count === 0) {
|
|
178
170
|
skipped.add(victim);
|
|
179
171
|
continue;
|
|
@@ -191,9 +183,9 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
191
183
|
|
|
192
184
|
const runLevel = async (): Promise<WorkerMessage | undefined> => {
|
|
193
185
|
const expansion: Expansion = {
|
|
194
|
-
states: frontier
|
|
186
|
+
states: frontier,
|
|
195
187
|
origin: 0,
|
|
196
|
-
end: frontier.
|
|
188
|
+
end: frontier.length,
|
|
197
189
|
successors: undefined,
|
|
198
190
|
index: 0,
|
|
199
191
|
added: 0,
|
|
@@ -206,8 +198,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
206
198
|
for (;;) {
|
|
207
199
|
const status = expand(expansion);
|
|
208
200
|
if (status === undefined) return undefined;
|
|
209
|
-
// HACK: Bun
|
|
210
|
-
// long level without returning to the loop holds on to memory it no longer uses.
|
|
201
|
+
// HACK: Bun frees memory on event loop timers, so a long level returns to the loop.
|
|
211
202
|
if (status === "break") {
|
|
212
203
|
await takeBreak();
|
|
213
204
|
expansion.breakAt = performance.now() + BREAK_INTERVAL;
|
|
@@ -215,7 +206,7 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
215
206
|
}
|
|
216
207
|
lockRequests(expansion);
|
|
217
208
|
if (status === "paused") {
|
|
218
|
-
const resumed = new Promise<void>((resolve) => (
|
|
209
|
+
const resumed = new Promise<void>((resolve) => (resumeLevel = resolve));
|
|
219
210
|
report({ type: "paused" });
|
|
220
211
|
await resumed;
|
|
221
212
|
unlockRequests(expansion);
|
|
@@ -223,11 +214,10 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
223
214
|
}
|
|
224
215
|
if (!(await steal(expansion))) break;
|
|
225
216
|
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
Atomics.store(remaining, workerIndex, frontier.states.length);
|
|
217
|
+
const unorderedString = getUnorderedString();
|
|
218
|
+
if (unorderedString !== undefined) return { type: "abort", string: unorderedString };
|
|
219
|
+
frontier = expansion.next;
|
|
220
|
+
Atomics.store(remaining, workerIndex, frontier.length);
|
|
231
221
|
return {
|
|
232
222
|
type: "level",
|
|
233
223
|
generated: expansion.generated,
|
|
@@ -247,11 +237,11 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
247
237
|
const message = event.data as CoordinatorMessage;
|
|
248
238
|
if (message.type === "level") startLevel();
|
|
249
239
|
if (message.type === "resize") {
|
|
250
|
-
|
|
251
|
-
|
|
240
|
+
sharedFingerprints = message.fingerprints;
|
|
241
|
+
resumeLevel();
|
|
252
242
|
}
|
|
253
243
|
});
|
|
254
|
-
Atomics.store(remaining, workerIndex, frontier.
|
|
244
|
+
Atomics.store(remaining, workerIndex, frontier.length);
|
|
255
245
|
report({ type: "ready" });
|
|
256
246
|
};
|
|
257
247
|
|
package/src/parallel.ts
CHANGED
|
@@ -25,16 +25,17 @@ import {
|
|
|
25
25
|
reportStartup,
|
|
26
26
|
} from "./search";
|
|
27
27
|
import { getInitialStates } from "./successors";
|
|
28
|
+
import { setFingerprintPolynomial } from "./tlc/fingerprint";
|
|
28
29
|
import { createTlcOrder } from "./tlc/order";
|
|
29
30
|
import { getFingerprintDistance, OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
30
31
|
import { createStateEncoder, type EncodedStates } from "./transfer";
|
|
31
32
|
import type { TlcVersion } from "./tlc/version";
|
|
32
33
|
import {
|
|
33
34
|
createCanonicalizer,
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
freezeStringOrder,
|
|
36
|
+
getUnorderedString,
|
|
36
37
|
setStringOrder,
|
|
37
|
-
|
|
38
|
+
setValueOptions,
|
|
38
39
|
type Value,
|
|
39
40
|
} from "./values";
|
|
40
41
|
import { spawnWorker, type Port } from "./worker";
|
|
@@ -49,9 +50,12 @@ export interface StartMessage {
|
|
|
49
50
|
ports: (Port | undefined)[];
|
|
50
51
|
seed: EncodedStates;
|
|
51
52
|
isTool: boolean | undefined;
|
|
52
|
-
|
|
53
|
+
traceFile: string | undefined;
|
|
53
54
|
isWarningEnabled: boolean | undefined;
|
|
54
55
|
version: TlcVersion | undefined;
|
|
56
|
+
fingerprintPolynomial: number | undefined;
|
|
57
|
+
maxSetSize: number | undefined;
|
|
58
|
+
isLazyValueExpanded: boolean | undefined;
|
|
55
59
|
fingerprints: SharedFingerprints;
|
|
56
60
|
requests: Int32Array;
|
|
57
61
|
remaining: Int32Array;
|
|
@@ -82,7 +86,6 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
82
86
|
: options.config;
|
|
83
87
|
const print = options.onPrint ?? console.log;
|
|
84
88
|
const printed = { count: 0 };
|
|
85
|
-
// What each point the search reports is about, such as the invariant TLC warns about.
|
|
86
89
|
const getKey = (progress: CheckProgress) =>
|
|
87
90
|
[
|
|
88
91
|
progress.kind,
|
|
@@ -113,15 +116,18 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
113
116
|
};
|
|
114
117
|
const workerCount = options.workers ?? 1;
|
|
115
118
|
// TLC's workers write the -dump state graph, and print the violations -continue goes on past, in
|
|
116
|
-
// whichever order they find them, so one worker does what a single TLC worker does.
|
|
119
|
+
// whichever order they find them, so one worker does what a single TLC worker does. The
|
|
120
|
+
// coverage counts live in one worker's evaluators.
|
|
117
121
|
const isSequential =
|
|
118
122
|
workerCount < 2 ||
|
|
119
123
|
typeof SharedArrayBuffer !== "function" ||
|
|
120
124
|
options.dump !== undefined ||
|
|
125
|
+
options.coverage !== undefined ||
|
|
121
126
|
options.isContinued === true ||
|
|
122
127
|
config.view !== undefined ||
|
|
123
128
|
config.postconditions.length > 0 ||
|
|
124
|
-
config.possible.length > 0
|
|
129
|
+
config.possible.length > 0 ||
|
|
130
|
+
(options.moduleOperators?.length ?? 0) > 0;
|
|
125
131
|
if (isSequential) return fallBack();
|
|
126
132
|
const modules = new Map<string, string | undefined>();
|
|
127
133
|
const loadModule = (name: string) => {
|
|
@@ -137,8 +143,9 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
137
143
|
};
|
|
138
144
|
const order = createTlcOrder(options.source, loadModule);
|
|
139
145
|
setStringOrder(order.getStringOrder(config));
|
|
140
|
-
|
|
141
|
-
|
|
146
|
+
setValueOptions(options);
|
|
147
|
+
setFingerprintPolynomial(options.fingerprintPolynomial ?? 0);
|
|
148
|
+
freezeStringOrder();
|
|
142
149
|
const specification = createEnvironment(config, {
|
|
143
150
|
source: options.source,
|
|
144
151
|
loadModule,
|
|
@@ -148,9 +155,13 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
148
155
|
printed.count++;
|
|
149
156
|
print(text);
|
|
150
157
|
},
|
|
151
|
-
files: {
|
|
158
|
+
files: {
|
|
159
|
+
readFile: options.readFile,
|
|
160
|
+
writeFile: options.writeFile,
|
|
161
|
+
makeDirectory: options.makeDirectory,
|
|
162
|
+
},
|
|
152
163
|
isTool: options.isTool,
|
|
153
|
-
|
|
164
|
+
traceFile: options.traceSpec?.traceFile,
|
|
154
165
|
isSanyReported: options.isSanyReported,
|
|
155
166
|
isWarningEnabled: options.isWarningEnabled,
|
|
156
167
|
version: options.version,
|
|
@@ -160,6 +171,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
160
171
|
const search = createSearch(
|
|
161
172
|
config,
|
|
162
173
|
environment,
|
|
174
|
+
specification.variableLocations,
|
|
163
175
|
() => order.getDeclarationOrder("variable"),
|
|
164
176
|
report,
|
|
165
177
|
);
|
|
@@ -237,7 +249,8 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
237
249
|
if (!(error instanceof TlaEvaluationError)) throw error;
|
|
238
250
|
return fallBack();
|
|
239
251
|
}
|
|
240
|
-
|
|
252
|
+
const unorderedString = getUnorderedString();
|
|
253
|
+
if (unorderedString !== undefined) return fallBack(unorderedString);
|
|
241
254
|
statistics.depth = statistics.generatedStates === 0 ? 0 : 1;
|
|
242
255
|
statistics.initialStates = {
|
|
243
256
|
generated: statistics.generatedStates,
|
|
@@ -294,9 +307,12 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
294
307
|
ports,
|
|
295
308
|
seed,
|
|
296
309
|
isTool: options.isTool,
|
|
297
|
-
|
|
310
|
+
traceFile: options.traceSpec?.traceFile,
|
|
298
311
|
isWarningEnabled: options.isWarningEnabled,
|
|
299
312
|
version: options.version,
|
|
313
|
+
fingerprintPolynomial: options.fingerprintPolynomial,
|
|
314
|
+
maxSetSize: options.maxSetSize,
|
|
315
|
+
isLazyValueExpanded: options.isLazyValueExpanded,
|
|
300
316
|
fingerprints: shared.fingerprints,
|
|
301
317
|
requests,
|
|
302
318
|
remaining,
|