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,15 +1,15 @@
|
|
|
1
|
-
// Ported from Z3 (src/cmd_context/tactic_cmds.cpp, src/tactic/tactical.cpp, src/tactic/tactic.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
SmtCanceledError,
|
|
5
3
|
SmtParseError,
|
|
4
|
+
SmtDefaultError,
|
|
6
5
|
SmtTacticError,
|
|
7
6
|
SmtUnsupportedError,
|
|
8
7
|
} from "../../../errors";
|
|
9
|
-
import { type AstManager,
|
|
8
|
+
import { type AstManager, OP_DIV0, OP_IDIV0, OP_MOD0, OP_OR, OP_POWER0, SORT_BOOL } from "./ast";
|
|
10
9
|
import { createQfufbvAckrTactic, runAckermannizeBv } from "./ackermannize-bv-tactic";
|
|
11
10
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
12
11
|
import { createAigTactic } from "./aig-tactic";
|
|
12
|
+
import { blastTermIte } from "./blast-term-ite";
|
|
13
13
|
import { card2bv } from "./card2bv";
|
|
14
14
|
import { Context, MBQI_MAX_ITERATIONS } from "./context";
|
|
15
15
|
import { ctxSimplify } from "./ctx-simplify";
|
|
@@ -25,6 +25,7 @@ import {
|
|
|
25
25
|
import type { AckrSolver } from "./lackr";
|
|
26
26
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
27
27
|
import { DerRewriter } from "./der";
|
|
28
|
+
import { finishSimplifier } from "./dependent-expr-state";
|
|
28
29
|
import { fixDlVar } from "./fix-dl-var";
|
|
29
30
|
import { runFpa2Bv } from "./fpa2bv-tactic";
|
|
30
31
|
import { type BitBlasterRewriter, runBitBlast } from "./bit-blast-tactic";
|
|
@@ -37,6 +38,7 @@ import { createSatTactic } from "./sat/sat-tactic";
|
|
|
37
38
|
import { mkThSolver } from "./euf/th-solvers";
|
|
38
39
|
import { createFdTactic } from "./fd-solver";
|
|
39
40
|
import { elimUncnstr } from "./elim-uncnstr";
|
|
41
|
+
import { runElimTermIte } from "./elim-term-ite-tactic";
|
|
40
42
|
import { rewriteUfbv } from "./demodulator";
|
|
41
43
|
import { distributeForall } from "./distribute-forall";
|
|
42
44
|
import { createDt2BvTactic } from "./dt2bv-tactic";
|
|
@@ -80,6 +82,7 @@ import { LOGIC_TACTICS, QFAUFBV, QFUFBV_ACKR_PREAMBLE } from "./logic-tactics";
|
|
|
80
82
|
import {
|
|
81
83
|
createCommandReader,
|
|
82
84
|
isSymbol,
|
|
85
|
+
isUnsigned,
|
|
83
86
|
type SExpr,
|
|
84
87
|
type SmtList,
|
|
85
88
|
type SmtToken,
|
|
@@ -138,9 +141,9 @@ interface NamedTactic {
|
|
|
138
141
|
|
|
139
142
|
const getDescrs = (module: string, entries: [string, number, TacticParam, boolean?][]) =>
|
|
140
143
|
new Map(
|
|
141
|
-
entries.map((
|
|
142
|
-
|
|
143
|
-
{ kind, module, defaultValue, isPorted:
|
|
144
|
+
entries.map((entry) => [
|
|
145
|
+
entry[0],
|
|
146
|
+
{ kind: entry[1], module, defaultValue: entry[2], isPorted: entry[3] ?? false },
|
|
144
147
|
]),
|
|
145
148
|
);
|
|
146
149
|
|
|
@@ -332,6 +335,15 @@ export const getSatParams = (parameters: ReadonlyMap<string, string>) =>
|
|
|
332
335
|
}),
|
|
333
336
|
);
|
|
334
337
|
|
|
338
|
+
export const getSmtTacticFailure = (context: Context) =>
|
|
339
|
+
context.checkCanceled()
|
|
340
|
+
? "canceled"
|
|
341
|
+
: `smt tactic failed to show goal to be sat/unsat ${context.getLastFailureMessage()}`;
|
|
342
|
+
|
|
343
|
+
// sat_params reads what using-params leaves unset from the sat module's global parameters.
|
|
344
|
+
const getSatTacticParams = (environment: TacticEnvironment, params: TacticParams) =>
|
|
345
|
+
new Map([...getSatParams(environment.parameters), ...params]);
|
|
346
|
+
|
|
335
347
|
const runSmt = (environment: TacticEnvironment, params: TacticParams) => (goal: Goal) => {
|
|
336
348
|
const manager = environment.manager;
|
|
337
349
|
// mk_smt_tactic: with sat.euf, the smt tactic is the sat tactic.
|
|
@@ -344,7 +356,7 @@ const runSmt = (environment: TacticEnvironment, params: TacticParams) => (goal:
|
|
|
344
356
|
? solveGoal(manager, goal.forms.items, kernelParams)
|
|
345
357
|
: solveAssuming(manager, extracted.clauses.items, extracted.assumptions, kernelParams);
|
|
346
358
|
extracted.clauses.reset();
|
|
347
|
-
if (solved.result === L_UNDEF) throw new SmtTacticError(solved.context
|
|
359
|
+
if (solved.result === L_UNDEF) throw new SmtTacticError(getSmtTacticFailure(solved.context));
|
|
348
360
|
goal.reset();
|
|
349
361
|
if (solved.result === L_FALSE)
|
|
350
362
|
goal.assert(environment.manager.falseExpr, mkCoreDependency(solved.context.unsatCore));
|
|
@@ -444,6 +456,39 @@ const inPlace = (run: (goal: Goal) => void) => (goal: Goal) => {
|
|
|
444
456
|
return [goal];
|
|
445
457
|
};
|
|
446
458
|
|
|
459
|
+
const selectClause = (goal: Goal, isLargest: boolean) => {
|
|
460
|
+
const manager = goal.manager;
|
|
461
|
+
let position = -1;
|
|
462
|
+
let length = 0;
|
|
463
|
+
for (let index = 0; index < goal.forms.size; index++) {
|
|
464
|
+
const form = goal.forms.items[index];
|
|
465
|
+
if (manager.getOp(form) !== OP_OR) continue;
|
|
466
|
+
const currentLength = manager.getNumArgs(form);
|
|
467
|
+
if (currentLength < 2) continue;
|
|
468
|
+
if (!isLargest) return index;
|
|
469
|
+
if (currentLength > length) {
|
|
470
|
+
position = index;
|
|
471
|
+
length = currentLength;
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
return position;
|
|
475
|
+
};
|
|
476
|
+
|
|
477
|
+
const runSplitClause = (isLargest: boolean) => (goal: Goal) => {
|
|
478
|
+
const manager = goal.manager;
|
|
479
|
+
const position = selectClause(goal, isLargest);
|
|
480
|
+
if (position === -1)
|
|
481
|
+
throw new SmtTacticError("split-clause tactic failed, goal does not contain any clause");
|
|
482
|
+
if (goal.isProofsEnabled) throw new SmtUnsupportedError("the proofs of split-clause");
|
|
483
|
+
const dependency = goal.dependencies[position];
|
|
484
|
+
return manager.getArgs(goal.forms.items[position]).map((literal) => {
|
|
485
|
+
const subgoal = goal.copy();
|
|
486
|
+
subgoal.update(position, literal, dependency);
|
|
487
|
+
subgoal.depth++;
|
|
488
|
+
return subgoal;
|
|
489
|
+
});
|
|
490
|
+
};
|
|
491
|
+
|
|
447
492
|
const runDer = (manager: AstManager) => (goal: Goal) => {
|
|
448
493
|
const rewriter = new DerRewriter(manager);
|
|
449
494
|
const size = goal.forms.size;
|
|
@@ -452,9 +497,7 @@ const runDer = (manager: AstManager) => (goal: Goal) => {
|
|
|
452
497
|
goal.update(index, result);
|
|
453
498
|
manager.decRef(result);
|
|
454
499
|
}
|
|
455
|
-
goal
|
|
456
|
-
goal.elimRedundancies();
|
|
457
|
-
goal.depth++;
|
|
500
|
+
finishSimplifier(goal);
|
|
458
501
|
rewriter.der.release();
|
|
459
502
|
rewriter.release();
|
|
460
503
|
return [goal];
|
|
@@ -526,6 +569,8 @@ const SAT_DESCRS = getDescrs("sat", [
|
|
|
526
569
|
["search.sat.conflicts", PARAM_UINT, 400, true],
|
|
527
570
|
["search.unsat.conflicts", PARAM_UINT, 400, true],
|
|
528
571
|
["restart.initial", PARAM_UINT, 2, true],
|
|
572
|
+
["restart.max", PARAM_UINT, UINT_MAX, true],
|
|
573
|
+
["inprocess.max", PARAM_UINT, UINT_MAX, true],
|
|
529
574
|
["random_seed", PARAM_UINT, 0, true],
|
|
530
575
|
["burst_search", PARAM_UINT, 100, true],
|
|
531
576
|
["enable_pre_simplify", PARAM_BOOL, false, true],
|
|
@@ -678,40 +723,30 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
678
723
|
]),
|
|
679
724
|
build: (environment, params) => {
|
|
680
725
|
const manager = environment.manager;
|
|
681
|
-
const snf = runNnf(manager, new Map());
|
|
682
726
|
const elimRemParams = new Map([...params, ["elim_rem", true]]);
|
|
683
|
-
return
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
727
|
+
return [
|
|
728
|
+
runNnf(manager, new Map()),
|
|
729
|
+
inPlace((goal) =>
|
|
730
|
+
simplifyGoal(manager, goal, getRewriterOptions(manager, elimRemParams)),
|
|
731
|
+
),
|
|
732
|
+
inPlace((goal) =>
|
|
733
|
+
purifyArith(manager, goal, {
|
|
734
|
+
isComplete: getBool(params, "complete", true),
|
|
735
|
+
isElimRootObjects: getBool(params, "elim_root_objects", true),
|
|
736
|
+
isElimInverses: getBool(params, "elim_inverses", true),
|
|
737
|
+
}),
|
|
738
|
+
),
|
|
739
|
+
inPlace((goal) => simplifyGoal(manager, goal, getRewriterOptions(manager, params))),
|
|
740
|
+
].reduceRight((second, first) => runAndThen(first, second));
|
|
694
741
|
},
|
|
695
742
|
},
|
|
696
743
|
],
|
|
697
744
|
[
|
|
698
745
|
"elim-term-ite",
|
|
699
746
|
{
|
|
747
|
+
isTrackingDependencies: true,
|
|
700
748
|
descrs: getDescrs("", [["max_memory", PARAM_UINT, UINT_MAX, true]]),
|
|
701
|
-
build: (environment) =>
|
|
702
|
-
inPlace((goal) => {
|
|
703
|
-
const manager = environment.manager;
|
|
704
|
-
const seen = new Set<number>();
|
|
705
|
-
const todo = [...goal.forms.items];
|
|
706
|
-
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
707
|
-
if (seen.has(expr) || manager.kinds[expr] !== KIND_APP) continue;
|
|
708
|
-
seen.add(expr);
|
|
709
|
-
if (manager.getOp(expr) === OP_ITE && manager.sorts[expr] !== SORT_BOOL)
|
|
710
|
-
throw new SmtUnsupportedError("elim-term-ite on a goal it changes");
|
|
711
|
-
manager.pushArgs(expr, todo);
|
|
712
|
-
}
|
|
713
|
-
goal.depth++;
|
|
714
|
-
}),
|
|
749
|
+
build: (environment) => runElimTermIte(environment.manager),
|
|
715
750
|
},
|
|
716
751
|
],
|
|
717
752
|
[
|
|
@@ -728,6 +763,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
728
763
|
build: (environment, params) =>
|
|
729
764
|
inPlace((goal) => {
|
|
730
765
|
const manager = environment.manager;
|
|
766
|
+
const original = new RefVector(manager);
|
|
767
|
+
for (const form of goal.forms.items) original.push(form);
|
|
731
768
|
try {
|
|
732
769
|
tseitinCnf(manager, goal);
|
|
733
770
|
} catch (error) {
|
|
@@ -737,7 +774,9 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
737
774
|
isEliminatingAnd: true,
|
|
738
775
|
isKeepingDistinct: false,
|
|
739
776
|
});
|
|
740
|
-
tseitinCnf(manager, goal);
|
|
777
|
+
if (!goal.isDecided()) tseitinCnf(manager, goal);
|
|
778
|
+
} finally {
|
|
779
|
+
original.reset();
|
|
741
780
|
}
|
|
742
781
|
}),
|
|
743
782
|
},
|
|
@@ -747,14 +786,9 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
747
786
|
{
|
|
748
787
|
descrs: new Map(),
|
|
749
788
|
build: (environment) =>
|
|
750
|
-
inPlace((goal) =>
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
goal.elimTrue();
|
|
754
|
-
goal.elimRedundancies();
|
|
755
|
-
}
|
|
756
|
-
goal.depth++;
|
|
757
|
-
}),
|
|
789
|
+
inPlace((goal) =>
|
|
790
|
+
goal.isProofsEnabled ? finishSimplifier(goal) : applyQeLite(environment.manager, goal),
|
|
791
|
+
),
|
|
758
792
|
},
|
|
759
793
|
],
|
|
760
794
|
[
|
|
@@ -799,6 +833,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
799
833
|
[
|
|
800
834
|
"lia2card",
|
|
801
835
|
{
|
|
836
|
+
isTrackingDependencies: true,
|
|
802
837
|
descrs: getDescrs("", [["compile_equality", PARAM_BOOL, true, true]]),
|
|
803
838
|
build: (environment, params) =>
|
|
804
839
|
inPlace((goal) =>
|
|
@@ -864,6 +899,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
864
899
|
["lia2pb_total_bits", PARAM_UINT, 2048, true],
|
|
865
900
|
]),
|
|
866
901
|
]),
|
|
902
|
+
isTrackingDependencies: true,
|
|
867
903
|
build: (environment, params) =>
|
|
868
904
|
inPlace((goal) =>
|
|
869
905
|
lia2pb(environment.manager, goal, {
|
|
@@ -879,7 +915,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
879
915
|
"pb2bv",
|
|
880
916
|
{
|
|
881
917
|
descrs: new Map([
|
|
882
|
-
...[...REWRITER_DESCRS].filter((
|
|
918
|
+
...[...REWRITER_DESCRS].filter((entry) => BOOL_REWRITER_PARAMS.includes(entry[0])),
|
|
883
919
|
...getDescrs("", [
|
|
884
920
|
["max_memory", PARAM_UINT, UINT_MAX, true],
|
|
885
921
|
["pb2bv_all_clauses_limit", PARAM_UINT, 8, true],
|
|
@@ -906,6 +942,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
906
942
|
[
|
|
907
943
|
"fm",
|
|
908
944
|
{
|
|
945
|
+
isTrackingDependencies: true,
|
|
909
946
|
descrs: new Map([
|
|
910
947
|
...REWRITER_DESCRS,
|
|
911
948
|
...getDescrs("", [
|
|
@@ -929,6 +966,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
929
966
|
new Map([...params, ["arith_lhs", true], ["elim_and", true], ["som", true]]),
|
|
930
967
|
),
|
|
931
968
|
);
|
|
969
|
+
// and_then stops at a decided goal.
|
|
970
|
+
if (goal.isDecided()) return;
|
|
932
971
|
fm(manager, goal, {
|
|
933
972
|
isRealOnly: getBool(params, "fm_real_only", true),
|
|
934
973
|
limit: getUint(params, "fm_limit", 5000000),
|
|
@@ -996,6 +1035,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
996
1035
|
[
|
|
997
1036
|
"fix-dl-var",
|
|
998
1037
|
{
|
|
1038
|
+
isTrackingDependencies: true,
|
|
999
1039
|
descrs: REWRITER_DESCRS,
|
|
1000
1040
|
build: (environment, params) =>
|
|
1001
1041
|
inPlace((goal) =>
|
|
@@ -1006,6 +1046,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1006
1046
|
[
|
|
1007
1047
|
"factor",
|
|
1008
1048
|
{
|
|
1049
|
+
isTrackingDependencies: true,
|
|
1009
1050
|
descrs: getDescrs("", [
|
|
1010
1051
|
["split_factors", PARAM_BOOL, true, true],
|
|
1011
1052
|
["max_search_size", PARAM_UINT, UINT_MAX],
|
|
@@ -1019,6 +1060,14 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1019
1060
|
},
|
|
1020
1061
|
],
|
|
1021
1062
|
["der", { descrs: new Map(), build: (environment) => runDer(environment.manager) }],
|
|
1063
|
+
[
|
|
1064
|
+
"blast-term-ite",
|
|
1065
|
+
{
|
|
1066
|
+
isTrackingDependencies: true,
|
|
1067
|
+
descrs: new Map(),
|
|
1068
|
+
build: (environment) => inPlace((goal) => blastTermIte(environment.manager, goal)),
|
|
1069
|
+
},
|
|
1070
|
+
],
|
|
1022
1071
|
[
|
|
1023
1072
|
"distribute-forall",
|
|
1024
1073
|
{
|
|
@@ -1080,6 +1129,15 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1080
1129
|
build: (environment) => inPlace((goal) => domSimplify(environment.manager, goal)),
|
|
1081
1130
|
},
|
|
1082
1131
|
],
|
|
1132
|
+
[
|
|
1133
|
+
"split-clause",
|
|
1134
|
+
{
|
|
1135
|
+
descrs: getDescrs("", [["split_largest_clause", PARAM_BOOL, false, true]]),
|
|
1136
|
+
isTrackingDependencies: true,
|
|
1137
|
+
build: (_environment, params) =>
|
|
1138
|
+
runSplitClause(getBool(params, "split_largest_clause", false)),
|
|
1139
|
+
},
|
|
1140
|
+
],
|
|
1083
1141
|
[
|
|
1084
1142
|
"occf",
|
|
1085
1143
|
{
|
|
@@ -1087,7 +1145,14 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1087
1145
|
build: (environment) => inPlace((goal) => occf(environment.manager, goal)),
|
|
1088
1146
|
},
|
|
1089
1147
|
],
|
|
1090
|
-
[
|
|
1148
|
+
[
|
|
1149
|
+
"fpa2bv",
|
|
1150
|
+
{
|
|
1151
|
+
descrs: new Map(),
|
|
1152
|
+
isTrackingDependencies: true,
|
|
1153
|
+
build: (environment) => runFpa2Bv(environment.manager),
|
|
1154
|
+
},
|
|
1155
|
+
],
|
|
1091
1156
|
[
|
|
1092
1157
|
"elim-small-bv",
|
|
1093
1158
|
{
|
|
@@ -1177,7 +1242,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1177
1242
|
const manager = environment.manager;
|
|
1178
1243
|
const preamble = createCommandReader(QFUFBV_ACKR_PREAMBLE).read() as SmtList;
|
|
1179
1244
|
return runAndThen(
|
|
1180
|
-
compile(environment, preamble,
|
|
1245
|
+
compile(environment, preamble, true).build(params),
|
|
1181
1246
|
runCond(
|
|
1182
1247
|
isQfufbv,
|
|
1183
1248
|
createQfufbvAckrTactic(manager, getRewriterOptions(manager, new Map()), true, () =>
|
|
@@ -1282,7 +1347,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1282
1347
|
{
|
|
1283
1348
|
descrs: SAT_DESCRS,
|
|
1284
1349
|
isRejectingUnknown: false,
|
|
1285
|
-
build: (environment, params) =>
|
|
1350
|
+
build: (environment, params) =>
|
|
1351
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1286
1352
|
},
|
|
1287
1353
|
],
|
|
1288
1354
|
[
|
|
@@ -1290,7 +1356,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1290
1356
|
{
|
|
1291
1357
|
descrs: SAT_DESCRS,
|
|
1292
1358
|
isRejectingUnknown: false,
|
|
1293
|
-
build: (environment, params) =>
|
|
1359
|
+
build: (environment, params) =>
|
|
1360
|
+
createFdTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1294
1361
|
},
|
|
1295
1362
|
],
|
|
1296
1363
|
[
|
|
@@ -1298,7 +1365,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1298
1365
|
{
|
|
1299
1366
|
descrs: SAT_DESCRS,
|
|
1300
1367
|
isRejectingUnknown: false,
|
|
1301
|
-
build: (environment, params) =>
|
|
1368
|
+
build: (environment, params) =>
|
|
1369
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1302
1370
|
},
|
|
1303
1371
|
],
|
|
1304
1372
|
[
|
|
@@ -1317,6 +1385,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1317
1385
|
"aig",
|
|
1318
1386
|
{
|
|
1319
1387
|
descrs: getDescrs("", [["max_memory", PARAM_UINT, UINT_MAX, true]]),
|
|
1388
|
+
isTrackingDependencies: true,
|
|
1320
1389
|
build: (environment) => createAigTactic(environment.manager),
|
|
1321
1390
|
},
|
|
1322
1391
|
],
|
|
@@ -1346,20 +1415,19 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1346
1415
|
|
|
1347
1416
|
const UNPORTED_TACTICS = new Set(
|
|
1348
1417
|
(
|
|
1349
|
-
"blast-term-ite " +
|
|
1350
1418
|
"bv-slice bvarray2uf collect-statistics " +
|
|
1351
1419
|
"degree-shift demodulator " +
|
|
1352
1420
|
"elim-predicates elim-uncnstr2 " +
|
|
1353
1421
|
"euf-completion ff-sat ff-simplify ff-solve ff-unique ff2bv fold-unfold fpa2bv " +
|
|
1354
1422
|
"horn-simplify injectivity pb-preprocess pqffd propagate-bv-bounds " +
|
|
1355
|
-
"propagate-bv-bounds2 propagate-values2 qfbv-sls
|
|
1423
|
+
"propagate-bv-bounds2 propagate-values2 qfbv-sls recover-01 reduce-args2 " +
|
|
1356
1424
|
"sat-preprocess sls-smt smtfd solver-subsumption special-relations " +
|
|
1357
|
-
"
|
|
1425
|
+
"subpaving symmetry-reduce"
|
|
1358
1426
|
).split(" "),
|
|
1359
1427
|
);
|
|
1360
1428
|
|
|
1361
|
-
const
|
|
1362
|
-
sexpr?.kind === "numeral" &&
|
|
1429
|
+
const isUnsignedNumeral = (sexpr: SExpr | undefined): sexpr is SmtToken =>
|
|
1430
|
+
sexpr?.kind === "numeral" && isUnsigned(sexpr.text);
|
|
1363
1431
|
|
|
1364
1432
|
const getParamName = (keyword: string) =>
|
|
1365
1433
|
keyword.replace(/^:/, "").toLowerCase().replaceAll("-", "_");
|
|
@@ -1380,7 +1448,7 @@ const parseParamValue = (kind: number, value: SExpr) =>
|
|
|
1380
1448
|
kind === PARAM_BOOL
|
|
1381
1449
|
? isSymbol(value, "true") || (isSymbol(value, "false") ? false : undefined)
|
|
1382
1450
|
: kind === PARAM_UINT
|
|
1383
|
-
?
|
|
1451
|
+
? isUnsignedNumeral(value)
|
|
1384
1452
|
? Number(value.text)
|
|
1385
1453
|
: undefined
|
|
1386
1454
|
: kind === PARAM_NUMERAL
|
|
@@ -1409,27 +1477,33 @@ const checkParams = (descrs: ParamDescrs, params: TacticParams) => {
|
|
|
1409
1477
|
}
|
|
1410
1478
|
};
|
|
1411
1479
|
|
|
1480
|
+
// sexpr2tactic reports an error at the s-expression: a list at its closing parenthesis.
|
|
1481
|
+
const getSexprPosition = (sexpr: SExpr) => (sexpr.kind === "list" ? sexpr.end : sexpr);
|
|
1482
|
+
|
|
1412
1483
|
const getParams = (
|
|
1413
1484
|
builder: TacticBuilder,
|
|
1414
1485
|
items: SExpr[],
|
|
1415
|
-
end: SmtToken,
|
|
1416
1486
|
isInternal: boolean,
|
|
1417
1487
|
): Map<string, TacticParam> => {
|
|
1418
1488
|
const params = new Map<string, TacticParam>();
|
|
1419
1489
|
for (let index = 2; index < items.length; index += 2) {
|
|
1420
1490
|
const keyword = items[index];
|
|
1421
1491
|
if (keyword.kind !== "keyword")
|
|
1422
|
-
throw new SmtParseError(
|
|
1492
|
+
throw new SmtParseError(
|
|
1493
|
+
"invalid using-params combinator, keyword expected",
|
|
1494
|
+
getSexprPosition(keyword),
|
|
1495
|
+
);
|
|
1423
1496
|
const value = items[index + 1];
|
|
1424
1497
|
if (value === undefined)
|
|
1425
|
-
throw new SmtParseError("invalid using-params combinator, parameter value expected",
|
|
1498
|
+
throw new SmtParseError("invalid using-params combinator, parameter value expected", keyword);
|
|
1426
1499
|
const found = findParam(builder.descrs, getParamName(keyword.text));
|
|
1427
1500
|
if (isInternal) {
|
|
1428
1501
|
const parsed =
|
|
1429
1502
|
found === undefined
|
|
1430
1503
|
? getUntypedParamValue(value)
|
|
1431
1504
|
: parseParamValue(found.descr.kind, value);
|
|
1432
|
-
if (parsed === undefined)
|
|
1505
|
+
if (parsed === undefined)
|
|
1506
|
+
throw new SmtParseError("invalid parameter value", getSexprPosition(value));
|
|
1433
1507
|
params.set(found?.name ?? getParamName(keyword.text), parsed);
|
|
1434
1508
|
continue;
|
|
1435
1509
|
}
|
|
@@ -1438,7 +1512,7 @@ const getParams = (
|
|
|
1438
1512
|
throw new SmtUnsupportedError(`the parameter ${keyword.text} of the tactic`);
|
|
1439
1513
|
throw new SmtParseError(
|
|
1440
1514
|
`invalid using-params combinator, unknown parameter ${getParamName(keyword.text)}`,
|
|
1441
|
-
|
|
1515
|
+
getSexprPosition(value),
|
|
1442
1516
|
);
|
|
1443
1517
|
}
|
|
1444
1518
|
const parsed = parseParamValue(found.descr.kind, value);
|
|
@@ -1451,7 +1525,7 @@ const getParams = (
|
|
|
1451
1525
|
: found.descr.kind === PARAM_NUMERAL
|
|
1452
1526
|
? "invalid parameter value, numeral expected"
|
|
1453
1527
|
: "invalid parameter value, symbol expected",
|
|
1454
|
-
|
|
1528
|
+
getSexprPosition(value),
|
|
1455
1529
|
);
|
|
1456
1530
|
if (isUnportedParam(found.descr, parsed))
|
|
1457
1531
|
throw new SmtUnsupportedError(`the parameter ${found.name} of the tactic`);
|
|
@@ -1470,19 +1544,30 @@ const isDecidedSat = (goals: Goal[]) => goals.length === 1 && goals[0].isDecided
|
|
|
1470
1544
|
|
|
1471
1545
|
const isDecidedUnsat = (goals: Goal[]) => goals.length === 1 && goals[0].isDecidedUnsat();
|
|
1472
1546
|
|
|
1547
|
+
// Deviation from Z3: and_then and repeat join the subgoals' cores, where Z3 answers an empty core.
|
|
1548
|
+
const assertUnsat = (goal: Goal, unsatGoals: Goal[]) => {
|
|
1549
|
+
goal.resetAll();
|
|
1550
|
+
goal.assert(
|
|
1551
|
+
goal.manager.falseExpr,
|
|
1552
|
+
unsatGoals.reduce<Dependency | undefined>(
|
|
1553
|
+
(core, unsatGoal) => joinDependencies(unsatGoal.getDependency(0), core),
|
|
1554
|
+
undefined,
|
|
1555
|
+
),
|
|
1556
|
+
);
|
|
1557
|
+
return [goal];
|
|
1558
|
+
};
|
|
1559
|
+
|
|
1473
1560
|
const runAndThen = (first: Tactic, second: Tactic) => (goal: Goal) => {
|
|
1474
1561
|
const goals = first(goal);
|
|
1475
1562
|
if (goals.length === 1) return goals[0].isDecided() ? goals : second(goals[0]);
|
|
1476
1563
|
const results: Goal[] = [];
|
|
1564
|
+
const unsatGoals: Goal[] = [];
|
|
1477
1565
|
for (const subgoal of goals) {
|
|
1478
1566
|
const subresults = second(subgoal);
|
|
1479
1567
|
if (isDecidedSat(subresults)) return subresults;
|
|
1480
|
-
|
|
1568
|
+
(isDecidedUnsat(subresults) ? unsatGoals : results).push(...subresults);
|
|
1481
1569
|
}
|
|
1482
|
-
|
|
1483
|
-
goal.resetAll();
|
|
1484
|
-
goal.assert(goal.manager.falseExpr);
|
|
1485
|
-
return [goal];
|
|
1570
|
+
return results.length > 0 ? results : assertUnsat(goal, unsatGoals);
|
|
1486
1571
|
};
|
|
1487
1572
|
|
|
1488
1573
|
const runOrElse = (tactics: Tactic[]) => (goal: Goal) => {
|
|
@@ -1496,7 +1581,7 @@ const runOrElse = (tactics: Tactic[]) => (goal: Goal) => {
|
|
|
1496
1581
|
goal.resetAll();
|
|
1497
1582
|
goal.copyFrom(original);
|
|
1498
1583
|
}
|
|
1499
|
-
return
|
|
1584
|
+
return tactics[tactics.length - 1](goal);
|
|
1500
1585
|
};
|
|
1501
1586
|
|
|
1502
1587
|
const isEqualGoal = (first: Goal, second: Goal) => {
|
|
@@ -1516,15 +1601,13 @@ const runRepeat = (tactic: Tactic, maxDepth: number) => {
|
|
|
1516
1601
|
if (goals.length === 1 && isEqualGoal(original, goals[0])) return goals;
|
|
1517
1602
|
if (goals.length === 1) return goals[0].isDecided() ? goals : run(depth + 1, goals[0]);
|
|
1518
1603
|
const results: Goal[] = [];
|
|
1604
|
+
const unsatGoals: Goal[] = [];
|
|
1519
1605
|
for (const subgoal of goals) {
|
|
1520
1606
|
const subresults = run(depth + 1, subgoal);
|
|
1521
1607
|
if (isDecidedSat(subresults)) return subresults;
|
|
1522
|
-
|
|
1608
|
+
(isDecidedUnsat(subresults) ? unsatGoals : results).push(...subresults);
|
|
1523
1609
|
}
|
|
1524
|
-
|
|
1525
|
-
goal.resetAll();
|
|
1526
|
-
goal.assert(goal.manager.falseExpr);
|
|
1527
|
-
return [goal];
|
|
1610
|
+
return results.length > 0 ? results : assertUnsat(goal, unsatGoals);
|
|
1528
1611
|
};
|
|
1529
1612
|
return (goal: Goal) => run(0, goal);
|
|
1530
1613
|
};
|
|
@@ -1532,22 +1615,21 @@ const runRepeat = (tactic: Tactic, maxDepth: number) => {
|
|
|
1532
1615
|
const runCond = (probe: Probe, onTrue: Tactic, onFalse: Tactic) => (goal: Goal) =>
|
|
1533
1616
|
probe(goal) === 0 ? onFalse(goal) : onTrue(goal);
|
|
1534
1617
|
|
|
1535
|
-
const checkHasArgument = (list: SmtList, combinator: string
|
|
1618
|
+
const checkHasArgument = (list: SmtList, combinator: string) => {
|
|
1536
1619
|
if (list.items.length < 2)
|
|
1537
1620
|
throw new SmtParseError(
|
|
1538
1621
|
`invalid ${combinator} combinator, at least one argument expected`,
|
|
1539
|
-
end,
|
|
1622
|
+
list.end,
|
|
1540
1623
|
);
|
|
1541
1624
|
};
|
|
1542
1625
|
|
|
1543
1626
|
const compile = (
|
|
1544
1627
|
environment: TacticEnvironment,
|
|
1545
1628
|
sexpr: SExpr,
|
|
1546
|
-
end: SmtToken,
|
|
1547
1629
|
isInternal: boolean,
|
|
1548
1630
|
): TacticBuilder => {
|
|
1549
1631
|
if (sexpr.kind !== "list") {
|
|
1550
|
-
if (!isSymbol(sexpr)) throw new SmtParseError("invalid tactic, unexpected input",
|
|
1632
|
+
if (!isSymbol(sexpr)) throw new SmtParseError("invalid tactic, unexpected input", sexpr);
|
|
1551
1633
|
const named = NAMED_TACTICS.get(sexpr.text);
|
|
1552
1634
|
if (named !== undefined)
|
|
1553
1635
|
return {
|
|
@@ -1565,7 +1647,7 @@ const compile = (
|
|
|
1565
1647
|
};
|
|
1566
1648
|
const strategy = LOGIC_TACTICS.get(sexpr.text);
|
|
1567
1649
|
if (strategy !== undefined)
|
|
1568
|
-
return compile(environment, createCommandReader(strategy).read() as SmtList,
|
|
1650
|
+
return compile(environment, createCommandReader(strategy).read() as SmtList, true);
|
|
1569
1651
|
if (UNPORTED_TACTICS.has(sexpr.text)) {
|
|
1570
1652
|
const error = new SmtUnsupportedError(`the tactic ${sexpr.text}`);
|
|
1571
1653
|
if (!isInternal) throw error;
|
|
@@ -1578,14 +1660,14 @@ const compile = (
|
|
|
1578
1660
|
},
|
|
1579
1661
|
};
|
|
1580
1662
|
}
|
|
1581
|
-
throw new SmtParseError(`invalid tactic, unknown tactic ${sexpr.text}`,
|
|
1663
|
+
throw new SmtParseError(`invalid tactic, unknown tactic ${sexpr.text}`, sexpr);
|
|
1582
1664
|
}
|
|
1583
1665
|
const head = sexpr.items[0];
|
|
1584
|
-
if (head === undefined) throw new SmtParseError("invalid tactic, arguments expected", end);
|
|
1585
|
-
if (!isSymbol(head)) throw new SmtParseError("invalid tactic, symbol expected", end);
|
|
1666
|
+
if (head === undefined) throw new SmtParseError("invalid tactic, arguments expected", sexpr.end);
|
|
1667
|
+
if (!isSymbol(head)) throw new SmtParseError("invalid tactic, symbol expected", sexpr.end);
|
|
1586
1668
|
const compileChildren = (combinator: string) => {
|
|
1587
|
-
checkHasArgument(sexpr, combinator
|
|
1588
|
-
return sexpr.items.slice(1).map((child) => compile(environment, child,
|
|
1669
|
+
checkHasArgument(sexpr, combinator);
|
|
1670
|
+
return sexpr.items.slice(1).map((child) => compile(environment, child, isInternal));
|
|
1589
1671
|
};
|
|
1590
1672
|
switch (head.text) {
|
|
1591
1673
|
case "then":
|
|
@@ -1635,27 +1717,43 @@ const compile = (
|
|
|
1635
1717
|
// The timeout is not ported, so the child runs to the end.
|
|
1636
1718
|
case "try-for": {
|
|
1637
1719
|
if (sexpr.items.length !== 3)
|
|
1638
|
-
throw new SmtParseError("invalid try-for combinator, two arguments expected", end);
|
|
1639
|
-
if (!
|
|
1720
|
+
throw new SmtParseError("invalid try-for combinator, two arguments expected", sexpr.end);
|
|
1721
|
+
if (!isUnsignedNumeral(sexpr.items[2]))
|
|
1640
1722
|
throw new SmtParseError(
|
|
1641
1723
|
"invalid try-for combinator, second argument must be an unsigned integer",
|
|
1642
|
-
end,
|
|
1724
|
+
sexpr.end,
|
|
1643
1725
|
);
|
|
1644
|
-
|
|
1726
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1727
|
+
return {
|
|
1728
|
+
...child,
|
|
1729
|
+
build: (params) => {
|
|
1730
|
+
const tactic = child.build(params);
|
|
1731
|
+
return (goal) => {
|
|
1732
|
+
try {
|
|
1733
|
+
return tactic(goal);
|
|
1734
|
+
} catch (error) {
|
|
1735
|
+
if (error instanceof SmtDefaultError) throw new SmtTacticError(error.message);
|
|
1736
|
+
if (error instanceof SmtCanceledError)
|
|
1737
|
+
throw new SmtTacticError(goal.manager.limit.getCancelMessage());
|
|
1738
|
+
throw error;
|
|
1739
|
+
}
|
|
1740
|
+
};
|
|
1741
|
+
},
|
|
1742
|
+
};
|
|
1645
1743
|
}
|
|
1646
1744
|
case "fail-if-branching": {
|
|
1647
1745
|
if (sexpr.items.length !== 3 && sexpr.items.length !== 2)
|
|
1648
1746
|
throw new SmtParseError(
|
|
1649
1747
|
"invalid fail-if-branching combinator, one or two arguments expected",
|
|
1650
|
-
end,
|
|
1748
|
+
sexpr.end,
|
|
1651
1749
|
);
|
|
1652
1750
|
const bound = sexpr.items[2];
|
|
1653
|
-
if (bound !== undefined && !
|
|
1751
|
+
if (bound !== undefined && !isUnsignedNumeral(bound))
|
|
1654
1752
|
throw new SmtParseError(
|
|
1655
1753
|
"invalid fail-if-branching combinator, second argument must be an unsigned integer",
|
|
1656
|
-
end,
|
|
1754
|
+
sexpr.end,
|
|
1657
1755
|
);
|
|
1658
|
-
const child = compile(environment, sexpr.items[1],
|
|
1756
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1659
1757
|
const threshold = bound === undefined ? 1 : Number(bound.text);
|
|
1660
1758
|
return {
|
|
1661
1759
|
...mergeDescrs([child]),
|
|
@@ -1673,11 +1771,17 @@ const compile = (
|
|
|
1673
1771
|
case "if-no-unsat-cores":
|
|
1674
1772
|
case "if-no-models": {
|
|
1675
1773
|
if (sexpr.items.length !== 2)
|
|
1676
|
-
throw new SmtParseError(
|
|
1677
|
-
|
|
1774
|
+
throw new SmtParseError(
|
|
1775
|
+
`invalid ${head.text} combinator, one argument expected`,
|
|
1776
|
+
sexpr.end,
|
|
1777
|
+
);
|
|
1778
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1678
1779
|
const isSkipping = (goal: Goal) =>
|
|
1679
|
-
head.text === "if-no-models"
|
|
1680
|
-
|
|
1780
|
+
head.text === "if-no-models"
|
|
1781
|
+
? goal.isModelsEnabled
|
|
1782
|
+
: head.text === "if-no-proofs"
|
|
1783
|
+
? goal.isProofsEnabled
|
|
1784
|
+
: goal.isCoresEnabled;
|
|
1681
1785
|
return {
|
|
1682
1786
|
...mergeDescrs([child]),
|
|
1683
1787
|
build: (params) => {
|
|
@@ -1688,14 +1792,17 @@ const compile = (
|
|
|
1688
1792
|
}
|
|
1689
1793
|
case "repeat": {
|
|
1690
1794
|
if (sexpr.items.length !== 3 && sexpr.items.length !== 2)
|
|
1691
|
-
throw new SmtParseError(
|
|
1795
|
+
throw new SmtParseError(
|
|
1796
|
+
"invalid repeat combinator, one or two arguments expected",
|
|
1797
|
+
sexpr.end,
|
|
1798
|
+
);
|
|
1692
1799
|
const bound = sexpr.items[2];
|
|
1693
|
-
if (bound !== undefined && !
|
|
1800
|
+
if (bound !== undefined && !isUnsignedNumeral(bound))
|
|
1694
1801
|
throw new SmtParseError(
|
|
1695
1802
|
"invalid repeat combinator, second argument must be an unsigned integer",
|
|
1696
|
-
end,
|
|
1803
|
+
sexpr.end,
|
|
1697
1804
|
);
|
|
1698
|
-
const child = compile(environment, sexpr.items[1],
|
|
1805
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1699
1806
|
const maxDepth = bound === undefined ? UINT_MAX : Number(bound.text);
|
|
1700
1807
|
return {
|
|
1701
1808
|
...mergeDescrs([child]),
|
|
@@ -1705,10 +1812,10 @@ const compile = (
|
|
|
1705
1812
|
case "!":
|
|
1706
1813
|
case "using-params":
|
|
1707
1814
|
case "with": {
|
|
1708
|
-
checkHasArgument(sexpr, "using-params"
|
|
1709
|
-
const child = compile(environment, sexpr.items[1],
|
|
1815
|
+
checkHasArgument(sexpr, "using-params");
|
|
1816
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1710
1817
|
if (sexpr.items.length === 2) return child;
|
|
1711
|
-
const own = getParams(child, sexpr.items,
|
|
1818
|
+
const own = getParams(child, sexpr.items, isInternal);
|
|
1712
1819
|
return {
|
|
1713
1820
|
...mergeDescrs([child]),
|
|
1714
1821
|
build: (params) => child.build(new Map([...params, ...own])),
|
|
@@ -1716,8 +1823,11 @@ const compile = (
|
|
|
1716
1823
|
}
|
|
1717
1824
|
case "skip-if-failed": {
|
|
1718
1825
|
if (sexpr.items.length !== 2)
|
|
1719
|
-
throw new SmtParseError(
|
|
1720
|
-
|
|
1826
|
+
throw new SmtParseError(
|
|
1827
|
+
"invalid skip-if-failed combinator, one argument expected",
|
|
1828
|
+
sexpr.end,
|
|
1829
|
+
);
|
|
1830
|
+
const child = compile(environment, sexpr.items[1], isInternal);
|
|
1721
1831
|
return {
|
|
1722
1832
|
...mergeDescrs([child]),
|
|
1723
1833
|
build: (params) => runOrElse([child.build(params), (goal) => [goal]]),
|
|
@@ -1727,11 +1837,12 @@ const compile = (
|
|
|
1727
1837
|
case "ite":
|
|
1728
1838
|
case "cond": {
|
|
1729
1839
|
if (sexpr.items.length !== 4)
|
|
1730
|
-
throw new SmtParseError(
|
|
1731
|
-
|
|
1732
|
-
|
|
1733
|
-
|
|
1734
|
-
|
|
1840
|
+
throw new SmtParseError(
|
|
1841
|
+
"invalid if/conditional combinator, three arguments expected",
|
|
1842
|
+
sexpr.end,
|
|
1843
|
+
);
|
|
1844
|
+
const probe = compileProbe(sexpr.items[1], isInternal);
|
|
1845
|
+
const children = sexpr.items.slice(2).map((child) => compile(environment, child, isInternal));
|
|
1735
1846
|
return {
|
|
1736
1847
|
...mergeDescrs(children),
|
|
1737
1848
|
build: (params) => runCond(probe, children[0].build(params), children[1].build(params)),
|
|
@@ -1739,9 +1850,9 @@ const compile = (
|
|
|
1739
1850
|
}
|
|
1740
1851
|
case "when": {
|
|
1741
1852
|
if (sexpr.items.length !== 3)
|
|
1742
|
-
throw new SmtParseError("invalid when combinator, two arguments expected", end);
|
|
1743
|
-
const probe = compileProbe(sexpr.items[1],
|
|
1744
|
-
const child = compile(environment, sexpr.items[2],
|
|
1853
|
+
throw new SmtParseError("invalid when combinator, two arguments expected", sexpr.end);
|
|
1854
|
+
const probe = compileProbe(sexpr.items[1], isInternal);
|
|
1855
|
+
const child = compile(environment, sexpr.items[2], isInternal);
|
|
1745
1856
|
return {
|
|
1746
1857
|
...mergeDescrs([child]),
|
|
1747
1858
|
build: (params) => runCond(probe, child.build(params), (goal) => [goal]),
|
|
@@ -1749,8 +1860,8 @@ const compile = (
|
|
|
1749
1860
|
}
|
|
1750
1861
|
case "fail-if": {
|
|
1751
1862
|
if (sexpr.items.length !== 2)
|
|
1752
|
-
throw new SmtParseError("invalid fail-if tactic, one argument expected", end);
|
|
1753
|
-
const probe = compileProbe(sexpr.items[1],
|
|
1863
|
+
throw new SmtParseError("invalid fail-if tactic, one argument expected", sexpr.end);
|
|
1864
|
+
const probe = compileProbe(sexpr.items[1], isInternal);
|
|
1754
1865
|
return {
|
|
1755
1866
|
descrs: new Map(),
|
|
1756
1867
|
isRejectingUnknown: true,
|
|
@@ -1763,7 +1874,7 @@ const compile = (
|
|
|
1763
1874
|
}
|
|
1764
1875
|
case "echo": {
|
|
1765
1876
|
if (sexpr.items.length < 2)
|
|
1766
|
-
throw new SmtParseError("invalid echo tactic, must have at least one argument", end);
|
|
1877
|
+
throw new SmtParseError("invalid echo tactic, must have at least one argument", sexpr.end);
|
|
1767
1878
|
const pieces = sexpr.items.slice(1).map((piece, index, all): Tactic => {
|
|
1768
1879
|
const newline = index === all.length - 1 ? "\n" : "";
|
|
1769
1880
|
if (piece.kind === "string")
|
|
@@ -1771,7 +1882,7 @@ const compile = (
|
|
|
1771
1882
|
environment.write(piece.text + newline, false);
|
|
1772
1883
|
return [goal];
|
|
1773
1884
|
};
|
|
1774
|
-
const probe = compileProbe(piece,
|
|
1885
|
+
const probe = compileProbe(piece, isInternal);
|
|
1775
1886
|
return (goal) => {
|
|
1776
1887
|
environment.write(formatProbeValue(probe(goal)) + newline, true);
|
|
1777
1888
|
return [goal];
|
|
@@ -1785,7 +1896,7 @@ const compile = (
|
|
|
1785
1896
|
};
|
|
1786
1897
|
}
|
|
1787
1898
|
default:
|
|
1788
|
-
throw new SmtParseError(`invalid tactic, unknown tactic combinator ${head.text}`, end);
|
|
1899
|
+
throw new SmtParseError(`invalid tactic, unknown tactic combinator ${head.text}`, sexpr.end);
|
|
1789
1900
|
}
|
|
1790
1901
|
};
|
|
1791
1902
|
|
|
@@ -1833,20 +1944,24 @@ export const mkIncSatPreprocess = (manager: AstManager, bitBlaster: BitBlasterRe
|
|
|
1833
1944
|
),
|
|
1834
1945
|
].reduceRight((second, first) => runAndThen(first, second));
|
|
1835
1946
|
|
|
1836
|
-
export const compileTactic = (environment: TacticEnvironment, sexpr: SExpr
|
|
1837
|
-
compile(environment, sexpr,
|
|
1947
|
+
export const compileTactic = (environment: TacticEnvironment, sexpr: SExpr) =>
|
|
1948
|
+
compile(environment, sexpr, false);
|
|
1838
1949
|
|
|
1839
1950
|
export const compileInternalTactic = (environment: TacticEnvironment, text: string) => {
|
|
1840
1951
|
const list = createCommandReader(`(${text})`).read() as SmtList;
|
|
1841
|
-
return compile(environment, list.items[0],
|
|
1952
|
+
return compile(environment, list.items[0], true).build(new Map());
|
|
1842
1953
|
};
|
|
1843
1954
|
|
|
1844
1955
|
interface TacticCheck {
|
|
1845
1956
|
status: number;
|
|
1846
1957
|
model: ProtoModel | undefined;
|
|
1847
1958
|
core: Dependency | undefined;
|
|
1959
|
+
reasonUnknown: string | undefined;
|
|
1848
1960
|
}
|
|
1849
1961
|
|
|
1962
|
+
// The port's declarations of division by zero leave out their domain; Z3's have two arguments.
|
|
1963
|
+
const DIVISION_BY_ZERO_DECLS = new Set([OP_DIV0, OP_IDIV0, OP_MOD0, OP_POWER0]);
|
|
1964
|
+
|
|
1850
1965
|
// A constant of an uninterpreted sort the model lacks puts its value in that sort's universe.
|
|
1851
1966
|
const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
1852
1967
|
const manager = model.manager;
|
|
@@ -1860,7 +1975,9 @@ const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
|
1860
1975
|
continue;
|
|
1861
1976
|
}
|
|
1862
1977
|
const value = evaluator.rewrite(definition.def);
|
|
1863
|
-
const arity =
|
|
1978
|
+
const arity = DIVISION_BY_ZERO_DECLS.has(definition.decl)
|
|
1979
|
+
? 2
|
|
1980
|
+
: manager.funcDecls[definition.decl].domain.length;
|
|
1864
1981
|
if (arity > 0) {
|
|
1865
1982
|
const oldInterp = model.funcInterps.get(definition.decl);
|
|
1866
1983
|
const isChanged = oldInterp?.elseExpr !== value;
|
|
@@ -1906,24 +2023,46 @@ export const convertModel = (goal: Goal, model: ProtoModel) =>
|
|
|
1906
2023
|
return converted;
|
|
1907
2024
|
}, model);
|
|
1908
2025
|
|
|
2026
|
+
const getConvertedModel = (goal: Goal) =>
|
|
2027
|
+
convertModel(goal, goal.model?.copy() ?? new ProtoModel(goal.manager).mkModel());
|
|
2028
|
+
|
|
1909
2029
|
export const checkSatUsing = (tactic: Tactic, goal: Goal): TacticCheck => {
|
|
2030
|
+
const undecided = { status: L_UNDEF, model: undefined, core: undefined };
|
|
1910
2031
|
const goals = (() => {
|
|
1911
2032
|
try {
|
|
1912
2033
|
return tactic(goal);
|
|
1913
2034
|
} catch (error) {
|
|
1914
|
-
if (error instanceof SmtTacticError || error instanceof
|
|
2035
|
+
if (error instanceof SmtTacticError || error instanceof SmtDefaultError) return error.message;
|
|
2036
|
+
if (error instanceof SmtCanceledError) return undefined;
|
|
1915
2037
|
throw error;
|
|
1916
2038
|
}
|
|
1917
2039
|
})();
|
|
1918
|
-
if (goals
|
|
2040
|
+
if (goals === undefined) return { ...undecided, reasonUnknown: undefined };
|
|
2041
|
+
if (typeof goals === "string") return { ...undecided, reasonUnknown: goals };
|
|
2042
|
+
if (isDecidedSat(goals)) {
|
|
2043
|
+
const model = getConvertedModel(goals[0]);
|
|
2044
|
+
return goal.manager.limit.inc()
|
|
2045
|
+
? { status: L_TRUE, model, core: undefined, reasonUnknown: "" }
|
|
2046
|
+
: { ...undecided, model, reasonUnknown: "canceled" };
|
|
2047
|
+
}
|
|
2048
|
+
if (isDecidedUnsat(goals))
|
|
1919
2049
|
return {
|
|
1920
|
-
status:
|
|
1921
|
-
model:
|
|
1922
|
-
core:
|
|
2050
|
+
status: L_FALSE,
|
|
2051
|
+
model: undefined,
|
|
2052
|
+
core: goals[0].getDependency(0),
|
|
2053
|
+
reasonUnknown: "",
|
|
1923
2054
|
};
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
2055
|
+
return {
|
|
2056
|
+
...undecided,
|
|
2057
|
+
model:
|
|
2058
|
+
goal.isModelsEnabled &&
|
|
2059
|
+
goals.length > 0 &&
|
|
2060
|
+
(goals[0].model !== undefined || goals[0].converters.length > 0)
|
|
2061
|
+
? getConvertedModel(goals[0])
|
|
2062
|
+
: undefined,
|
|
2063
|
+
reasonUnknown:
|
|
2064
|
+
goals.length === 1 && goals[0].reasonUnknown !== "" ? goals[0].reasonUnknown : "unknown",
|
|
2065
|
+
};
|
|
1927
2066
|
};
|
|
1928
2067
|
|
|
1929
2068
|
export const applyTactic = (tactic: Tactic, goal: Goal) => {
|