tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
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/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +6 -16
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -7
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +25 -6
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +0 -1
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -14
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +91 -55
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +0 -1
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +66 -16
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
package/src/search.ts
CHANGED
|
@@ -22,7 +22,12 @@ import {
|
|
|
22
22
|
type Coverage,
|
|
23
23
|
type CoverageKind,
|
|
24
24
|
} from "./coverage";
|
|
25
|
-
import {
|
|
25
|
+
import {
|
|
26
|
+
getReadVariables,
|
|
27
|
+
isConstantLevel,
|
|
28
|
+
isExpressionImpure,
|
|
29
|
+
isImpureDefinition,
|
|
30
|
+
} from "./dependencies";
|
|
26
31
|
import { createEnvironment, type ResolvedModuleOperator } from "./environment";
|
|
27
32
|
import {
|
|
28
33
|
isStackOverflow,
|
|
@@ -55,6 +60,7 @@ import {
|
|
|
55
60
|
VARIABLE_LEVEL,
|
|
56
61
|
} from "./levels";
|
|
57
62
|
import { expandTemporal, getLevel, type ScopedExpression, type TemporalProperty } from "./liveness";
|
|
63
|
+
import { getLiveExpressions } from "./liveness-checker";
|
|
58
64
|
import { prettyPrint } from "./pretty-print";
|
|
59
65
|
import { getPossibleCounts, type CheckerRuntime } from "./runtime";
|
|
60
66
|
import {
|
|
@@ -63,7 +69,8 @@ import {
|
|
|
63
69
|
getSubscriptVariables,
|
|
64
70
|
type SpecDescription,
|
|
65
71
|
} from "./spec-description";
|
|
66
|
-
import { getRepresentative, getSymmetryGroup } from "./symmetry";
|
|
72
|
+
import { getRepresentative, getSymmetryGroup, type Images } from "./symmetry";
|
|
73
|
+
import type { Solution } from "./tableau";
|
|
67
74
|
import {
|
|
68
75
|
formatInnerMessage,
|
|
69
76
|
formatNestedMessage,
|
|
@@ -88,26 +95,33 @@ import {
|
|
|
88
95
|
type Value,
|
|
89
96
|
} from "./values";
|
|
90
97
|
|
|
91
|
-
interface
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
98
|
+
export interface StandardInput {
|
|
99
|
+
readLine?: () => string | undefined;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
interface EnvironmentSettings
|
|
103
|
+
extends
|
|
104
|
+
Pick<
|
|
105
|
+
CheckOptions,
|
|
106
|
+
| "source"
|
|
107
|
+
| "loadModule"
|
|
108
|
+
| "loadClass"
|
|
109
|
+
| "readFile"
|
|
110
|
+
| "writeFile"
|
|
111
|
+
| "makeDirectory"
|
|
112
|
+
| "seed"
|
|
113
|
+
| "isTool"
|
|
114
|
+
| "traceSpec"
|
|
115
|
+
| "isSanyReported"
|
|
116
|
+
| "isWarningEnabled"
|
|
117
|
+
| "version"
|
|
118
|
+
| "moduleOperators"
|
|
119
|
+
| "fingerprintPolynomial"
|
|
120
|
+
| "maxSetSize"
|
|
121
|
+
| "isLazyValueExpanded"
|
|
122
|
+
| "isViewPrinted"
|
|
123
|
+
>,
|
|
124
|
+
StandardInput {}
|
|
111
125
|
|
|
112
126
|
interface NamedExpression {
|
|
113
127
|
name: string;
|
|
@@ -560,6 +574,29 @@ const getProperties = (
|
|
|
560
574
|
return properties;
|
|
561
575
|
};
|
|
562
576
|
|
|
577
|
+
// The expressions the LET definitions and arguments of a scope stand for, or undefined if it binds
|
|
578
|
+
// an operator only as a function.
|
|
579
|
+
const getScopeExpressions = (scope: Scope | undefined): Expression[] | undefined => {
|
|
580
|
+
const expressions: Expression[] = [];
|
|
581
|
+
const visited = new Set<Scope>();
|
|
582
|
+
const visit = (current: Scope | undefined): boolean => {
|
|
583
|
+
if (current === undefined || visited.has(current)) return true;
|
|
584
|
+
visited.add(current);
|
|
585
|
+
const binding = current.binding;
|
|
586
|
+
if (binding.kind === "Thunk") {
|
|
587
|
+
expressions.push(binding.expression);
|
|
588
|
+
return visit(binding.scope) && visit(current.parent);
|
|
589
|
+
}
|
|
590
|
+
if (binding.kind === "Operator") {
|
|
591
|
+
if (binding.operator.kind !== "Closure") return false;
|
|
592
|
+
expressions.push(binding.operator.body);
|
|
593
|
+
return visit(binding.operator.scope) && visit(current.parent);
|
|
594
|
+
}
|
|
595
|
+
return visit(current.parent);
|
|
596
|
+
};
|
|
597
|
+
return visit(scope) ? expressions : undefined;
|
|
598
|
+
};
|
|
599
|
+
|
|
563
600
|
const getNamedExpressions = (
|
|
564
601
|
kind: string,
|
|
565
602
|
names: string[],
|
|
@@ -680,6 +717,21 @@ export interface Search {
|
|
|
680
717
|
getTlcOrder: () => number[];
|
|
681
718
|
isSymmetric: boolean;
|
|
682
719
|
isConstrained: boolean;
|
|
720
|
+
getTypedChecks: (liveness: Solution[] | undefined) =>
|
|
721
|
+
| {
|
|
722
|
+
init: Expression;
|
|
723
|
+
next: Expression;
|
|
724
|
+
scope: Scope | undefined;
|
|
725
|
+
invariants: Expression[];
|
|
726
|
+
constraints: Expression[];
|
|
727
|
+
holdsInitialPredicates: (state: Value[]) => boolean;
|
|
728
|
+
actionProperties: ActionProperty[];
|
|
729
|
+
symmetry: Images[] | undefined;
|
|
730
|
+
view: Expression | undefined;
|
|
731
|
+
variableOrder: number[];
|
|
732
|
+
liveness: Solution[] | undefined;
|
|
733
|
+
}
|
|
734
|
+
| undefined;
|
|
683
735
|
findViolatedInvariant: (state: Value[], parent?: Value[]) => StateCheck | undefined;
|
|
684
736
|
getViolatedInvariants: (state: Value[]) => StateCheck[];
|
|
685
737
|
checkReplayedInitialState: (
|
|
@@ -724,7 +776,7 @@ export const getIncompleteSuccessorMessage = (
|
|
|
724
776
|
return `Successor state is not completely specified by ${subject}. The following variable${missing.length > 1 ? "s are" : " is"} not ${verb}: ${missing.join(", ")}.\n`;
|
|
725
777
|
};
|
|
726
778
|
|
|
727
|
-
const getContext = (
|
|
779
|
+
export const getContext = (
|
|
728
780
|
environment: Environment,
|
|
729
781
|
state: Value[] | undefined,
|
|
730
782
|
next: Value[] | undefined,
|
|
@@ -830,6 +882,7 @@ export const createCheckEnvironment = (
|
|
|
830
882
|
isWarningEnabled: options.isWarningEnabled,
|
|
831
883
|
version: options.version,
|
|
832
884
|
moduleOperators: options.moduleOperators,
|
|
885
|
+
readLine: options.readLine,
|
|
833
886
|
});
|
|
834
887
|
return { order, specification };
|
|
835
888
|
};
|
|
@@ -1051,15 +1104,24 @@ export const createSearch = (
|
|
|
1051
1104
|
const getViewValue = (expression: Expression, state: Value[]) =>
|
|
1052
1105
|
evaluate(expression, getContext(environment, state, undefined));
|
|
1053
1106
|
const getTlcStateFingerprint = (state: Value[]) => {
|
|
1054
|
-
const indices = getTlcOrder();
|
|
1055
1107
|
const representative =
|
|
1056
|
-
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup,
|
|
1108
|
+
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1057
1109
|
return getTlcFingerprint(
|
|
1058
1110
|
view === undefined
|
|
1059
|
-
?
|
|
1111
|
+
? getTlcOrder().map((index) => representative[index])
|
|
1060
1112
|
: [getViewValue(view.expression, representative)],
|
|
1061
1113
|
);
|
|
1062
1114
|
};
|
|
1115
|
+
const findFailedInitialPredicate = (state: Value[]) =>
|
|
1116
|
+
isCoveredHeld(coveredInitialPredicates, state)
|
|
1117
|
+
? undefined
|
|
1118
|
+
: properties.initialPredicates.find(
|
|
1119
|
+
(predicate) =>
|
|
1120
|
+
!holdsLikeTlc(
|
|
1121
|
+
predicate.expression,
|
|
1122
|
+
getContext(environment, state, undefined, predicate.scope),
|
|
1123
|
+
),
|
|
1124
|
+
);
|
|
1063
1125
|
const violatingStates = new WeakSet<Value[]>();
|
|
1064
1126
|
const isViolated = (invariant: StateCheck, state: Value[], parent: Value[] | undefined) => {
|
|
1065
1127
|
const checkedParent = parent && !violatingStates.has(parent) ? parent : undefined;
|
|
@@ -1132,6 +1194,7 @@ export const createSearch = (
|
|
|
1132
1194
|
? record
|
|
1133
1195
|
: setViewText(record, () => getViewText(view.expression, state));
|
|
1134
1196
|
};
|
|
1197
|
+
runtime.toRecord = toRecord;
|
|
1135
1198
|
return {
|
|
1136
1199
|
properties,
|
|
1137
1200
|
spec,
|
|
@@ -1149,6 +1212,76 @@ export const createSearch = (
|
|
|
1149
1212
|
},
|
|
1150
1213
|
isSymmetric: symmetryGroup !== undefined,
|
|
1151
1214
|
isConstrained: constraints.length > 0 || actionConstraints.length > 0,
|
|
1215
|
+
getTypedChecks: (liveness) => {
|
|
1216
|
+
const isInterpreted =
|
|
1217
|
+
coverage !== undefined ||
|
|
1218
|
+
possible.length > 0 ||
|
|
1219
|
+
config.periodic !== undefined ||
|
|
1220
|
+
[...invariants, ...constraints].some((check) => check.scope !== undefined) ||
|
|
1221
|
+
actionConstraints.length > 0 ||
|
|
1222
|
+
properties.actionProperties.some((property) => property.scope !== undefined) ||
|
|
1223
|
+
(properties.liveness.length > 0 && (liveness === undefined || view !== undefined));
|
|
1224
|
+
if (isInterpreted || spec.init === undefined || spec.next === undefined) return undefined;
|
|
1225
|
+
const invariantExpressions = invariantPredicates.map((invariant) => invariant.predicate);
|
|
1226
|
+
const constraintExpressions = [
|
|
1227
|
+
...new Set(constraints.map((constraint) => constraint.predicate)),
|
|
1228
|
+
];
|
|
1229
|
+
const initialExpressions = properties.initialPredicates.map(
|
|
1230
|
+
(predicate) => predicate.expression,
|
|
1231
|
+
);
|
|
1232
|
+
const definitions = [...environment.facts.ids.keys()];
|
|
1233
|
+
const scopeExpressions = getScopeExpressions(spec.scope);
|
|
1234
|
+
// The interpreter evaluates again what the tier evaluated before it fell back. TLC evaluates
|
|
1235
|
+
// a constant definition without parameters once as it starts, so one with a startup value
|
|
1236
|
+
// never draws again. An operator a scope binds without its expression can reach any
|
|
1237
|
+
// definition.
|
|
1238
|
+
const isReplayed = (definition: Definition) =>
|
|
1239
|
+
getStartupValue(definition, environment) === undefined &&
|
|
1240
|
+
isImpureDefinition(definition, environment, "replayed");
|
|
1241
|
+
const hasReplayedEffects =
|
|
1242
|
+
scopeExpressions === undefined
|
|
1243
|
+
? definitions.some(isReplayed)
|
|
1244
|
+
: definitions.some(
|
|
1245
|
+
(definition) =>
|
|
1246
|
+
!(definition.kind === "Operator" && definition.params.length > 0) &&
|
|
1247
|
+
isConstantLevel(definition, environment) &&
|
|
1248
|
+
isReplayed(definition),
|
|
1249
|
+
) ||
|
|
1250
|
+
isExpressionImpure(
|
|
1251
|
+
[
|
|
1252
|
+
spec.init,
|
|
1253
|
+
spec.next,
|
|
1254
|
+
...invariantExpressions,
|
|
1255
|
+
...constraintExpressions,
|
|
1256
|
+
...initialExpressions,
|
|
1257
|
+
...properties.actionProperties.flatMap((property) => [
|
|
1258
|
+
property.action,
|
|
1259
|
+
property.subscript,
|
|
1260
|
+
]),
|
|
1261
|
+
...(view ? [view.expression] : []),
|
|
1262
|
+
...scopeExpressions,
|
|
1263
|
+
...getLiveExpressions(liveness ?? []),
|
|
1264
|
+
],
|
|
1265
|
+
environment,
|
|
1266
|
+
"replayed",
|
|
1267
|
+
);
|
|
1268
|
+
return hasReplayedEffects
|
|
1269
|
+
? undefined
|
|
1270
|
+
: {
|
|
1271
|
+
init: spec.init,
|
|
1272
|
+
next: spec.next,
|
|
1273
|
+
scope: spec.scope,
|
|
1274
|
+
invariants: invariantExpressions,
|
|
1275
|
+
constraints: constraintExpressions,
|
|
1276
|
+
holdsInitialPredicates: (state: Value[]) =>
|
|
1277
|
+
findFailedInitialPredicate(state) === undefined,
|
|
1278
|
+
actionProperties: properties.actionProperties,
|
|
1279
|
+
symmetry: symmetryGroup,
|
|
1280
|
+
view: view?.expression,
|
|
1281
|
+
variableOrder: getTlcOrder(),
|
|
1282
|
+
liveness,
|
|
1283
|
+
};
|
|
1284
|
+
},
|
|
1152
1285
|
getTlcOrder,
|
|
1153
1286
|
getStoredFingerprints: (states, fingerprintStates) => {
|
|
1154
1287
|
if (view !== undefined || isFingerprintedLikeTlc) {
|
|
@@ -1226,16 +1359,7 @@ export const createSearch = (
|
|
|
1226
1359
|
isUnchangedFor(constraint, state, parent) ||
|
|
1227
1360
|
holdsAsConjunct(constraint, getContext(environment, state, undefined)),
|
|
1228
1361
|
),
|
|
1229
|
-
findFailedInitialPredicate
|
|
1230
|
-
isCoveredHeld(coveredInitialPredicates, state)
|
|
1231
|
-
? undefined
|
|
1232
|
-
: properties.initialPredicates.find(
|
|
1233
|
-
(predicate) =>
|
|
1234
|
-
!holdsLikeTlc(
|
|
1235
|
-
predicate.expression,
|
|
1236
|
-
getContext(environment, state, undefined, predicate.scope),
|
|
1237
|
-
),
|
|
1238
|
-
),
|
|
1362
|
+
findFailedInitialPredicate,
|
|
1239
1363
|
findViolatedActionProperty: (state, next) =>
|
|
1240
1364
|
isCoveredHeld(coveredActionProperties, state, next)
|
|
1241
1365
|
? undefined
|
package/src/simulate.ts
CHANGED
|
@@ -249,6 +249,8 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
249
249
|
const nextActions = description.actions;
|
|
250
250
|
let traceCount = 0;
|
|
251
251
|
let currentTrace = 0;
|
|
252
|
+
let evaluatedAction: SpecAction | undefined;
|
|
253
|
+
runtime.getSuccessorAction = () => evaluatedAction;
|
|
252
254
|
runtime.getLevel = (state) => nodes.get(state)?.level ?? 0;
|
|
253
255
|
runtime.getBehavior = (state) => {
|
|
254
256
|
const node = nodes.get(state);
|
|
@@ -486,6 +488,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
486
488
|
const successors: TraceNode[] = [];
|
|
487
489
|
let failure: WorkerError | undefined;
|
|
488
490
|
runtime.deferred = undefined;
|
|
491
|
+
evaluatedAction = action;
|
|
489
492
|
try {
|
|
490
493
|
forEachSuccessor(
|
|
491
494
|
action.expression,
|
|
@@ -81,6 +81,10 @@ const SIGNATURES: Signature[] = [
|
|
|
81
81
|
["RandomSubset", 0, [0, 0], [2, 2], [1, 1]],
|
|
82
82
|
["RandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
83
83
|
["TestRandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
84
|
+
["_Track", 0, [0, 0], [3, 2], [0, 0]],
|
|
85
|
+
["_Counts", 0, [], [], []],
|
|
86
|
+
["_CheckName", 0, [0], [2], [1]],
|
|
87
|
+
["_PrintCounts", 0, [], [], []],
|
|
84
88
|
];
|
|
85
89
|
|
|
86
90
|
export const STANDARD_LEVELS = new Map(
|
package/src/state-graph.ts
CHANGED
package/src/successors.ts
CHANGED
package/src/symmetry.ts
CHANGED
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
type Value,
|
|
21
21
|
} from "./values";
|
|
22
22
|
|
|
23
|
-
type Images = Map<string, ModelValue>;
|
|
23
|
+
export type Images = Map<string, ModelValue>;
|
|
24
24
|
|
|
25
25
|
const getPermutationKey = (permutation: Images) =>
|
|
26
26
|
[...permutation]
|
|
@@ -222,7 +222,7 @@ const permuteSortedElements = (elements: Value[], images: Images) => {
|
|
|
222
222
|
return merged;
|
|
223
223
|
};
|
|
224
224
|
|
|
225
|
-
const permuteValue = (value: Value, images: Images): Value => {
|
|
225
|
+
export const permuteValue = (value: Value, images: Images): Value => {
|
|
226
226
|
if (typeof value !== "object") return value;
|
|
227
227
|
const kind = value.kind;
|
|
228
228
|
if (kind === "ModelValue") return images.get(value.name) ?? value;
|
package/src/tableau.ts
CHANGED
|
@@ -8,7 +8,7 @@ interface LiveBoolean {
|
|
|
8
8
|
value: boolean;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
interface LiveState {
|
|
11
|
+
export interface LiveState {
|
|
12
12
|
kind: "State";
|
|
13
13
|
expression: Expression;
|
|
14
14
|
scope: Scope | undefined;
|
|
@@ -20,7 +20,7 @@ export interface LiveEnabled {
|
|
|
20
20
|
scope: Scope | undefined;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
interface LiveAction {
|
|
23
|
+
export interface LiveAction {
|
|
24
24
|
kind: "Action";
|
|
25
25
|
expression: Expression;
|
|
26
26
|
subscript: Expression | undefined;
|
package/src/tlc/fingerprint.ts
CHANGED
|
@@ -249,21 +249,87 @@ const extendScalar = (value: boolean | number | string | ModelValue) => {
|
|
|
249
249
|
return 5;
|
|
250
250
|
};
|
|
251
251
|
|
|
252
|
+
// TLC's fingerprint is linear in the bytes it extends by. A scalar extends it as zero bytes of its
|
|
253
|
+
// length would, and then by its fingerprint from zero, so code may extend by a scalar it knows
|
|
254
|
+
// without inspecting it.
|
|
255
|
+
export const getScalarExtension = (value: boolean | number | string | ModelValue) => {
|
|
256
|
+
const outerHigh = high;
|
|
257
|
+
const outerLow = low;
|
|
258
|
+
high = 0;
|
|
259
|
+
low = 0;
|
|
260
|
+
const extension = [extendScalar(value), high, low];
|
|
261
|
+
high = outerHigh;
|
|
262
|
+
low = outerLow;
|
|
263
|
+
return extension;
|
|
264
|
+
};
|
|
265
|
+
|
|
266
|
+
// Code that extends a fingerprint in the locals h and l as the functions here extend theirs, with
|
|
267
|
+
// a local m and the tables FINGERPRINT_TABLES gives as H0 to H3 and L0 to L3.
|
|
268
|
+
const getByteCode = (byte: string) =>
|
|
269
|
+
`m = (${byte} ^ l) & 255; l = ((l >>> 8) | (h << 24)) ^ L0[m]; h = (h >>> 8) ^ H0[m];`;
|
|
270
|
+
const getWordCode = (word: string) =>
|
|
271
|
+
`m = l ^ ${word}; l = h ^ L3[m & 255] ^ L2[(m >>> 8) & 255] ^ L1[(m >>> 16) & 255] ^ L0[m >>> 24]; h = H3[m & 255] ^ H2[(m >>> 8) & 255] ^ H1[(m >>> 16) & 255] ^ H0[m >>> 24];`;
|
|
272
|
+
|
|
273
|
+
export const FINGERPRINT_CODE = {
|
|
274
|
+
integer: (value: string) => `${getByteCode(String(INT_VALUE))} ${getWordCode(value)}`,
|
|
275
|
+
boolean: (value: string) =>
|
|
276
|
+
`${getByteCode(String(BOOL_VALUE))} ${getByteCode(`(${value} ? 116 : 102)`)}`,
|
|
277
|
+
set: (length: string) => `${getByteCode(String(SET_ENUM_VALUE))} ${getWordCode(length)}`,
|
|
278
|
+
function: (length: string) => `${getByteCode(String(FCN_RCD_VALUE))} ${getWordCode(length)}`,
|
|
279
|
+
// A scalar of the extension getScalarExtension gives.
|
|
280
|
+
scalar: (length: string, scalarHigh: string, scalarLow: string) =>
|
|
281
|
+
`{ let r = ${length}; for (; r >= 4; r -= 4) { ${getWordCode("0")} } for (; r > 0; r--) { ${getByteCode("0")} } h ^= ${scalarHigh}; l ^= ${scalarLow}; }`,
|
|
282
|
+
};
|
|
283
|
+
|
|
284
|
+
export const getFingerprintTables = () => ({
|
|
285
|
+
H0: SLICE_HIGH_0,
|
|
286
|
+
H1: SLICE_HIGH_1,
|
|
287
|
+
H2: SLICE_HIGH_2,
|
|
288
|
+
H3: SLICE_HIGH_3,
|
|
289
|
+
L0: SLICE_LOW_0,
|
|
290
|
+
L1: SLICE_LOW_1,
|
|
291
|
+
L2: SLICE_LOW_2,
|
|
292
|
+
L3: SLICE_LOW_3,
|
|
293
|
+
initialHigh,
|
|
294
|
+
initialLow,
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
// Extends the fingerprint held in state, as low and high words, by a value.
|
|
298
|
+
export const extendFingerprint = (state: Int32Array, value: Value) => {
|
|
299
|
+
const outerHigh = high;
|
|
300
|
+
const outerLow = low;
|
|
301
|
+
low = state[0];
|
|
302
|
+
high = state[1];
|
|
303
|
+
extendValue(value);
|
|
304
|
+
state[0] = low;
|
|
305
|
+
state[1] = high;
|
|
306
|
+
high = outerHigh;
|
|
307
|
+
low = outerLow;
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
const extendSet = (length: number) => {
|
|
311
|
+
extendByte(SET_ENUM_VALUE);
|
|
312
|
+
extendInt(length);
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
const extendFunction = (length: number) => {
|
|
316
|
+
extendByte(FCN_RCD_VALUE);
|
|
317
|
+
extendInt(length);
|
|
318
|
+
};
|
|
319
|
+
|
|
252
320
|
const extendValue = (value: Value) => {
|
|
253
321
|
if (typeof value !== "object" || isModelValue(value)) {
|
|
254
322
|
extendScalar(value);
|
|
255
323
|
} else if (isFunctionValue(value)) {
|
|
256
324
|
const functionValue = toFiniteFunction(value);
|
|
257
|
-
|
|
258
|
-
extendInt(functionValue.domain.length);
|
|
325
|
+
extendFunction(functionValue.domain.length);
|
|
259
326
|
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
260
327
|
extendValue(functionValue.domain[index]);
|
|
261
328
|
extendValue(functionValue.range[index]);
|
|
262
329
|
}
|
|
263
330
|
} else {
|
|
264
331
|
const elements = toFiniteSet(value).elements;
|
|
265
|
-
|
|
266
|
-
extendInt(elements.length);
|
|
332
|
+
extendSet(elements.length);
|
|
267
333
|
for (const element of elements) extendValue(element);
|
|
268
334
|
}
|
|
269
335
|
};
|
|
@@ -280,19 +346,25 @@ export const getTlcFingerprint = (state: Value[]) => {
|
|
|
280
346
|
return fingerprint;
|
|
281
347
|
};
|
|
282
348
|
|
|
283
|
-
|
|
284
|
-
|
|
349
|
+
// Fingerprints each of count states from the values extend adds for it.
|
|
350
|
+
const getExtendedFingerprints = (count: number, extend: (position: number) => void) => {
|
|
351
|
+
const fingerprints = new BigInt64Array(count);
|
|
285
352
|
const words = new Int32Array(fingerprints.buffer);
|
|
286
353
|
const outerHigh = high;
|
|
287
354
|
const outerLow = low;
|
|
288
|
-
|
|
355
|
+
for (let position = 0; position < count; position++) {
|
|
289
356
|
high = initialHigh;
|
|
290
357
|
low = initialLow;
|
|
291
|
-
|
|
358
|
+
extend(position);
|
|
292
359
|
words[2 * position] = low;
|
|
293
360
|
words[2 * position + 1] = high;
|
|
294
|
-
}
|
|
361
|
+
}
|
|
295
362
|
high = outerHigh;
|
|
296
363
|
low = outerLow;
|
|
297
364
|
return fingerprints;
|
|
298
365
|
};
|
|
366
|
+
|
|
367
|
+
export const getTlcFingerprints = (states: Value[][], order: number[]) =>
|
|
368
|
+
getExtendedFingerprints(states.length, (position) => {
|
|
369
|
+
for (const index of order) extendValue(states[position][index]);
|
|
370
|
+
});
|
package/src/tlc/summary.ts
CHANGED
|
@@ -69,30 +69,45 @@ export const getActualProbability = (distance: bigint) => {
|
|
|
69
69
|
return Number(`${quotient + (isRoundedUp ? 1n : 0n)}e-${exponent + 1}`);
|
|
70
70
|
};
|
|
71
71
|
|
|
72
|
+
// The fingerprints come in runs, each of which holds only fingerprints below those of the next.
|
|
72
73
|
export const getFingerprintDistance = (
|
|
73
74
|
distinctStates: number,
|
|
74
75
|
generatedStates: number,
|
|
75
|
-
|
|
76
|
+
forEachRun: (visit: (run: BigInt64Array) => void) => void,
|
|
76
77
|
) => {
|
|
77
78
|
const probability = getOptimisticProbability(distinctStates, generatedStates);
|
|
78
79
|
if (probability < ACTUAL_PROBABILITY_THRESHOLD) return undefined;
|
|
79
|
-
const fingerprints = getFingerprints().sort();
|
|
80
|
-
const words = new Int32Array(fingerprints.buffer);
|
|
81
80
|
let narrowest = Number.POSITIVE_INFINITY;
|
|
82
81
|
let widest = 0x7fff_ffff_ffff_ffffn;
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
const gap = highGap * 0x1_0000_0000 + (words[2 * index] >>> 0) - (words[2 * index - 2] >>> 0);
|
|
90
|
-
narrowest = Math.min(narrowest, gap);
|
|
91
|
-
} else {
|
|
92
|
-
const gap = fingerprints[index] - fingerprints[index - 1];
|
|
82
|
+
let previous: bigint | undefined;
|
|
83
|
+
forEachRun((run) => {
|
|
84
|
+
if (run.length === 0) return;
|
|
85
|
+
const fingerprints = run.sort();
|
|
86
|
+
if (previous !== undefined && previous < 0n === fingerprints[0] < 0n) {
|
|
87
|
+
const gap = fingerprints[0] - previous;
|
|
93
88
|
if (gap < widest) widest = gap;
|
|
94
89
|
}
|
|
95
|
-
|
|
90
|
+
previous = fingerprints[fingerprints.length - 1];
|
|
91
|
+
const words = new Int32Array(
|
|
92
|
+
fingerprints.buffer,
|
|
93
|
+
fingerprints.byteOffset,
|
|
94
|
+
fingerprints.length * 2,
|
|
95
|
+
);
|
|
96
|
+
for (let index = 1; index < fingerprints.length; index++) {
|
|
97
|
+
const high = words[2 * index + 1];
|
|
98
|
+
const previousHigh = words[2 * index - 1];
|
|
99
|
+
if (high < 0 !== previousHigh < 0) continue;
|
|
100
|
+
const highGap = high - previousHigh;
|
|
101
|
+
if (highGap <= 0x10_0000) {
|
|
102
|
+
const gap =
|
|
103
|
+
highGap * 0x1_0000_0000 + (words[2 * index] >>> 0) - (words[2 * index - 2] >>> 0);
|
|
104
|
+
narrowest = Math.min(narrowest, gap);
|
|
105
|
+
} else {
|
|
106
|
+
const gap = fingerprints[index] - fingerprints[index - 1];
|
|
107
|
+
if (gap < widest) widest = gap;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
});
|
|
96
111
|
if (narrowest === Number.POSITIVE_INFINITY) return widest;
|
|
97
112
|
const narrow = BigInt(narrowest);
|
|
98
113
|
return narrow < widest ? narrow : widest;
|
|
@@ -7,7 +7,13 @@ import {
|
|
|
7
7
|
getThunk,
|
|
8
8
|
getValue,
|
|
9
9
|
} from "../builtins";
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
formatRange,
|
|
12
|
+
TlaEndOfInputError,
|
|
13
|
+
TlaEvaluationError,
|
|
14
|
+
TlaModuleError,
|
|
15
|
+
TlaUnsupportedError,
|
|
16
|
+
} from "../errors";
|
|
11
17
|
import { getTlcFingerprint } from "./fingerprint";
|
|
12
18
|
import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
|
|
13
19
|
import {
|
|
@@ -31,6 +37,7 @@ import {
|
|
|
31
37
|
createRecord,
|
|
32
38
|
createSet,
|
|
33
39
|
createTuple,
|
|
40
|
+
formatState,
|
|
34
41
|
formatValue,
|
|
35
42
|
getFingerprintError,
|
|
36
43
|
getSequenceElements,
|
|
@@ -270,17 +277,42 @@ export const createTlcExtOperators = (
|
|
|
270
277
|
if (isPicked || !context?.next || !context.state || !isCompleteState(context.state)) {
|
|
271
278
|
return true;
|
|
272
279
|
}
|
|
273
|
-
const
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
280
|
+
const state = context.state;
|
|
281
|
+
const action = runtime.getSuccessorAction(state, next);
|
|
282
|
+
const printOverride = (text: string) =>
|
|
283
|
+
print(
|
|
284
|
+
formatMessage(
|
|
285
|
+
runtime.isTool,
|
|
286
|
+
MESSAGE_CODE.moduleOverrideStdout,
|
|
287
|
+
MESSAGE_LEVEL.none,
|
|
288
|
+
text,
|
|
289
|
+
),
|
|
290
|
+
);
|
|
291
|
+
while (true) {
|
|
292
|
+
printOverride(
|
|
293
|
+
`Extend behavior of length ${runtime.getLevel(state)} with a "${action?.name}" step [<Action ${action?.location.range && formatRange(action.location.range)}>]? (Yes/no/explored/states/diff):`,
|
|
294
|
+
);
|
|
295
|
+
const answer = runtime.readLine?.();
|
|
296
|
+
// Deviation from TLC: at the end of standard input, TLC's Scanner leaks a NoSuchElementException.
|
|
297
|
+
if (answer === undefined) throw new TlaEndOfInputError();
|
|
298
|
+
if (/^[\0-\x20]*$/.test(answer) || answer.toLowerCase().startsWith("y")) return true;
|
|
299
|
+
if (answer[0] === "s") {
|
|
300
|
+
printOverride(
|
|
301
|
+
`${formatState(runtime.toRecord(state)).trimEnd()}\n~>\n${formatState(runtime.toRecord(next)).trimEnd()}`,
|
|
302
|
+
);
|
|
303
|
+
} else if (answer[0] === "d") {
|
|
304
|
+
printOverride(formatState(runtime.toRecord(next), runtime.toRecord(state)));
|
|
305
|
+
} else if (answer[0] === "e") {
|
|
306
|
+
if (runtime.getSimulationValue === undefined) {
|
|
307
|
+
throw new TlaUnsupportedError(
|
|
308
|
+
"tla-ts can't mark a state explored while it checks a model.",
|
|
309
|
+
);
|
|
310
|
+
}
|
|
311
|
+
printOverride(
|
|
312
|
+
"Marking a state explored is unsupported by the current TLC mode. Is TLC running in simulation mode?",
|
|
313
|
+
);
|
|
314
|
+
} else if (answer[0] === "n") return false;
|
|
315
|
+
}
|
|
284
316
|
}),
|
|
285
317
|
isActionLevel: true,
|
|
286
318
|
},
|