tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +6 -16
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -7
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +25 -6
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +0 -1
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -14
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +91 -55
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +0 -1
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +66 -16
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,11 +1,17 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/pb_solver.h, src/sat/smt/pb_solver.cpp,
|
|
2
|
-
// src/sat/smt/pb_internalize.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../../errors";
|
|
4
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
type AstManager,
|
|
4
|
+
OP_AT_LEAST_K,
|
|
5
|
+
OP_AT_MOST_K,
|
|
6
|
+
OP_PB_EQ,
|
|
7
|
+
OP_PB_GE,
|
|
8
|
+
OP_PB_LE,
|
|
9
|
+
SORT_BOOL,
|
|
10
|
+
} from "../ast";
|
|
5
11
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
|
-
import { getPbCoeff, getPbK, hasUnitCoefficients } from "../pb-rewriter";
|
|
12
|
+
import { getPbCoeff, getPbK, hasUnitCoefficients, mkPbGe } from "../pb-rewriter";
|
|
7
13
|
import { Rational } from "../rational";
|
|
8
|
-
import { NULL_LITERAL } from "./clause";
|
|
14
|
+
import { NULL_LITERAL, UINT_MAX } from "./clause";
|
|
9
15
|
import { Card, type Constraint, type ConstraintHost, Pbc } from "./pb-constraint";
|
|
10
16
|
import {
|
|
11
17
|
JUSTIFICATION_BINARY,
|
|
@@ -16,7 +22,6 @@ import {
|
|
|
16
22
|
type Solver,
|
|
17
23
|
} from "./solver";
|
|
18
24
|
|
|
19
|
-
const UINT_MAX = 4294967295;
|
|
20
25
|
const INT_MAX = 2147483647;
|
|
21
26
|
const INT_MIN = -2147483648;
|
|
22
27
|
|
|
@@ -1005,14 +1010,6 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1005
1010
|
this.initWatch(constraint);
|
|
1006
1011
|
}
|
|
1007
1012
|
|
|
1008
|
-
private numNonlearnedBin(lit: number) {
|
|
1009
|
-
const wlist = this.getWlist(lit ^ 1);
|
|
1010
|
-
let count = 0;
|
|
1011
|
-
for (let index = 0; index < wlist.size; index++)
|
|
1012
|
-
if (wlist.isBinary(index) && !wlist.isLearned(index)) count++;
|
|
1013
|
-
return count;
|
|
1014
|
-
}
|
|
1015
|
-
|
|
1016
1013
|
private initUseLists() {
|
|
1017
1014
|
const solver = this.solver;
|
|
1018
1015
|
const arena = solver.arena;
|
|
@@ -1071,7 +1068,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1071
1068
|
this.value(lit) !== L_UNDEF ||
|
|
1072
1069
|
this.cnstrUseList[lit].length === 0 ||
|
|
1073
1070
|
this.useCount(lit ^ 1) !== 0 ||
|
|
1074
|
-
this.
|
|
1071
|
+
this.getWlist(lit).numNonlearnedBin() !== 0
|
|
1075
1072
|
)
|
|
1076
1073
|
return false;
|
|
1077
1074
|
this.solver.assignScoped(lit);
|
|
@@ -1323,6 +1320,33 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1323
1320
|
if (isChanged) lits.splice(0, lits.length, ...members);
|
|
1324
1321
|
}
|
|
1325
1322
|
|
|
1323
|
+
toFormulas(lit2expr: (lit: number) => number, formulas: number[]) {
|
|
1324
|
+
const manager = this.manager;
|
|
1325
|
+
for (const constraint of this.constraints) {
|
|
1326
|
+
const args = constraint.lits.map(lit2expr);
|
|
1327
|
+
const formula =
|
|
1328
|
+
constraint instanceof Pbc
|
|
1329
|
+
? mkPbGe(
|
|
1330
|
+
manager,
|
|
1331
|
+
constraint.coeffs.map((coeff) => Rational.fromNumber(coeff)),
|
|
1332
|
+
args,
|
|
1333
|
+
Rational.fromNumber(constraint.k),
|
|
1334
|
+
)
|
|
1335
|
+
: manager.mkApp(
|
|
1336
|
+
manager.mkPbDecl(
|
|
1337
|
+
OP_AT_LEAST_K,
|
|
1338
|
+
[Rational.fromNumber(constraint.k)],
|
|
1339
|
+
args.map(() => SORT_BOOL),
|
|
1340
|
+
),
|
|
1341
|
+
args,
|
|
1342
|
+
SORT_BOOL,
|
|
1343
|
+
);
|
|
1344
|
+
formulas.push(
|
|
1345
|
+
constraint.lit === NULL_LITERAL ? formula : manager.mkEq(lit2expr(constraint.lit), formula),
|
|
1346
|
+
);
|
|
1347
|
+
}
|
|
1348
|
+
}
|
|
1349
|
+
|
|
1326
1350
|
private active2card() {
|
|
1327
1351
|
const wlits: { coeff: number; lit: number }[] = [];
|
|
1328
1352
|
let sum = 0;
|
|
@@ -1450,7 +1474,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1450
1474
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1451
1475
|
return NULL_LITERAL;
|
|
1452
1476
|
}
|
|
1453
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1477
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1454
1478
|
this.addPbGe(lit, wlits, bound, false);
|
|
1455
1479
|
return isSign ? lit ^ 1 : lit;
|
|
1456
1480
|
}
|
|
@@ -1462,7 +1486,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1462
1486
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1463
1487
|
return NULL_LITERAL;
|
|
1464
1488
|
}
|
|
1465
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1489
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1466
1490
|
this.addPbGe(lit, wlits, bound, false);
|
|
1467
1491
|
return isSign ? lit ^ 1 : lit;
|
|
1468
1492
|
}
|
|
@@ -1472,8 +1496,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1472
1496
|
let k = getPbK(this.manager, this.manager.decls[expr]);
|
|
1473
1497
|
const wlits = this.convertPbWlits(expr);
|
|
1474
1498
|
const isBaseAssert = isRoot && !isSign;
|
|
1475
|
-
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1476
|
-
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1499
|
+
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1500
|
+
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1477
1501
|
this.addPbGe(lit1, wlits, Number(BigInt.asUintN(32, k.num)), false);
|
|
1478
1502
|
k = k.neg();
|
|
1479
1503
|
for (let index = 0; index < wlits.lits.length; index++) {
|
|
@@ -1481,7 +1505,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1481
1505
|
k = k.add(Rational.of(BigInt(wlits.coeffs[index])));
|
|
1482
1506
|
}
|
|
1483
1507
|
if (k.isNegative()) {
|
|
1484
|
-
const lit = 2 * solver.mkVar(false
|
|
1508
|
+
const lit = 2 * solver.mkVar(false);
|
|
1485
1509
|
solver.assignUnit(lit ^ 1);
|
|
1486
1510
|
this.si.cache(expr, lit);
|
|
1487
1511
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1493,7 +1517,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1493
1517
|
|
|
1494
1518
|
private mkConjunction(expr: number, lit1: number, lit2: number, isSign: boolean) {
|
|
1495
1519
|
const solver = this.solver;
|
|
1496
|
-
const lit = 2 * solver.mkVar(false
|
|
1520
|
+
const lit = 2 * solver.mkVar(false);
|
|
1497
1521
|
solver.mkClause([lit ^ 1, lit1]);
|
|
1498
1522
|
solver.mkClause([lit ^ 1, lit2]);
|
|
1499
1523
|
solver.mkClause([lit1 ^ 1, lit2 ^ 1, lit]);
|
|
@@ -1512,7 +1536,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1512
1536
|
this.addAtLeast(NULL_LITERAL, lits, bound, false);
|
|
1513
1537
|
return NULL_LITERAL;
|
|
1514
1538
|
}
|
|
1515
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1539
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1516
1540
|
this.addAtLeast(lit, lits, bound, false);
|
|
1517
1541
|
this.si.cache(expr, lit);
|
|
1518
1542
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1531,7 +1555,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1531
1555
|
this.addAtLeast(NULL_LITERAL, lits, bound, false);
|
|
1532
1556
|
return NULL_LITERAL;
|
|
1533
1557
|
}
|
|
1534
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1558
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1535
1559
|
this.addAtLeast(lit, lits, bound, false);
|
|
1536
1560
|
this.si.cache(expr, lit);
|
|
1537
1561
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1541,8 +1565,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1541
1565
|
const solver = this.solver;
|
|
1542
1566
|
const lits = this.convertPbArgs(expr);
|
|
1543
1567
|
const isBaseAssert = isRoot && !isSign;
|
|
1544
|
-
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1545
|
-
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1568
|
+
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1569
|
+
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1546
1570
|
const bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
1547
1571
|
this.addAtLeast(lit1, lits, bound, false);
|
|
1548
1572
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_probing.h, src/sat/sat_probing.cpp,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg), MIT license, see z3-license.txt.
|
|
3
1
|
import { L_UNDEF } from "../lbool";
|
|
4
2
|
import { Big } from "./big";
|
|
5
3
|
import { getBool, getNumber, type SatParams } from "./config";
|
|
@@ -135,26 +133,30 @@ export class Probing {
|
|
|
135
133
|
this.big.init(solver, true);
|
|
136
134
|
const numVars = solver.numVars();
|
|
137
135
|
this.assigned = new Uint8Array(2 * numVars);
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
this.
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
if (
|
|
148
|
-
this.
|
|
149
|
-
|
|
136
|
+
try {
|
|
137
|
+
for (let index = 0; index < numVars; index++) {
|
|
138
|
+
const boolVar = (this.stoppedAt + index) % numVars;
|
|
139
|
+
if (this.counter < -this.limit) {
|
|
140
|
+
this.stoppedAt = boolVar;
|
|
141
|
+
isComplete = false;
|
|
142
|
+
break;
|
|
143
|
+
}
|
|
144
|
+
if (solver.isInconsistent) break;
|
|
145
|
+
if (solver.valueVar(boolVar) !== L_UNDEF || solver.wasEliminated(boolVar)) {
|
|
146
|
+
if (this.isCaching) {
|
|
147
|
+
this.resetCache(2 * boolVar);
|
|
148
|
+
this.resetCache(2 * boolVar + 1);
|
|
149
|
+
}
|
|
150
|
+
continue;
|
|
150
151
|
}
|
|
151
|
-
|
|
152
|
+
solver.checkpoint();
|
|
153
|
+
const oldCounter = this.counter;
|
|
154
|
+
const oldNumAssigned = this.numAssigned;
|
|
155
|
+
this.processCore(boolVar);
|
|
156
|
+
if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
|
|
152
157
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const oldNumAssigned = this.numAssigned;
|
|
156
|
-
this.processCore(boolVar);
|
|
157
|
-
if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
|
|
158
|
+
} finally {
|
|
159
|
+
solver.isProbing = wasProbing;
|
|
158
160
|
}
|
|
159
161
|
if (isComplete) this.stoppedAt = 0;
|
|
160
162
|
this.counter = -this.counter;
|
|
@@ -163,7 +165,6 @@ export class Probing {
|
|
|
163
165
|
this.assignedLits.length = 0;
|
|
164
166
|
this.toAssert.length = 0;
|
|
165
167
|
this.cachedBins = [];
|
|
166
|
-
solver.isProbing = wasProbing;
|
|
167
168
|
return isComplete;
|
|
168
169
|
}
|
|
169
170
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/sat2goal.h, src/sat/tactic/sat2goal.cpp,
|
|
2
|
-
// src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { type AstManager, SORT_BOOL } from "../ast";
|
|
5
3
|
import type { Definition, Goal } from "../goal";
|
|
@@ -7,11 +5,13 @@ import { NULL_LITERAL } from "./clause";
|
|
|
7
5
|
import { ModelConverter } from "./model-converter";
|
|
8
6
|
import type { Solver } from "./solver";
|
|
9
7
|
|
|
10
|
-
const SMALL_LBD = 3;
|
|
11
|
-
|
|
12
8
|
const mkNot = (manager: AstManager, expr: number) =>
|
|
13
9
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkNot(expr);
|
|
14
10
|
|
|
11
|
+
export const isLiteral = (manager: AstManager, expr: number) =>
|
|
12
|
+
manager.isUninterpretedConst(expr) ||
|
|
13
|
+
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
|
|
14
|
+
|
|
15
15
|
class Sat2GoalConverter {
|
|
16
16
|
readonly smc = new ModelConverter();
|
|
17
17
|
var2expr: number[] = [];
|
|
@@ -19,14 +19,6 @@ class Sat2GoalConverter {
|
|
|
19
19
|
|
|
20
20
|
constructor(private manager: AstManager) {}
|
|
21
21
|
|
|
22
|
-
private isLiteral(expr: number) {
|
|
23
|
-
const manager = this.manager;
|
|
24
|
-
return (
|
|
25
|
-
manager.isUninterpretedConst(expr) ||
|
|
26
|
-
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
|
|
27
|
-
);
|
|
28
|
-
}
|
|
29
|
-
|
|
30
22
|
private add(expr: number, def: number) {
|
|
31
23
|
const manager = this.manager;
|
|
32
24
|
manager.incRef(def);
|
|
@@ -62,7 +54,7 @@ class Sat2GoalConverter {
|
|
|
62
54
|
def = manager.mkNot(def);
|
|
63
55
|
}
|
|
64
56
|
const expr = this.lit2expr(first);
|
|
65
|
-
if (
|
|
57
|
+
if (isLiteral(manager, expr)) this.add(expr, def);
|
|
66
58
|
clause.length = 0;
|
|
67
59
|
continue;
|
|
68
60
|
}
|
|
@@ -81,7 +73,7 @@ class Sat2GoalConverter {
|
|
|
81
73
|
root ^= 1;
|
|
82
74
|
}
|
|
83
75
|
const expr = this.lit2expr(first);
|
|
84
|
-
if (
|
|
76
|
+
if (isLiteral(manager, expr)) this.add(expr, this.lit2expr(root));
|
|
85
77
|
index += 5;
|
|
86
78
|
continue;
|
|
87
79
|
}
|
|
@@ -164,8 +156,10 @@ export const sat2goal = (
|
|
|
164
156
|
const arena = solver.arena;
|
|
165
157
|
for (const clause of solver.clauses) {
|
|
166
158
|
checkpoint();
|
|
167
|
-
if (arena.glue[clause] > SMALL_LBD && arena.isLearned(clause)) continue;
|
|
168
159
|
goal.assert(manager.mkOr(arena.getLits(clause).map(getExpr)));
|
|
169
160
|
}
|
|
161
|
+
const formulas: number[] = [];
|
|
162
|
+
solver.ext?.toFormulas(getExpr, formulas);
|
|
163
|
+
for (const formula of formulas) goal.assert(formula);
|
|
170
164
|
goal.addDefinitions(converter.entries);
|
|
171
165
|
};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_scc.h, src/sat/sat_scc.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Big } from "./big";
|
|
3
2
|
import { NULL_LITERAL } from "./clause";
|
|
4
3
|
import type { SatConfig } from "./config";
|
|
@@ -8,7 +7,7 @@ import type { Solver } from "./solver";
|
|
|
8
7
|
const UNVISITED = -1;
|
|
9
8
|
|
|
10
9
|
export class Scc {
|
|
11
|
-
big: Big;
|
|
10
|
+
private big: Big;
|
|
12
11
|
|
|
13
12
|
constructor(
|
|
14
13
|
private solver: Solver,
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_simplifier.h, src/sat/sat_simplifier.cpp,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg, src/sat/sat_clause_set.h, src/sat/sat_clause_set.cpp,
|
|
3
|
-
// src/util/heap.h, src/util/util.h), MIT license, see z3-license.txt.
|
|
4
1
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
5
2
|
import type { RandomGen } from "../random-gen";
|
|
6
|
-
import { type ClauseArena, NULL_LITERAL } from "./clause";
|
|
3
|
+
import { type ClauseArena, NULL_LITERAL, UINT_MAX } from "./clause";
|
|
7
4
|
import { UseList } from "./clause-use-list";
|
|
8
5
|
import { getBool, getNumber, type SatParams } from "./config";
|
|
9
6
|
import { MC_ABCE, MC_ACCE, MC_BCE, MC_CCE, MC_ELIM_VAR } from "./model-converter";
|
|
@@ -17,8 +14,6 @@ const ABCE_T = 3;
|
|
|
17
14
|
const ATE_T = 4;
|
|
18
15
|
const NO_T = 5;
|
|
19
16
|
|
|
20
|
-
const UINT_MAX = 4294967295;
|
|
21
|
-
|
|
22
17
|
const isApproxSubset = (first: number, second: number) => (first | second) === second;
|
|
23
18
|
|
|
24
19
|
const shuffle = (lits: number[], rand: RandomGen) => {
|
|
@@ -606,7 +601,6 @@ class BlockedClauseElim {
|
|
|
606
601
|
if (!this.isSelectClause(2)) continue;
|
|
607
602
|
const other = wlist.getLiteral(index);
|
|
608
603
|
const result = this.cceBinary(lit, other, elimType);
|
|
609
|
-
this.incBc(result);
|
|
610
604
|
if (result === ATE_T) {
|
|
611
605
|
wlist.setLearned(index, true);
|
|
612
606
|
solver.setLearned1(other, lit, true);
|
|
@@ -633,7 +627,6 @@ class BlockedClauseElim {
|
|
|
633
627
|
if (arena.wasRemoved(clause) || arena.isLearned(clause)) continue;
|
|
634
628
|
if (!this.isSelectClause(arena.size[clause])) continue;
|
|
635
629
|
const result = this.cceClause(clause, elimType);
|
|
636
|
-
this.incBc(result);
|
|
637
630
|
if (result === ATE_T) {
|
|
638
631
|
solver.mc.addAte(this.coveredClause);
|
|
639
632
|
simplifier.setLearnedClause(clause);
|
|
@@ -646,15 +639,6 @@ class BlockedClauseElim {
|
|
|
646
639
|
}
|
|
647
640
|
}
|
|
648
641
|
|
|
649
|
-
private incBc(elimType: number) {
|
|
650
|
-
const simplifier = this.simplifier;
|
|
651
|
-
if (elimType === CCE_T) simplifier.numCce++;
|
|
652
|
-
else if (elimType === ACCE_T) simplifier.numAcce++;
|
|
653
|
-
else if (elimType === ABCE_T) simplifier.numAbce++;
|
|
654
|
-
else if (elimType === ATE_T) simplifier.numAte++;
|
|
655
|
-
else if (elimType === BCE_T) simplifier.numBce++;
|
|
656
|
-
}
|
|
657
|
-
|
|
658
642
|
private isSelectClause(size: number) {
|
|
659
643
|
return size > 3 || this.simplifier.solver.rand.next() % 4 === 0;
|
|
660
644
|
}
|
|
@@ -668,7 +652,6 @@ class BlockedClauseElim {
|
|
|
668
652
|
if (lit !== this.blocked && this.isProcessVar(lit >> 1)) this.queue.decreased(lit ^ 1);
|
|
669
653
|
}
|
|
670
654
|
solver.mc.insert(entry, this.coveredClause);
|
|
671
|
-
solver.mc.setClause(entry, arena.getLits(clause));
|
|
672
655
|
}
|
|
673
656
|
|
|
674
657
|
private blockCoveredBinary(other: number, lit: number) {
|
|
@@ -676,7 +659,6 @@ class BlockedClauseElim {
|
|
|
676
659
|
const entry = solver.mc.mk(this.kind, this.blocked >> 1);
|
|
677
660
|
this.simplifier.setLearnedBinary(lit, other);
|
|
678
661
|
solver.mc.insert(entry, this.coveredClause);
|
|
679
|
-
solver.mc.setClause(entry, [lit, other]);
|
|
680
662
|
if (this.isProcessVar(other >> 1)) this.queue.decreased(other ^ 1);
|
|
681
663
|
}
|
|
682
664
|
}
|
|
@@ -719,15 +701,7 @@ export class Simplifier {
|
|
|
719
701
|
private isSubsumption: boolean;
|
|
720
702
|
private subsumptionLimit: number;
|
|
721
703
|
readonly isElimVars: boolean;
|
|
722
|
-
numBce = 0;
|
|
723
|
-
numCce = 0;
|
|
724
|
-
numAcce = 0;
|
|
725
|
-
numAbce = 0;
|
|
726
|
-
numAte = 0;
|
|
727
|
-
numSubsumed = 0;
|
|
728
704
|
numElimVars = 0;
|
|
729
|
-
numSubRes = 0;
|
|
730
|
-
numElimLits = 0;
|
|
731
705
|
private isLearnedInUseLists = false;
|
|
732
706
|
private oldNumElimVars = 0;
|
|
733
707
|
private bsClauses: number[] = [];
|
|
@@ -1092,33 +1066,30 @@ export class Simplifier {
|
|
|
1092
1066
|
const second = this.bsClauses[index];
|
|
1093
1067
|
const lit = this.bsLits[index];
|
|
1094
1068
|
if (!arena.wasRemoved(second) && lit === NULL_LITERAL) {
|
|
1095
|
-
if (arena.isLearned(first) && !arena.isLearned(second))
|
|
1069
|
+
if (arena.isLearned(first) && !arena.isLearned(second)) arena.setLearned(first, false);
|
|
1096
1070
|
this.removeClause(second);
|
|
1097
|
-
this.numSubsumed++;
|
|
1098
1071
|
} else if (!arena.wasRemoved(second)) {
|
|
1099
1072
|
this.elimLit(second, lit);
|
|
1100
|
-
this.numSubRes++;
|
|
1101
1073
|
}
|
|
1102
1074
|
if (solver.isInconsistent) break;
|
|
1103
1075
|
}
|
|
1104
1076
|
}
|
|
1105
1077
|
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
if (clause !== this.dummy) this.useList.unblock(clause);
|
|
1109
|
-
}
|
|
1110
|
-
|
|
1078
|
+
// tmp_clause::set computes the approximation only when it allocates the clause, so every later
|
|
1079
|
+
// binary is filtered with the approximation of the first one.
|
|
1111
1080
|
private setDummy(first: number, second: number, isLearned: boolean) {
|
|
1112
1081
|
const arena = this.solver.arena;
|
|
1113
|
-
|
|
1082
|
+
const previousArena = this.dummyArena;
|
|
1083
|
+
if (previousArena !== arena) {
|
|
1084
|
+
const previous = this.dummy;
|
|
1114
1085
|
this.dummyArena = arena;
|
|
1115
1086
|
this.dummy = arena.mkClause([first, second], 2, isLearned);
|
|
1087
|
+
if (previousArena !== undefined) arena.approx[this.dummy] = previousArena.approx[previous];
|
|
1116
1088
|
return this.dummy;
|
|
1117
1089
|
}
|
|
1118
1090
|
arena.set(this.dummy, 0, first);
|
|
1119
1091
|
arena.set(this.dummy, 1, second);
|
|
1120
1092
|
arena.setLearned(this.dummy, isLearned);
|
|
1121
|
-
arena.updateApprox(this.dummy);
|
|
1122
1093
|
return this.dummy;
|
|
1123
1094
|
}
|
|
1124
1095
|
|
|
@@ -1164,9 +1135,8 @@ export class Simplifier {
|
|
|
1164
1135
|
}
|
|
1165
1136
|
}
|
|
1166
1137
|
for (const second of this.bsClauses) {
|
|
1167
|
-
if (arena.isLearned(first) && !arena.isLearned(second))
|
|
1138
|
+
if (arena.isLearned(first) && !arena.isLearned(second)) arena.setLearned(first, false);
|
|
1168
1139
|
this.removeClause(second);
|
|
1169
|
-
this.numSubsumed++;
|
|
1170
1140
|
}
|
|
1171
1141
|
}
|
|
1172
1142
|
|
|
@@ -1217,7 +1187,7 @@ export class Simplifier {
|
|
|
1217
1187
|
const oldTrailSize = solver.trail.length;
|
|
1218
1188
|
const numClauses = solver.clauses.length;
|
|
1219
1189
|
solver.assignScoped(lit);
|
|
1220
|
-
solver.
|
|
1190
|
+
solver.propagate(false);
|
|
1221
1191
|
if (solver.isInconsistent) return;
|
|
1222
1192
|
const newTrailSize = solver.trail.length;
|
|
1223
1193
|
for (let index = oldTrailSize; index < newTrailSize; index++) {
|
|
@@ -1236,7 +1206,6 @@ export class Simplifier {
|
|
|
1236
1206
|
const solver = this.solver;
|
|
1237
1207
|
const arena = solver.arena;
|
|
1238
1208
|
this.isNeedingCleanup = true;
|
|
1239
|
-
this.numElimLits++;
|
|
1240
1209
|
this.insertElimTodo(lit >> 1);
|
|
1241
1210
|
arena.elim(clause, lit);
|
|
1242
1211
|
this.useList.eraseNotRemoved(lit, clause);
|
|
@@ -1298,7 +1267,6 @@ export class Simplifier {
|
|
|
1298
1267
|
|
|
1299
1268
|
private elimDupBins() {
|
|
1300
1269
|
const solver = this.solver;
|
|
1301
|
-
let numElim = 0;
|
|
1302
1270
|
for (const wlist of solver.watches) {
|
|
1303
1271
|
solver.checkpoint();
|
|
1304
1272
|
const size = wlist.size;
|
|
@@ -1315,10 +1283,7 @@ export class Simplifier {
|
|
|
1315
1283
|
const val1 = data[2 * index];
|
|
1316
1284
|
const val2 = data[2 * index + 1];
|
|
1317
1285
|
if ((val2 & 3) === 0) {
|
|
1318
|
-
if (val1 === lastLit)
|
|
1319
|
-
numElim++;
|
|
1320
|
-
continue;
|
|
1321
|
-
}
|
|
1286
|
+
if (val1 === lastLit) continue;
|
|
1322
1287
|
lastLit = val1;
|
|
1323
1288
|
}
|
|
1324
1289
|
wlist.data[2 * next] = val1;
|
|
@@ -1327,7 +1292,6 @@ export class Simplifier {
|
|
|
1327
1292
|
}
|
|
1328
1293
|
wlist.setEnd(next);
|
|
1329
1294
|
}
|
|
1330
|
-
this.numSubsumed += Math.trunc(numElim / 2);
|
|
1331
1295
|
}
|
|
1332
1296
|
|
|
1333
1297
|
private subsume() {
|
|
@@ -1390,14 +1354,6 @@ export class Simplifier {
|
|
|
1390
1354
|
}
|
|
1391
1355
|
}
|
|
1392
1356
|
|
|
1393
|
-
private numNonlearnedBin(lit: number) {
|
|
1394
|
-
const wlist = this.solver.watches[lit ^ 1];
|
|
1395
|
-
let count = 0;
|
|
1396
|
-
for (let index = 0; index < wlist.size; index++)
|
|
1397
|
-
if (wlist.isBinary(index) && !wlist.isLearned(index)) count++;
|
|
1398
|
-
return count;
|
|
1399
|
-
}
|
|
1400
|
-
|
|
1401
1357
|
private orderVarsForElim() {
|
|
1402
1358
|
const solver = this.solver;
|
|
1403
1359
|
const sizes = this.useList.size;
|
|
@@ -1409,8 +1365,8 @@ export class Simplifier {
|
|
|
1409
1365
|
if (solver.valueVar(boolVar) !== L_UNDEF) continue;
|
|
1410
1366
|
const numPos = sizes[2 * boolVar];
|
|
1411
1367
|
const numNeg = sizes[2 * boolVar + 1];
|
|
1412
|
-
const numBinPos =
|
|
1413
|
-
const numBinNeg =
|
|
1368
|
+
const numBinPos = solver.watches[2 * boolVar + 1].numNonlearnedBin();
|
|
1369
|
+
const numBinNeg = solver.watches[2 * boolVar].numNonlearnedBin();
|
|
1414
1370
|
costs[boolVar] =
|
|
1415
1371
|
(Math.imul(2 * numPos, numNeg) +
|
|
1416
1372
|
Math.imul(numPos, numBinNeg) +
|
|
@@ -1536,8 +1492,8 @@ export class Simplifier {
|
|
|
1536
1492
|
if (solver.valueVar(boolVar) !== L_UNDEF) return false;
|
|
1537
1493
|
const posLit = 2 * boolVar;
|
|
1538
1494
|
const negLit = 2 * boolVar + 1;
|
|
1539
|
-
const numBinPos =
|
|
1540
|
-
const numBinNeg =
|
|
1495
|
+
const numBinPos = solver.watches[negLit].numNonlearnedBin();
|
|
1496
|
+
const numBinNeg = solver.watches[posLit].numNonlearnedBin();
|
|
1541
1497
|
const numPos = this.useList.numIrredundant(posLit) + numBinPos;
|
|
1542
1498
|
const numNeg = this.useList.numIrredundant(negLit) + numBinNeg;
|
|
1543
1499
|
if (numPos >= this.resOccCutoff && numNeg >= this.resOccCutoff) return false;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver.h, src/sat/sat_solver.cpp, src/sat/sat_gc.cpp,
|
|
2
|
-
// src/sat/sat_justification.h, src/util/ema.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
5
3
|
import { RandomGen } from "../random-gen";
|
|
6
4
|
import type { ResourceLimit } from "../rlimit";
|
|
7
5
|
import { AsymmBranch } from "./asymm-branch";
|
|
8
6
|
import { Cleaner } from "./cleaner";
|
|
9
|
-
import { ClauseArena, NULL_LITERAL } from "./clause";
|
|
7
|
+
import { ClauseArena, NULL_LITERAL, UINT_MAX } from "./clause";
|
|
10
8
|
import {
|
|
11
9
|
GC_DYN_PSM,
|
|
12
10
|
GC_GLUE,
|
|
@@ -68,9 +66,9 @@ export interface SatExtension {
|
|
|
68
66
|
flushRoots(): void;
|
|
69
67
|
initUseList(useVars: Set<number>): void;
|
|
70
68
|
findMutexes(lits: number[], mutexes: number[][]): void;
|
|
69
|
+
toFormulas(lit2expr: (lit: number) => number, formulas: number[]): void;
|
|
71
70
|
}
|
|
72
71
|
|
|
73
|
-
const UINT_MAX = 4294967295;
|
|
74
72
|
const RANDOM_MAX_VALUE = 0x7fff;
|
|
75
73
|
|
|
76
74
|
const S_SAT = 0;
|
|
@@ -106,11 +104,11 @@ interface Scope {
|
|
|
106
104
|
const getLuby = (index: number) => {
|
|
107
105
|
let size = 1;
|
|
108
106
|
let sequence = 0;
|
|
109
|
-
while (size < index
|
|
107
|
+
while (size < index) {
|
|
110
108
|
sequence++;
|
|
111
109
|
size = 2 * size + 1;
|
|
112
110
|
}
|
|
113
|
-
let remaining = index;
|
|
111
|
+
let remaining = index - 1;
|
|
114
112
|
while (size - 1 !== remaining) {
|
|
115
113
|
size = (size - 1) >> 1;
|
|
116
114
|
sequence--;
|
|
@@ -124,7 +122,7 @@ const sortClauses = (clauses: number[], isLess: (first: number, second: number)
|
|
|
124
122
|
|
|
125
123
|
export class Solver {
|
|
126
124
|
config: SatConfig;
|
|
127
|
-
rand
|
|
125
|
+
rand: RandomGen;
|
|
128
126
|
arena = new ClauseArena();
|
|
129
127
|
cleaner: Cleaner;
|
|
130
128
|
mc = new ModelConverter();
|
|
@@ -156,7 +154,6 @@ export class Solver {
|
|
|
156
154
|
private varCount = 0;
|
|
157
155
|
justVal: number[] = [];
|
|
158
156
|
justKind: number[] = [];
|
|
159
|
-
decision: boolean[] = [];
|
|
160
157
|
mark: boolean[] = [];
|
|
161
158
|
litMark: boolean[] = [];
|
|
162
159
|
eliminated: boolean[] = [];
|
|
@@ -216,7 +213,7 @@ export class Solver {
|
|
|
216
213
|
isSimplifyEnabled = true;
|
|
217
214
|
isRestartEnabled = true;
|
|
218
215
|
lemma: number[] = [];
|
|
219
|
-
private incremental
|
|
216
|
+
private incremental: boolean;
|
|
220
217
|
private assumptions: number[] = [];
|
|
221
218
|
private assumptionSet = new Set<number>();
|
|
222
219
|
readonly userScopeLiterals: number[] = [];
|
|
@@ -240,7 +237,7 @@ export class Solver {
|
|
|
240
237
|
this.asymmBranch = new AsymmBranch(this, params);
|
|
241
238
|
this.probing = new Probing(this, params);
|
|
242
239
|
this.updateParams();
|
|
243
|
-
this.mkVar(false
|
|
240
|
+
this.mkVar(false);
|
|
244
241
|
}
|
|
245
242
|
|
|
246
243
|
private updateParams() {
|
|
@@ -333,7 +330,7 @@ export class Solver {
|
|
|
333
330
|
}
|
|
334
331
|
}
|
|
335
332
|
|
|
336
|
-
mkVar(isExternal: boolean
|
|
333
|
+
mkVar(isExternal: boolean) {
|
|
337
334
|
this.isModelCurrent = false;
|
|
338
335
|
const boolVar = this.varCount++;
|
|
339
336
|
this.activeVars.push(boolVar);
|
|
@@ -349,7 +346,6 @@ export class Solver {
|
|
|
349
346
|
this.justLevel[boolVar] = UINT_MAX;
|
|
350
347
|
this.justVal.push(0);
|
|
351
348
|
this.justKind.push(JUSTIFICATION_NONE);
|
|
352
|
-
this.decision.push(isDecision);
|
|
353
349
|
this.eliminated.push(false);
|
|
354
350
|
this.external.push(isExternal);
|
|
355
351
|
this.varScope.push(this.scopeLvl);
|
|
@@ -401,10 +397,7 @@ export class Solver {
|
|
|
401
397
|
}
|
|
402
398
|
|
|
403
399
|
mkClauseCore(lits: number[], isRedundant: boolean, isTheory = false): number {
|
|
404
|
-
if (!isRedundant || isTheory)
|
|
405
|
-
if (!this.simplifyClause(lits)) return -1;
|
|
406
|
-
if (!this.isSearching) this.mc.addClause(lits);
|
|
407
|
-
}
|
|
400
|
+
if ((!isRedundant || isTheory) && !this.simplifyClause(lits)) return -1;
|
|
408
401
|
switch (lits.length) {
|
|
409
402
|
case 0:
|
|
410
403
|
this.setConflict();
|
|
@@ -722,7 +715,7 @@ export class Solver {
|
|
|
722
715
|
this.trail.push(lit);
|
|
723
716
|
}
|
|
724
717
|
|
|
725
|
-
|
|
718
|
+
propagate(isUpdating: boolean) {
|
|
726
719
|
if (this.isExtPropagating()) this.ext?.unitPropagate?.();
|
|
727
720
|
while (this.qhead < this.trail.length && !this.isInconsistent) {
|
|
728
721
|
do {
|
|
@@ -737,10 +730,6 @@ export class Solver {
|
|
|
737
730
|
return !this.isInconsistent;
|
|
738
731
|
}
|
|
739
732
|
|
|
740
|
-
propagate(isUpdating: boolean) {
|
|
741
|
-
return this.propagateCore(isUpdating);
|
|
742
|
-
}
|
|
743
|
-
|
|
744
733
|
private propagateClause(clause: number, isUpdating: boolean, assignLevel: number, first: number) {
|
|
745
734
|
const arena = this.arena;
|
|
746
735
|
arena.markUsed(clause);
|
|
@@ -1082,6 +1071,14 @@ export class Solver {
|
|
|
1082
1071
|
this.reasonUnknown = "sat.canceled";
|
|
1083
1072
|
return true;
|
|
1084
1073
|
}
|
|
1074
|
+
if (this.config.restartMax <= this.restarts) {
|
|
1075
|
+
this.reasonUnknown = "sat.max.restarts";
|
|
1076
|
+
return true;
|
|
1077
|
+
}
|
|
1078
|
+
if (this.config.inprocessMax <= this.simplifications) {
|
|
1079
|
+
this.reasonUnknown = "sat.max.inprocess";
|
|
1080
|
+
return true;
|
|
1081
|
+
}
|
|
1085
1082
|
return this.reachedMaxConflicts();
|
|
1086
1083
|
}
|
|
1087
1084
|
|
|
@@ -1831,7 +1828,7 @@ export class Solver {
|
|
|
1831
1828
|
// variables, the scope variable is the last one.
|
|
1832
1829
|
userPush() {
|
|
1833
1830
|
this.popToBaseLevel();
|
|
1834
|
-
this.userScopeLiterals.push(2 * this.mkVar(true
|
|
1831
|
+
this.userScopeLiterals.push(2 * this.mkVar(true));
|
|
1835
1832
|
this.ext?.userPush?.();
|
|
1836
1833
|
}
|
|
1837
1834
|
|
|
@@ -1844,7 +1841,10 @@ export class Solver {
|
|
|
1844
1841
|
this.ext?.userPop?.(numScopes);
|
|
1845
1842
|
this.gcVars(maxVar);
|
|
1846
1843
|
this.qhead = 0;
|
|
1844
|
+
const wasSuspended = this.limit.isSuspended;
|
|
1845
|
+
this.limit.isSuspended = true;
|
|
1847
1846
|
this.propagate(false);
|
|
1847
|
+
this.limit.isSuspended = wasSuspended;
|
|
1848
1848
|
}
|
|
1849
1849
|
|
|
1850
1850
|
// gc_vars: drop the variables from maxVar on, with their watches and clauses.
|
|
@@ -1903,7 +1903,6 @@ export class Solver {
|
|
|
1903
1903
|
for (const values of [
|
|
1904
1904
|
this.justVal,
|
|
1905
1905
|
this.justKind,
|
|
1906
|
-
this.decision,
|
|
1907
1906
|
this.eliminated,
|
|
1908
1907
|
this.external,
|
|
1909
1908
|
this.varScope,
|