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
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/solve_eqs.cpp, src/ast/simplifiers/extract_eqs.cpp,
|
|
2
|
-
// src/ast/simplifiers/solve_context_eqs.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -39,7 +37,7 @@ import { RefVector } from "./ref-vector";
|
|
|
39
37
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
40
38
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
41
39
|
|
|
42
|
-
|
|
40
|
+
interface SolveEqsOptions {
|
|
43
41
|
isTheorySolver: boolean;
|
|
44
42
|
isIteSolver: boolean;
|
|
45
43
|
isContextSolve: boolean;
|
|
@@ -297,7 +295,7 @@ export class SolveEqs {
|
|
|
297
295
|
)
|
|
298
296
|
)
|
|
299
297
|
continue;
|
|
300
|
-
const others = factors.filter((
|
|
298
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== factorIndex);
|
|
301
299
|
const term = this.mkSubTerm(x, index, y);
|
|
302
300
|
this.push(
|
|
303
301
|
eqs,
|
|
@@ -330,7 +328,7 @@ export class SolveEqs {
|
|
|
330
328
|
!factors.every((other, otherIndex) => otherIndex === index || this.isNonzeroFactor(other))
|
|
331
329
|
)
|
|
332
330
|
continue;
|
|
333
|
-
const others = factors.filter((
|
|
331
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== index);
|
|
334
332
|
this.push(
|
|
335
333
|
eqs,
|
|
336
334
|
orig,
|
|
@@ -438,8 +436,7 @@ export class SolveEqs {
|
|
|
438
436
|
const manager = this.manager;
|
|
439
437
|
const visited = new Set<number>();
|
|
440
438
|
const todo = [root];
|
|
441
|
-
|
|
442
|
-
const expr = todo.pop() as number;
|
|
439
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
443
440
|
if (visited.has(expr)) continue;
|
|
444
441
|
visited.add(expr);
|
|
445
442
|
if (isMatch(expr)) return true;
|
|
@@ -555,8 +552,7 @@ export class SolveEqs {
|
|
|
555
552
|
initLevel -= size + 1;
|
|
556
553
|
let currLevel = initLevel;
|
|
557
554
|
todo.push(id);
|
|
558
|
-
|
|
559
|
-
const next = todo.pop() as number;
|
|
555
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
560
556
|
if (this.id2level[next] !== Infinity) continue;
|
|
561
557
|
this.id2level[next] = currLevel++;
|
|
562
558
|
for (const eq of this.next[next]) {
|
|
@@ -564,8 +560,7 @@ export class SolveEqs {
|
|
|
564
560
|
let isSafe = true;
|
|
565
561
|
const visited = new Set<number>();
|
|
566
562
|
const stack = [eq.term];
|
|
567
|
-
|
|
568
|
-
const expr = stack.pop() as number;
|
|
563
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
569
564
|
if (visited.has(expr)) continue;
|
|
570
565
|
visited.add(expr);
|
|
571
566
|
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, stack);
|
|
@@ -739,8 +734,7 @@ export class SolveEqs {
|
|
|
739
734
|
private containsConjunctively(form: number, isNegated: boolean, eq: number, conjuncts: Signed[]) {
|
|
740
735
|
const manager = this.manager;
|
|
741
736
|
const todo: Signed[] = [{ isNegated, expr: form }];
|
|
742
|
-
|
|
743
|
-
const item = todo.pop() as Signed;
|
|
737
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
744
738
|
if (!item.isNegated && item.expr === eq) return true;
|
|
745
739
|
const marks = item.isNegated ? this.andNegative : this.andPositive;
|
|
746
740
|
if (marks.has(item.expr)) continue;
|
|
@@ -760,8 +754,7 @@ export class SolveEqs {
|
|
|
760
754
|
private isDisjunctivelySafe(depth: number, root: number, isNegated: boolean, eq: number) {
|
|
761
755
|
const manager = this.manager;
|
|
762
756
|
const todo: Signed[] = [{ isNegated, expr: root }];
|
|
763
|
-
|
|
764
|
-
const item = todo.pop() as Signed;
|
|
757
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
765
758
|
const marks = item.isNegated ? this.orNegative : this.orPositive;
|
|
766
759
|
if (marks.has(item.expr)) continue;
|
|
767
760
|
marks.add(item.expr);
|
|
@@ -880,8 +873,7 @@ export class SolveEqs {
|
|
|
880
873
|
const seen = new Set<number>();
|
|
881
874
|
for (const index of order) {
|
|
882
875
|
const todo = [forms[index]];
|
|
883
|
-
|
|
884
|
-
const expr = todo.pop() as number;
|
|
876
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
885
877
|
if (seen.has(expr)) continue;
|
|
886
878
|
seen.add(expr);
|
|
887
879
|
occurrence.set(expr, index);
|
|
@@ -895,11 +887,11 @@ export class SolveEqs {
|
|
|
895
887
|
};
|
|
896
888
|
record(
|
|
897
889
|
firstOccurrence,
|
|
898
|
-
forms.map((
|
|
890
|
+
forms.map((_value, index) => index),
|
|
899
891
|
);
|
|
900
892
|
record(
|
|
901
893
|
lastOccurrence,
|
|
902
|
-
forms.map((
|
|
894
|
+
forms.map((_value, index) => forms.length - 1 - index),
|
|
903
895
|
);
|
|
904
896
|
const kept: DependentEq[] = [];
|
|
905
897
|
let lastVar = -1;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// It decides like `z3 -smt2 AUTO_CONFIG=false smt.MBQI=true`.
|
|
1
|
+
// The solver decides like `z3 -smt2 AUTO_CONFIG=false smt.MBQI=true`.
|
|
3
2
|
import {
|
|
4
3
|
isStackOverflow,
|
|
5
4
|
SmtCanceledError,
|
|
@@ -1,12 +1,19 @@
|
|
|
1
|
-
// Ported from Z3 (src/cmd_context/tactic_cmds.cpp, src/tactic/tactical.cpp, src/tactic/tactic.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
SmtCanceledError,
|
|
5
3
|
SmtParseError,
|
|
6
4
|
SmtTacticError,
|
|
7
5
|
SmtUnsupportedError,
|
|
8
6
|
} from "../../../errors";
|
|
9
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
type AstManager,
|
|
9
|
+
KIND_APP,
|
|
10
|
+
OP_DIV0,
|
|
11
|
+
OP_IDIV0,
|
|
12
|
+
OP_ITE,
|
|
13
|
+
OP_MOD0,
|
|
14
|
+
OP_POWER0,
|
|
15
|
+
SORT_BOOL,
|
|
16
|
+
} from "./ast";
|
|
10
17
|
import { createQfufbvAckrTactic, runAckermannizeBv } from "./ackermannize-bv-tactic";
|
|
11
18
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
12
19
|
import { createAigTactic } from "./aig-tactic";
|
|
@@ -332,6 +339,15 @@ export const getSatParams = (parameters: ReadonlyMap<string, string>) =>
|
|
|
332
339
|
}),
|
|
333
340
|
);
|
|
334
341
|
|
|
342
|
+
export const getSmtTacticFailure = (context: Context) =>
|
|
343
|
+
context.checkCanceled()
|
|
344
|
+
? "canceled"
|
|
345
|
+
: `smt tactic failed to show goal to be sat/unsat ${context.getLastFailureMessage()}`;
|
|
346
|
+
|
|
347
|
+
// sat_params reads what using-params leaves unset from the sat module's global parameters.
|
|
348
|
+
const getSatTacticParams = (environment: TacticEnvironment, params: TacticParams) =>
|
|
349
|
+
new Map([...getSatParams(environment.parameters), ...params]);
|
|
350
|
+
|
|
335
351
|
const runSmt = (environment: TacticEnvironment, params: TacticParams) => (goal: Goal) => {
|
|
336
352
|
const manager = environment.manager;
|
|
337
353
|
// mk_smt_tactic: with sat.euf, the smt tactic is the sat tactic.
|
|
@@ -344,7 +360,7 @@ const runSmt = (environment: TacticEnvironment, params: TacticParams) => (goal:
|
|
|
344
360
|
? solveGoal(manager, goal.forms.items, kernelParams)
|
|
345
361
|
: solveAssuming(manager, extracted.clauses.items, extracted.assumptions, kernelParams);
|
|
346
362
|
extracted.clauses.reset();
|
|
347
|
-
if (solved.result === L_UNDEF) throw new SmtTacticError(solved.context
|
|
363
|
+
if (solved.result === L_UNDEF) throw new SmtTacticError(getSmtTacticFailure(solved.context));
|
|
348
364
|
goal.reset();
|
|
349
365
|
if (solved.result === L_FALSE)
|
|
350
366
|
goal.assert(environment.manager.falseExpr, mkCoreDependency(solved.context.unsatCore));
|
|
@@ -526,6 +542,8 @@ const SAT_DESCRS = getDescrs("sat", [
|
|
|
526
542
|
["search.sat.conflicts", PARAM_UINT, 400, true],
|
|
527
543
|
["search.unsat.conflicts", PARAM_UINT, 400, true],
|
|
528
544
|
["restart.initial", PARAM_UINT, 2, true],
|
|
545
|
+
["restart.max", PARAM_UINT, UINT_MAX, true],
|
|
546
|
+
["inprocess.max", PARAM_UINT, UINT_MAX, true],
|
|
529
547
|
["random_seed", PARAM_UINT, 0, true],
|
|
530
548
|
["burst_search", PARAM_UINT, 100, true],
|
|
531
549
|
["enable_pre_simplify", PARAM_BOOL, false, true],
|
|
@@ -728,6 +746,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
728
746
|
build: (environment, params) =>
|
|
729
747
|
inPlace((goal) => {
|
|
730
748
|
const manager = environment.manager;
|
|
749
|
+
const original = new RefVector(manager);
|
|
750
|
+
for (const form of goal.forms.items) original.push(form);
|
|
731
751
|
try {
|
|
732
752
|
tseitinCnf(manager, goal);
|
|
733
753
|
} catch (error) {
|
|
@@ -738,6 +758,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
738
758
|
isKeepingDistinct: false,
|
|
739
759
|
});
|
|
740
760
|
tseitinCnf(manager, goal);
|
|
761
|
+
} finally {
|
|
762
|
+
original.reset();
|
|
741
763
|
}
|
|
742
764
|
}),
|
|
743
765
|
},
|
|
@@ -799,6 +821,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
799
821
|
[
|
|
800
822
|
"lia2card",
|
|
801
823
|
{
|
|
824
|
+
isTrackingDependencies: true,
|
|
802
825
|
descrs: getDescrs("", [["compile_equality", PARAM_BOOL, true, true]]),
|
|
803
826
|
build: (environment, params) =>
|
|
804
827
|
inPlace((goal) =>
|
|
@@ -864,6 +887,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
864
887
|
["lia2pb_total_bits", PARAM_UINT, 2048, true],
|
|
865
888
|
]),
|
|
866
889
|
]),
|
|
890
|
+
isTrackingDependencies: true,
|
|
867
891
|
build: (environment, params) =>
|
|
868
892
|
inPlace((goal) =>
|
|
869
893
|
lia2pb(environment.manager, goal, {
|
|
@@ -906,6 +930,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
906
930
|
[
|
|
907
931
|
"fm",
|
|
908
932
|
{
|
|
933
|
+
isTrackingDependencies: true,
|
|
909
934
|
descrs: new Map([
|
|
910
935
|
...REWRITER_DESCRS,
|
|
911
936
|
...getDescrs("", [
|
|
@@ -929,6 +954,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
929
954
|
new Map([...params, ["arith_lhs", true], ["elim_and", true], ["som", true]]),
|
|
930
955
|
),
|
|
931
956
|
);
|
|
957
|
+
// and_then stops at a decided goal.
|
|
958
|
+
if (goal.isDecided()) return;
|
|
932
959
|
fm(manager, goal, {
|
|
933
960
|
isRealOnly: getBool(params, "fm_real_only", true),
|
|
934
961
|
limit: getUint(params, "fm_limit", 5000000),
|
|
@@ -996,6 +1023,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
996
1023
|
[
|
|
997
1024
|
"fix-dl-var",
|
|
998
1025
|
{
|
|
1026
|
+
isTrackingDependencies: true,
|
|
999
1027
|
descrs: REWRITER_DESCRS,
|
|
1000
1028
|
build: (environment, params) =>
|
|
1001
1029
|
inPlace((goal) =>
|
|
@@ -1006,6 +1034,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1006
1034
|
[
|
|
1007
1035
|
"factor",
|
|
1008
1036
|
{
|
|
1037
|
+
isTrackingDependencies: true,
|
|
1009
1038
|
descrs: getDescrs("", [
|
|
1010
1039
|
["split_factors", PARAM_BOOL, true, true],
|
|
1011
1040
|
["max_search_size", PARAM_UINT, UINT_MAX],
|
|
@@ -1087,7 +1116,14 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1087
1116
|
build: (environment) => inPlace((goal) => occf(environment.manager, goal)),
|
|
1088
1117
|
},
|
|
1089
1118
|
],
|
|
1090
|
-
[
|
|
1119
|
+
[
|
|
1120
|
+
"fpa2bv",
|
|
1121
|
+
{
|
|
1122
|
+
descrs: new Map(),
|
|
1123
|
+
isTrackingDependencies: true,
|
|
1124
|
+
build: (environment) => runFpa2Bv(environment.manager),
|
|
1125
|
+
},
|
|
1126
|
+
],
|
|
1091
1127
|
[
|
|
1092
1128
|
"elim-small-bv",
|
|
1093
1129
|
{
|
|
@@ -1282,7 +1318,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1282
1318
|
{
|
|
1283
1319
|
descrs: SAT_DESCRS,
|
|
1284
1320
|
isRejectingUnknown: false,
|
|
1285
|
-
build: (environment, params) =>
|
|
1321
|
+
build: (environment, params) =>
|
|
1322
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1286
1323
|
},
|
|
1287
1324
|
],
|
|
1288
1325
|
[
|
|
@@ -1290,7 +1327,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1290
1327
|
{
|
|
1291
1328
|
descrs: SAT_DESCRS,
|
|
1292
1329
|
isRejectingUnknown: false,
|
|
1293
|
-
build: (environment, params) =>
|
|
1330
|
+
build: (environment, params) =>
|
|
1331
|
+
createFdTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1294
1332
|
},
|
|
1295
1333
|
],
|
|
1296
1334
|
[
|
|
@@ -1298,7 +1336,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1298
1336
|
{
|
|
1299
1337
|
descrs: SAT_DESCRS,
|
|
1300
1338
|
isRejectingUnknown: false,
|
|
1301
|
-
build: (environment, params) =>
|
|
1339
|
+
build: (environment, params) =>
|
|
1340
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1302
1341
|
},
|
|
1303
1342
|
],
|
|
1304
1343
|
[
|
|
@@ -1317,6 +1356,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1317
1356
|
"aig",
|
|
1318
1357
|
{
|
|
1319
1358
|
descrs: getDescrs("", [["max_memory", PARAM_UINT, UINT_MAX, true]]),
|
|
1359
|
+
isTrackingDependencies: true,
|
|
1320
1360
|
build: (environment) => createAigTactic(environment.manager),
|
|
1321
1361
|
},
|
|
1322
1362
|
],
|
|
@@ -1496,7 +1536,7 @@ const runOrElse = (tactics: Tactic[]) => (goal: Goal) => {
|
|
|
1496
1536
|
goal.resetAll();
|
|
1497
1537
|
goal.copyFrom(original);
|
|
1498
1538
|
}
|
|
1499
|
-
return
|
|
1539
|
+
return tactics[tactics.length - 1](goal);
|
|
1500
1540
|
};
|
|
1501
1541
|
|
|
1502
1542
|
const isEqualGoal = (first: Goal, second: Goal) => {
|
|
@@ -1845,8 +1885,12 @@ interface TacticCheck {
|
|
|
1845
1885
|
status: number;
|
|
1846
1886
|
model: ProtoModel | undefined;
|
|
1847
1887
|
core: Dependency | undefined;
|
|
1888
|
+
reasonUnknown: string | undefined;
|
|
1848
1889
|
}
|
|
1849
1890
|
|
|
1891
|
+
// The port's declarations of division by zero leave out their domain; Z3's have two arguments.
|
|
1892
|
+
const DIVISION_BY_ZERO_DECLS = new Set([OP_DIV0, OP_IDIV0, OP_MOD0, OP_POWER0]);
|
|
1893
|
+
|
|
1850
1894
|
// A constant of an uninterpreted sort the model lacks puts its value in that sort's universe.
|
|
1851
1895
|
const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
1852
1896
|
const manager = model.manager;
|
|
@@ -1860,7 +1904,9 @@ const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
|
1860
1904
|
continue;
|
|
1861
1905
|
}
|
|
1862
1906
|
const value = evaluator.rewrite(definition.def);
|
|
1863
|
-
const arity =
|
|
1907
|
+
const arity = DIVISION_BY_ZERO_DECLS.has(definition.decl)
|
|
1908
|
+
? 2
|
|
1909
|
+
: manager.funcDecls[definition.decl].domain.length;
|
|
1864
1910
|
if (arity > 0) {
|
|
1865
1911
|
const oldInterp = model.funcInterps.get(definition.decl);
|
|
1866
1912
|
const isChanged = oldInterp?.elseExpr !== value;
|
|
@@ -1907,23 +1953,36 @@ export const convertModel = (goal: Goal, model: ProtoModel) =>
|
|
|
1907
1953
|
}, model);
|
|
1908
1954
|
|
|
1909
1955
|
export const checkSatUsing = (tactic: Tactic, goal: Goal): TacticCheck => {
|
|
1956
|
+
const undecided = { status: L_UNDEF, model: undefined, core: undefined };
|
|
1910
1957
|
const goals = (() => {
|
|
1911
1958
|
try {
|
|
1912
1959
|
return tactic(goal);
|
|
1913
1960
|
} catch (error) {
|
|
1914
|
-
if (error instanceof SmtTacticError
|
|
1961
|
+
if (error instanceof SmtTacticError) return error.message;
|
|
1962
|
+
if (error instanceof SmtCanceledError) return undefined;
|
|
1915
1963
|
throw error;
|
|
1916
1964
|
}
|
|
1917
1965
|
})();
|
|
1918
|
-
if (goals
|
|
1966
|
+
if (goals === undefined) return { ...undecided, reasonUnknown: undefined };
|
|
1967
|
+
if (typeof goals === "string") return { ...undecided, reasonUnknown: goals };
|
|
1968
|
+
if (isDecidedSat(goals)) {
|
|
1969
|
+
const model = convertModel(goals[0], goals[0].model ?? new ProtoModel(goal.manager));
|
|
1970
|
+
return goal.manager.limit.inc()
|
|
1971
|
+
? { status: L_TRUE, model, core: undefined, reasonUnknown: "" }
|
|
1972
|
+
: { ...undecided, model, reasonUnknown: "canceled" };
|
|
1973
|
+
}
|
|
1974
|
+
if (isDecidedUnsat(goals))
|
|
1919
1975
|
return {
|
|
1920
|
-
status:
|
|
1921
|
-
model:
|
|
1922
|
-
core:
|
|
1976
|
+
status: L_FALSE,
|
|
1977
|
+
model: undefined,
|
|
1978
|
+
core: goals[0].getDependency(0),
|
|
1979
|
+
reasonUnknown: "",
|
|
1923
1980
|
};
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
1981
|
+
return {
|
|
1982
|
+
...undecided,
|
|
1983
|
+
reasonUnknown:
|
|
1984
|
+
goals.length === 1 && goals[0].reasonUnknown !== "" ? goals[0].reasonUnknown : "unknown",
|
|
1985
|
+
};
|
|
1927
1986
|
};
|
|
1928
1987
|
|
|
1929
1988
|
export const applyTactic = (tactic: Tactic, goal: Goal) => {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_array_base.cpp, theory_array.cpp, theory_array_full.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../errors";
|
|
4
2
|
import { mkArrayApp, mkArrayDecl, mkAsArray } from "./array-decl-plugin";
|
|
5
3
|
import {
|
|
@@ -19,6 +17,7 @@ import {
|
|
|
19
17
|
import type { Context } from "./context";
|
|
20
18
|
import { type Enode, TheoryJustification } from "./enode";
|
|
21
19
|
import { FALSE_LITERAL, getVar, isNegated, type Literal, negate, TRUE_LITERAL } from "./literal";
|
|
20
|
+
import { UnionFind } from "./lp/union-find";
|
|
22
21
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
23
22
|
import {
|
|
24
23
|
type DependentValue,
|
|
@@ -64,9 +63,7 @@ interface Reach {
|
|
|
64
63
|
|
|
65
64
|
export class TheoryArray extends Theory {
|
|
66
65
|
readonly name = "array";
|
|
67
|
-
private
|
|
68
|
-
private sizes: number[] = [];
|
|
69
|
-
private nexts: number[] = [];
|
|
66
|
+
private unionFind: UnionFind;
|
|
70
67
|
private trail: (() => void)[] = [];
|
|
71
68
|
private trailLimits: number[] = [];
|
|
72
69
|
private stores: Enode[][] = [];
|
|
@@ -98,6 +95,8 @@ export class TheoryArray extends Theory {
|
|
|
98
95
|
|
|
99
96
|
constructor(context: Context) {
|
|
100
97
|
super(context, FAMILY_ARRAY);
|
|
98
|
+
this.unionFind = new UnionFind(this.trail);
|
|
99
|
+
this.unionFind.handler = { mergeEh: (root, joining) => this.mergeEh(root, joining) };
|
|
101
100
|
}
|
|
102
101
|
|
|
103
102
|
private isOp(node: Enode, op: number) {
|
|
@@ -108,34 +107,6 @@ export class TheoryArray extends Theory {
|
|
|
108
107
|
return this.manager.isArraySort(this.manager.sorts[node.owner]);
|
|
109
108
|
}
|
|
110
109
|
|
|
111
|
-
private find(thVar: number) {
|
|
112
|
-
let current = thVar;
|
|
113
|
-
while (this.finds[current] !== current) current = this.finds[current];
|
|
114
|
-
return current;
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
private merge(inputFirst: number, inputSecond: number) {
|
|
118
|
-
const firstRoot = this.find(inputFirst);
|
|
119
|
-
const secondRoot = this.find(inputSecond);
|
|
120
|
-
if (firstRoot === secondRoot) return;
|
|
121
|
-
const isSwapped = this.sizes[firstRoot] > this.sizes[secondRoot];
|
|
122
|
-
const joining = isSwapped ? secondRoot : firstRoot;
|
|
123
|
-
const root = isSwapped ? firstRoot : secondRoot;
|
|
124
|
-
this.mergeEh(root, joining);
|
|
125
|
-
this.finds[joining] = root;
|
|
126
|
-
this.sizes[root] += this.sizes[joining];
|
|
127
|
-
const next = this.nexts[joining];
|
|
128
|
-
this.nexts[joining] = this.nexts[root];
|
|
129
|
-
this.nexts[root] = next;
|
|
130
|
-
this.trail.push(() => {
|
|
131
|
-
this.sizes[root] -= this.sizes[joining];
|
|
132
|
-
this.finds[joining] = joining;
|
|
133
|
-
const restored = this.nexts[joining];
|
|
134
|
-
this.nexts[joining] = this.nexts[root];
|
|
135
|
-
this.nexts[root] = restored;
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
|
|
139
110
|
private pushBack(list: Enode[], node: Enode) {
|
|
140
111
|
list.push(node);
|
|
141
112
|
this.trail.push(() => list.pop());
|
|
@@ -189,14 +160,7 @@ export class TheoryArray extends Theory {
|
|
|
189
160
|
const manager = this.manager;
|
|
190
161
|
const thVar = this.varEnodes.length;
|
|
191
162
|
this.varEnodes.push(node);
|
|
192
|
-
this.
|
|
193
|
-
this.sizes.push(1);
|
|
194
|
-
this.nexts.push(thVar);
|
|
195
|
-
this.trail.push(() => {
|
|
196
|
-
this.finds.pop();
|
|
197
|
-
this.sizes.pop();
|
|
198
|
-
this.nexts.pop();
|
|
199
|
-
});
|
|
163
|
+
this.unionFind.mkVar();
|
|
200
164
|
const isStore = this.isOp(node, OP_STORE);
|
|
201
165
|
this.stores.push(isStore ? [node] : []);
|
|
202
166
|
this.parentSelects.push([]);
|
|
@@ -311,12 +275,12 @@ export class TheoryArray extends Theory {
|
|
|
311
275
|
}
|
|
312
276
|
|
|
313
277
|
newEqEh(first: number, second: number) {
|
|
314
|
-
this.merge(first, second);
|
|
278
|
+
this.unionFind.merge(first, second);
|
|
315
279
|
}
|
|
316
280
|
|
|
317
281
|
newDiseqEh(inputFirst: number, inputSecond: number) {
|
|
318
|
-
const first = this.find(inputFirst);
|
|
319
|
-
const second = this.find(inputSecond);
|
|
282
|
+
const first = this.unionFind.find(inputFirst);
|
|
283
|
+
const second = this.unionFind.find(inputSecond);
|
|
320
284
|
if (this.isArrayNode(this.getEnode(first)))
|
|
321
285
|
this.assertExtensionality(this.getEnode(first), this.getEnode(second));
|
|
322
286
|
}
|
|
@@ -343,7 +307,7 @@ export class TheoryArray extends Theory {
|
|
|
343
307
|
}
|
|
344
308
|
|
|
345
309
|
private addParentSelect(inputVar: number, select: Enode) {
|
|
346
|
-
const thVar = this.find(inputVar);
|
|
310
|
+
const thVar = this.unionFind.find(inputVar);
|
|
347
311
|
this.pushBack(this.parentSelects[thVar], select);
|
|
348
312
|
const stores = this.stores[thVar];
|
|
349
313
|
for (let index = 0; index < stores.length; index++)
|
|
@@ -357,11 +321,11 @@ export class TheoryArray extends Theory {
|
|
|
357
321
|
}
|
|
358
322
|
|
|
359
323
|
private addParentStore(inputVar: number, store: Enode) {
|
|
360
|
-
this.pushBack(this.parentStores[this.find(inputVar)], store);
|
|
324
|
+
this.pushBack(this.parentStores[this.unionFind.find(inputVar)], store);
|
|
361
325
|
}
|
|
362
326
|
|
|
363
327
|
private addStore(inputVar: number, store: Enode) {
|
|
364
|
-
const thVar = this.find(inputVar);
|
|
328
|
+
const thVar = this.unionFind.find(inputVar);
|
|
365
329
|
this.setPropUpwardStores(thVar);
|
|
366
330
|
this.pushBack(this.stores[thVar], store);
|
|
367
331
|
const parentSelects = this.parentSelects[thVar];
|
|
@@ -371,7 +335,7 @@ export class TheoryArray extends Theory {
|
|
|
371
335
|
}
|
|
372
336
|
|
|
373
337
|
private addMap(inputVar: number, map: Enode) {
|
|
374
|
-
const thVar = this.find(inputVar);
|
|
338
|
+
const thVar = this.unionFind.find(inputVar);
|
|
375
339
|
this.setPropUpwardStores(thVar);
|
|
376
340
|
this.pushBack(this.maps[thVar], map);
|
|
377
341
|
const parentSelects = this.parentSelects[thVar];
|
|
@@ -381,7 +345,7 @@ export class TheoryArray extends Theory {
|
|
|
381
345
|
}
|
|
382
346
|
|
|
383
347
|
private addParentMap(inputVar: number, map: Enode) {
|
|
384
|
-
this.pushBack(this.parentMaps[this.find(inputVar)], map);
|
|
348
|
+
this.pushBack(this.parentMaps[this.unionFind.find(inputVar)], map);
|
|
385
349
|
}
|
|
386
350
|
|
|
387
351
|
// add_const and add_as_array take the variable as it is, the root that merge_eh passes.
|
|
@@ -403,13 +367,13 @@ export class TheoryArray extends Theory {
|
|
|
403
367
|
}
|
|
404
368
|
|
|
405
369
|
private addParentDefault(inputVar: number) {
|
|
406
|
-
const stores = this.stores[this.find(inputVar)];
|
|
370
|
+
const stores = this.stores[this.unionFind.find(inputVar)];
|
|
407
371
|
for (let index = 0; index < stores.length; index++)
|
|
408
372
|
if (this.isOp(stores[index], OP_STORE)) this.instantiateDefaultStoreAxiom(stores[index]);
|
|
409
373
|
}
|
|
410
374
|
|
|
411
375
|
private setPropUpwardVar(inputVar: number) {
|
|
412
|
-
const thVar = this.find(inputVar);
|
|
376
|
+
const thVar = this.unionFind.find(inputVar);
|
|
413
377
|
if (this.isPropUpward[thVar]) return;
|
|
414
378
|
this.isPropUpward[thVar] = true;
|
|
415
379
|
this.trail.push(() => {
|
|
@@ -454,19 +418,19 @@ export class TheoryArray extends Theory {
|
|
|
454
418
|
const node = context.getEnode(expr);
|
|
455
419
|
if (node === undefined) return;
|
|
456
420
|
if (op === OP_SELECT)
|
|
457
|
-
this.addParentSelect(this.find(this.getVar(this.getArgNode(expr, 0))), node);
|
|
421
|
+
this.addParentSelect(this.unionFind.find(this.getVar(this.getArgNode(expr, 0))), node);
|
|
458
422
|
else if (op === OP_ARRAY_DEFAULT) {
|
|
459
423
|
const thVar = this.getVar(this.getArgNode(expr, 0));
|
|
460
424
|
this.setPropUpwardVar(thVar);
|
|
461
|
-
this.addParentDefault(this.find(thVar));
|
|
425
|
+
this.addParentDefault(this.unionFind.find(thVar));
|
|
462
426
|
} else if (op === OP_CONST_ARRAY) {
|
|
463
427
|
this.instantiateDefaultConstAxiom(node);
|
|
464
428
|
const thVar = this.getVar(node);
|
|
465
429
|
this.setPropUpwardVar(thVar);
|
|
466
|
-
this.addParentDefault(this.find(thVar));
|
|
430
|
+
this.addParentDefault(this.unionFind.find(thVar));
|
|
467
431
|
} else if (op === OP_ARRAY_MAP) {
|
|
468
432
|
for (let index = 0; index < node.numArgs; index++) {
|
|
469
|
-
const thVar = this.find(this.getVar(node.getArg(index)));
|
|
433
|
+
const thVar = this.unionFind.find(this.getVar(node.getArg(index)));
|
|
470
434
|
this.addParentMap(thVar, node);
|
|
471
435
|
this.setPropUpwardVar(thVar);
|
|
472
436
|
}
|
|
@@ -741,7 +705,7 @@ export class TheoryArray extends Theory {
|
|
|
741
705
|
|
|
742
706
|
private instantiateParentStoresDefault(inputVar: number) {
|
|
743
707
|
let result = false;
|
|
744
|
-
for (const store of this.parentStores[this.find(inputVar)])
|
|
708
|
+
for (const store of this.parentStores[this.unionFind.find(inputVar)])
|
|
745
709
|
if (this.instantiateDefaultStoreAxiom(store)) result = true;
|
|
746
710
|
return result;
|
|
747
711
|
}
|
|
@@ -936,7 +900,7 @@ export class TheoryArray extends Theory {
|
|
|
936
900
|
const current = result[qhead];
|
|
937
901
|
const thVar = this.getVar(current.root);
|
|
938
902
|
if (thVar < 0) continue;
|
|
939
|
-
for (const store of this.parentStores[this.find(thVar)]) {
|
|
903
|
+
for (const store of this.parentStores[this.unionFind.find(thVar)]) {
|
|
940
904
|
if (
|
|
941
905
|
!this.isOp(store, OP_STORE) ||
|
|
942
906
|
!context.isRelevant(store.owner) ||
|
|
@@ -1153,8 +1117,9 @@ export class TheoryArray extends Theory {
|
|
|
1153
1117
|
for (let thVar = 0; thVar < numVars; thVar++) {
|
|
1154
1118
|
const node = this.getEnode(thVar);
|
|
1155
1119
|
if (!this.context.isRelevant(node.owner)) continue;
|
|
1156
|
-
this.mgMerge(thVar, this.find(thVar));
|
|
1157
|
-
if (this.isOp(node, OP_STORE))
|
|
1120
|
+
this.mgMerge(thVar, this.unionFind.find(thVar));
|
|
1121
|
+
if (this.isOp(node, OP_STORE))
|
|
1122
|
+
this.mgMerge(thVar, this.unionFind.find(this.getVar(node.getArg(0))));
|
|
1158
1123
|
else if (this.isOp(node, OP_CONST_ARRAY)) this.setDefault(thVar, node.getArg(0));
|
|
1159
1124
|
else if (this.isOp(node, OP_ARRAY_DEFAULT))
|
|
1160
1125
|
this.setDefault(this.getVar(node.getArg(0)), node);
|
|
@@ -1175,7 +1140,7 @@ export class TheoryArray extends Theory {
|
|
|
1175
1140
|
const context = this.context;
|
|
1176
1141
|
for (let thVar = 0; thVar < this.getNumVars(); thVar++) {
|
|
1177
1142
|
const root = this.getEnode(thVar).root;
|
|
1178
|
-
if (this.find(thVar) !== thVar || !context.isRelevant(root.owner)) continue;
|
|
1143
|
+
if (this.unionFind.find(thVar) !== thVar || !context.isRelevant(root.owner)) continue;
|
|
1179
1144
|
for (const parent of root.parents)
|
|
1180
1145
|
if (
|
|
1181
1146
|
parent.cg === parent &&
|