tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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 +4 -1
- package/dist/index.d.ts +4 -1
- 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 +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- 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/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- 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 +5 -3
- 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 +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- 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 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- 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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- 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 +50 -3
- 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/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- 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 +0 -1
- 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 +3 -6
- 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 +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- 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 +15 -19
- 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 +1 -4
- 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 +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- 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 +1 -3
- 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 +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- 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 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- 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 +1 -3
- 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 +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- 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 +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- 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 +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- 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 +0 -1
- 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 +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- 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 +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- 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 +26 -7
- 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 +158 -82
- 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 +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- 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 +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- 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 +9 -2
- 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 +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- 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 +3 -2
- 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 +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- 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 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- 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 +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- 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 +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- 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 +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- 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 +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- 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 -20
- 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 +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- 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 +4 -7
- 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 +48 -57
- 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 +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -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 +14 -10
- 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 +35 -21
- 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 +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- 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 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- 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 +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- 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 +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- 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 +15 -54
- 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 -2
- 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 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- 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 +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- 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 +2 -3
- 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 +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- 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 +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- 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 +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- 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/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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/sany/generation.ts
CHANGED
|
@@ -34,19 +34,7 @@ import {
|
|
|
34
34
|
getTokenIndex,
|
|
35
35
|
type SourceFile,
|
|
36
36
|
} from "./source";
|
|
37
|
-
import {
|
|
38
|
-
|
|
39
|
-
const SYNONYMS = new Map(
|
|
40
|
-
SANY_OPERATOR_SYNONYMS.flatMap(([canonical, ...synonyms]) =>
|
|
41
|
-
synonyms.map((synonym) => [synonym, canonical]),
|
|
42
|
-
),
|
|
43
|
-
);
|
|
44
|
-
|
|
45
|
-
export const resolveSynonym = (name: string) =>
|
|
46
|
-
name
|
|
47
|
-
.split("!")
|
|
48
|
-
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
49
|
-
.join("!");
|
|
37
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
50
38
|
|
|
51
39
|
export interface AssumeProveScope {
|
|
52
40
|
isDeclaredBefore: boolean[];
|
|
@@ -60,10 +60,10 @@ import {
|
|
|
60
60
|
popLabels,
|
|
61
61
|
pushLabelScope,
|
|
62
62
|
resolveSymbol,
|
|
63
|
-
resolveSynonym,
|
|
64
63
|
setRecursionFields,
|
|
65
64
|
withContext,
|
|
66
65
|
} from "./generation";
|
|
66
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
67
67
|
import {
|
|
68
68
|
findNameOrKeyword,
|
|
69
69
|
generateBounds,
|
|
@@ -356,6 +356,7 @@ const processSubstitutions = (
|
|
|
356
356
|
if (targetIndex !== -1) {
|
|
357
357
|
cursor = getExpressionSpan(generation.file, substitution.expression).end + 1;
|
|
358
358
|
}
|
|
359
|
+
// Deviation from SANY: Generator#generateSubst looks a target up as spelled, so it rejects `<= <- G` for a CONSTANT _ <= _.
|
|
359
360
|
const target = getContextSymbol(instanceeContext, resolveSynonym(substitution.name));
|
|
360
361
|
if (target?.kind !== "OpDecl") {
|
|
361
362
|
generation.addError(
|
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
getArgumentSpan,
|
|
28
28
|
getExpressionSpan,
|
|
29
29
|
getMatchingIndex,
|
|
30
|
+
getParenthesizedSpan,
|
|
30
31
|
getPreComments,
|
|
31
32
|
getSpanLocation,
|
|
32
33
|
getTokenIndex,
|
|
@@ -48,11 +49,10 @@ import {
|
|
|
48
49
|
type ModuleGeneration,
|
|
49
50
|
popLabels,
|
|
50
51
|
pushLabelScope,
|
|
51
|
-
resolveName,
|
|
52
52
|
resolveSymbol,
|
|
53
|
-
resolveSynonym,
|
|
54
53
|
withContext,
|
|
55
54
|
} from "./generation";
|
|
55
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
56
56
|
import { getOperandSpan } from "./generator-def-entries";
|
|
57
57
|
import {
|
|
58
58
|
checkForUndefinedRecursiveOps,
|
|
@@ -93,18 +93,6 @@ const isOperatorArgument = (argument: Expression) => {
|
|
|
93
93
|
return OPERATOR_ARGUMENT_KINDS.has(argument.kind) || (items !== undefined && isGeneralId(items));
|
|
94
94
|
};
|
|
95
95
|
|
|
96
|
-
const POSTFIX_OPERATOR_TEXTS = new Set(["'", "^+", "^*", "^#"]);
|
|
97
|
-
|
|
98
|
-
const getOperatorNodeKind = (
|
|
99
|
-
expression: Expression & { kind: "OperatorReference" | "Lambda" },
|
|
100
|
-
text: string,
|
|
101
|
-
) => {
|
|
102
|
-
if (POSTFIX_OPERATOR_TEXTS.has(text)) return "N_GenPostfixOp";
|
|
103
|
-
return expression.kind === "Lambda" || text === "~" || text === "-."
|
|
104
|
-
? "N_GenNonExpPrefixOp"
|
|
105
|
-
: "N_GenInfixOp";
|
|
106
|
-
};
|
|
107
|
-
|
|
108
96
|
const locateSelectorItems = (file: SourceFile, items: SelectorItem[], span: TokenSpan) => {
|
|
109
97
|
let cursor = span.start;
|
|
110
98
|
return items.map((item): SelectorItem => {
|
|
@@ -244,22 +232,33 @@ const getOperatorArgumentName = (file: SourceFile, argument: Expression) =>
|
|
|
244
232
|
? argument.body.operator
|
|
245
233
|
: file.tokens[getTokenIndex(file, argument.location)].text;
|
|
246
234
|
|
|
235
|
+
const resolveOperatorArgument = (
|
|
236
|
+
generation: ModuleGeneration,
|
|
237
|
+
argument: Expression,
|
|
238
|
+
location: SanyLocation,
|
|
239
|
+
) => {
|
|
240
|
+
const name = getOperatorArgumentName(generation.file, argument);
|
|
241
|
+
const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
|
|
242
|
+
if (symbol !== undefined) return createOpArg(generation, symbol, location);
|
|
243
|
+
generation.addError(location, `Could not find declaration or definition of symbol '${name}'.`);
|
|
244
|
+
return createNullNode(generation);
|
|
245
|
+
};
|
|
246
|
+
|
|
247
247
|
export const generateOperatorArgument = (
|
|
248
248
|
generation: ModuleGeneration,
|
|
249
249
|
argument: Expression,
|
|
250
250
|
target: OpDeclNode,
|
|
251
251
|
): OpArgNode | OpApplNode => {
|
|
252
|
-
const
|
|
253
|
-
|
|
252
|
+
const span = getExpressionSpan(generation.file, argument);
|
|
253
|
+
const parenthesizedSpan = getParenthesizedSpan(generation.file, span);
|
|
254
|
+
const location = getSpanLocation(generation.file, parenthesizedSpan);
|
|
255
|
+
const isParenthesized = parenthesizedSpan !== span;
|
|
256
|
+
if (argument.kind === "Lambda" && !isParenthesized) {
|
|
254
257
|
if (argument.location.range !== undefined && argument.operator === undefined)
|
|
255
258
|
return createOpArg(generation, generateLambda(generation, argument), location);
|
|
256
|
-
return
|
|
257
|
-
generation,
|
|
258
|
-
resolveName(generation, getOperatorArgumentName(generation.file, argument), location),
|
|
259
|
-
location,
|
|
260
|
-
);
|
|
259
|
+
return resolveOperatorArgument(generation, argument, location);
|
|
261
260
|
}
|
|
262
|
-
if (!isOperatorArgument(argument)) {
|
|
261
|
+
if (isParenthesized || !isOperatorArgument(argument)) {
|
|
263
262
|
generation.addError(
|
|
264
263
|
location,
|
|
265
264
|
`Arity ${target.arity} operator (not an expression) is expected \nto substitute for CONSTANT '${target.name}'.`,
|
|
@@ -267,7 +266,7 @@ export const generateOperatorArgument = (
|
|
|
267
266
|
return createNullNode(generation);
|
|
268
267
|
}
|
|
269
268
|
if (argument.kind === "OperatorReference") {
|
|
270
|
-
return
|
|
269
|
+
return resolveOperatorArgument(generation, argument, location);
|
|
271
270
|
}
|
|
272
271
|
const node = generateSelector(generation, argument, target.arity, false, false);
|
|
273
272
|
if (node.kind === "OpArg" || (node.kind === "OpAppl" && node.nullKind !== undefined)) return node;
|
|
@@ -722,13 +721,17 @@ export const generateExpression = (
|
|
|
722
721
|
return { ...createNullNode(generation), nullKind: "absent" };
|
|
723
722
|
case "OperatorReference":
|
|
724
723
|
case "Lambda": {
|
|
725
|
-
const
|
|
726
|
-
|
|
724
|
+
const token = generation.file.tokens[getExpressionSpan(generation.file, expression).start];
|
|
725
|
+
const name = expression.operator ?? token.text;
|
|
726
|
+
// Deviation from SANY: Generator#generateExpression names its internal node kind here, where tla-ts words it as for a name.
|
|
727
|
+
const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
|
|
727
728
|
generation.addError(
|
|
728
729
|
location,
|
|
729
|
-
text === "LAMBDA"
|
|
730
|
+
token.text === "LAMBDA"
|
|
730
731
|
? "LAMBDA expression used where an expression is required."
|
|
731
|
-
:
|
|
732
|
+
: symbol === undefined
|
|
733
|
+
? `Could not find declaration or definition of symbol '${token.spelling ?? name}'.`
|
|
734
|
+
: `The operator ${resolveSynonym(name)} requires ${getSymbolArity(symbol)} arguments.`,
|
|
732
735
|
);
|
|
733
736
|
return { ...createNullNode(generation), nullKind: "absent" };
|
|
734
737
|
}
|
|
@@ -66,9 +66,9 @@ import {
|
|
|
66
66
|
pushLabelScope,
|
|
67
67
|
resolveModule,
|
|
68
68
|
resolveName,
|
|
69
|
-
resolveSynonym,
|
|
70
69
|
withContext,
|
|
71
70
|
} from "./generation";
|
|
71
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
72
72
|
import { getOperandSpan, reportDefEntry } from "./generator-def-entries";
|
|
73
73
|
import {
|
|
74
74
|
generateInstance,
|
package/src/sany/generator.ts
CHANGED
|
@@ -51,8 +51,8 @@ import {
|
|
|
51
51
|
type ModuleGeneration,
|
|
52
52
|
resolveModule,
|
|
53
53
|
resolveSymbol,
|
|
54
|
-
resolveSynonym,
|
|
55
54
|
} from "./generation";
|
|
55
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
56
56
|
import {
|
|
57
57
|
checkForUndefinedRecursiveOps,
|
|
58
58
|
checkRecursiveSection,
|
|
@@ -125,6 +125,7 @@ const isInternalInstance = (module: Module, instance: Instance) => {
|
|
|
125
125
|
return seen.has(instance.module);
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
// Deviation from SANY: SpecObj#instanceResolvesToInternalModule reads only top-level INSTANCEs, so SANY loads an inner module that only a LET instantiates a second time and rejects it as multiply defined.
|
|
128
129
|
return module.modules.some(
|
|
129
130
|
(inner) => inner.name === instance.module && isBefore(inner.location, instance.location),
|
|
130
131
|
);
|
package/src/sany/levels.ts
CHANGED
package/src/sany/linter.ts
CHANGED
package/src/sany/nodes.ts
CHANGED
|
@@ -156,7 +156,7 @@ export interface OpApplNode extends LevelFields {
|
|
|
156
156
|
nullKind?: "null" | "absent";
|
|
157
157
|
}
|
|
158
158
|
|
|
159
|
-
export const isAbsent = (node: LevelNode | undefined) =>
|
|
159
|
+
export const isAbsent = (node: LevelNode | SymbolNode | undefined) =>
|
|
160
160
|
node?.kind === "OpAppl" && node.nullKind === "absent";
|
|
161
161
|
|
|
162
162
|
export interface NumeralNode extends LevelFields {
|
package/src/sany/selectors.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
CONSTANT_DECL_KIND,
|
|
5
5
|
getContextSymbol,
|
|
6
6
|
getSymbolArity,
|
|
7
|
+
isAbsent,
|
|
7
8
|
type AssumeProveNode,
|
|
8
9
|
type Context,
|
|
9
10
|
type ExprNode,
|
|
@@ -382,7 +383,7 @@ export const createSelectorResolver =
|
|
|
382
383
|
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
383
384
|
);
|
|
384
385
|
}
|
|
385
|
-
} else if (node === undefined) {
|
|
386
|
+
} else if (node === undefined || isAbsent(node)) {
|
|
386
387
|
return generator.addError(
|
|
387
388
|
getItemLocation(),
|
|
388
389
|
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
@@ -438,7 +439,7 @@ export const createSelectorResolver =
|
|
|
438
439
|
);
|
|
439
440
|
}
|
|
440
441
|
walk.node = pair.operands[number - 1];
|
|
441
|
-
if (walk.node === undefined)
|
|
442
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
442
443
|
return generator.addError(
|
|
443
444
|
getItemLocation(),
|
|
444
445
|
"Selecting OTHER in a CASE statement.",
|
|
@@ -476,7 +477,7 @@ export const createSelectorResolver =
|
|
|
476
477
|
} else {
|
|
477
478
|
return generator.addError(
|
|
478
479
|
getItemLocation(),
|
|
479
|
-
`Choosing operand \`${item
|
|
480
|
+
`Choosing operand \`${getSelectorItemName(item)}' of subexpression with no operands.`,
|
|
480
481
|
);
|
|
481
482
|
}
|
|
482
483
|
} else if (node.kind === "AssumeProve") {
|
|
@@ -542,10 +543,10 @@ export const createSelectorResolver =
|
|
|
542
543
|
"Selecting subexpression of expression that has none.",
|
|
543
544
|
);
|
|
544
545
|
}
|
|
545
|
-
if (walk.node === undefined)
|
|
546
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
546
547
|
return generator.addError(
|
|
547
548
|
getItemLocation(),
|
|
548
|
-
`An unexpected null node specified by '${item
|
|
549
|
+
`An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
|
|
549
550
|
);
|
|
550
551
|
if (walk.index !== items.length - 1) {
|
|
551
552
|
const next = items[walk.index + 1];
|
package/src/search.ts
CHANGED
|
@@ -22,8 +22,17 @@ import {
|
|
|
22
22
|
type Coverage,
|
|
23
23
|
type CoverageKind,
|
|
24
24
|
} from "./coverage";
|
|
25
|
-
import {
|
|
26
|
-
|
|
25
|
+
import {
|
|
26
|
+
getReadVariables,
|
|
27
|
+
isConstantLevel,
|
|
28
|
+
isExpressionImpure,
|
|
29
|
+
isImpureDefinition,
|
|
30
|
+
} from "./dependencies";
|
|
31
|
+
import {
|
|
32
|
+
createEnvironment,
|
|
33
|
+
type ResolvedModuleOperator,
|
|
34
|
+
type RuntimeInvariant,
|
|
35
|
+
} from "./environment";
|
|
27
36
|
import {
|
|
28
37
|
isStackOverflow,
|
|
29
38
|
TlaConfigError,
|
|
@@ -55,6 +64,7 @@ import {
|
|
|
55
64
|
VARIABLE_LEVEL,
|
|
56
65
|
} from "./levels";
|
|
57
66
|
import { expandTemporal, getLevel, type ScopedExpression, type TemporalProperty } from "./liveness";
|
|
67
|
+
import { getLiveExpressions } from "./liveness-checker";
|
|
58
68
|
import { prettyPrint } from "./pretty-print";
|
|
59
69
|
import { getPossibleCounts, type CheckerRuntime } from "./runtime";
|
|
60
70
|
import {
|
|
@@ -63,7 +73,8 @@ import {
|
|
|
63
73
|
getSubscriptVariables,
|
|
64
74
|
type SpecDescription,
|
|
65
75
|
} from "./spec-description";
|
|
66
|
-
import { getRepresentative, getSymmetryGroup } from "./symmetry";
|
|
76
|
+
import { getRepresentative, getSymmetryGroup, type Images } from "./symmetry";
|
|
77
|
+
import type { Solution } from "./tableau";
|
|
67
78
|
import {
|
|
68
79
|
formatInnerMessage,
|
|
69
80
|
formatNestedMessage,
|
|
@@ -88,26 +99,34 @@ import {
|
|
|
88
99
|
type Value,
|
|
89
100
|
} from "./values";
|
|
90
101
|
|
|
91
|
-
interface
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
102
|
+
export interface CliSettings {
|
|
103
|
+
readLine?: () => string | undefined;
|
|
104
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
interface EnvironmentSettings
|
|
108
|
+
extends
|
|
109
|
+
Pick<
|
|
110
|
+
CheckOptions,
|
|
111
|
+
| "source"
|
|
112
|
+
| "loadModule"
|
|
113
|
+
| "loadClass"
|
|
114
|
+
| "readFile"
|
|
115
|
+
| "writeFile"
|
|
116
|
+
| "makeDirectory"
|
|
117
|
+
| "seed"
|
|
118
|
+
| "isTool"
|
|
119
|
+
| "traceSpec"
|
|
120
|
+
| "isSanyReported"
|
|
121
|
+
| "isWarningEnabled"
|
|
122
|
+
| "version"
|
|
123
|
+
| "moduleOperators"
|
|
124
|
+
| "fingerprintPolynomial"
|
|
125
|
+
| "maxSetSize"
|
|
126
|
+
| "isLazyValueExpanded"
|
|
127
|
+
| "isViewPrinted"
|
|
128
|
+
>,
|
|
129
|
+
CliSettings {}
|
|
111
130
|
|
|
112
131
|
interface NamedExpression {
|
|
113
132
|
name: string;
|
|
@@ -560,6 +579,29 @@ const getProperties = (
|
|
|
560
579
|
return properties;
|
|
561
580
|
};
|
|
562
581
|
|
|
582
|
+
// The expressions the LET definitions and arguments of a scope stand for, or undefined if it binds
|
|
583
|
+
// an operator only as a function.
|
|
584
|
+
const getScopeExpressions = (scope: Scope | undefined): Expression[] | undefined => {
|
|
585
|
+
const expressions: Expression[] = [];
|
|
586
|
+
const visited = new Set<Scope>();
|
|
587
|
+
const visit = (current: Scope | undefined): boolean => {
|
|
588
|
+
if (current === undefined || visited.has(current)) return true;
|
|
589
|
+
visited.add(current);
|
|
590
|
+
const binding = current.binding;
|
|
591
|
+
if (binding.kind === "Thunk") {
|
|
592
|
+
expressions.push(binding.expression);
|
|
593
|
+
return visit(binding.scope) && visit(current.parent);
|
|
594
|
+
}
|
|
595
|
+
if (binding.kind === "Operator") {
|
|
596
|
+
if (binding.operator.kind !== "Closure") return false;
|
|
597
|
+
expressions.push(binding.operator.body);
|
|
598
|
+
return visit(binding.operator.scope) && visit(current.parent);
|
|
599
|
+
}
|
|
600
|
+
return visit(current.parent);
|
|
601
|
+
};
|
|
602
|
+
return visit(scope) ? expressions : undefined;
|
|
603
|
+
};
|
|
604
|
+
|
|
563
605
|
const getNamedExpressions = (
|
|
564
606
|
kind: string,
|
|
565
607
|
names: string[],
|
|
@@ -680,6 +722,21 @@ export interface Search {
|
|
|
680
722
|
getTlcOrder: () => number[];
|
|
681
723
|
isSymmetric: boolean;
|
|
682
724
|
isConstrained: boolean;
|
|
725
|
+
getTypedChecks: (liveness: Solution[] | undefined) =>
|
|
726
|
+
| {
|
|
727
|
+
init: Expression;
|
|
728
|
+
next: Expression;
|
|
729
|
+
scope: Scope | undefined;
|
|
730
|
+
invariants: Expression[];
|
|
731
|
+
constraints: Expression[];
|
|
732
|
+
holdsInitialPredicates: (state: Value[]) => boolean;
|
|
733
|
+
actionProperties: ActionProperty[];
|
|
734
|
+
symmetry: Images[] | undefined;
|
|
735
|
+
view: Expression | undefined;
|
|
736
|
+
variableOrder: number[];
|
|
737
|
+
liveness: Solution[] | undefined;
|
|
738
|
+
}
|
|
739
|
+
| undefined;
|
|
683
740
|
findViolatedInvariant: (state: Value[], parent?: Value[]) => StateCheck | undefined;
|
|
684
741
|
getViolatedInvariants: (state: Value[]) => StateCheck[];
|
|
685
742
|
checkReplayedInitialState: (
|
|
@@ -724,7 +781,7 @@ export const getIncompleteSuccessorMessage = (
|
|
|
724
781
|
return `Successor state is not completely specified by ${subject}. The following variable${missing.length > 1 ? "s are" : " is"} not ${verb}: ${missing.join(", ")}.\n`;
|
|
725
782
|
};
|
|
726
783
|
|
|
727
|
-
const getContext = (
|
|
784
|
+
export const getContext = (
|
|
728
785
|
environment: Environment,
|
|
729
786
|
state: Value[] | undefined,
|
|
730
787
|
next: Value[] | undefined,
|
|
@@ -808,7 +865,12 @@ export const createCheckEnvironment = (
|
|
|
808
865
|
isStringOrderFrozen = false,
|
|
809
866
|
) => {
|
|
810
867
|
const order = createTlcOrder(options.source, options.loadModule);
|
|
811
|
-
setStringOrder(
|
|
868
|
+
setStringOrder(
|
|
869
|
+
order.getStringOrder(
|
|
870
|
+
config,
|
|
871
|
+
(options.runtimeInvariants ?? []).flatMap((invariant) => invariant.module ?? []),
|
|
872
|
+
),
|
|
873
|
+
);
|
|
812
874
|
setValueOptions(options);
|
|
813
875
|
setFingerprintPolynomial(options.fingerprintPolynomial ?? 0);
|
|
814
876
|
if (isStringOrderFrozen) freezeStringOrder();
|
|
@@ -830,6 +892,8 @@ export const createCheckEnvironment = (
|
|
|
830
892
|
isWarningEnabled: options.isWarningEnabled,
|
|
831
893
|
version: options.version,
|
|
832
894
|
moduleOperators: options.moduleOperators,
|
|
895
|
+
readLine: options.readLine,
|
|
896
|
+
runtimeInvariants: options.runtimeInvariants,
|
|
833
897
|
});
|
|
834
898
|
return { order, specification };
|
|
835
899
|
};
|
|
@@ -855,6 +919,7 @@ export const prepareSearch = (options: CheckOptions) => {
|
|
|
855
919
|
() => created.order.getDeclarationOrder("variable"),
|
|
856
920
|
options.onProgress,
|
|
857
921
|
specification.moduleOperators,
|
|
922
|
+
specification.runtimeInvariants,
|
|
858
923
|
);
|
|
859
924
|
return { config, specification, environment, search, getDescription };
|
|
860
925
|
};
|
|
@@ -895,6 +960,7 @@ export const createSearch = (
|
|
|
895
960
|
getVariableOrder: () => string[],
|
|
896
961
|
onProgress?: CheckOptions["onProgress"],
|
|
897
962
|
moduleOperators: ResolvedModuleOperator[] = [],
|
|
963
|
+
runtimeInvariants: RuntimeInvariant[] = [],
|
|
898
964
|
): Search | undefined => {
|
|
899
965
|
const getModuleOperators = (kind: ResolvedModuleOperator["kind"]) =>
|
|
900
966
|
moduleOperators
|
|
@@ -923,12 +989,12 @@ export const createSearch = (
|
|
|
923
989
|
text: `Implied-temporal checking is a tautology.\nThe temporal formula ${live} at ${formatRange(liveRange)} equals\nthe fairness constraints of the behavior specification ${specName} at ${formatRange(specRange)}.\nTherefore, checking whether ${specName} => ${live} using TLC will never result in a violation of ${live}.`,
|
|
924
990
|
});
|
|
925
991
|
}
|
|
926
|
-
const
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
992
|
+
const checkedInvariants = getStateChecks(
|
|
993
|
+
[...configInvariants, ...properties.invariants],
|
|
994
|
+
environment,
|
|
995
|
+
);
|
|
930
996
|
const isCheckingBehaviors =
|
|
931
|
-
|
|
997
|
+
checkedInvariants.length > 0 ||
|
|
932
998
|
properties.actionProperties.length > 0 ||
|
|
933
999
|
properties.liveness.length > 0;
|
|
934
1000
|
if (
|
|
@@ -946,6 +1012,22 @@ export const createSearch = (
|
|
|
946
1012
|
if (spec.next === undefined && isCheckingBehaviors) {
|
|
947
1013
|
throw new TlaConfigError("The configuration file did not specify the next state predicate.");
|
|
948
1014
|
}
|
|
1015
|
+
const runtimeChecks = getStateChecks(
|
|
1016
|
+
runtimeInvariants.map((invariant) => {
|
|
1017
|
+
const definition = getDefinition(invariant.name, environment);
|
|
1018
|
+
return {
|
|
1019
|
+
name: invariant.name,
|
|
1020
|
+
expression:
|
|
1021
|
+
definition?.kind === "Operator" ? definition.body : createIdentifier(invariant.name),
|
|
1022
|
+
scope: undefined,
|
|
1023
|
+
};
|
|
1024
|
+
}),
|
|
1025
|
+
environment,
|
|
1026
|
+
);
|
|
1027
|
+
const invariants = [...checkedInvariants, ...runtimeChecks];
|
|
1028
|
+
const invariantPredicates = [
|
|
1029
|
+
...new Map(invariants.map((invariant) => [invariant.predicate, invariant])).values(),
|
|
1030
|
+
];
|
|
949
1031
|
const namedConstraints = getNamedExpressions(
|
|
950
1032
|
"constraint",
|
|
951
1033
|
[...config.constraints, ...getModuleOperators("constraint").map((operator) => operator.name)],
|
|
@@ -1051,15 +1133,24 @@ export const createSearch = (
|
|
|
1051
1133
|
const getViewValue = (expression: Expression, state: Value[]) =>
|
|
1052
1134
|
evaluate(expression, getContext(environment, state, undefined));
|
|
1053
1135
|
const getTlcStateFingerprint = (state: Value[]) => {
|
|
1054
|
-
const indices = getTlcOrder();
|
|
1055
1136
|
const representative =
|
|
1056
|
-
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup,
|
|
1137
|
+
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1057
1138
|
return getTlcFingerprint(
|
|
1058
1139
|
view === undefined
|
|
1059
|
-
?
|
|
1140
|
+
? getTlcOrder().map((index) => representative[index])
|
|
1060
1141
|
: [getViewValue(view.expression, representative)],
|
|
1061
1142
|
);
|
|
1062
1143
|
};
|
|
1144
|
+
const findFailedInitialPredicate = (state: Value[]) =>
|
|
1145
|
+
isCoveredHeld(coveredInitialPredicates, state)
|
|
1146
|
+
? undefined
|
|
1147
|
+
: properties.initialPredicates.find(
|
|
1148
|
+
(predicate) =>
|
|
1149
|
+
!holdsLikeTlc(
|
|
1150
|
+
predicate.expression,
|
|
1151
|
+
getContext(environment, state, undefined, predicate.scope),
|
|
1152
|
+
),
|
|
1153
|
+
);
|
|
1063
1154
|
const violatingStates = new WeakSet<Value[]>();
|
|
1064
1155
|
const isViolated = (invariant: StateCheck, state: Value[], parent: Value[] | undefined) => {
|
|
1065
1156
|
const checkedParent = parent && !violatingStates.has(parent) ? parent : undefined;
|
|
@@ -1132,6 +1223,7 @@ export const createSearch = (
|
|
|
1132
1223
|
? record
|
|
1133
1224
|
: setViewText(record, () => getViewText(view.expression, state));
|
|
1134
1225
|
};
|
|
1226
|
+
runtime.toRecord = toRecord;
|
|
1135
1227
|
return {
|
|
1136
1228
|
properties,
|
|
1137
1229
|
spec,
|
|
@@ -1149,6 +1241,76 @@ export const createSearch = (
|
|
|
1149
1241
|
},
|
|
1150
1242
|
isSymmetric: symmetryGroup !== undefined,
|
|
1151
1243
|
isConstrained: constraints.length > 0 || actionConstraints.length > 0,
|
|
1244
|
+
getTypedChecks: (liveness) => {
|
|
1245
|
+
const isInterpreted =
|
|
1246
|
+
coverage !== undefined ||
|
|
1247
|
+
possible.length > 0 ||
|
|
1248
|
+
config.periodic !== undefined ||
|
|
1249
|
+
[...invariants, ...constraints].some((check) => check.scope !== undefined) ||
|
|
1250
|
+
actionConstraints.length > 0 ||
|
|
1251
|
+
properties.actionProperties.some((property) => property.scope !== undefined) ||
|
|
1252
|
+
(properties.liveness.length > 0 && (liveness === undefined || view !== undefined));
|
|
1253
|
+
if (isInterpreted || spec.init === undefined || spec.next === undefined) return undefined;
|
|
1254
|
+
const invariantExpressions = invariantPredicates.map((invariant) => invariant.predicate);
|
|
1255
|
+
const constraintExpressions = [
|
|
1256
|
+
...new Set(constraints.map((constraint) => constraint.predicate)),
|
|
1257
|
+
];
|
|
1258
|
+
const initialExpressions = properties.initialPredicates.map(
|
|
1259
|
+
(predicate) => predicate.expression,
|
|
1260
|
+
);
|
|
1261
|
+
const definitions = [...environment.facts.ids.keys()];
|
|
1262
|
+
const scopeExpressions = getScopeExpressions(spec.scope);
|
|
1263
|
+
// The interpreter evaluates again what the tier evaluated before it fell back. TLC evaluates
|
|
1264
|
+
// a constant definition without parameters once as it starts, so one with a startup value
|
|
1265
|
+
// never draws again. An operator a scope binds without its expression can reach any
|
|
1266
|
+
// definition.
|
|
1267
|
+
const isReplayed = (definition: Definition) =>
|
|
1268
|
+
getStartupValue(definition, environment) === undefined &&
|
|
1269
|
+
isImpureDefinition(definition, environment, "replayed");
|
|
1270
|
+
const hasReplayedEffects =
|
|
1271
|
+
scopeExpressions === undefined
|
|
1272
|
+
? definitions.some(isReplayed)
|
|
1273
|
+
: definitions.some(
|
|
1274
|
+
(definition) =>
|
|
1275
|
+
!(definition.kind === "Operator" && definition.params.length > 0) &&
|
|
1276
|
+
isConstantLevel(definition, environment) &&
|
|
1277
|
+
isReplayed(definition),
|
|
1278
|
+
) ||
|
|
1279
|
+
isExpressionImpure(
|
|
1280
|
+
[
|
|
1281
|
+
spec.init,
|
|
1282
|
+
spec.next,
|
|
1283
|
+
...invariantExpressions,
|
|
1284
|
+
...constraintExpressions,
|
|
1285
|
+
...initialExpressions,
|
|
1286
|
+
...properties.actionProperties.flatMap((property) => [
|
|
1287
|
+
property.action,
|
|
1288
|
+
property.subscript,
|
|
1289
|
+
]),
|
|
1290
|
+
...(view ? [view.expression] : []),
|
|
1291
|
+
...scopeExpressions,
|
|
1292
|
+
...getLiveExpressions(liveness ?? []),
|
|
1293
|
+
],
|
|
1294
|
+
environment,
|
|
1295
|
+
"replayed",
|
|
1296
|
+
);
|
|
1297
|
+
return hasReplayedEffects
|
|
1298
|
+
? undefined
|
|
1299
|
+
: {
|
|
1300
|
+
init: spec.init,
|
|
1301
|
+
next: spec.next,
|
|
1302
|
+
scope: spec.scope,
|
|
1303
|
+
invariants: invariantExpressions,
|
|
1304
|
+
constraints: constraintExpressions,
|
|
1305
|
+
holdsInitialPredicates: (state: Value[]) =>
|
|
1306
|
+
findFailedInitialPredicate(state) === undefined,
|
|
1307
|
+
actionProperties: properties.actionProperties,
|
|
1308
|
+
symmetry: symmetryGroup,
|
|
1309
|
+
view: view?.expression,
|
|
1310
|
+
variableOrder: getTlcOrder(),
|
|
1311
|
+
liveness,
|
|
1312
|
+
};
|
|
1313
|
+
},
|
|
1152
1314
|
getTlcOrder,
|
|
1153
1315
|
getStoredFingerprints: (states, fingerprintStates) => {
|
|
1154
1316
|
if (view !== undefined || isFingerprintedLikeTlc) {
|
|
@@ -1165,8 +1327,8 @@ export const createSearch = (
|
|
|
1165
1327
|
return view === undefined ? representative : [getViewValue(view.expression, representative)];
|
|
1166
1328
|
},
|
|
1167
1329
|
findViolatedInvariant: (state, parent) => {
|
|
1168
|
-
|
|
1169
|
-
const violated =
|
|
1330
|
+
const checked = isCoveredHeld(coveredInvariants, state) ? runtimeChecks : invariants;
|
|
1331
|
+
const violated = checked.find((invariant) => isViolated(invariant, state, parent));
|
|
1170
1332
|
if (violated) violatingStates.add(state);
|
|
1171
1333
|
return violated;
|
|
1172
1334
|
},
|
|
@@ -1226,16 +1388,7 @@ export const createSearch = (
|
|
|
1226
1388
|
isUnchangedFor(constraint, state, parent) ||
|
|
1227
1389
|
holdsAsConjunct(constraint, getContext(environment, state, undefined)),
|
|
1228
1390
|
),
|
|
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
|
-
),
|
|
1391
|
+
findFailedInitialPredicate,
|
|
1239
1392
|
findViolatedActionProperty: (state, next) =>
|
|
1240
1393
|
isCoveredHeld(coveredActionProperties, state, next)
|
|
1241
1394
|
? 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(
|