tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- 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/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- 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 +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- 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-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- 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 +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 +3 -5
- 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 +3 -5
- 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/md5.ts +26 -29
- 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 +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 +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 +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- 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/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- 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 +3 -7
- 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 +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- 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 +22 -17
- 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 +25 -7
- 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-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- 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 +2 -8
- 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 +21 -12
- 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 +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- 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 +27 -98
- 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 -16
- 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 +2 -4
- 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 +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- 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 +4 -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 +9 -6
- 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 +1 -2
- 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 +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 +1 -2
- 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 +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 +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- 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 +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 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- 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 +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- 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 +4 -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 +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- 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 +118 -105
- 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 +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- 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 +19 -13
- 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 +1 -2
- 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 +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- 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 +2 -3
- 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 +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 +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 +17 -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 +6 -9
- 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 +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- 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 +4 -4
- 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 +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- 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 +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- 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 +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- 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 +32 -35
- 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 +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- 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 +269 -130
- 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 +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- 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 -36
- 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/tlapm/cache.ts +8 -8
- 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 +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- 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,9 +1,12 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_context.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { type AstManager, getSymbolName, KIND_VAR, OP_AND, OP_IMPLIES, SORT_BOOL } from "../ast";
|
|
4
|
-
import { pushNotOwned } from "../ast-util";
|
|
3
|
+
import { flattenOrVector, pushNotOwned } from "../ast-util";
|
|
4
|
+
import { ObjHashtable, ObjMap } from "../hashtable";
|
|
5
5
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
|
-
import
|
|
6
|
+
import { ExprSafeReplace } from "../expr-safe-replace";
|
|
7
|
+
import { FuncInterp, ProtoModel } from "../proto-model";
|
|
8
|
+
import { RefVector } from "../ref-vector";
|
|
9
|
+
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "../rewriter";
|
|
7
10
|
import { getFreeVarSorts, VarSubst } from "../var-subst";
|
|
8
11
|
import type { DatalogContext, FpParams } from "./dl-context";
|
|
9
12
|
import { blastTermIte } from "./dl-mk-elim-term-ite";
|
|
@@ -35,10 +38,8 @@ export const L_GAVE_UP = 2;
|
|
|
35
38
|
|
|
36
39
|
class ReachFact {
|
|
37
40
|
tag = -1;
|
|
38
|
-
readonly justifications: ReachFact[] = [];
|
|
39
41
|
|
|
40
42
|
constructor(
|
|
41
|
-
readonly rule: Rule,
|
|
42
43
|
readonly fact: number,
|
|
43
44
|
readonly auxVars: readonly number[],
|
|
44
45
|
readonly isInit = false,
|
|
@@ -52,10 +53,7 @@ export class Lemma {
|
|
|
52
53
|
ctp: ProtoModel | undefined;
|
|
53
54
|
level: number;
|
|
54
55
|
bumped = 0;
|
|
55
|
-
weakness: number;
|
|
56
|
-
isExternal = false;
|
|
57
56
|
isBlocked = false;
|
|
58
|
-
isBackground = false;
|
|
59
57
|
|
|
60
58
|
constructor(
|
|
61
59
|
private context: SpacerContext,
|
|
@@ -64,7 +62,6 @@ export class Lemma {
|
|
|
64
62
|
pob?: Pob,
|
|
65
63
|
) {
|
|
66
64
|
this.level = level;
|
|
67
|
-
this.weakness = pob === undefined ? 65535 : pob.weakness;
|
|
68
65
|
this.pob = pob;
|
|
69
66
|
if (body !== -1) this.body = context.normalizer.normalize(body);
|
|
70
67
|
}
|
|
@@ -116,7 +113,6 @@ export class Lemma {
|
|
|
116
113
|
}
|
|
117
114
|
|
|
118
115
|
setLevel(level: number) {
|
|
119
|
-
this.pob?.blockedAt(level);
|
|
120
116
|
this.level = level;
|
|
121
117
|
}
|
|
122
118
|
|
|
@@ -132,8 +128,7 @@ export class Lemma {
|
|
|
132
128
|
const isLemmaLess = (manager: AstManager, first: Lemma, second: Lemma) =>
|
|
133
129
|
first.level !== second.level
|
|
134
130
|
? first.level < second.level
|
|
135
|
-
:
|
|
136
|
-
first.getExpr() !== second.getExpr();
|
|
131
|
+
: manager.ids[first.getExpr()] < manager.ids[second.getExpr()];
|
|
137
132
|
|
|
138
133
|
export class Pob {
|
|
139
134
|
readonly id: number;
|
|
@@ -141,7 +136,6 @@ export class Pob {
|
|
|
141
136
|
binding: number[] = [];
|
|
142
137
|
level: number;
|
|
143
138
|
depth: number;
|
|
144
|
-
desiredLevel = 0;
|
|
145
139
|
isOpen = true;
|
|
146
140
|
isUsingFarkas = true;
|
|
147
141
|
isInQueue = false;
|
|
@@ -149,8 +143,6 @@ export class Pob {
|
|
|
149
143
|
derivation: Derivation | undefined;
|
|
150
144
|
readonly kids: Pob[] = [];
|
|
151
145
|
readonly lemmas: Lemma[] = [];
|
|
152
|
-
blockedLevel = 0;
|
|
153
|
-
gas = 0;
|
|
154
146
|
|
|
155
147
|
constructor(
|
|
156
148
|
readonly parent: Pob | undefined,
|
|
@@ -163,7 +155,6 @@ export class Pob {
|
|
|
163
155
|
this.level = level;
|
|
164
156
|
this.depth = depth;
|
|
165
157
|
if (isAddingToParent && parent !== undefined) parent.kids.push(this);
|
|
166
|
-
if (parent !== undefined) this.gas = parent.gas;
|
|
167
158
|
}
|
|
168
159
|
|
|
169
160
|
setPost(post: number, binding: readonly number[] = []) {
|
|
@@ -175,7 +166,6 @@ export class Pob {
|
|
|
175
166
|
this.binding = [...other.binding];
|
|
176
167
|
this.level = other.level;
|
|
177
168
|
this.depth = other.depth;
|
|
178
|
-
this.desiredLevel = Math.max(this.desiredLevel, other.desiredLevel);
|
|
179
169
|
this.isOpen = other.isOpen;
|
|
180
170
|
this.isUsingFarkas = other.isUsingFarkas;
|
|
181
171
|
this.weakness = other.weakness;
|
|
@@ -198,17 +188,11 @@ export class Pob {
|
|
|
198
188
|
this.depth++;
|
|
199
189
|
this.weakness = 0;
|
|
200
190
|
}
|
|
201
|
-
|
|
202
|
-
blockedAt(level = 0) {
|
|
203
|
-
this.blockedLevel = Math.max(level, this.blockedLevel);
|
|
204
|
-
return this.blockedLevel;
|
|
205
|
-
}
|
|
206
191
|
}
|
|
207
192
|
|
|
208
193
|
const isPobLess = (manager: AstManager, first: Pob, second: Pob) => {
|
|
209
194
|
if (first.level !== second.level) return first.level < second.level;
|
|
210
195
|
if (first.depth !== second.depth) return first.depth < second.depth;
|
|
211
|
-
if (first.gas !== second.gas) return first.gas > second.gas;
|
|
212
196
|
const getSize = (post: number) => (manager.getOp(post) === OP_AND ? manager.getNumArgs(post) : 1);
|
|
213
197
|
if (getSize(first.post) !== getSize(second.post))
|
|
214
198
|
return getSize(first.post) < getSize(second.post);
|
|
@@ -218,6 +202,8 @@ const isPobLess = (manager: AstManager, first: Pob, second: Pob) => {
|
|
|
218
202
|
return firstHead !== secondHead ? firstHead < secondHead : first.id < second.id;
|
|
219
203
|
};
|
|
220
204
|
|
|
205
|
+
// A binary heap by isPobLess, which orders the proof obligations totally and reads nothing that
|
|
206
|
+
// changes while they are queued.
|
|
221
207
|
class PobQueue {
|
|
222
208
|
root: Pob | undefined;
|
|
223
209
|
maxLevel = 0;
|
|
@@ -226,25 +212,31 @@ class PobQueue {
|
|
|
226
212
|
|
|
227
213
|
constructor(private manager: AstManager) {}
|
|
228
214
|
|
|
229
|
-
private getMinIndex() {
|
|
230
|
-
let best = 0;
|
|
231
|
-
for (let index = 1; index < this.data.length; index++)
|
|
232
|
-
if (isPobLess(this.manager, this.data[index], this.data[best])) best = index;
|
|
233
|
-
return best;
|
|
234
|
-
}
|
|
235
|
-
|
|
236
215
|
top() {
|
|
237
216
|
if (this.data.length === 0) return undefined;
|
|
238
|
-
const top = this.data[
|
|
217
|
+
const top = this.data[0];
|
|
239
218
|
if (top.level > this.maxLevel) return undefined;
|
|
240
219
|
if (top.level === this.maxLevel && top.depth > this.minDepth) return undefined;
|
|
241
220
|
return top;
|
|
242
221
|
}
|
|
243
222
|
|
|
244
223
|
pop() {
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
|
|
224
|
+
const data = this.data;
|
|
225
|
+
data[0].isInQueue = false;
|
|
226
|
+
const moved = data[data.length - 1];
|
|
227
|
+
data.pop();
|
|
228
|
+
if (data.length === 0) return;
|
|
229
|
+
let index = 0;
|
|
230
|
+
for (let left = 1; left < data.length; left = 2 * index + 1) {
|
|
231
|
+
const child =
|
|
232
|
+
left + 1 < data.length && isPobLess(this.manager, data[left + 1], data[left])
|
|
233
|
+
? left + 1
|
|
234
|
+
: left;
|
|
235
|
+
if (!isPobLess(this.manager, data[child], moved)) break;
|
|
236
|
+
data[index] = data[child];
|
|
237
|
+
index = child;
|
|
238
|
+
}
|
|
239
|
+
data[index] = moved;
|
|
248
240
|
}
|
|
249
241
|
|
|
250
242
|
setRoot(root: Pob) {
|
|
@@ -265,7 +257,16 @@ class PobQueue {
|
|
|
265
257
|
push(pob: Pob) {
|
|
266
258
|
if (pob.isInQueue) return;
|
|
267
259
|
pob.isInQueue = true;
|
|
268
|
-
this.data
|
|
260
|
+
const data = this.data;
|
|
261
|
+
let index = data.length;
|
|
262
|
+
data.push(pob);
|
|
263
|
+
while (index > 0) {
|
|
264
|
+
const parent = (index - 1) >> 1;
|
|
265
|
+
if (!isPobLess(this.manager, pob, data[parent])) break;
|
|
266
|
+
data[index] = data[parent];
|
|
267
|
+
index = parent;
|
|
268
|
+
}
|
|
269
|
+
data[index] = pob;
|
|
269
270
|
}
|
|
270
271
|
|
|
271
272
|
incLevel() {
|
|
@@ -295,7 +296,6 @@ class Derivation {
|
|
|
295
296
|
|
|
296
297
|
constructor(
|
|
297
298
|
readonly parent: Pob,
|
|
298
|
-
readonly rule: Rule,
|
|
299
299
|
private trans: number,
|
|
300
300
|
private evars: number[],
|
|
301
301
|
) {}
|
|
@@ -391,7 +391,7 @@ class Derivation {
|
|
|
391
391
|
summaries.push(activeTrans);
|
|
392
392
|
const model = pt.isMustReachable(mkAndOf(manager, summaries));
|
|
393
393
|
if (model === undefined) return undefined;
|
|
394
|
-
const reachFact = pt.getUsedRf(model
|
|
394
|
+
const reachFact = pt.getUsedRf(model);
|
|
395
395
|
const summary = mkAndOf(manager, computeImplicantLiterals(model, [reachFact.fact]));
|
|
396
396
|
premise.isMust = true;
|
|
397
397
|
premise.summary = spacer.formulaN2o(summary, premise.oIndex);
|
|
@@ -428,11 +428,9 @@ class PredTransformer {
|
|
|
428
428
|
private pobs = new Map<number, Pob[]>();
|
|
429
429
|
nextPobId = 0;
|
|
430
430
|
readonly lemmas: Lemma[] = [];
|
|
431
|
-
private bgInvs: Lemma[] = [];
|
|
432
431
|
private frameSize = 0;
|
|
433
432
|
private isSorted = true;
|
|
434
433
|
readonly reachFacts: ReachFact[] = [];
|
|
435
|
-
private rfInitSize = 0;
|
|
436
434
|
private transitionClause: number[] = [];
|
|
437
435
|
private transition = -1;
|
|
438
436
|
private init = -1;
|
|
@@ -504,11 +502,8 @@ class PredTransformer {
|
|
|
504
502
|
return model;
|
|
505
503
|
}
|
|
506
504
|
|
|
507
|
-
getUsedRf(model: ProtoModel
|
|
508
|
-
for (const reachFact of this.reachFacts)
|
|
509
|
-
if (!isAll && reachFact.isInit) continue;
|
|
510
|
-
if (isFalseIn(model, reachFact.tag)) return reachFact;
|
|
511
|
-
}
|
|
505
|
+
getUsedRf(model: ProtoModel) {
|
|
506
|
+
for (const reachFact of this.reachFacts) if (isFalseIn(model, reachFact.tag)) return reachFact;
|
|
512
507
|
throw new SmtTacticError("spacer found no used reach fact");
|
|
513
508
|
}
|
|
514
509
|
|
|
@@ -567,20 +562,15 @@ class PredTransformer {
|
|
|
567
562
|
);
|
|
568
563
|
}
|
|
569
564
|
|
|
570
|
-
private addLemmaCore(lemma: Lemma
|
|
565
|
+
private addLemmaCore(lemma: Lemma) {
|
|
571
566
|
const level = lemma.level;
|
|
572
567
|
const expr = lemma.getExpr();
|
|
573
568
|
if (!isInftyLevel(level)) this.ensureLevel(level);
|
|
574
569
|
this.solver.assertExpr(expr, level);
|
|
575
|
-
for (const use of this.uses) use.addLemmaFromChild(this, lemma, nextLevel(level)
|
|
570
|
+
for (const use of this.uses) use.addLemmaFromChild(this, lemma, nextLevel(level));
|
|
576
571
|
}
|
|
577
572
|
|
|
578
|
-
private addLemmaFromChild(
|
|
579
|
-
child: PredTransformer,
|
|
580
|
-
lemma: Lemma,
|
|
581
|
-
level: number,
|
|
582
|
-
_isGroundOnly: boolean,
|
|
583
|
-
) {
|
|
573
|
+
private addLemmaFromChild(child: PredTransformer, lemma: Lemma, level: number) {
|
|
584
574
|
this.ensureLevel(level);
|
|
585
575
|
for (const fml of this.mkAssumptions(child.head, lemma.getExpr()))
|
|
586
576
|
this.solver.assertExpr(fml, level);
|
|
@@ -588,11 +578,6 @@ class PredTransformer {
|
|
|
588
578
|
|
|
589
579
|
addLemma(lemma: Lemma) {
|
|
590
580
|
const manager = this.manager;
|
|
591
|
-
if (lemma.isBackground) {
|
|
592
|
-
if (this.bgInvs.some((other) => other.getExpr() === lemma.getExpr())) return false;
|
|
593
|
-
this.bgInvs.push(lemma);
|
|
594
|
-
return true;
|
|
595
|
-
}
|
|
596
581
|
for (let index = 0; index < this.lemmas.length; index++) {
|
|
597
582
|
const old = this.lemmas[index];
|
|
598
583
|
if (old.getExpr() !== lemma.getExpr()) continue;
|
|
@@ -691,7 +676,6 @@ class PredTransformer {
|
|
|
691
676
|
? this.mkFreshRfTag()
|
|
692
677
|
: manager.getArg(this.extendInitial(reachFact.fact), 0);
|
|
693
678
|
this.reachFacts.push(reachFact);
|
|
694
|
-
if (reachFact.isInit) this.rfInitSize++;
|
|
695
679
|
const fml = mkOrOf(
|
|
696
680
|
manager,
|
|
697
681
|
lastTag === -1
|
|
@@ -700,7 +684,7 @@ class PredTransformer {
|
|
|
700
684
|
);
|
|
701
685
|
this.reachSolver.assertExpr(fml);
|
|
702
686
|
const fakeLemma = new Lemma(this.context, INFTY_LEVEL, fml);
|
|
703
|
-
for (const use of this.uses) use.addLemmaFromChild(this, fakeLemma, INFTY_LEVEL
|
|
687
|
+
for (const use of this.uses) use.addLemmaFromChild(this, fakeLemma, INFTY_LEVEL);
|
|
704
688
|
}
|
|
705
689
|
|
|
706
690
|
getLastRfTag() {
|
|
@@ -722,17 +706,6 @@ class PredTransformer {
|
|
|
722
706
|
return { summary: mkAndOf(manager, computeImplicantLiterals(model, conjs)), auxVars };
|
|
723
707
|
}
|
|
724
708
|
|
|
725
|
-
isBlocked(pob: Pob) {
|
|
726
|
-
this.ensureLevel(pob.level);
|
|
727
|
-
const solver = this.solver;
|
|
728
|
-
return solver.withLevel(pob.level, () => {
|
|
729
|
-
solver.core = undefined;
|
|
730
|
-
solver.model = undefined;
|
|
731
|
-
const result = solver.checkAssumptions([pob.post], [], [], []);
|
|
732
|
-
return result === L_FALSE ? solver.usesLevel : undefined;
|
|
733
|
-
});
|
|
734
|
-
}
|
|
735
|
-
|
|
736
709
|
mbp(vars: number[], fml: number, model: ProtoModel, isForcing: boolean) {
|
|
737
710
|
return qeProject(this.manager, vars, fml, model, !isForcing);
|
|
738
711
|
}
|
|
@@ -880,8 +853,7 @@ class PredTransformer {
|
|
|
880
853
|
|
|
881
854
|
initRfs() {
|
|
882
855
|
for (const ptRule of this.ptRules.values())
|
|
883
|
-
if (isInitRule(ptRule))
|
|
884
|
-
this.addRf(new ReachFact(ptRule.rule, ptRule.trans, ptRule.auxs, true));
|
|
856
|
+
if (isInitRule(ptRule)) this.addRf(new ReachFact(ptRule.trans, ptRule.auxs, true));
|
|
885
857
|
}
|
|
886
858
|
|
|
887
859
|
private initRules(pts: Map<number, PredTransformer>) {
|
|
@@ -941,7 +913,7 @@ class PredTransformer {
|
|
|
941
913
|
trans = context.simplify(mkAndOf(manager, side));
|
|
942
914
|
const inflation = context.params.getUint("spacer.blast_term_ite_inflation", 3);
|
|
943
915
|
if (inflation > 0) trans = context.simplify(blastTermIte(manager, trans, inflation));
|
|
944
|
-
if (rule.uninterpretedSize > 0 && !manager.
|
|
916
|
+
if (rule.uninterpretedSize > 0 && !manager.isGroundApp(trans))
|
|
945
917
|
throw new SmtTacticError("spacer: quantifier in a recursive rule");
|
|
946
918
|
if (manager.isFalse(trans)) return;
|
|
947
919
|
if (!this.ptRules.has(rule)) this.ptRules.set(rule, { rule, trans, auxs: auxVars, tag: -1 });
|
|
@@ -983,17 +955,15 @@ class PredTransformer {
|
|
|
983
955
|
return this.extendLit;
|
|
984
956
|
}
|
|
985
957
|
|
|
986
|
-
mkRf(
|
|
958
|
+
mkRf(model: ProtoModel, rule: Rule) {
|
|
987
959
|
const manager = this.manager;
|
|
988
960
|
const context = this.context;
|
|
989
961
|
const spacer = this.spacer;
|
|
990
|
-
const children: ReachFact[] = [];
|
|
991
962
|
const pathCons = [this.getTransition(rule)];
|
|
992
963
|
const vars: number[] = [];
|
|
993
964
|
this.getPredecessors(rule).forEach((predicate, index) => {
|
|
994
965
|
const pt = context.getPredTransformer(predicate);
|
|
995
966
|
const kid = pt.getUsedOriginRf(model, index);
|
|
996
|
-
children.push(kid);
|
|
997
967
|
pathCons.push(spacer.formulaN2o(kid.fact, index));
|
|
998
968
|
for (const decl of pt.sig) vars.push(spacer.constOf(spacer.o2o(decl, index)));
|
|
999
969
|
for (const variable of kid.auxVars)
|
|
@@ -1006,10 +976,7 @@ class PredTransformer {
|
|
|
1006
976
|
if (context.params.getBool("spacer.reach_dnf", true))
|
|
1007
977
|
result = mkAndOf(manager, computeImplicantLiterals(model, [result]));
|
|
1008
978
|
result = this.mbp(vars, result, model, true);
|
|
1009
|
-
|
|
1010
|
-
reachFact.justifications.push(...children);
|
|
1011
|
-
void pob;
|
|
1012
|
-
return reachFact;
|
|
979
|
+
return new ReachFact(result, isElimAux ? [] : auxVars);
|
|
1013
980
|
}
|
|
1014
981
|
|
|
1015
982
|
isMdlRfConsistent(rule: Rule, model: ProtoModel) {
|
|
@@ -1066,9 +1033,8 @@ export class SpacerContext {
|
|
|
1066
1033
|
queryPred = -1;
|
|
1067
1034
|
query: PredTransformer | undefined;
|
|
1068
1035
|
readonly pobQueue: PobQueue;
|
|
1069
|
-
lastResult = L_UNDEF;
|
|
1070
|
-
inductiveLevel = 0;
|
|
1071
1036
|
expandedLevel = 0;
|
|
1037
|
+
private inductiveLevel = 0;
|
|
1072
1038
|
private generalizers: LemmaGeneralizer[] = [];
|
|
1073
1039
|
readonly isUsingCtp: boolean;
|
|
1074
1040
|
readonly isUsingGroundPob: boolean;
|
|
@@ -1079,11 +1045,14 @@ export class SpacerContext {
|
|
|
1079
1045
|
readonly maxLevel: number;
|
|
1080
1046
|
readonly isPdrBfs: boolean;
|
|
1081
1047
|
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1048
|
+
readonly params: FpParams;
|
|
1049
|
+
readonly manager: AstManager;
|
|
1050
|
+
|
|
1051
|
+
constructor(readonly datalogContext: DatalogContext) {
|
|
1052
|
+
const params = datalogContext.params;
|
|
1053
|
+
const manager = datalogContext.manager;
|
|
1054
|
+
this.params = params;
|
|
1055
|
+
this.manager = manager;
|
|
1087
1056
|
this.spacerManager = new SpacerManager(manager);
|
|
1088
1057
|
this.normalizer = new SpacerNormalizer(manager);
|
|
1089
1058
|
this.zkConsts = new ZkConsts(manager);
|
|
@@ -1120,18 +1089,23 @@ export class SpacerContext {
|
|
|
1120
1089
|
}
|
|
1121
1090
|
|
|
1122
1091
|
updateRules(rules: RuleSet) {
|
|
1123
|
-
const rels = new Map<number, PredTransformer>();
|
|
1124
1092
|
const manager = this.manager;
|
|
1125
|
-
|
|
1093
|
+
// decl2rel and the grouped rules are tables that Z3 walks in slot order.
|
|
1094
|
+
const getHash = (decl: number) => manager.getDeclHash(decl);
|
|
1095
|
+
const heads = new ObjHashtable(getHash);
|
|
1096
|
+
for (const predicate of rules.getHeadPredicates()) heads.add(predicate);
|
|
1097
|
+
const table = new ObjMap<PredTransformer>(getHash);
|
|
1098
|
+
for (const predicate of heads) {
|
|
1126
1099
|
const pt = new PredTransformer(this, predicate);
|
|
1127
|
-
|
|
1100
|
+
table.set(predicate, pt);
|
|
1128
1101
|
pt.rules.push(...rules.getPredicateRules(predicate));
|
|
1129
1102
|
}
|
|
1130
1103
|
for (const rule of rules.rules)
|
|
1131
1104
|
for (let index = 0; index < rule.uninterpretedSize; index++) {
|
|
1132
1105
|
const predicate = rule.getTailDecl(manager, index);
|
|
1133
|
-
if (!
|
|
1106
|
+
if (!table.has(predicate)) table.set(predicate, new PredTransformer(this, predicate));
|
|
1134
1107
|
}
|
|
1108
|
+
const rels = new Map(table);
|
|
1135
1109
|
for (const [predicate, pt] of rels)
|
|
1136
1110
|
for (const dependency of rules.deps.getDeps(predicate)) {
|
|
1137
1111
|
const user = rels.get(dependency) as PredTransformer;
|
|
@@ -1141,14 +1115,11 @@ export class SpacerContext {
|
|
|
1141
1115
|
for (const pt of rels.values()) pt.initRfs();
|
|
1142
1116
|
this.rels = rels;
|
|
1143
1117
|
this.query = undefined;
|
|
1144
|
-
this.lastResult = L_UNDEF;
|
|
1145
|
-
this.inductiveLevel = 0;
|
|
1146
1118
|
this.generalizers = mkLemmaGeneralizers(this);
|
|
1147
1119
|
}
|
|
1148
1120
|
|
|
1149
1121
|
solve(fromLevel: number) {
|
|
1150
|
-
|
|
1151
|
-
return this.lastResult;
|
|
1122
|
+
return this.isUsingGpdr ? gpdrSolveCore(this) : this.solveCore(fromLevel);
|
|
1152
1123
|
}
|
|
1153
1124
|
|
|
1154
1125
|
private solveCore(fromLevel: number) {
|
|
@@ -1168,6 +1139,7 @@ export class SpacerContext {
|
|
|
1168
1139
|
this.pobQueue.incLevel();
|
|
1169
1140
|
level = this.pobQueue.maxLevel;
|
|
1170
1141
|
}
|
|
1142
|
+
this.datalogContext.isBounded = true;
|
|
1171
1143
|
return L_UNDEF;
|
|
1172
1144
|
}
|
|
1173
1145
|
|
|
@@ -1222,7 +1194,7 @@ export class SpacerContext {
|
|
|
1222
1194
|
pob.level = saved;
|
|
1223
1195
|
if (reach.result !== L_TRUE || !reach.isConcrete) return false;
|
|
1224
1196
|
if (reach.rule !== undefined && reach.rule.uninterpretedSize > 0)
|
|
1225
|
-
pob.pt.addRf(pob.pt.mkRf(
|
|
1197
|
+
pob.pt.addRf(pob.pt.mkRf(reach.model as ProtoModel, reach.rule));
|
|
1226
1198
|
const derivation = pob.derivation;
|
|
1227
1199
|
pob.derivation = undefined;
|
|
1228
1200
|
pob.close();
|
|
@@ -1273,7 +1245,7 @@ export class SpacerContext {
|
|
|
1273
1245
|
if (reach.isConcrete) {
|
|
1274
1246
|
const isRoot = this.pobQueue.isRoot(pob);
|
|
1275
1247
|
if (reach.rule !== undefined && (reach.rule.uninterpretedSize > 0 || isRoot))
|
|
1276
|
-
pob.pt.addRf(pob.pt.mkRf(
|
|
1248
|
+
pob.pt.addRf(pob.pt.mkRf(model, reach.rule), isRoot);
|
|
1277
1249
|
const derivation = pob.derivation;
|
|
1278
1250
|
pob.derivation = undefined;
|
|
1279
1251
|
pob.close();
|
|
@@ -1335,12 +1307,49 @@ export class SpacerContext {
|
|
|
1335
1307
|
isAllPropagated = pt.propagateToNextLevel(level) && isAllPropagated;
|
|
1336
1308
|
if (!isAllPropagated) continue;
|
|
1337
1309
|
for (const pt of this.rels.values()) pt.propagateToInfinity(level);
|
|
1338
|
-
if (level
|
|
1339
|
-
|
|
1340
|
-
|
|
1310
|
+
if (level > maxLevel) return false;
|
|
1311
|
+
this.inductiveLevel = level;
|
|
1312
|
+
return true;
|
|
1313
|
+
}
|
|
1314
|
+
}
|
|
1315
|
+
|
|
1316
|
+
// context::get_model with get_level_property and inductive_property::to_model, before the
|
|
1317
|
+
// model converter.
|
|
1318
|
+
getModel() {
|
|
1319
|
+
const manager = this.manager;
|
|
1320
|
+
const model = new ProtoModel(manager);
|
|
1321
|
+
const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
1322
|
+
for (const pt of this.rels.values()) {
|
|
1323
|
+
if (pt.head === this.queryPred) continue;
|
|
1324
|
+
const clauses = flattenAnd(manager, [
|
|
1325
|
+
this.spacerManager.formulaN2o(pt.getFormulas(this.inductiveLevel), 0),
|
|
1326
|
+
]).map((clause) => {
|
|
1327
|
+
const disjuncts = new RefVector(manager);
|
|
1328
|
+
disjuncts.push(clause);
|
|
1329
|
+
flattenOrVector(manager, disjuncts);
|
|
1330
|
+
const fixed = pin(manager, rewriter.mkOr([...disjuncts.items]));
|
|
1331
|
+
disjuncts.reset();
|
|
1332
|
+
return fixed;
|
|
1333
|
+
});
|
|
1334
|
+
const replace = new ExprSafeReplace(manager);
|
|
1335
|
+
pt.sig.forEach((decl, index) =>
|
|
1336
|
+
replace.insert(
|
|
1337
|
+
this.spacerManager.constOf(decl),
|
|
1338
|
+
pin(manager, manager.mkVar(index, manager.funcDecls[decl].range)),
|
|
1339
|
+
),
|
|
1340
|
+
);
|
|
1341
|
+
const property = replace.apply(pin(manager, rewriter.mkAnd(clauses)));
|
|
1342
|
+
replace.release();
|
|
1343
|
+
if (pt.sig.length === 0) model.registerConst(pt.head, property);
|
|
1344
|
+
else {
|
|
1345
|
+
const interp = new FuncInterp(manager, pt.sig.length);
|
|
1346
|
+
interp.setElse(property);
|
|
1347
|
+
model.registerFunc(pt.head, interp);
|
|
1341
1348
|
}
|
|
1342
|
-
|
|
1349
|
+
manager.decRef(property);
|
|
1343
1350
|
}
|
|
1351
|
+
rewriter.release();
|
|
1352
|
+
return model;
|
|
1344
1353
|
}
|
|
1345
1354
|
|
|
1346
1355
|
createChildren(
|
|
@@ -1361,7 +1370,7 @@ export class SpacerContext {
|
|
|
1361
1370
|
];
|
|
1362
1371
|
phi = pt.mbp(vars, phi, model, this.isUsingGroundPob);
|
|
1363
1372
|
if (this.isUsingGpdr && predicates.length > 1) return gpdrCreateSplitChildren();
|
|
1364
|
-
const derivation = new Derivation(pob,
|
|
1373
|
+
const derivation = new Derivation(pob, phi, vars);
|
|
1365
1374
|
for (let index = 0; index < predicates.length; index++) {
|
|
1366
1375
|
const premisePt = this.getPredTransformer(predicates[index]);
|
|
1367
1376
|
const summary = premisePt.getOriginSummary(
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_dl_interface.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { L_FALSE } from "../lbool";
|
|
4
|
-
import
|
|
3
|
+
import { ProtoModel } from "../proto-model";
|
|
4
|
+
import type { DatalogContext, Engine, ModelConverter } from "./dl-context";
|
|
5
5
|
import { MkSlice } from "./dl-mk-slice";
|
|
6
6
|
import { RuleSet } from "./dl-rule-set";
|
|
7
7
|
import { applyDefaultTransformation, transformRules } from "./dl-rule-transformer";
|
|
@@ -10,6 +10,9 @@ import { SpacerContext } from "./spacer-context";
|
|
|
10
10
|
// Each query gets a fresh spacer context, where Z3 keeps the lemmas of a previous query whose
|
|
11
11
|
// rules subsume the new ones.
|
|
12
12
|
export class SpacerDlInterface implements Engine {
|
|
13
|
+
private spacer: SpacerContext | undefined;
|
|
14
|
+
private modelConverters: readonly ModelConverter[] = [];
|
|
15
|
+
|
|
13
16
|
constructor(private context: DatalogContext) {}
|
|
14
17
|
|
|
15
18
|
query(query: number) {
|
|
@@ -28,14 +31,22 @@ export class SpacerDlInterface implements Engine {
|
|
|
28
31
|
const spacerRules = new RuleSet(context);
|
|
29
32
|
spacerRules.replaceRules(rules);
|
|
30
33
|
spacerRules.close();
|
|
31
|
-
context.recordTransformedRules();
|
|
32
34
|
context.reopen();
|
|
33
35
|
context.replaceRules(oldRules);
|
|
34
36
|
context.manager.limit.checkpoint();
|
|
35
|
-
const spacer = new SpacerContext(context
|
|
37
|
+
const spacer = new SpacerContext(context);
|
|
38
|
+
this.spacer = spacer;
|
|
39
|
+
this.modelConverters = context.modelConverters ?? [];
|
|
36
40
|
spacer.setQuery(queryPred);
|
|
37
41
|
spacer.updateRules(spacerRules);
|
|
38
42
|
if (spacerRules.rules.length === 0) return L_FALSE;
|
|
39
43
|
return spacer.solve(params.getUint("spacer.min_level", 0));
|
|
40
44
|
}
|
|
45
|
+
|
|
46
|
+
getModel() {
|
|
47
|
+
return this.modelConverters.reduceRight(
|
|
48
|
+
(model, convert) => convert(model),
|
|
49
|
+
this.spacer?.getModel() ?? new ProtoModel(this.context.manager),
|
|
50
|
+
);
|
|
51
|
+
}
|
|
41
52
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_ind_lemma_generalizer.cpp,
|
|
2
|
-
// src/muz/spacer/spacer_generalizers.cpp, src/muz/spacer/spacer_util.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { MBQI_MAX_ITERATIONS } from "../context";
|
|
5
2
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
6
3
|
import {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_manager.cpp, src/muz/spacer/spacer_sym_mux.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, getSymbolName, KIND_APP } from "../ast";
|
|
4
2
|
import { RewriterTpl } from "../rewriter-tpl";
|
|
5
3
|
import { pin } from "./spacer-util";
|
|
@@ -126,8 +124,4 @@ export class SpacerManager {
|
|
|
126
124
|
formulaN2o(expr: number, oIndex: number) {
|
|
127
125
|
return this.shiftExpr(expr, 0, oIndex + 1);
|
|
128
126
|
}
|
|
129
|
-
|
|
130
|
-
formulaO2o(expr: number, sourceIndex: number, targetIndex: number) {
|
|
131
|
-
return this.shiftExpr(expr, sourceIndex + 1, targetIndex + 1);
|
|
132
|
-
}
|
|
133
127
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_pdr.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
4
3
|
import { L_GAVE_UP, type Pob, type SpacerContext } from "./spacer-context";
|
|
@@ -158,9 +157,9 @@ class ModelSearch {
|
|
|
158
157
|
}
|
|
159
158
|
}
|
|
160
159
|
|
|
161
|
-
// Z3 closes
|
|
162
|
-
// root of a reachable query stays open and
|
|
163
|
-
// children close are closed here, up to the root.
|
|
160
|
+
// Deviation from Z3: gpdr_check_reachability closes only the node that reaches its premises
|
|
161
|
+
// (set_closed), so the root of a reachable query stays open and Z3 answers unreachable
|
|
162
|
+
// (spacer_pdr.cpp). The parents that all their children close are closed here, up to the root.
|
|
164
163
|
const closeNode = (node: ModelNode, root: ModelNode) => {
|
|
165
164
|
node.isClosed = true;
|
|
166
165
|
for (let parent = node.parent; parent?.isOneClosed(); parent = parent.parent)
|
|
@@ -211,6 +210,7 @@ export const gpdrSolveCore = (context: SpacerContext) => {
|
|
|
211
210
|
if (reachable !== L_FALSE) return reachable;
|
|
212
211
|
if (level > 0 && context.propagate(context.expandedLevel, level)) return L_FALSE;
|
|
213
212
|
}
|
|
213
|
+
context.datalogContext.isBounded = true;
|
|
214
214
|
return L_UNDEF;
|
|
215
215
|
};
|
|
216
216
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// MIT license, see z3-license.txt. Cores are subset cores: the port has no proofs to interpolate.
|
|
1
|
+
// Cores are subset cores: the port has no proofs to interpolate.
|
|
3
2
|
import { MBQI_MAX_ITERATIONS } from "../context";
|
|
4
3
|
import { type AstManager, KIND_APP, SORT_BOOL } from "../ast";
|
|
5
4
|
import { flattenAndVector } from "../ast-util";
|
|
@@ -9,7 +8,7 @@ import { RandomGen } from "../random-gen";
|
|
|
9
8
|
import { RefVector } from "../ref-vector";
|
|
10
9
|
import { SmtKernel } from "../smt-kernel";
|
|
11
10
|
import type { SpacerManager } from "./spacer-manager";
|
|
12
|
-
import { INFTY_LEVEL, isInftyLevel,
|
|
11
|
+
import { INFTY_LEVEL, isInftyLevel, pin } from "./spacer-util";
|
|
13
12
|
|
|
14
13
|
class DefManager {
|
|
15
14
|
readonly expr2proxy = new Map<number, number>();
|
|
@@ -186,9 +185,7 @@ export class PropSolver {
|
|
|
186
185
|
private random: RandomGen;
|
|
187
186
|
core: number[] | undefined;
|
|
188
187
|
model: { value: ProtoModel | undefined } | undefined;
|
|
189
|
-
isSubsetBasedCore = false;
|
|
190
188
|
usesLevel = INFTY_LEVEL;
|
|
191
|
-
isDeltaLevel = false;
|
|
192
189
|
isInLevel = false;
|
|
193
190
|
currentLevel = 0;
|
|
194
191
|
|
|
@@ -225,10 +222,8 @@ export class PropSolver {
|
|
|
225
222
|
}
|
|
226
223
|
|
|
227
224
|
private assertLevelAtoms(level: number) {
|
|
228
|
-
for (let index = 0; index < this.levelPreds.length; index++)
|
|
229
|
-
|
|
230
|
-
this.context.pushBg(isActive ? this.negLevelAtoms[index] : this.posLevelAtoms[index]);
|
|
231
|
-
}
|
|
225
|
+
for (let index = 0; index < this.levelPreds.length; index++)
|
|
226
|
+
this.context.pushBg(index >= level ? this.negLevelAtoms[index] : this.posLevelAtoms[index]);
|
|
232
227
|
}
|
|
233
228
|
|
|
234
229
|
assertExpr(form: number, level = INFTY_LEVEL) {
|
|
@@ -324,7 +319,6 @@ export class PropSolver {
|
|
|
324
319
|
if (context.getNumBg() > numBg) context.popBg(context.getNumBg() - numBg);
|
|
325
320
|
this.core = undefined;
|
|
326
321
|
this.model = undefined;
|
|
327
|
-
this.isSubsetBasedCore = false;
|
|
328
322
|
return result;
|
|
329
323
|
}
|
|
330
324
|
|
|
@@ -336,9 +330,4 @@ export class PropSolver {
|
|
|
336
330
|
this.isInLevel = saved;
|
|
337
331
|
return result;
|
|
338
332
|
}
|
|
339
|
-
|
|
340
|
-
isFalseInModel(expr: number) {
|
|
341
|
-
const model = this.model?.value;
|
|
342
|
-
return model !== undefined && isFalseIn(model, expr);
|
|
343
|
-
}
|
|
344
333
|
}
|