tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d166e0ae9
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 +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +14 -4
- package/dist/index.d.ts +14 -4
- 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 +69 -69
- package/dist/prove.js +79 -79
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +46 -44
- package/dist/transfer.js +42 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -78
- package/src/check.ts +474 -209
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +5 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +29 -9
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +96 -37
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +152 -55
- package/src/exit-codes.ts +29 -13
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +172 -83
- package/src/liveness.ts +52 -11
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +0 -2
- 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 +1 -1
- 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/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/source.ts +2 -0
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +115 -145
- package/src/pretty-print.ts +1 -1
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +4 -8
- package/src/prover/isabelle/isar/context.ts +0 -4
- package/src/prover/isabelle/isar/induct.ts +0 -4
- package/src/prover/isabelle/isar/method.ts +0 -2
- package/src/prover/isabelle/isar/proof.ts +0 -2
- package/src/prover/isabelle/isar/rule-cases.ts +8 -8
- package/src/prover/isabelle/isar/toplevel.ts +0 -4
- 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 +0 -2
- 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/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +0 -1
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +11 -4
- 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 +12 -3
- package/src/prover/smt/solver/asserted-formulas.ts +169 -59
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +0 -2
- package/src/prover/smt/solver/ast.ts +63 -15
- package/src/prover/smt/solver/auf-solver.ts +23 -13
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -3
- 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 +0 -1
- package/src/prover/smt/solver/bound-simplifier.ts +11 -15
- package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
- 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 +1 -3
- package/src/prover/smt/solver/bv1-blast.ts +0 -2
- 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 +35 -20
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +0 -2
- package/src/prover/smt/solver/check-logic.ts +0 -1
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -26
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +67 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -8
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +0 -3
- package/src/prover/smt/solver/dependent-expr-state.ts +26 -18
- 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 +0 -1
- package/src/prover/smt/solver/dom-simplify.ts +0 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -22
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +0 -1
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- 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 +5 -10
- package/src/prover/smt/solver/enode.ts +0 -1
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -3
- 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 +0 -2
- package/src/prover/smt/solver/euf/egraph.ts +4 -12
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -5
- package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -7
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -4
- package/src/prover/smt/solver/euf/q-mbi.ts +0 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +0 -3
- package/src/prover/smt/solver/euf/q-solver.ts +0 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -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 +204 -80
- package/src/prover/smt/solver/factor.ts +36 -15
- package/src/prover/smt/solver/fd-solver.ts +148 -42
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +0 -1
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -3
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- 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 +1 -2
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -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 +0 -1
- 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 +0 -2
- 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 +0 -3
- package/src/prover/smt/solver/mam-compiler.ts +1 -2
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +0 -2
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +3 -3
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +0 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +1 -2
- package/src/prover/smt/solver/model-evaluator.ts +2 -1
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +85 -44
- package/src/prover/smt/solver/model-macro-solver.ts +0 -1
- 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 +22 -46
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -3
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -4
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -11
- package/src/prover/smt/solver/muz/hnf.ts +2 -3
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -3
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -4
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -5
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +0 -1
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -1
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -3
- package/src/prover/smt/solver/muz/spacer-util.ts +0 -1
- package/src/prover/smt/solver/muz/substitution.ts +0 -2
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +3 -3
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -94
- 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 +375 -218
- 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 +77 -75
- 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 +22 -9
- package/src/prover/smt/solver/opt-nlsat.ts +29 -19
- package/src/prover/smt/solver/opt-pareto.ts +19 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +10 -7
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +1 -3
- package/src/prover/smt/solver/parallel-tactic.ts +1 -3
- package/src/prover/smt/solver/pattern-inference.ts +0 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -7
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +75 -19
- package/src/prover/smt/solver/probes.ts +90 -27
- package/src/prover/smt/solver/propagate-values.ts +0 -1
- package/src/prover/smt/solver/proto-model.ts +8 -9
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +0 -1
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -6
- 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 +0 -1
- package/src/prover/smt/solver/qe.ts +3 -4
- 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 +23 -9
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +0 -1
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +0 -2
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +0 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -2
- package/src/prover/smt/solver/recfun-rewriter.ts +0 -1
- 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 +7 -7
- package/src/prover/smt/solver/rewriter.ts +31 -26
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +0 -2
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -2
- package/src/prover/smt/solver/sat/clause.ts +0 -3
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +1 -4
- package/src/prover/smt/solver/sat/consequences.ts +0 -1
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -29
- package/src/prover/smt/solver/sat/model-converter.ts +1 -3
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -3
- package/src/prover/smt/solver/sat/probing.ts +0 -2
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -8
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -9
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +1 -4
- package/src/prover/smt/solver/sat/solver.ts +25 -49
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +0 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -2
- package/src/prover/smt/solver/seq-derive.ts +4 -9
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -3
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +0 -2
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -2
- package/src/prover/smt/solver/seq-re-util.ts +1 -3
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +2 -4
- package/src/prover/smt/solver/seq-rewriter.ts +31 -31
- 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 +1 -3
- package/src/prover/smt/solver/smt-kernel.ts +48 -9
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +99 -15
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +589 -226
- package/src/prover/smt/solver/smtlib-script.ts +674 -197
- package/src/prover/smt/solver/solve-eqs.ts +36 -39
- package/src/prover/smt/solver/solver.ts +19 -5
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +332 -191
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +0 -2
- package/src/prover/smt/solver/theory-bv.ts +13 -5
- 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 +1 -2
- 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 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +10 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -4
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -2
- package/src/prover/smt/solver/theory-pb.ts +24 -9
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +0 -1
- package/src/prover/smt/solver/theory-seq-regex.ts +0 -1
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -3
- package/src/prover/smt/solver/theory-seq-state.ts +2 -23
- package/src/prover/smt/solver/theory-seq.ts +0 -1
- package/src/prover/smt/solver/theory.ts +0 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -2
- package/src/prover/smt/solver/var-subst.ts +0 -1
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1072 -253
- package/src/runtime.ts +11 -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 +38 -30
- package/src/sany/generator-proofs.ts +6 -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 +262 -144
- package/src/simulate.ts +168 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +56 -22
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- 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/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
@@ -15,10 +14,12 @@ import {
|
|
|
15
14
|
import { mkNot } from "./ast-util";
|
|
16
15
|
import { simplifyInjAxiom } from "./inj-axiom";
|
|
17
16
|
import { MacroManager } from "./macro-finder";
|
|
17
|
+
import { ElimBoundsRw } from "./elim-bounds";
|
|
18
18
|
import { DefinedNames, Nnf } from "./nnf";
|
|
19
19
|
import { PatternInference } from "./pattern-inference";
|
|
20
20
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
21
21
|
import { PullQuant } from "./pull-quant";
|
|
22
|
+
import { NgPushAppIteRw } from "./push-app-ite";
|
|
22
23
|
import { RefVector } from "./ref-vector";
|
|
23
24
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
24
25
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
@@ -69,6 +70,43 @@ export class PatternInferenceRw extends RewriterTpl {
|
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
72
|
|
|
73
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
74
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
75
|
+
readonly definitions: RefVector;
|
|
76
|
+
private lims: number[] = [];
|
|
77
|
+
|
|
78
|
+
constructor(
|
|
79
|
+
manager: AstManager,
|
|
80
|
+
private names: DefinedNames,
|
|
81
|
+
) {
|
|
82
|
+
super(manager);
|
|
83
|
+
this.definitions = new RefVector(manager);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
87
|
+
const manager = this.manager;
|
|
88
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
89
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
90
|
+
manager.incRef(ite);
|
|
91
|
+
const named = this.names.mkName(ite);
|
|
92
|
+
manager.decRef(ite);
|
|
93
|
+
if (named.definition === -1) return -1;
|
|
94
|
+
this.definitions.push(named.definition);
|
|
95
|
+
manager.decRef(named.definition);
|
|
96
|
+
manager.incRef(named.name);
|
|
97
|
+
return named.name;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
push() {
|
|
101
|
+
this.lims.push(this.definitions.size);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pop() {
|
|
105
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
106
|
+
this.lims.pop();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
72
110
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
73
111
|
if (left === right) return false;
|
|
74
112
|
const isLeftValue = manager.isValue(left);
|
|
@@ -157,9 +195,15 @@ export class AssertedFormulas {
|
|
|
157
195
|
private isReducePending = true;
|
|
158
196
|
private isNnfCnf = true;
|
|
159
197
|
private isEq2Ineq = false;
|
|
198
|
+
private isEliminatingTermIte = false;
|
|
199
|
+
private isLiftingNonGroundIte = false;
|
|
200
|
+
private isEliminatingBounds = false;
|
|
160
201
|
private names: DefinedNames;
|
|
202
|
+
private termIteElim: ElimTermIteRw;
|
|
161
203
|
private patternInference: PatternInferenceRw;
|
|
162
204
|
private bvSharing: MaxBvSharing;
|
|
205
|
+
private ngLiftIte: NgPushAppIteRw;
|
|
206
|
+
private boundsElim: ElimBoundsRw;
|
|
163
207
|
hasQuantifiers = false;
|
|
164
208
|
readonly macros: MacroManager;
|
|
165
209
|
isInconsistent = false;
|
|
@@ -178,8 +222,11 @@ export class AssertedFormulas {
|
|
|
178
222
|
// string literals reach the seq theory as concatenations of units.
|
|
179
223
|
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
180
224
|
this.names = new DefinedNames(manager);
|
|
225
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
181
226
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
182
227
|
this.bvSharing = new MaxBvSharing(manager);
|
|
228
|
+
this.ngLiftIte = new NgPushAppIteRw(manager);
|
|
229
|
+
this.boundsElim = new ElimBoundsRw(manager);
|
|
183
230
|
}
|
|
184
231
|
|
|
185
232
|
push() {
|
|
@@ -197,6 +244,7 @@ export class AssertedFormulas {
|
|
|
197
244
|
this.bvSharing.popScope();
|
|
198
245
|
this.macros.popScope();
|
|
199
246
|
this.names.pop();
|
|
247
|
+
this.termIteElim.pop();
|
|
200
248
|
this.substitution.pop();
|
|
201
249
|
this.formulas.shrink(scope.numFormulas);
|
|
202
250
|
this.qhead = scope.numFormulas;
|
|
@@ -208,6 +256,7 @@ export class AssertedFormulas {
|
|
|
208
256
|
this.substitution.push();
|
|
209
257
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
210
258
|
this.names.push();
|
|
259
|
+
this.termIteElim.push();
|
|
211
260
|
this.macros.pushScope();
|
|
212
261
|
this.bvSharing.pushScope();
|
|
213
262
|
}
|
|
@@ -233,9 +282,22 @@ export class AssertedFormulas {
|
|
|
233
282
|
setup(config: SmtConfig) {
|
|
234
283
|
this.isNnfCnf = config.isNnfCnf;
|
|
235
284
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
285
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
286
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
287
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
236
288
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
237
289
|
}
|
|
238
290
|
|
|
291
|
+
updateParams(config: SmtConfig) {
|
|
292
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
293
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
294
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
295
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
296
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
297
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
298
|
+
this.isReducePending = true;
|
|
299
|
+
}
|
|
300
|
+
|
|
239
301
|
getNumFormulas() {
|
|
240
302
|
return this.formulas.size;
|
|
241
303
|
}
|
|
@@ -244,55 +306,51 @@ export class AssertedFormulas {
|
|
|
244
306
|
return this.formulas.items;
|
|
245
307
|
}
|
|
246
308
|
|
|
247
|
-
|
|
309
|
+
getQhead() {
|
|
310
|
+
return this.qhead;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
commit(qhead = this.formulas.size) {
|
|
314
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
315
|
+
this.macros.markForbidden(committed);
|
|
316
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
317
|
+
this.qhead = qhead;
|
|
318
|
+
}
|
|
319
|
+
|
|
248
320
|
reduce() {
|
|
249
|
-
if (this.qhead === this.formulas.size) return
|
|
250
|
-
if (!this.
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
if (this.isFindingMacros) this.macros.markForbidden(result);
|
|
254
|
-
for (const formula of result) this.substitution.update(formula);
|
|
255
|
-
this.qhead = this.formulas.size;
|
|
256
|
-
return result;
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
private reduceCore() {
|
|
260
|
-
if (this.macros.hasMacros()) this.findMacros();
|
|
321
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
322
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
323
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
324
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
261
325
|
this.setEliminateAnd(false);
|
|
262
|
-
this.propagateValues();
|
|
263
|
-
if (this.
|
|
264
|
-
this.
|
|
265
|
-
if (this.isInconsistent) return;
|
|
266
|
-
if (this.isNnfCnf || this.hasQuantifiers) {
|
|
267
|
-
this.isReducePending = true;
|
|
268
|
-
this.nnfCnf();
|
|
269
|
-
if (this.isInconsistent) return;
|
|
270
|
-
}
|
|
326
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
327
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
328
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
271
329
|
this.setEliminateAnd(true);
|
|
272
|
-
this.reduceAsserted();
|
|
273
|
-
if (this.
|
|
274
|
-
if (this.
|
|
275
|
-
|
|
276
|
-
if (this.
|
|
277
|
-
this.
|
|
278
|
-
|
|
279
|
-
if (
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
)
|
|
283
|
-
this.isReducePending = true;
|
|
284
|
-
if (this.isInconsistent) return;
|
|
285
|
-
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
286
|
-
this.isReducePending = true;
|
|
287
|
-
if (this.isInconsistent) return;
|
|
288
|
-
this.reduceAsserted();
|
|
289
|
-
if (this.isInconsistent) return;
|
|
290
|
-
this.isReducePending = true;
|
|
291
|
-
this.flattenClauses();
|
|
292
|
-
if (this.isInconsistent) return;
|
|
330
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
331
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
332
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
333
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
334
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
335
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
336
|
+
return;
|
|
337
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
338
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
339
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
293
341
|
this.flushCache();
|
|
294
342
|
}
|
|
295
343
|
|
|
344
|
+
private isCanceled() {
|
|
345
|
+
return !this.manager.limit.inc();
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
349
|
+
if (!isApplying) return true;
|
|
350
|
+
step();
|
|
351
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
352
|
+
}
|
|
353
|
+
|
|
296
354
|
private pushAssertion(expr: number, result: RefVector) {
|
|
297
355
|
const manager = this.manager;
|
|
298
356
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -331,8 +389,43 @@ export class AssertedFormulas {
|
|
|
331
389
|
return formula;
|
|
332
390
|
}
|
|
333
391
|
|
|
392
|
+
private elimTermIte() {
|
|
393
|
+
const elim = this.termIteElim;
|
|
394
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
395
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
396
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
397
|
+
this.flushCache();
|
|
398
|
+
this.reduceAsserted();
|
|
399
|
+
elim.reset();
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
403
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
404
|
+
this.flushCache();
|
|
405
|
+
this.reduceAsserted();
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
private liftNonGroundIte() {
|
|
409
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
private refineInjAxioms() {
|
|
413
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private elimBounds() {
|
|
417
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
private inferPatterns() {
|
|
421
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
private maximizeBvSharing() {
|
|
425
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
426
|
+
}
|
|
427
|
+
|
|
334
428
|
private findMacros() {
|
|
335
|
-
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
336
429
|
this.isReducePending = true;
|
|
337
430
|
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
338
431
|
this.flushCache();
|
|
@@ -361,19 +454,22 @@ export class AssertedFormulas {
|
|
|
361
454
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
362
455
|
const manager = this.manager;
|
|
363
456
|
const formulas = new RefVector(manager);
|
|
364
|
-
let isChanged = false;
|
|
365
457
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
366
458
|
const formula = this.formulas.items[index];
|
|
367
459
|
const result = simplify(formula);
|
|
368
460
|
if (result === formula) formulas.push(formula);
|
|
369
461
|
else {
|
|
370
462
|
this.pushAssertion(result, formulas);
|
|
371
|
-
|
|
463
|
+
this.isReducePending = true;
|
|
372
464
|
}
|
|
373
465
|
manager.decRef(result);
|
|
466
|
+
if (this.isCanceled()) {
|
|
467
|
+
formulas.reset();
|
|
468
|
+
return false;
|
|
469
|
+
}
|
|
374
470
|
}
|
|
375
471
|
this.swapFormulas(formulas);
|
|
376
|
-
return
|
|
472
|
+
return true;
|
|
377
473
|
}
|
|
378
474
|
|
|
379
475
|
private reduceAsserted() {
|
|
@@ -411,28 +507,42 @@ export class AssertedFormulas {
|
|
|
411
507
|
}
|
|
412
508
|
|
|
413
509
|
private nnfCnf() {
|
|
510
|
+
this.isReducePending = true;
|
|
414
511
|
const manager = this.manager;
|
|
415
512
|
const nnf = new Nnf(manager, this.names);
|
|
416
513
|
const formulas = new RefVector(manager);
|
|
417
514
|
const todo = new RefVector(manager);
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
515
|
+
const isFinished = (() => {
|
|
516
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
517
|
+
todo.reset();
|
|
518
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
519
|
+
todo.push(result);
|
|
520
|
+
if (this.isCanceled()) {
|
|
521
|
+
manager.decRef(result);
|
|
522
|
+
return false;
|
|
523
|
+
}
|
|
524
|
+
for (let position = 0; position < todo.size; position++) {
|
|
525
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
526
|
+
manager.decRef(result);
|
|
527
|
+
result = rewritten;
|
|
528
|
+
if (this.isCanceled()) {
|
|
529
|
+
manager.decRef(result);
|
|
530
|
+
return false;
|
|
531
|
+
}
|
|
532
|
+
this.pushAssertion(result, formulas);
|
|
533
|
+
}
|
|
424
534
|
manager.decRef(result);
|
|
425
|
-
result = rewritten;
|
|
426
|
-
this.pushAssertion(result, formulas);
|
|
427
535
|
}
|
|
428
|
-
|
|
429
|
-
}
|
|
430
|
-
this.swapFormulas(formulas);
|
|
536
|
+
return true;
|
|
537
|
+
})();
|
|
538
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
431
539
|
todo.reset();
|
|
540
|
+
formulas.reset();
|
|
432
541
|
nnf.release();
|
|
433
542
|
}
|
|
434
543
|
|
|
435
544
|
private flattenClauses() {
|
|
545
|
+
this.isReducePending = true;
|
|
436
546
|
const manager = this.manager;
|
|
437
547
|
const mkNegation = (expr: number) =>
|
|
438
548
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_ARRAY,
|
|
4
3
|
FAMILY_BV,
|
|
@@ -251,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
|
|
|
251
250
|
return compareSorts(manager, firstKey.range, secondKey.range);
|
|
252
251
|
};
|
|
253
252
|
|
|
254
|
-
|
|
253
|
+
const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
255
254
|
if (first === second) return 0;
|
|
256
255
|
const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
|
|
257
256
|
if (byKind !== 0) return byKind;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast.h, src/ast/ast.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { FlatLiterals } from "./flat-literals";
|
|
4
3
|
import { astArrayHash, bytesHash, combineHash, getCompositeHash, mkMix, stringHash } from "./hash";
|
|
@@ -299,7 +298,6 @@ export const OP_INTERNAL_STRING_STRIDOF = SEQ_OP_BASE + 64;
|
|
|
299
298
|
export const OP_INTERNAL_STRING_POWER = SEQ_OP_BASE + 65;
|
|
300
299
|
export const OP_INTERNAL_REGEXP_EMPTY = SEQ_OP_BASE + 66;
|
|
301
300
|
export const OP_INTERNAL_REGEXP_FULL_CHAR = SEQ_OP_BASE + 67;
|
|
302
|
-
export const OP_RE_IS_NULLABLE = SEQ_OP_BASE + 68;
|
|
303
301
|
export const OP_SEQ_SKOLEM = SEQ_OP_BASE + 69;
|
|
304
302
|
const CHAR_OP_BASE = 600;
|
|
305
303
|
export const OP_CHAR_CONST = CHAR_OP_BASE;
|
|
@@ -317,6 +315,7 @@ export const OP_AT_LEAST_K = PB_OP_BASE + 1;
|
|
|
317
315
|
export const OP_PB_LE = PB_OP_BASE + 2;
|
|
318
316
|
export const OP_PB_GE = PB_OP_BASE + 3;
|
|
319
317
|
export const OP_PB_EQ = PB_OP_BASE + 4;
|
|
318
|
+
export const OP_PB_AUX_BOOL = PB_OP_BASE + 5;
|
|
320
319
|
const RECFUN_OP_BASE = 900;
|
|
321
320
|
export const OP_FUN_DEFINED = RECFUN_OP_BASE;
|
|
322
321
|
export const OP_FUN_CASE_PRED = RECFUN_OP_BASE + 1;
|
|
@@ -612,7 +611,10 @@ const hasOwnDeclHash = (family: number) =>
|
|
|
612
611
|
family === FAMILY_RECFUN;
|
|
613
612
|
|
|
614
613
|
// The declarations that Z3 makes once and counts references to, rather than on each use.
|
|
615
|
-
const
|
|
614
|
+
const isDeclared = (funcDecl: FuncDecl) =>
|
|
615
|
+
funcDecl.family === FAMILY_USER ||
|
|
616
|
+
funcDecl.family === FAMILY_RECFUN ||
|
|
617
|
+
funcDecl.op === OP_PB_AUX_BOOL;
|
|
616
618
|
|
|
617
619
|
export class AstManager {
|
|
618
620
|
private numNodes = 0;
|
|
@@ -675,6 +677,7 @@ export class AstManager {
|
|
|
675
677
|
private charSort = -1;
|
|
676
678
|
private stringSort = -1;
|
|
677
679
|
private reglanSort = -1;
|
|
680
|
+
private isSeqPluginInitialized = false;
|
|
678
681
|
private seqSorts = new Map<string, number>();
|
|
679
682
|
private seqDecls = new Map<string, number>();
|
|
680
683
|
private stringValues: number[][] = [];
|
|
@@ -740,6 +743,17 @@ export class AstManager {
|
|
|
740
743
|
smallId: Z3_SMALL_IDS.get(builtin[2]) ?? -1,
|
|
741
744
|
parameters: [],
|
|
742
745
|
});
|
|
746
|
+
// Each has one signature in Z3, and a model's tables hash its declaration as a user's.
|
|
747
|
+
for (const entry of Z3_BUILTINS)
|
|
748
|
+
if (entry[0] === OP_DIV0 || entry[0] === OP_IDIV0 || entry[0] === OP_MOD0) {
|
|
749
|
+
const range = this.funcDecls[entry[0]].range;
|
|
750
|
+
this.declHashes[entry[0]] = this.getFuncDeclHash(
|
|
751
|
+
entry[1][0],
|
|
752
|
+
[range, range],
|
|
753
|
+
range,
|
|
754
|
+
getInfoHash(Z3_ARITH_FAMILY, entry[1][1], []),
|
|
755
|
+
);
|
|
756
|
+
}
|
|
743
757
|
this.trueExpr = this.mkApp(OP_TRUE, [], SORT_BOOL);
|
|
744
758
|
this.falseExpr = this.mkApp(OP_FALSE, [], SORT_BOOL);
|
|
745
759
|
this.incRef(this.trueExpr);
|
|
@@ -800,6 +814,15 @@ export class AstManager {
|
|
|
800
814
|
this.declRefCounts[decl] = 1;
|
|
801
815
|
this.mkSmallId();
|
|
802
816
|
this.macros.set(decl, expr);
|
|
817
|
+
return decl;
|
|
818
|
+
}
|
|
819
|
+
|
|
820
|
+
eraseRecFunDef(decl: number) {
|
|
821
|
+
this.macros.delete(decl);
|
|
822
|
+
const def = this.recFunDefs.get(decl);
|
|
823
|
+
if (def === undefined) return;
|
|
824
|
+
for (const recFunCase of def.cases) this.recFunCases.delete(recFunCase.pred);
|
|
825
|
+
this.recFunDefs.delete(decl);
|
|
803
826
|
}
|
|
804
827
|
|
|
805
828
|
// recfun::def: the declaration of a defined function, which the definition holds.
|
|
@@ -882,7 +905,7 @@ export class AstManager {
|
|
|
882
905
|
|
|
883
906
|
private holdDecl(expr: number) {
|
|
884
907
|
const decl = this.decls[expr];
|
|
885
|
-
if (
|
|
908
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
886
909
|
this.incDeclRef(decl);
|
|
887
910
|
return;
|
|
888
911
|
}
|
|
@@ -901,7 +924,7 @@ export class AstManager {
|
|
|
901
924
|
|
|
902
925
|
private releaseDecl(expr: number) {
|
|
903
926
|
const decl = this.decls[expr];
|
|
904
|
-
if (
|
|
927
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
905
928
|
this.declRefCounts[decl]--;
|
|
906
929
|
if (this.declRefCounts[decl] > 0) return -1;
|
|
907
930
|
this.deletedDecls.add(decl);
|
|
@@ -984,9 +1007,11 @@ export class AstManager {
|
|
|
984
1007
|
withoutTemporaries<T>(body: () => T) {
|
|
985
1008
|
const outer = this.temporariesMark;
|
|
986
1009
|
this.temporariesMark = -1;
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
1010
|
+
try {
|
|
1011
|
+
return body();
|
|
1012
|
+
} finally {
|
|
1013
|
+
this.temporariesMark = outer;
|
|
1014
|
+
}
|
|
990
1015
|
}
|
|
991
1016
|
|
|
992
1017
|
releaseLater(expr: number) {
|
|
@@ -1291,7 +1316,7 @@ export class AstManager {
|
|
|
1291
1316
|
return this.sortNames.length - 1;
|
|
1292
1317
|
}
|
|
1293
1318
|
|
|
1294
|
-
// Z3 makes the Char
|
|
1319
|
+
// Z3 makes the Char and String sorts at startup, so they take no small id.
|
|
1295
1320
|
mkCharSort() {
|
|
1296
1321
|
if (this.charSort === -1)
|
|
1297
1322
|
this.charSort = this.addSort(
|
|
@@ -1316,8 +1341,18 @@ export class AstManager {
|
|
|
1316
1341
|
return this.stringSort;
|
|
1317
1342
|
}
|
|
1318
1343
|
|
|
1344
|
+
initSeqPlugin() {
|
|
1345
|
+
if (this.isSeqPluginInitialized) return;
|
|
1346
|
+
this.isSeqPluginInitialized = true;
|
|
1347
|
+
const element = this.mkTypeParameter(0);
|
|
1348
|
+
this.mkReSort(this.mkSeqSort(element));
|
|
1349
|
+
this.mkReSort(this.mkStringSort());
|
|
1350
|
+
this.mkArraySort([element, SORT_BOOL]);
|
|
1351
|
+
}
|
|
1352
|
+
|
|
1319
1353
|
mkSeqSort(element: number) {
|
|
1320
1354
|
if (element === this.mkCharSort()) return this.mkStringSort();
|
|
1355
|
+
this.initSeqPlugin();
|
|
1321
1356
|
const key = `s${element}`;
|
|
1322
1357
|
const existing = this.seqSorts.get(key);
|
|
1323
1358
|
if (existing !== undefined) return existing;
|
|
@@ -1336,6 +1371,7 @@ export class AstManager {
|
|
|
1336
1371
|
}
|
|
1337
1372
|
|
|
1338
1373
|
mkReSort(seq: number) {
|
|
1374
|
+
this.initSeqPlugin();
|
|
1339
1375
|
const isReglan = seq === this.mkStringSort();
|
|
1340
1376
|
if (isReglan && this.reglanSort !== -1) return this.reglanSort;
|
|
1341
1377
|
const key = `r${seq}`;
|
|
@@ -1350,11 +1386,9 @@ export class AstManager {
|
|
|
1350
1386
|
getInfoHash(Z3_SEQ_FAMILY, Z3_RE_SORT, [this.sortHashes[seq]]),
|
|
1351
1387
|
),
|
|
1352
1388
|
);
|
|
1389
|
+
this.mkSmallId();
|
|
1353
1390
|
if (isReglan) this.reglanSort = sort;
|
|
1354
|
-
else
|
|
1355
|
-
this.mkSmallId();
|
|
1356
|
-
this.seqSorts.set(key, sort);
|
|
1357
|
-
}
|
|
1391
|
+
else this.seqSorts.set(key, sort);
|
|
1358
1392
|
return sort;
|
|
1359
1393
|
}
|
|
1360
1394
|
|
|
@@ -1733,7 +1767,7 @@ export class AstManager {
|
|
|
1733
1767
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1734
1768
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1735
1769
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1736
|
-
const domain = Array.from({ length: arity }, (
|
|
1770
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1737
1771
|
op === OP_PATTERN
|
|
1738
1772
|
? this.sorts[args[index]]
|
|
1739
1773
|
: op === OP_ITE && index === 0
|
|
@@ -1874,6 +1908,20 @@ export class AstManager {
|
|
|
1874
1908
|
return decl;
|
|
1875
1909
|
}
|
|
1876
1910
|
|
|
1911
|
+
mkPbAuxBool() {
|
|
1912
|
+
const decl = this.addDecl(
|
|
1913
|
+
this.mkFreshVarName("pb"),
|
|
1914
|
+
FAMILY_PB,
|
|
1915
|
+
OP_PB_AUX_BOOL,
|
|
1916
|
+
[],
|
|
1917
|
+
SORT_BOOL,
|
|
1918
|
+
[],
|
|
1919
|
+
getInfoHash(Z3_PB_FAMILY, OP_PB_AUX_BOOL - PB_OP_BASE, []),
|
|
1920
|
+
);
|
|
1921
|
+
this.declRefCounts[decl] = 0;
|
|
1922
|
+
return this.mkApp(decl, [], SORT_BOOL);
|
|
1923
|
+
}
|
|
1924
|
+
|
|
1877
1925
|
mkFreshVarName(prefix: string | null) {
|
|
1878
1926
|
return `${prefix ?? "var"}!${this.mkFreshId()}`;
|
|
1879
1927
|
}
|
|
@@ -2052,7 +2100,7 @@ export class AstManager {
|
|
|
2052
2100
|
}
|
|
2053
2101
|
|
|
2054
2102
|
get am() {
|
|
2055
|
-
this.algebraicManager ??= new AlgebraicManager();
|
|
2103
|
+
this.algebraicManager ??= new AlgebraicManager(this.limit);
|
|
2056
2104
|
return this.algebraicManager;
|
|
2057
2105
|
}
|
|
2058
2106
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_finder.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
|
-
import { OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
2
|
+
import { KIND_APP, OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
4
3
|
import { combineHash } from "./hash";
|
|
5
4
|
import { ObjHashtable, ObjMap } from "./hashtable";
|
|
6
5
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
@@ -246,14 +245,30 @@ export class AufSolver {
|
|
|
246
245
|
|
|
247
246
|
private cleanupInstantiationSets() {
|
|
248
247
|
const manager = this.manager;
|
|
248
|
+
const containsArray = (expr: number) => {
|
|
249
|
+
const visited = new Set<number>();
|
|
250
|
+
const todo = [expr];
|
|
251
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
252
|
+
if (visited.has(term)) continue;
|
|
253
|
+
visited.add(term);
|
|
254
|
+
if (manager.isArraySort(manager.sorts[term])) return true;
|
|
255
|
+
manager.pushArgs(term, todo);
|
|
256
|
+
}
|
|
257
|
+
return false;
|
|
258
|
+
};
|
|
259
|
+
const shouldCleanup = (value: number | null) =>
|
|
260
|
+
value === null ||
|
|
261
|
+
(!manager.isValue(value) &&
|
|
262
|
+
!manager.isArraySort(manager.sorts[value]) &&
|
|
263
|
+
(manager.kinds[value] !== KIND_APP ||
|
|
264
|
+
manager.getNumArgs(value) === 0 ||
|
|
265
|
+
!containsArray(value)));
|
|
249
266
|
for (const node of this.nodes) {
|
|
250
267
|
if (!node.isRoot()) continue;
|
|
251
268
|
const set = node.getInstantiationSet();
|
|
252
269
|
const toDelete: number[] = [];
|
|
253
|
-
for (const term of set.elems.keys())
|
|
254
|
-
|
|
255
|
-
if (value === null || !manager.isUniqueValue(value)) toDelete.push(term);
|
|
256
|
-
}
|
|
270
|
+
for (const term of set.elems.keys())
|
|
271
|
+
if (shouldCleanup(this.eval(term, true))) toDelete.push(term);
|
|
257
272
|
for (const term of toDelete) set.remove(term);
|
|
258
273
|
this.resetEvalCache();
|
|
259
274
|
}
|
|
@@ -286,18 +301,13 @@ export class AufSolver {
|
|
|
286
301
|
return result;
|
|
287
302
|
}
|
|
288
303
|
|
|
289
|
-
private areDistinct(first: number, second: number) {
|
|
290
|
-
const manager = this.manager;
|
|
291
|
-
return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
|
|
292
|
-
}
|
|
293
|
-
|
|
294
304
|
private pickInstanceDiffExceptions(node: Node, exceptionValues: number[]) {
|
|
295
305
|
let result: number | null = null;
|
|
296
306
|
let resultGeneration = Number.POSITIVE_INFINITY;
|
|
297
307
|
for (const entry of node.getInstantiationSet().elems) {
|
|
298
308
|
const value = this.eval(entry[0], true);
|
|
299
309
|
if (value === null) return result;
|
|
300
|
-
const isFound = exceptionValues.some((other) => !this.areDistinct(value, other));
|
|
310
|
+
const isFound = exceptionValues.some((other) => !this.manager.areDistinct(value, other));
|
|
301
311
|
if (!isFound && (result === null || entry[1] < resultGeneration)) {
|
|
302
312
|
result = entry[0];
|
|
303
313
|
resultGeneration = entry[1];
|
|
@@ -332,7 +342,7 @@ export class AufSolver {
|
|
|
332
342
|
if (kValue === null) return false;
|
|
333
343
|
for (const exception of exceptions) {
|
|
334
344
|
const value = this.eval(exception, true);
|
|
335
|
-
if (value !== null && !this.areDistinct(kValue, value))
|
|
345
|
+
if (value !== null && !this.manager.areDistinct(kValue, value))
|
|
336
346
|
this.newConstraints.push(this.manager.mkNot(this.manager.mkEq(k, exception)));
|
|
337
347
|
}
|
|
338
348
|
return true;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp,
|
|
2
|
-
// src/tactic/bv/bit_blaster_tactic.cpp, src/tactic/bv/bit_blaster_model_converter.cpp), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -91,6 +88,8 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
91
88
|
readonly keys: number[] = [];
|
|
92
89
|
readonly values: RefVector;
|
|
93
90
|
readonly newbits: number[] = [];
|
|
91
|
+
private keyLimits: number[] = [];
|
|
92
|
+
private newbitLimits: number[] = [];
|
|
94
93
|
|
|
95
94
|
constructor(
|
|
96
95
|
manager: AstManager,
|
|
@@ -126,6 +125,30 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
126
125
|
return this.const2bits.get(decl);
|
|
127
126
|
}
|
|
128
127
|
|
|
128
|
+
getNumScopes() {
|
|
129
|
+
return this.keyLimits.length;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
push() {
|
|
133
|
+
this.keyLimits.push(this.keys.length);
|
|
134
|
+
this.newbitLimits.push(this.newbits.length);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
pop(numScopes: number) {
|
|
138
|
+
if (numScopes === 0) return;
|
|
139
|
+
const manager = this.manager;
|
|
140
|
+
const size = this.keyLimits.length - numScopes;
|
|
141
|
+
const keyLimit = this.keyLimits[size];
|
|
142
|
+
for (const decl of this.keys.splice(keyLimit)) {
|
|
143
|
+
this.const2bits.delete(decl);
|
|
144
|
+
manager.decDeclRef(decl);
|
|
145
|
+
}
|
|
146
|
+
this.values.shrink(keyLimit);
|
|
147
|
+
this.keyLimits.length = size;
|
|
148
|
+
for (const decl of this.newbits.splice(this.newbitLimits[size])) manager.decDeclRef(decl);
|
|
149
|
+
this.newbitLimits.length = size;
|
|
150
|
+
}
|
|
151
|
+
|
|
129
152
|
private mkConst(decl: number) {
|
|
130
153
|
const manager = this.manager;
|
|
131
154
|
const existing = this.const2bits.get(decl);
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h,
|
|
2
|
-
// src/ast/rewriter/bit_blaster/bit_blaster.cpp,
|
|
3
|
-
// src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtCanceledError } from "../../../errors";
|
|
5
2
|
import { OP_EQ, SORT_BOOL, type AstManager } from "./ast";
|
|
6
3
|
import { TACTIC_ARITH_OPTIONS } from "./arith-rewriter";
|