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,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/q_clause.h, src/sat/smt/q_eval.cpp, src/sat/smt/q_queue.cpp,
|
|
2
|
-
// src/sat/smt/q_ematch.cpp, src/smt/smt_quantifier_stat.h, src/util/dlist.h), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { KIND_VAR, OP_DISTINCT, OP_EQ, QUANTIFIER_EXISTS, QUANTIFIER_FORALL } from "../ast";
|
|
5
2
|
import { flattenOrVector, mkNot } from "../ast-util";
|
|
6
3
|
import { PatternInferenceRw } from "../asserted-formulas";
|
|
@@ -22,13 +19,6 @@ export interface QLit {
|
|
|
22
19
|
readonly sign: boolean;
|
|
23
20
|
}
|
|
24
21
|
|
|
25
|
-
// q::quantifier_stat, with the fields the default cost function reads.
|
|
26
|
-
interface QuantifierStat {
|
|
27
|
-
readonly generation: number;
|
|
28
|
-
maxGeneration: number;
|
|
29
|
-
maxCost: number;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
22
|
// q::binding: a match of a clause's quantifier, in a circular list of the clause's bindings.
|
|
33
23
|
export class Binding {
|
|
34
24
|
next: Binding = this;
|
|
@@ -36,10 +26,7 @@ export class Binding {
|
|
|
36
26
|
|
|
37
27
|
constructor(
|
|
38
28
|
readonly clause: Clause,
|
|
39
|
-
readonly pattern: number,
|
|
40
29
|
readonly maxGeneration: number,
|
|
41
|
-
readonly minTopGeneration: number,
|
|
42
|
-
readonly maxTopGeneration: number,
|
|
43
30
|
readonly nodes: readonly Enode[],
|
|
44
31
|
) {}
|
|
45
32
|
}
|
|
@@ -54,15 +41,11 @@ export class Clause {
|
|
|
54
41
|
readonly lits: readonly QLit[],
|
|
55
42
|
readonly q: number,
|
|
56
43
|
readonly numDecls: number,
|
|
57
|
-
readonly stat: QuantifierStat,
|
|
58
44
|
) {}
|
|
59
45
|
}
|
|
60
46
|
|
|
61
47
|
// q::justification: the evidence for a propagation from a binding.
|
|
62
48
|
interface Justification {
|
|
63
|
-
readonly lhs: number;
|
|
64
|
-
readonly rhs: number;
|
|
65
|
-
readonly sign: boolean;
|
|
66
49
|
readonly generation: number;
|
|
67
50
|
readonly explain: readonly number[];
|
|
68
51
|
readonly clause: Clause;
|
|
@@ -217,7 +200,13 @@ class Eval {
|
|
|
217
200
|
evidence: EnodePair[],
|
|
218
201
|
) {
|
|
219
202
|
const manager = this.ctx.manager;
|
|
220
|
-
if (
|
|
203
|
+
if (
|
|
204
|
+
s === t ||
|
|
205
|
+
(manager.isAlgebraicNumeral(s) &&
|
|
206
|
+
manager.isAlgebraicNumeral(t) &&
|
|
207
|
+
manager.compareArithValues(s, t) === 0)
|
|
208
|
+
)
|
|
209
|
+
return L_TRUE;
|
|
221
210
|
if (manager.areDistinct(s, t)) return L_FALSE;
|
|
222
211
|
if (!manager.isApp(s) || !manager.isApp(t)) return L_UNDEF;
|
|
223
212
|
if (manager.decls[s] !== manager.decls[t]) return L_UNDEF;
|
|
@@ -280,11 +269,7 @@ class Eval {
|
|
|
280
269
|
else todo.push(arg);
|
|
281
270
|
}
|
|
282
271
|
if (args.length !== manager.getNumArgs(term)) continue;
|
|
283
|
-
const node = ctx.egraph.findCongruent(
|
|
284
|
-
manager.decls[term],
|
|
285
|
-
args,
|
|
286
|
-
args.length === 2 && manager.getOp(term) === OP_EQ,
|
|
287
|
-
);
|
|
272
|
+
const node = ctx.egraph.findCongruent(manager.decls[term], args);
|
|
288
273
|
if (node === undefined) return null;
|
|
289
274
|
for (let index = args.length; index-- > 0;) {
|
|
290
275
|
const first = args[index];
|
|
@@ -323,14 +308,8 @@ class Queue {
|
|
|
323
308
|
this.subst = new VarSubst(ctx.manager, true);
|
|
324
309
|
}
|
|
325
310
|
|
|
326
|
-
private getCost(binding: Binding) {
|
|
327
|
-
const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
|
|
328
|
-
binding.clause.stat.maxCost = Math.max(binding.clause.stat.maxCost, cost);
|
|
329
|
-
return cost;
|
|
330
|
-
}
|
|
331
|
-
|
|
332
311
|
insert(binding: Binding) {
|
|
333
|
-
const cost = this.
|
|
312
|
+
const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
|
|
334
313
|
if (this.newEntries.length === 0) this.ctx.trail.push(() => (this.newEntries = []));
|
|
335
314
|
this.newEntries.push({ binding, cost, isInstantiated: false });
|
|
336
315
|
}
|
|
@@ -392,19 +371,13 @@ class Queue {
|
|
|
392
371
|
}
|
|
393
372
|
}
|
|
394
373
|
|
|
395
|
-
interface Prop {
|
|
396
|
-
readonly isConflict: boolean;
|
|
397
|
-
readonly idx: number;
|
|
398
|
-
readonly justification: number;
|
|
399
|
-
}
|
|
400
|
-
|
|
401
374
|
const GENERATION_PROPAGATION_THRESHOLD = 3;
|
|
402
375
|
|
|
403
376
|
export class Ematch {
|
|
404
377
|
private eval: Eval;
|
|
405
378
|
private bindings = new Set<string>();
|
|
406
379
|
private queue: Queue;
|
|
407
|
-
private props:
|
|
380
|
+
private props: number[] = [];
|
|
408
381
|
private inferPatterns: PatternInferenceRw;
|
|
409
382
|
private mam: Mam;
|
|
410
383
|
private lazyMam: Mam | null = null;
|
|
@@ -419,7 +392,6 @@ export class Ematch {
|
|
|
419
392
|
private evidence: EnodePair[] = [];
|
|
420
393
|
private names: DefinedNames;
|
|
421
394
|
private nnf: Nnf;
|
|
422
|
-
private numInstantiations = 0;
|
|
423
395
|
private subst: VarSubst;
|
|
424
396
|
|
|
425
397
|
constructor(
|
|
@@ -453,14 +425,8 @@ export class Ematch {
|
|
|
453
425
|
}
|
|
454
426
|
|
|
455
427
|
// mk_justification: the explanation of the evidence, taken while it is created.
|
|
456
|
-
private mkJustification(
|
|
457
|
-
idx: number,
|
|
458
|
-
generation: number,
|
|
459
|
-
clause: Clause,
|
|
460
|
-
binding: readonly Enode[],
|
|
461
|
-
) {
|
|
428
|
+
private mkJustification(generation: number, clause: Clause, binding: readonly Enode[]) {
|
|
462
429
|
const ctx = this.ctx;
|
|
463
|
-
const lit = idx === -1 ? null : clause.lits[idx];
|
|
464
430
|
const explain: number[] = [];
|
|
465
431
|
ctx.egraph.beginExplain();
|
|
466
432
|
for (const pair of this.evidence) {
|
|
@@ -469,9 +435,6 @@ export class Ematch {
|
|
|
469
435
|
}
|
|
470
436
|
ctx.egraph.endExplain();
|
|
471
437
|
const justification: Justification = {
|
|
472
|
-
lhs: lit === null ? -1 : lit.lhs,
|
|
473
|
-
rhs: lit === null ? -1 : lit.rhs,
|
|
474
|
-
sign: lit === null ? false : lit.sign,
|
|
475
438
|
generation,
|
|
476
439
|
explain,
|
|
477
440
|
clause,
|
|
@@ -530,8 +493,7 @@ export class Ematch {
|
|
|
530
493
|
const manager = this.ctx.manager;
|
|
531
494
|
const todo = [expr];
|
|
532
495
|
const marked = new Set<number>();
|
|
533
|
-
|
|
534
|
-
const term = todo.pop() as number;
|
|
496
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
535
497
|
if (marked.has(term)) continue;
|
|
536
498
|
marked.add(term);
|
|
537
499
|
if (manager.isGroundApp(term)) {
|
|
@@ -555,14 +517,7 @@ export class Ematch {
|
|
|
555
517
|
return `${clause.q}:${nodes.map((node) => node.owner).join(",")}`;
|
|
556
518
|
}
|
|
557
519
|
|
|
558
|
-
private allocBinding(
|
|
559
|
-
clause: Clause,
|
|
560
|
-
pattern: number,
|
|
561
|
-
nodes: readonly Enode[],
|
|
562
|
-
maxGeneration: number,
|
|
563
|
-
minTopGeneration: number,
|
|
564
|
-
maxTopGeneration: number,
|
|
565
|
-
) {
|
|
520
|
+
private allocBinding(clause: Clause, nodes: readonly Enode[], maxGeneration: number) {
|
|
566
521
|
if (this.bindings.has(this.getBindingKey(clause, nodes))) return null;
|
|
567
522
|
if (
|
|
568
523
|
this.bindings.has(
|
|
@@ -573,14 +528,7 @@ export class Ematch {
|
|
|
573
528
|
)
|
|
574
529
|
)
|
|
575
530
|
return null;
|
|
576
|
-
const binding = new Binding(
|
|
577
|
-
clause,
|
|
578
|
-
pattern,
|
|
579
|
-
maxGeneration,
|
|
580
|
-
minTopGeneration,
|
|
581
|
-
maxTopGeneration,
|
|
582
|
-
[...nodes],
|
|
583
|
-
);
|
|
531
|
+
const binding = new Binding(clause, maxGeneration, [...nodes]);
|
|
584
532
|
const key = this.getBindingKey(clause, binding.nodes);
|
|
585
533
|
this.bindings.add(key);
|
|
586
534
|
this.ctx.trail.push(() => this.bindings.delete(key));
|
|
@@ -589,21 +537,12 @@ export class Ematch {
|
|
|
589
537
|
|
|
590
538
|
private onBinding = (
|
|
591
539
|
quantifier: number,
|
|
592
|
-
|
|
540
|
+
_pattern: number,
|
|
593
541
|
nodes: readonly Enode[],
|
|
594
542
|
maxGeneration: number,
|
|
595
|
-
minTopGeneration: number,
|
|
596
|
-
maxTopGeneration: number,
|
|
597
543
|
) => {
|
|
598
544
|
const clause = this.clauses[this.q2clauses.get(quantifier) as number];
|
|
599
|
-
const binding = this.allocBinding(
|
|
600
|
-
clause,
|
|
601
|
-
pattern,
|
|
602
|
-
nodes,
|
|
603
|
-
maxGeneration,
|
|
604
|
-
minTopGeneration,
|
|
605
|
-
maxTopGeneration,
|
|
606
|
-
);
|
|
545
|
+
const binding = this.allocBinding(clause, nodes, maxGeneration);
|
|
607
546
|
if (binding === null) return;
|
|
608
547
|
if (this.propagate(false, nodes, maxGeneration, clause).isDone) return;
|
|
609
548
|
pushToFront(clause, binding);
|
|
@@ -629,14 +568,9 @@ export class Ematch {
|
|
|
629
568
|
if (evaluated.value === L_UNDEF && maxGeneration > GENERATION_PROPAGATION_THRESHOLD)
|
|
630
569
|
return { isDone: false, isPropagated: false };
|
|
631
570
|
const owned = isOwned ? binding : [...binding];
|
|
632
|
-
const justification = this.mkJustification(
|
|
571
|
+
const justification = this.mkJustification(maxGeneration, clause, owned);
|
|
633
572
|
if (isOwned) this.propagateJustification(justification);
|
|
634
|
-
else
|
|
635
|
-
this.props.push({
|
|
636
|
-
isConflict: evaluated.value === L_FALSE,
|
|
637
|
-
idx: evaluated.idx,
|
|
638
|
-
justification,
|
|
639
|
-
});
|
|
573
|
+
else this.props.push(justification);
|
|
640
574
|
return { isDone: true, isPropagated: true };
|
|
641
575
|
}
|
|
642
576
|
|
|
@@ -652,21 +586,14 @@ export class Ematch {
|
|
|
652
586
|
private flushPropQueue() {
|
|
653
587
|
if (this.props.length === 0) return false;
|
|
654
588
|
for (let index = 0; index < this.props.length; index++)
|
|
655
|
-
this.propagateJustification(this.props[index]
|
|
589
|
+
this.propagateJustification(this.props[index]);
|
|
656
590
|
this.props = [];
|
|
657
591
|
return true;
|
|
658
592
|
}
|
|
659
593
|
|
|
660
|
-
private instantiateBinding(binding: Binding) {
|
|
661
|
-
const stat = binding.clause.stat;
|
|
662
|
-
stat.maxGeneration = Math.max(stat.maxGeneration, binding.maxGeneration, stat.generation);
|
|
663
|
-
this.numInstantiations++;
|
|
664
|
-
this.queue.insert(binding);
|
|
665
|
-
}
|
|
666
|
-
|
|
667
594
|
addInstantiation(clause: Clause, binding: Binding, lit: number) {
|
|
668
595
|
this.evidence = [];
|
|
669
|
-
this.ctx.propagate(lit, this.mkJustification(
|
|
596
|
+
this.ctx.propagate(lit, this.mkJustification(binding.maxGeneration, clause, binding.nodes));
|
|
670
597
|
}
|
|
671
598
|
|
|
672
599
|
private instantiateLit(generation: number, binding: readonly Enode[], lit: QLit) {
|
|
@@ -750,15 +677,12 @@ export class Ematch {
|
|
|
750
677
|
manager.decRef(q);
|
|
751
678
|
q = inferred;
|
|
752
679
|
}
|
|
753
|
-
const node = ctx.egraph.find(quantifier);
|
|
754
|
-
const generation = node === undefined ? ctx.generation : node.generation;
|
|
755
680
|
return new Clause(
|
|
756
681
|
this.clauses.length,
|
|
757
682
|
isExists ? literal ^ 1 : literal,
|
|
758
683
|
lits,
|
|
759
684
|
q,
|
|
760
685
|
manager.getQuantifier(q).sorts.length,
|
|
761
|
-
{ generation, maxGeneration: 0, maxCost: 0 },
|
|
762
686
|
);
|
|
763
687
|
}
|
|
764
688
|
|
|
@@ -852,7 +776,7 @@ export class Ematch {
|
|
|
852
776
|
isPropagated ||= result.isPropagated;
|
|
853
777
|
if (result.isDone) toRemove.push(binding);
|
|
854
778
|
else if (isFlushing) {
|
|
855
|
-
this.
|
|
779
|
+
this.queue.insert(binding);
|
|
856
780
|
toRemove.push(binding);
|
|
857
781
|
isPropagated = true;
|
|
858
782
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/q_mbi.h, src/sat/smt/q_mbi.cpp,
|
|
2
|
-
// src/ast/for_each_expr.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -410,13 +408,15 @@ export class Mbqi {
|
|
|
410
408
|
)
|
|
411
409
|
continue;
|
|
412
410
|
visited.add(value);
|
|
411
|
+
const replaced = this.replaceModelValue(value);
|
|
413
412
|
veqs.push(this.pin(manager.mkEq(sk, expr)));
|
|
414
|
-
meqs.push(this.pin(manager.mkEq(sk,
|
|
413
|
+
meqs.push(this.pin(manager.mkEq(sk, replaced)));
|
|
415
414
|
bound--;
|
|
416
415
|
}
|
|
417
416
|
if (veqs.length === 0) continue;
|
|
418
|
-
|
|
417
|
+
const meq = manager.mkOr(meqs);
|
|
419
418
|
qb.domainEqs.push(manager.mkOr(veqs));
|
|
419
|
+
this.assertExpr(meq);
|
|
420
420
|
}
|
|
421
421
|
}
|
|
422
422
|
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/q_model_fixer.h, src/sat/smt/q_model_fixer.cpp,
|
|
2
|
-
// src/model/arith_value_order.h, src/ast/macros/quantifier_macro_info.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -237,7 +234,7 @@ export class ModelFixer {
|
|
|
237
234
|
isLess: (first, second) =>
|
|
238
235
|
manager.isBvNumeral(first) && manager.isBvNumeral(second)
|
|
239
236
|
? manager.getBvNumeralValue(first) < manager.getBvNumeralValue(second)
|
|
240
|
-
: first < second,
|
|
237
|
+
: manager.ids[first] < manager.ids[second],
|
|
241
238
|
mkLt: (first, second) =>
|
|
242
239
|
manager.mkApp(OP_NOT, [mkBvApp(manager, OP_ULEQ, [second, first])], SORT_BOOL),
|
|
243
240
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/q_solver.h, src/sat/smt/q_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
KIND_QUANTIFIER,
|
|
5
3
|
OP_AND,
|
|
@@ -124,6 +122,8 @@ export class QSolver extends ThSolver {
|
|
|
124
122
|
...data,
|
|
125
123
|
kind: data.kind === QUANTIFIER_FORALL ? QUANTIFIER_EXISTS : QUANTIFIER_FORALL,
|
|
126
124
|
body: manager.mkNot(data.body),
|
|
125
|
+
patterns: [],
|
|
126
|
+
noPatterns: [],
|
|
127
127
|
}),
|
|
128
128
|
)
|
|
129
129
|
: quantifier;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/sat_th.h, src/sat/smt/sat_th.cpp, src/util/trail.h), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { mkNot } from "../ast-util";
|
|
5
3
|
import type { ProtoModel } from "../proto-model";
|
|
@@ -27,10 +25,6 @@ export class TrailStack {
|
|
|
27
25
|
this.scopes.length -= numScopes;
|
|
28
26
|
while (this.undos.length > lim) (this.undos.pop() as () => void)();
|
|
29
27
|
}
|
|
30
|
-
|
|
31
|
-
get numScopes() {
|
|
32
|
-
return this.scopes.length;
|
|
33
|
-
}
|
|
34
28
|
}
|
|
35
29
|
|
|
36
30
|
// A th_explain: the literals and equalities that explain a propagation or a conflict.
|
|
@@ -111,12 +105,9 @@ export abstract class ThSolver {
|
|
|
111
105
|
isBetaRedex(_parent: Enode, _node: Enode) {
|
|
112
106
|
return false;
|
|
113
107
|
}
|
|
114
|
-
isFixed(_thVar: number, _lits: number[]): number {
|
|
115
|
-
return -1;
|
|
116
|
-
}
|
|
117
108
|
addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
|
|
118
109
|
addDep(node: Enode, deps: Dependencies) {
|
|
119
|
-
deps.set(node,
|
|
110
|
+
deps.set(node, null);
|
|
120
111
|
return true;
|
|
121
112
|
}
|
|
122
113
|
includeFuncInterp(_decl: number) {
|