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,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.
|
|
@@ -841,28 +864,19 @@ export class AstManager {
|
|
|
841
864
|
domain: number[],
|
|
842
865
|
range: number,
|
|
843
866
|
) {
|
|
844
|
-
|
|
845
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
867
|
+
return this.addDecl(
|
|
846
868
|
name,
|
|
869
|
+
FAMILY_RECFUN,
|
|
870
|
+
op,
|
|
847
871
|
domain,
|
|
848
872
|
range,
|
|
873
|
+
parameters,
|
|
849
874
|
getInfoHash(
|
|
850
875
|
Z3_RECFUN_FAMILY,
|
|
851
876
|
op - RECFUN_OP_BASE,
|
|
852
877
|
op === OP_FUN_CASE_PRED ? [parameters[0], this.declHashes[parameters[1]]] : parameters,
|
|
853
878
|
),
|
|
854
879
|
);
|
|
855
|
-
this.funcDecls.push({
|
|
856
|
-
name,
|
|
857
|
-
family: FAMILY_RECFUN,
|
|
858
|
-
op,
|
|
859
|
-
domain,
|
|
860
|
-
range,
|
|
861
|
-
isSkolem: false,
|
|
862
|
-
smallId: this.mkSmallId(),
|
|
863
|
-
parameters,
|
|
864
|
-
});
|
|
865
|
-
return decl;
|
|
866
880
|
}
|
|
867
881
|
|
|
868
882
|
private getSignature(expr: number) {
|
|
@@ -891,7 +905,7 @@ export class AstManager {
|
|
|
891
905
|
|
|
892
906
|
private holdDecl(expr: number) {
|
|
893
907
|
const decl = this.decls[expr];
|
|
894
|
-
if (
|
|
908
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
895
909
|
this.incDeclRef(decl);
|
|
896
910
|
return;
|
|
897
911
|
}
|
|
@@ -910,7 +924,7 @@ export class AstManager {
|
|
|
910
924
|
|
|
911
925
|
private releaseDecl(expr: number) {
|
|
912
926
|
const decl = this.decls[expr];
|
|
913
|
-
if (
|
|
927
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
914
928
|
this.declRefCounts[decl]--;
|
|
915
929
|
if (this.declRefCounts[decl] > 0) return -1;
|
|
916
930
|
this.deletedDecls.add(decl);
|
|
@@ -1112,35 +1126,33 @@ export class AstManager {
|
|
|
1112
1126
|
}
|
|
1113
1127
|
|
|
1114
1128
|
mkSort(name: SmtSymbol) {
|
|
1115
|
-
this.
|
|
1129
|
+
const sort = this.addSort(
|
|
1130
|
+
getSymbolName(name),
|
|
1131
|
+
FAMILY_USER,
|
|
1132
|
+
[],
|
|
1116
1133
|
combineHash(
|
|
1117
1134
|
getSymbolHash(name),
|
|
1118
1135
|
getInfoHash(Z3_USER_SORT_FAMILY, this.getUserSortKind(name), []),
|
|
1119
1136
|
),
|
|
1120
1137
|
);
|
|
1121
|
-
this.sortNames.push(getSymbolName(name));
|
|
1122
|
-
this.sortFamilies.push(FAMILY_USER);
|
|
1123
|
-
this.sortWidths.push(0);
|
|
1124
|
-
this.sortSbits.push(0);
|
|
1125
|
-
this.sortParameters.push([]);
|
|
1126
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1127
1138
|
this.mkSmallId();
|
|
1128
|
-
return
|
|
1139
|
+
return sort;
|
|
1129
1140
|
}
|
|
1130
1141
|
|
|
1131
1142
|
mkBvSort(width: number) {
|
|
1132
1143
|
const existing = this.bvSorts.get(width);
|
|
1133
1144
|
if (existing !== undefined) return existing;
|
|
1134
|
-
this.
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1145
|
+
const sort = this.addSort(
|
|
1146
|
+
"bv",
|
|
1147
|
+
FAMILY_BV,
|
|
1148
|
+
[],
|
|
1149
|
+
combineHash(getSymbolHash("bv"), getInfoHash(Z3_BV_FAMILY, 0, [width])),
|
|
1150
|
+
width,
|
|
1151
|
+
0,
|
|
1152
|
+
width < 64 ? 1n << BigInt(width) : SORT_SIZE_VERY_BIG,
|
|
1153
|
+
);
|
|
1141
1154
|
// bv_decl_plugin makes the sorts up to 64 bits when Z3 starts.
|
|
1142
1155
|
if (width > 64) this.mkSmallId();
|
|
1143
|
-
const sort = this.sortNames.length - 1;
|
|
1144
1156
|
this.bvSorts.set(width, sort);
|
|
1145
1157
|
return sort;
|
|
1146
1158
|
}
|
|
@@ -1149,40 +1161,35 @@ export class AstManager {
|
|
|
1149
1161
|
const key = `${ebits}:${sbits}`;
|
|
1150
1162
|
const existing = this.fpSorts.get(key);
|
|
1151
1163
|
if (existing !== undefined) return existing;
|
|
1152
|
-
this.
|
|
1164
|
+
const sort = this.addSort(
|
|
1165
|
+
"FloatingPoint",
|
|
1166
|
+
FAMILY_FPA,
|
|
1167
|
+
[],
|
|
1153
1168
|
combineHash(
|
|
1154
1169
|
getSymbolHash("FloatingPoint"),
|
|
1155
1170
|
getInfoHash(Z3_FPA_FAMILY, Z3_FLOATING_POINT_SORT, [ebits, sbits]),
|
|
1156
1171
|
),
|
|
1172
|
+
ebits,
|
|
1173
|
+
sbits,
|
|
1174
|
+
SORT_SIZE_VERY_BIG,
|
|
1157
1175
|
);
|
|
1158
|
-
this.sortNames.push("FloatingPoint");
|
|
1159
|
-
this.sortFamilies.push(FAMILY_FPA);
|
|
1160
|
-
this.sortWidths.push(ebits);
|
|
1161
|
-
this.sortSbits.push(sbits);
|
|
1162
|
-
this.sortParameters.push([]);
|
|
1163
|
-
this.sortSizes.push(SORT_SIZE_VERY_BIG);
|
|
1164
1176
|
this.mkSmallId();
|
|
1165
|
-
const sort = this.sortNames.length - 1;
|
|
1166
1177
|
this.fpSorts.set(key, sort);
|
|
1167
1178
|
return sort;
|
|
1168
1179
|
}
|
|
1169
1180
|
|
|
1170
1181
|
mkRmSort() {
|
|
1171
1182
|
if (this.rmSort !== -1) return this.rmSort;
|
|
1172
|
-
this.
|
|
1183
|
+
this.rmSort = this.addSort(
|
|
1184
|
+
"RoundingMode",
|
|
1185
|
+
FAMILY_FPA,
|
|
1186
|
+
[],
|
|
1173
1187
|
combineHash(
|
|
1174
1188
|
getSymbolHash("RoundingMode"),
|
|
1175
1189
|
getInfoHash(Z3_FPA_FAMILY, Z3_ROUNDING_MODE_SORT, []),
|
|
1176
1190
|
),
|
|
1177
1191
|
);
|
|
1178
|
-
this.sortNames.push("RoundingMode");
|
|
1179
|
-
this.sortFamilies.push(FAMILY_FPA);
|
|
1180
|
-
this.sortWidths.push(0);
|
|
1181
|
-
this.sortSbits.push(0);
|
|
1182
|
-
this.sortParameters.push([]);
|
|
1183
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1184
1192
|
this.mkSmallId();
|
|
1185
|
-
this.rmSort = this.sortNames.length - 1;
|
|
1186
1193
|
return this.rmSort;
|
|
1187
1194
|
}
|
|
1188
1195
|
|
|
@@ -1202,27 +1209,44 @@ export class AstManager {
|
|
|
1202
1209
|
return this.sortSbits[sort];
|
|
1203
1210
|
}
|
|
1204
1211
|
|
|
1205
|
-
|
|
1206
|
-
|
|
1207
|
-
|
|
1208
|
-
|
|
1212
|
+
private addDecl(
|
|
1213
|
+
name: SmtSymbol,
|
|
1214
|
+
family: number,
|
|
1215
|
+
op: number,
|
|
1216
|
+
domain: number[],
|
|
1217
|
+
range: number,
|
|
1218
|
+
parameters: number[],
|
|
1219
|
+
infoHash: number,
|
|
1220
|
+
hasSmallId = true,
|
|
1221
|
+
) {
|
|
1209
1222
|
const decl = this.funcDecls.length;
|
|
1210
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1211
|
-
name,
|
|
1212
|
-
domain,
|
|
1213
|
-
range,
|
|
1214
|
-
getInfoHash(Z3_FPA_FAMILY, op - FPA_OP_BASE, parameters),
|
|
1215
|
-
);
|
|
1223
|
+
this.declHashes[decl] = this.getFuncDeclHash(name, domain, range, infoHash);
|
|
1216
1224
|
this.funcDecls.push({
|
|
1217
1225
|
name,
|
|
1218
|
-
family
|
|
1226
|
+
family,
|
|
1219
1227
|
op,
|
|
1220
1228
|
domain,
|
|
1221
1229
|
range,
|
|
1222
1230
|
isSkolem: false,
|
|
1223
|
-
smallId: this.mkSmallId(),
|
|
1231
|
+
smallId: hasSmallId ? this.mkSmallId() : -1,
|
|
1224
1232
|
parameters,
|
|
1225
1233
|
});
|
|
1234
|
+
return decl;
|
|
1235
|
+
}
|
|
1236
|
+
|
|
1237
|
+
mkFpaDecl(op: number, name: string, parameters: number[], domain: number[], range: number) {
|
|
1238
|
+
const key = `${op}:${name}:${parameters.join(",")}:${domain.join(",")}:${range}`;
|
|
1239
|
+
const existing = this.fpaDecls.get(key);
|
|
1240
|
+
if (existing !== undefined) return existing;
|
|
1241
|
+
const decl = this.addDecl(
|
|
1242
|
+
name,
|
|
1243
|
+
FAMILY_FPA,
|
|
1244
|
+
op,
|
|
1245
|
+
domain,
|
|
1246
|
+
range,
|
|
1247
|
+
parameters,
|
|
1248
|
+
getInfoHash(Z3_FPA_FAMILY, op - FPA_OP_BASE, parameters),
|
|
1249
|
+
);
|
|
1226
1250
|
this.fpaDecls.set(key, decl);
|
|
1227
1251
|
return decl;
|
|
1228
1252
|
}
|
|
@@ -1232,12 +1256,13 @@ export class AstManager {
|
|
|
1232
1256
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1233
1257
|
const existing = this.pbDecls.get(key);
|
|
1234
1258
|
if (existing !== undefined) return existing;
|
|
1235
|
-
const decl = this.
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1259
|
+
const decl = this.addDecl(
|
|
1260
|
+
PB_OP_NAMES[op - PB_OP_BASE],
|
|
1261
|
+
FAMILY_PB,
|
|
1262
|
+
op,
|
|
1239
1263
|
domain,
|
|
1240
1264
|
SORT_BOOL,
|
|
1265
|
+
[],
|
|
1241
1266
|
getInfoHash(
|
|
1242
1267
|
Z3_PB_FAMILY,
|
|
1243
1268
|
op - PB_OP_BASE,
|
|
@@ -1248,16 +1273,6 @@ export class AstManager {
|
|
|
1248
1273
|
),
|
|
1249
1274
|
),
|
|
1250
1275
|
);
|
|
1251
|
-
this.funcDecls.push({
|
|
1252
|
-
name,
|
|
1253
|
-
family: FAMILY_PB,
|
|
1254
|
-
op,
|
|
1255
|
-
domain,
|
|
1256
|
-
range: SORT_BOOL,
|
|
1257
|
-
isSkolem: false,
|
|
1258
|
-
smallId: this.mkSmallId(),
|
|
1259
|
-
parameters: [],
|
|
1260
|
-
});
|
|
1261
1276
|
this.pbParameters.set(decl, parameters);
|
|
1262
1277
|
this.pbDecls.set(key, decl);
|
|
1263
1278
|
return decl;
|
|
@@ -1280,18 +1295,26 @@ export class AstManager {
|
|
|
1280
1295
|
return this.fpValues[id];
|
|
1281
1296
|
}
|
|
1282
1297
|
|
|
1283
|
-
private addSort(
|
|
1298
|
+
private addSort(
|
|
1299
|
+
name: string,
|
|
1300
|
+
family: number,
|
|
1301
|
+
parameters: number[],
|
|
1302
|
+
hash: number,
|
|
1303
|
+
width = 0,
|
|
1304
|
+
sbits = 0,
|
|
1305
|
+
size = SORT_SIZE_INFINITE,
|
|
1306
|
+
) {
|
|
1284
1307
|
this.sortHashes.push(hash);
|
|
1285
1308
|
this.sortNames.push(name);
|
|
1286
1309
|
this.sortFamilies.push(family);
|
|
1287
|
-
this.sortWidths.push(
|
|
1288
|
-
this.sortSbits.push(
|
|
1310
|
+
this.sortWidths.push(width);
|
|
1311
|
+
this.sortSbits.push(sbits);
|
|
1289
1312
|
this.sortParameters.push(parameters);
|
|
1290
|
-
this.sortSizes.push(
|
|
1313
|
+
this.sortSizes.push(size);
|
|
1291
1314
|
return this.sortNames.length - 1;
|
|
1292
1315
|
}
|
|
1293
1316
|
|
|
1294
|
-
// Z3 makes the Char
|
|
1317
|
+
// Z3 makes the Char and String sorts at startup, so they take no small id.
|
|
1295
1318
|
mkCharSort() {
|
|
1296
1319
|
if (this.charSort === -1)
|
|
1297
1320
|
this.charSort = this.addSort(
|
|
@@ -1316,8 +1339,18 @@ export class AstManager {
|
|
|
1316
1339
|
return this.stringSort;
|
|
1317
1340
|
}
|
|
1318
1341
|
|
|
1342
|
+
initSeqPlugin() {
|
|
1343
|
+
if (this.isSeqPluginInitialized) return;
|
|
1344
|
+
this.isSeqPluginInitialized = true;
|
|
1345
|
+
const element = this.mkTypeParameter(0);
|
|
1346
|
+
this.mkReSort(this.mkSeqSort(element));
|
|
1347
|
+
this.mkReSort(this.mkStringSort());
|
|
1348
|
+
this.mkArraySort([element, SORT_BOOL]);
|
|
1349
|
+
}
|
|
1350
|
+
|
|
1319
1351
|
mkSeqSort(element: number) {
|
|
1320
1352
|
if (element === this.mkCharSort()) return this.mkStringSort();
|
|
1353
|
+
this.initSeqPlugin();
|
|
1321
1354
|
const key = `s${element}`;
|
|
1322
1355
|
const existing = this.seqSorts.get(key);
|
|
1323
1356
|
if (existing !== undefined) return existing;
|
|
@@ -1336,6 +1369,7 @@ export class AstManager {
|
|
|
1336
1369
|
}
|
|
1337
1370
|
|
|
1338
1371
|
mkReSort(seq: number) {
|
|
1372
|
+
this.initSeqPlugin();
|
|
1339
1373
|
const isReglan = seq === this.mkStringSort();
|
|
1340
1374
|
if (isReglan && this.reglanSort !== -1) return this.reglanSort;
|
|
1341
1375
|
const key = `r${seq}`;
|
|
@@ -1350,11 +1384,9 @@ export class AstManager {
|
|
|
1350
1384
|
getInfoHash(Z3_SEQ_FAMILY, Z3_RE_SORT, [this.sortHashes[seq]]),
|
|
1351
1385
|
),
|
|
1352
1386
|
);
|
|
1387
|
+
this.mkSmallId();
|
|
1353
1388
|
if (isReglan) this.reglanSort = sort;
|
|
1354
|
-
else
|
|
1355
|
-
this.mkSmallId();
|
|
1356
|
-
this.seqSorts.set(key, sort);
|
|
1357
|
-
}
|
|
1389
|
+
else this.seqSorts.set(key, sort);
|
|
1358
1390
|
return sort;
|
|
1359
1391
|
}
|
|
1360
1392
|
|
|
@@ -1394,27 +1426,19 @@ export class AstManager {
|
|
|
1394
1426
|
const existing = this.seqDecls.get(key);
|
|
1395
1427
|
if (existing !== undefined) return existing;
|
|
1396
1428
|
const isChar = op >= CHAR_OP_BASE;
|
|
1397
|
-
const decl = this.
|
|
1398
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1429
|
+
const decl = this.addDecl(
|
|
1399
1430
|
name,
|
|
1431
|
+
isChar ? FAMILY_CHAR : FAMILY_SEQ,
|
|
1432
|
+
op,
|
|
1400
1433
|
domain,
|
|
1401
1434
|
range,
|
|
1435
|
+
parameters,
|
|
1402
1436
|
getInfoHash(
|
|
1403
1437
|
isChar ? Z3_CHAR_FAMILY : Z3_SEQ_FAMILY,
|
|
1404
1438
|
op - (isChar ? CHAR_OP_BASE : SEQ_OP_BASE),
|
|
1405
1439
|
parameterHashes,
|
|
1406
1440
|
),
|
|
1407
1441
|
);
|
|
1408
|
-
this.funcDecls.push({
|
|
1409
|
-
name,
|
|
1410
|
-
family: isChar ? FAMILY_CHAR : FAMILY_SEQ,
|
|
1411
|
-
op,
|
|
1412
|
-
domain,
|
|
1413
|
-
range,
|
|
1414
|
-
isSkolem: false,
|
|
1415
|
-
smallId: this.mkSmallId(),
|
|
1416
|
-
parameters,
|
|
1417
|
-
});
|
|
1418
1442
|
this.seqDecls.set(key, decl);
|
|
1419
1443
|
return decl;
|
|
1420
1444
|
}
|
|
@@ -1468,7 +1492,10 @@ export class AstManager {
|
|
|
1468
1492
|
const key = parameters.join(",");
|
|
1469
1493
|
const existing = this.arraySorts.get(key);
|
|
1470
1494
|
if (existing !== undefined) return existing;
|
|
1471
|
-
this.
|
|
1495
|
+
const sort = this.addSort(
|
|
1496
|
+
"Array",
|
|
1497
|
+
FAMILY_ARRAY,
|
|
1498
|
+
parameters,
|
|
1472
1499
|
combineHash(
|
|
1473
1500
|
getSymbolHash("Array"),
|
|
1474
1501
|
getInfoHash(
|
|
@@ -1477,15 +1504,11 @@ export class AstManager {
|
|
|
1477
1504
|
parameters.map((parameter) => this.sortHashes[parameter]),
|
|
1478
1505
|
),
|
|
1479
1506
|
),
|
|
1507
|
+
0,
|
|
1508
|
+
0,
|
|
1509
|
+
this.getArraySortSize(parameters),
|
|
1480
1510
|
);
|
|
1481
|
-
this.sortNames.push("Array");
|
|
1482
|
-
this.sortFamilies.push(FAMILY_ARRAY);
|
|
1483
|
-
this.sortWidths.push(0);
|
|
1484
|
-
this.sortSbits.push(0);
|
|
1485
|
-
this.sortParameters.push(parameters);
|
|
1486
|
-
this.sortSizes.push(this.getArraySortSize(parameters));
|
|
1487
1511
|
this.mkSmallId();
|
|
1488
|
-
const sort = this.sortNames.length - 1;
|
|
1489
1512
|
this.arraySorts.set(key, sort);
|
|
1490
1513
|
return sort;
|
|
1491
1514
|
}
|
|
@@ -1535,7 +1558,6 @@ export class AstManager {
|
|
|
1535
1558
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1536
1559
|
const existing = this.arrayDecls.get(key);
|
|
1537
1560
|
if (existing !== undefined) return existing;
|
|
1538
|
-
const decl = this.funcDecls.length;
|
|
1539
1561
|
const parameterHashes = parameters.map((parameter) =>
|
|
1540
1562
|
op === OP_CONST_ARRAY
|
|
1541
1563
|
? this.sortHashes[parameter]
|
|
@@ -1544,22 +1566,15 @@ export class AstManager {
|
|
|
1544
1566
|
(this.getDeclHash(parameter) ?? 0)
|
|
1545
1567
|
: parameter,
|
|
1546
1568
|
);
|
|
1547
|
-
|
|
1569
|
+
const decl = this.addDecl(
|
|
1548
1570
|
name,
|
|
1549
|
-
|
|
1550
|
-
range,
|
|
1551
|
-
getInfoHash(Z3_ARRAY_FAMILY, op - ARRAY_OP_BASE, parameterHashes),
|
|
1552
|
-
);
|
|
1553
|
-
this.funcDecls.push({
|
|
1554
|
-
name,
|
|
1555
|
-
family: FAMILY_ARRAY,
|
|
1571
|
+
FAMILY_ARRAY,
|
|
1556
1572
|
op,
|
|
1557
1573
|
domain,
|
|
1558
1574
|
range,
|
|
1559
|
-
isSkolem: false,
|
|
1560
|
-
smallId: this.mkSmallId(),
|
|
1561
1575
|
parameters,
|
|
1562
|
-
|
|
1576
|
+
getInfoHash(Z3_ARRAY_FAMILY, op - ARRAY_OP_BASE, parameterHashes),
|
|
1577
|
+
);
|
|
1563
1578
|
this.arrayDecls.set(key, decl);
|
|
1564
1579
|
return decl;
|
|
1565
1580
|
}
|
|
@@ -1573,14 +1588,12 @@ export class AstManager {
|
|
|
1573
1588
|
const key = `${family}:${typeof name}:${name}:${parameters.join(",")}`;
|
|
1574
1589
|
const existing = this.parametricSorts.get(key);
|
|
1575
1590
|
if (existing !== undefined) return existing;
|
|
1576
|
-
this.
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1583
|
-
const sort = this.sortNames.length - 1;
|
|
1591
|
+
const sort = this.addSort(
|
|
1592
|
+
getSymbolName(name),
|
|
1593
|
+
family,
|
|
1594
|
+
parameters,
|
|
1595
|
+
combineHash(getSymbolHash(name), infoHash),
|
|
1596
|
+
);
|
|
1584
1597
|
this.sortSmallIds[sort] = this.mkSmallId();
|
|
1585
1598
|
this.parametricSorts.set(key, sort);
|
|
1586
1599
|
return sort;
|
|
@@ -1653,23 +1666,15 @@ export class AstManager {
|
|
|
1653
1666
|
const key = `${op}:${name}:${parameters.join(",")}:${domain.join(",")}:${range}`;
|
|
1654
1667
|
const existing = this.datatypeDecls.get(key);
|
|
1655
1668
|
if (existing !== undefined) return existing;
|
|
1656
|
-
const decl = this.
|
|
1657
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1669
|
+
const decl = this.addDecl(
|
|
1658
1670
|
name,
|
|
1659
|
-
|
|
1660
|
-
range,
|
|
1661
|
-
getInfoHash(Z3_DATATYPE_FAMILY, op - DATATYPE_OP_BASE, parameterHashes),
|
|
1662
|
-
);
|
|
1663
|
-
this.funcDecls.push({
|
|
1664
|
-
name,
|
|
1665
|
-
family: FAMILY_DATATYPE,
|
|
1671
|
+
FAMILY_DATATYPE,
|
|
1666
1672
|
op,
|
|
1667
1673
|
domain,
|
|
1668
1674
|
range,
|
|
1669
|
-
isSkolem: false,
|
|
1670
|
-
smallId: this.mkSmallId(),
|
|
1671
1675
|
parameters,
|
|
1672
|
-
|
|
1676
|
+
getInfoHash(Z3_DATATYPE_FAMILY, op - DATATYPE_OP_BASE, parameterHashes),
|
|
1677
|
+
);
|
|
1673
1678
|
this.datatypeDecls.set(key, decl);
|
|
1674
1679
|
return decl;
|
|
1675
1680
|
}
|
|
@@ -1686,23 +1691,16 @@ export class AstManager {
|
|
|
1686
1691
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1687
1692
|
const existing = this.bvDecls.get(key);
|
|
1688
1693
|
if (existing !== undefined) return existing;
|
|
1689
|
-
const decl = this.
|
|
1690
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1691
|
-
name,
|
|
1692
|
-
domain,
|
|
1693
|
-
range,
|
|
1694
|
-
getInfoHash(Z3_BV_FAMILY, op - BV_OP_BASE, parameters),
|
|
1695
|
-
);
|
|
1696
|
-
this.funcDecls.push({
|
|
1694
|
+
const decl = this.addDecl(
|
|
1697
1695
|
name,
|
|
1698
|
-
|
|
1696
|
+
FAMILY_BV,
|
|
1699
1697
|
op,
|
|
1700
1698
|
domain,
|
|
1701
1699
|
range,
|
|
1702
|
-
isSkolem: false,
|
|
1703
|
-
smallId: UNCACHED_BV_OPS.has(op) ? -1 : this.mkSmallId(),
|
|
1704
1700
|
parameters,
|
|
1705
|
-
|
|
1701
|
+
getInfoHash(Z3_BV_FAMILY, op - BV_OP_BASE, parameters),
|
|
1702
|
+
!UNCACHED_BV_OPS.has(op),
|
|
1703
|
+
);
|
|
1706
1704
|
this.bvDecls.set(key, decl);
|
|
1707
1705
|
return decl;
|
|
1708
1706
|
}
|
|
@@ -1767,7 +1765,7 @@ export class AstManager {
|
|
|
1767
1765
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1768
1766
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1769
1767
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1770
|
-
const domain = Array.from({ length: arity }, (
|
|
1768
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1771
1769
|
op === OP_PATTERN
|
|
1772
1770
|
? this.sorts[args[index]]
|
|
1773
1771
|
: op === OP_ITE && index === 0
|
|
@@ -1908,6 +1906,20 @@ export class AstManager {
|
|
|
1908
1906
|
return decl;
|
|
1909
1907
|
}
|
|
1910
1908
|
|
|
1909
|
+
mkPbAuxBool() {
|
|
1910
|
+
const decl = this.addDecl(
|
|
1911
|
+
this.mkFreshVarName("pb"),
|
|
1912
|
+
FAMILY_PB,
|
|
1913
|
+
OP_PB_AUX_BOOL,
|
|
1914
|
+
[],
|
|
1915
|
+
SORT_BOOL,
|
|
1916
|
+
[],
|
|
1917
|
+
getInfoHash(Z3_PB_FAMILY, OP_PB_AUX_BOOL - PB_OP_BASE, []),
|
|
1918
|
+
);
|
|
1919
|
+
this.declRefCounts[decl] = 0;
|
|
1920
|
+
return this.mkApp(decl, [], SORT_BOOL);
|
|
1921
|
+
}
|
|
1922
|
+
|
|
1911
1923
|
mkFreshVarName(prefix: string | null) {
|
|
1912
1924
|
return `${prefix ?? "var"}!${this.mkFreshId()}`;
|
|
1913
1925
|
}
|
|
@@ -2086,7 +2098,7 @@ export class AstManager {
|
|
|
2086
2098
|
}
|
|
2087
2099
|
|
|
2088
2100
|
get am() {
|
|
2089
|
-
this.algebraicManager ??= new AlgebraicManager();
|
|
2101
|
+
this.algebraicManager ??= new AlgebraicManager(this.limit);
|
|
2090
2102
|
return this.algebraicManager;
|
|
2091
2103
|
}
|
|
2092
2104
|
|
|
@@ -2207,7 +2219,7 @@ export class AstManager {
|
|
|
2207
2219
|
const noPatterns = data.patterns.length > 0 ? [] : data.noPatterns;
|
|
2208
2220
|
const key = `q${data.kind}:${data.sorts.join(",")}:${JSON.stringify(data.names)}:${
|
|
2209
2221
|
data.body
|
|
2210
|
-
}:${data.patterns.join(",")}:${noPatterns.join(",")}:${data.weight}`;
|
|
2222
|
+
}:${data.patterns.join(",")}:${noPatterns.join(",")}:${data.weight}:${data.qid}`;
|
|
2211
2223
|
const existing = this.table.get(key);
|
|
2212
2224
|
if (existing !== undefined) {
|
|
2213
2225
|
// A dead quantifier comes back as the new one Z3 makes, with its skolem id.
|
|
@@ -2270,27 +2282,19 @@ export class AstManager {
|
|
|
2270
2282
|
const name = op === OP_LABEL_LIT ? "lbl-lit" : isPositive ? "lblpos" : "lblneg";
|
|
2271
2283
|
const domain = op === OP_LABEL ? [SORT_BOOL] : [];
|
|
2272
2284
|
const parameterHashes = names.map(getSymbolHash);
|
|
2273
|
-
const decl = this.
|
|
2274
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
2285
|
+
const decl = this.addDecl(
|
|
2275
2286
|
name,
|
|
2287
|
+
FAMILY_LABEL,
|
|
2288
|
+
op,
|
|
2276
2289
|
domain,
|
|
2277
2290
|
SORT_BOOL,
|
|
2291
|
+
parameters,
|
|
2278
2292
|
getInfoHash(
|
|
2279
2293
|
Z3_LABEL_FAMILY,
|
|
2280
2294
|
op - LABEL_OP_BASE,
|
|
2281
2295
|
op === OP_LABEL ? [isPositive ? 1 : 0, ...parameterHashes] : parameterHashes,
|
|
2282
2296
|
),
|
|
2283
2297
|
);
|
|
2284
|
-
this.funcDecls.push({
|
|
2285
|
-
name,
|
|
2286
|
-
family: FAMILY_LABEL,
|
|
2287
|
-
op,
|
|
2288
|
-
domain,
|
|
2289
|
-
range: SORT_BOOL,
|
|
2290
|
-
isSkolem: false,
|
|
2291
|
-
smallId: this.mkSmallId(),
|
|
2292
|
-
parameters,
|
|
2293
|
-
});
|
|
2294
2298
|
this.labelDecls.set(key, decl);
|
|
2295
2299
|
return decl;
|
|
2296
2300
|
}
|
|
@@ -2414,14 +2418,13 @@ export class AstManager {
|
|
|
2414
2418
|
op === OP_CHAR_CONST ||
|
|
2415
2419
|
(op >= OP_FPA_RM_NEAREST_TIES_TO_EVEN && op <= OP_FPA_RM_TOWARD_ZERO) ||
|
|
2416
2420
|
(op === OP_CONST_ARRAY && this.isUniqueValue(this.getArg(expr, 0))) ||
|
|
2417
|
-
(op === OP_DT_CONSTRUCTOR &&
|
|
2418
|
-
this.mapArgs(expr, (arg) => this.isUniqueValue(arg)).every((isUnique) => isUnique)) ||
|
|
2421
|
+
(op === OP_DT_CONSTRUCTOR && this.everyArg(expr, (arg) => this.isUniqueValue(arg))) ||
|
|
2419
2422
|
(op === OP_FPA_FP && this.isUniqueFp(expr))
|
|
2420
2423
|
);
|
|
2421
2424
|
}
|
|
2422
2425
|
|
|
2423
2426
|
private isUniqueFp(expr: number) {
|
|
2424
|
-
if (!this.
|
|
2427
|
+
if (!this.everyArg(expr, (arg) => this.isValue(arg))) return false;
|
|
2425
2428
|
const exponent = this.getArg(expr, 1);
|
|
2426
2429
|
const value = this.getBvNumeralValue(exponent);
|
|
2427
2430
|
return value !== 0n && value !== (1n << BigInt(this.getBvSize(this.sorts[exponent]))) - 1n;
|
|
@@ -2436,7 +2439,7 @@ export class AstManager {
|
|
|
2436
2439
|
}
|
|
2437
2440
|
if (this.getOp(current) === OP_CONST_ARRAY) return this.isValue(this.getArg(current, 0));
|
|
2438
2441
|
if (this.getOp(current) === OP_DT_CONSTRUCTOR || this.getOp(current) === OP_FPA_FP)
|
|
2439
|
-
return this.
|
|
2442
|
+
return this.everyArg(current, (arg) => this.isValue(arg));
|
|
2440
2443
|
if (this.getOp(current) >= OP_FPA_NUM && this.getOp(current) <= OP_FPA_MINUS_ZERO) return true;
|
|
2441
2444
|
if (this.getOp(current) === OP_ALGEBRAIC_NUM) return true;
|
|
2442
2445
|
if (this.getFamily(current) === FAMILY_SEQ) return this.isSeqValue(current);
|
|
@@ -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,
|
|
@@ -61,7 +58,7 @@ import { mkBvApp } from "./bv-decl-plugin";
|
|
|
61
58
|
import { release } from "./expr-ref";
|
|
62
59
|
import type { Goal } from "./goal";
|
|
63
60
|
import { ObjMap } from "./hashtable";
|
|
64
|
-
import {
|
|
61
|
+
import { ProtoModel } from "./proto-model";
|
|
65
62
|
import { RefVector } from "./ref-vector";
|
|
66
63
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
67
64
|
import { type Rewrite, RewriterTpl, VarShifter } from "./rewriter-tpl";
|
|
@@ -508,13 +505,7 @@ const convertModel = (manager: AstManager, consts: BlastedConst[], source: Proto
|
|
|
508
505
|
for (const bit of manager.getArgs(blasted.bits)) bitDecls.add(manager.decls[bit]);
|
|
509
506
|
for (const decl of source.getConstDecls())
|
|
510
507
|
if (!bitDecls.has(decl)) target.registerConst(decl, source.constInterps.get(decl) as number);
|
|
511
|
-
for (const entry of source.funcInterps)
|
|
512
|
-
const copied = new FuncInterp(manager, entry[1].arity);
|
|
513
|
-
for (const funcEntry of entry[1].entries)
|
|
514
|
-
copied.insertNewEntry(funcEntry.args, funcEntry.result);
|
|
515
|
-
if (entry[1].elseExpr !== null) copied.setElse(entry[1].elseExpr);
|
|
516
|
-
target.registerFunc(entry[0], copied);
|
|
517
|
-
}
|
|
508
|
+
for (const entry of source.funcInterps) target.registerFunc(entry[0], entry[1].copy());
|
|
518
509
|
for (const sort of source.getUninterpretedSorts())
|
|
519
510
|
for (const value of source.getKnownUniverse(sort)) target.registerValue(value);
|
|
520
511
|
for (const blasted of consts) {
|