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/subexpressions.ts
CHANGED
|
@@ -16,15 +16,19 @@ import {
|
|
|
16
16
|
} from "./ast";
|
|
17
17
|
import { formatRange, TlaSyntaxError } from "./errors";
|
|
18
18
|
import { getSourceName, mapChildren, mapDefinition } from "./instances";
|
|
19
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
19
20
|
import {
|
|
20
21
|
getArity,
|
|
21
22
|
getBinder,
|
|
22
23
|
getNameSelectors,
|
|
23
24
|
getOperandIndex,
|
|
24
25
|
getOperands,
|
|
26
|
+
isBefore,
|
|
25
27
|
LOCAL_RESOLUTION,
|
|
28
|
+
nullSelections,
|
|
26
29
|
selectionErrors,
|
|
27
30
|
selections,
|
|
31
|
+
type NullSelection,
|
|
28
32
|
} from "./resolve";
|
|
29
33
|
|
|
30
34
|
type Lookup = (name: string) => Definition | undefined;
|
|
@@ -49,6 +53,23 @@ interface SelectingName {
|
|
|
49
53
|
|
|
50
54
|
const SELECTION_NAME = "$subexpression";
|
|
51
55
|
|
|
56
|
+
const getSelectorName = (selector: Selector) => {
|
|
57
|
+
switch (selector.kind) {
|
|
58
|
+
case "Name":
|
|
59
|
+
return selector.name;
|
|
60
|
+
case "Operand":
|
|
61
|
+
return typeof selector.operand === "number"
|
|
62
|
+
? `argument selector ${selector.operand}`
|
|
63
|
+
: selector.operand;
|
|
64
|
+
case "Bound":
|
|
65
|
+
return "!(...)";
|
|
66
|
+
case "At":
|
|
67
|
+
return "@";
|
|
68
|
+
case "Colon":
|
|
69
|
+
return ":";
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
|
|
52
73
|
const createError = (message: string, location: SourceLocation) =>
|
|
53
74
|
new TlaSyntaxError(`${message} at line ${location.line}, column ${location.column}`);
|
|
54
75
|
|
|
@@ -158,8 +179,13 @@ const selectSubexpression = (
|
|
|
158
179
|
const location = reference.location;
|
|
159
180
|
const selection: Selection = { params: [], args: [], lets: [], location };
|
|
160
181
|
let selectorIndex = 0;
|
|
161
|
-
let current
|
|
182
|
+
let current: Expression | undefined;
|
|
162
183
|
let isFailed = false;
|
|
184
|
+
const nulls: NullSelection[] = [];
|
|
185
|
+
const checkNull = (node: Expression | undefined, message: string) => {
|
|
186
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
187
|
+
if (node && range) nulls.push({ node, error: { location: formatRange(range), message } });
|
|
188
|
+
};
|
|
163
189
|
|
|
164
190
|
const report = (range: SourceRange | undefined, message: string) => {
|
|
165
191
|
if (!range) throw createError(message, location);
|
|
@@ -178,6 +204,7 @@ const selectSubexpression = (
|
|
|
178
204
|
const args: Expression[] = [];
|
|
179
205
|
while (selectorIndex < selectors.length) {
|
|
180
206
|
const selector = selectors[selectorIndex];
|
|
207
|
+
if (selector.kind !== "Name" && !local) return undefined;
|
|
181
208
|
if (selector.kind !== "Name") throw createError("Expected an operator name", location);
|
|
182
209
|
names.push(selector.name);
|
|
183
210
|
args.push(...selector.args);
|
|
@@ -194,13 +221,17 @@ const selectSubexpression = (
|
|
|
194
221
|
|
|
195
222
|
const enterDefinition = (local: Definition[] | undefined) => {
|
|
196
223
|
const found = findDefinition(local);
|
|
224
|
+
if (!found) {
|
|
225
|
+
isFailed = true;
|
|
226
|
+
return undefined;
|
|
227
|
+
}
|
|
197
228
|
const definition = found.definition;
|
|
198
229
|
const arity = getArity(definition);
|
|
199
230
|
const isLast = selectorIndex === selectors.length - 1;
|
|
200
231
|
if (found.args.length !== arity && (!isOperator || found.args.length !== 0)) {
|
|
201
232
|
return report(
|
|
202
233
|
reference.argumentRanges?.[selectorIndex] ?? location.range,
|
|
203
|
-
`The operator ${found.name} requires ${arity - found.earlier} arguments.`,
|
|
234
|
+
`The operator ${resolveSynonym(found.name)} requires ${arity - found.earlier} arguments.`,
|
|
204
235
|
);
|
|
205
236
|
}
|
|
206
237
|
if (isLast) return { definition, args: found.args };
|
|
@@ -276,8 +307,16 @@ const selectSubexpression = (
|
|
|
276
307
|
if (selector.kind !== "Operand")
|
|
277
308
|
throw createError("Unexpected subexpression selector", location);
|
|
278
309
|
const operands = binder ? binder.sets : getOperands(current);
|
|
310
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
311
|
+
if (!operands && current.kind !== "Identifier") {
|
|
312
|
+
report(range, "Selecting subexpression of expression that has none.");
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
279
315
|
const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
|
|
280
|
-
if (!operand)
|
|
316
|
+
if (!operand) {
|
|
317
|
+
report(range, `Nonexistent operand specified by \`${getSelectorName(selector)}'.`);
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
281
320
|
current = operand;
|
|
282
321
|
};
|
|
283
322
|
|
|
@@ -304,12 +343,24 @@ const selectSubexpression = (
|
|
|
304
343
|
followLabels();
|
|
305
344
|
continue;
|
|
306
345
|
}
|
|
346
|
+
if (selector.kind !== "Colon") {
|
|
347
|
+
checkNull(
|
|
348
|
+
current,
|
|
349
|
+
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
350
|
+
);
|
|
351
|
+
}
|
|
307
352
|
selectOperand(selector);
|
|
353
|
+
checkNull(
|
|
354
|
+
current,
|
|
355
|
+
`An unexpected null node specified by '${getSelectorName(selectors[selectorIndex])}'.\nThis is probably due to a previous error.`,
|
|
356
|
+
);
|
|
308
357
|
selectorIndex++;
|
|
309
358
|
}
|
|
310
359
|
if (isFailed) return reference;
|
|
311
360
|
if (!current) throw createError("Subexpression selection failed", location);
|
|
312
|
-
|
|
361
|
+
const selected = createApplication(selection, current);
|
|
362
|
+
nullSelections.set(selected, nulls);
|
|
363
|
+
return selected;
|
|
313
364
|
};
|
|
314
365
|
|
|
315
366
|
const getQualifiedSelectors = (
|
|
@@ -373,6 +424,7 @@ const resolveSubexpressions = (
|
|
|
373
424
|
: undefined;
|
|
374
425
|
const first = selectors?.[0];
|
|
375
426
|
if (!selectors || (first?.kind === "Name" && isGoal(first.name))) return mapped;
|
|
427
|
+
if (first?.kind === "Name" && selectors[1].kind !== "Name" && !lookup(first.name)) return mapped;
|
|
376
428
|
const selected = selectSubexpression(selectors, lookup, mapped, isOperator);
|
|
377
429
|
if (selected !== mapped) selections.add(selected);
|
|
378
430
|
return selected;
|
|
@@ -427,89 +479,122 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
|
|
|
427
479
|
},
|
|
428
480
|
];
|
|
429
481
|
});
|
|
430
|
-
const
|
|
482
|
+
const own = new Set([...module.definitions, ...clauses]);
|
|
483
|
+
const recursive = new Map(
|
|
484
|
+
module.units.flatMap((unit): [string, SourceLocation][] =>
|
|
485
|
+
unit.kind === "Recursive"
|
|
486
|
+
? unit.declarations.map((declaration) => [declaration.name, declaration.location])
|
|
487
|
+
: [],
|
|
488
|
+
),
|
|
489
|
+
);
|
|
490
|
+
const isDeclaredBefore = (definition: Definition, location: SourceLocation) => {
|
|
491
|
+
const declared = recursive.get(definition.name);
|
|
492
|
+
return (
|
|
493
|
+
isBefore(definition.location, location) ||
|
|
494
|
+
(definition.isRecursive && declared !== undefined && isBefore(declared, location))
|
|
495
|
+
);
|
|
496
|
+
};
|
|
497
|
+
const getVisibleLookup =
|
|
498
|
+
(lookup: Lookup, location: SourceLocation): Lookup =>
|
|
499
|
+
(name) => {
|
|
500
|
+
const definition = lookup(name);
|
|
501
|
+
return definition && (!own.has(definition) || isDeclaredBefore(definition, location))
|
|
502
|
+
? definition
|
|
503
|
+
: undefined;
|
|
504
|
+
};
|
|
505
|
+
const proofLookup = createLookup([...available, ...module.definitions]);
|
|
431
506
|
const isGoal = (name: string) => goals.has(name);
|
|
432
507
|
const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
|
|
433
|
-
const resolve = (expression: Expression) =>
|
|
508
|
+
const resolve = (expression: Expression, location: SourceLocation) =>
|
|
434
509
|
resolveSubexpressions(
|
|
435
510
|
expression,
|
|
436
|
-
definitionLookup,
|
|
511
|
+
getVisibleLookup(definitionLookup, location),
|
|
437
512
|
(name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
|
|
438
513
|
);
|
|
439
|
-
const
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
assumptions: statement.assumptions.map((assumption) =>
|
|
451
|
-
assumption.kind === "NewSymbol"
|
|
452
|
-
? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
|
|
453
|
-
: resolveStatement(assumption),
|
|
454
|
-
),
|
|
455
|
-
conclusion: resolveInProof(statement.conclusion),
|
|
456
|
-
}
|
|
457
|
-
: resolveInProof(statement);
|
|
458
|
-
const resolveStep = (body: StepBody): StepBody => {
|
|
459
|
-
switch (body.kind) {
|
|
460
|
-
case "Use":
|
|
461
|
-
case "Hide":
|
|
462
|
-
return { ...body, facts: resolveFacts(body.facts) };
|
|
463
|
-
case "Instance":
|
|
464
|
-
return resolveInstance(body, lookup, isProofGoal);
|
|
465
|
-
case "Define":
|
|
466
|
-
return {
|
|
467
|
-
...body,
|
|
468
|
-
definitions: body.definitions.map((definition) =>
|
|
469
|
-
definition.kind === "Instance"
|
|
470
|
-
? resolveInstance(definition, lookup, isProofGoal)
|
|
471
|
-
: mapDefinition(definition, resolveInProof),
|
|
472
|
-
),
|
|
473
|
-
};
|
|
474
|
-
case "Have":
|
|
475
|
-
case "Case":
|
|
476
|
-
return { ...body, expression: resolveInProof(body.expression) };
|
|
477
|
-
case "Witness":
|
|
478
|
-
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
479
|
-
case "Take":
|
|
480
|
-
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
481
|
-
case "Pick":
|
|
482
|
-
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
483
|
-
case "Assert":
|
|
484
|
-
return { ...body, statement: resolveStatement(body.statement) };
|
|
485
|
-
default:
|
|
486
|
-
return body;
|
|
487
|
-
}
|
|
488
|
-
};
|
|
489
|
-
const resolveProof = (proof: Proof | undefined): Proof | undefined =>
|
|
490
|
-
proof?.kind === "By"
|
|
491
|
-
? { ...proof, facts: resolveFacts(proof.facts) }
|
|
492
|
-
: proof?.kind === "Steps"
|
|
514
|
+
const createProofResolver = (location: SourceLocation) => {
|
|
515
|
+
const lookup = getVisibleLookup(proofLookup, location);
|
|
516
|
+
const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
|
|
517
|
+
const resolveInProof = (expression: Expression) =>
|
|
518
|
+
resolveSubexpressions(expression, lookup, isProofGoal);
|
|
519
|
+
const resolveFacts = (facts: Fact[]) =>
|
|
520
|
+
facts.map((fact) => (fact.kind === "ModuleFact" ? fact : resolveInProof(fact)));
|
|
521
|
+
const resolveBounds = (bounds: Bound[]) =>
|
|
522
|
+
bounds.map((bound) => ({ ...bound, set: resolveInProof(bound.set) }));
|
|
523
|
+
const resolveStatement = (statement: Expression | AssumeProve): Expression | AssumeProve =>
|
|
524
|
+
statement.kind === "AssumeProve"
|
|
493
525
|
? {
|
|
494
|
-
...
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
526
|
+
...statement,
|
|
527
|
+
assumptions: statement.assumptions.map((assumption) =>
|
|
528
|
+
assumption.kind === "NewSymbol"
|
|
529
|
+
? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
|
|
530
|
+
: resolveStatement(assumption),
|
|
531
|
+
),
|
|
532
|
+
conclusion: resolveInProof(statement.conclusion),
|
|
500
533
|
}
|
|
501
|
-
:
|
|
534
|
+
: resolveInProof(statement);
|
|
535
|
+
const resolveStep = (body: StepBody): StepBody => {
|
|
536
|
+
switch (body.kind) {
|
|
537
|
+
case "Use":
|
|
538
|
+
case "Hide":
|
|
539
|
+
return { ...body, facts: resolveFacts(body.facts) };
|
|
540
|
+
case "Instance":
|
|
541
|
+
return resolveInstance(body, lookup, isProofGoal);
|
|
542
|
+
case "Define":
|
|
543
|
+
return {
|
|
544
|
+
...body,
|
|
545
|
+
definitions: body.definitions.map((definition) =>
|
|
546
|
+
definition.kind === "Instance"
|
|
547
|
+
? resolveInstance(definition, lookup, isProofGoal)
|
|
548
|
+
: mapDefinition(definition, resolveInProof),
|
|
549
|
+
),
|
|
550
|
+
};
|
|
551
|
+
case "Have":
|
|
552
|
+
case "Case":
|
|
553
|
+
return { ...body, expression: resolveInProof(body.expression) };
|
|
554
|
+
case "Witness":
|
|
555
|
+
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
556
|
+
case "Take":
|
|
557
|
+
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
558
|
+
case "Pick":
|
|
559
|
+
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
560
|
+
case "Assert":
|
|
561
|
+
return { ...body, statement: resolveStatement(body.statement) };
|
|
562
|
+
default:
|
|
563
|
+
return body;
|
|
564
|
+
}
|
|
565
|
+
};
|
|
566
|
+
const resolveProof = (proof: Proof | undefined): Proof | undefined =>
|
|
567
|
+
proof?.kind === "By"
|
|
568
|
+
? { ...proof, facts: resolveFacts(proof.facts) }
|
|
569
|
+
: proof?.kind === "Steps"
|
|
570
|
+
? {
|
|
571
|
+
...proof,
|
|
572
|
+
steps: proof.steps.map((step) => ({
|
|
573
|
+
...step,
|
|
574
|
+
body: resolveStep(step.body),
|
|
575
|
+
proof: resolveProof(step.proof),
|
|
576
|
+
})),
|
|
577
|
+
}
|
|
578
|
+
: proof;
|
|
579
|
+
return { resolveFacts, resolveStatement, resolveProof };
|
|
580
|
+
};
|
|
502
581
|
const resolved = {
|
|
503
582
|
...module,
|
|
504
|
-
theorems: module.theorems.map((theorem) =>
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
theorem
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
583
|
+
theorems: module.theorems.map((theorem) => {
|
|
584
|
+
const resolver = createProofResolver(theorem.location);
|
|
585
|
+
return {
|
|
586
|
+
...theorem,
|
|
587
|
+
statement:
|
|
588
|
+
theorem.name !== undefined && theorem.statement.kind !== "AssumeProve"
|
|
589
|
+
? theorem.statement
|
|
590
|
+
: resolver.resolveStatement(theorem.statement),
|
|
591
|
+
proof: resolver.resolveProof(theorem.proof),
|
|
592
|
+
};
|
|
593
|
+
}),
|
|
594
|
+
uses: module.uses.map((use) => ({
|
|
595
|
+
...use,
|
|
596
|
+
facts: createProofResolver(use.location).resolveFacts(use.facts),
|
|
511
597
|
})),
|
|
512
|
-
uses: module.uses.map((use) => ({ ...use, facts: resolveFacts(use.facts) })),
|
|
513
598
|
};
|
|
514
599
|
const hasReferences =
|
|
515
600
|
module.definitions.some((definition) => containsReference(definition.body)) ||
|
|
@@ -517,10 +602,12 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
|
|
|
517
602
|
if (!hasReferences) return resolved;
|
|
518
603
|
return {
|
|
519
604
|
...resolved,
|
|
520
|
-
definitions: module.definitions.map((definition) =>
|
|
605
|
+
definitions: module.definitions.map((definition) =>
|
|
606
|
+
mapDefinition(definition, (expression) => resolve(expression, definition.location)),
|
|
607
|
+
),
|
|
521
608
|
assumptions: module.assumptions.map((assumption) => ({
|
|
522
609
|
...assumption,
|
|
523
|
-
expression: resolve(assumption.expression),
|
|
610
|
+
expression: resolve(assumption.expression, assumption.location),
|
|
524
611
|
})),
|
|
525
612
|
};
|
|
526
613
|
};
|
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/jar-data.ts
CHANGED
|
@@ -143,6 +143,18 @@ export const SANY_OPERATOR_SYNONYMS = [
|
|
|
143
143
|
["^+", "⁺"],
|
|
144
144
|
];
|
|
145
145
|
|
|
146
|
+
const SYNONYMS = new Map(
|
|
147
|
+
SANY_OPERATOR_SYNONYMS.flatMap(([canonical, ...synonyms]) =>
|
|
148
|
+
synonyms.map((synonym) => [synonym, canonical]),
|
|
149
|
+
),
|
|
150
|
+
);
|
|
151
|
+
|
|
152
|
+
export const resolveSynonym = (name: string) =>
|
|
153
|
+
name
|
|
154
|
+
.split("!")
|
|
155
|
+
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
156
|
+
.join("!");
|
|
157
|
+
|
|
146
158
|
export const TLC_STARTUP_STRINGS = [
|
|
147
159
|
"STRING",
|
|
148
160
|
"FALSE",
|
package/src/tlc/order.ts
CHANGED
|
@@ -444,7 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
444
444
|
};
|
|
445
445
|
};
|
|
446
446
|
|
|
447
|
-
const getStringOrder = (
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
448
452
|
const order = new Set<string>();
|
|
449
453
|
const intern = (text: string) => {
|
|
450
454
|
order.add(text);
|
|
@@ -541,12 +545,19 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
541
545
|
});
|
|
542
546
|
};
|
|
543
547
|
analyze(undefined);
|
|
548
|
+
runtimeModules.forEach((name) => {
|
|
549
|
+
const tokens = getUnitTokens(name);
|
|
550
|
+
getParsedTexts(tokens).forEach(intern);
|
|
551
|
+
tokens.forEach((token) => {
|
|
552
|
+
if (token.kind === "String") intern(token.text);
|
|
553
|
+
});
|
|
554
|
+
});
|
|
544
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
545
556
|
return [...order];
|
|
546
557
|
};
|
|
547
558
|
|
|
548
559
|
export interface TlcOrder {
|
|
549
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
550
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
551
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
552
563
|
parseModule: (source: string) => Module;
|
|
@@ -558,7 +569,7 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
558
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
559
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
560
571
|
return {
|
|
561
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
562
573
|
getDeclarationOrder: (kind) =>
|
|
563
574
|
getContexts()
|
|
564
575
|
.getContext(undefined)
|
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;
|