tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +6 -16
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -7
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +25 -6
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +0 -1
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -14
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +91 -55
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +0 -1
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +66 -16
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/purify_arith_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -110,7 +109,7 @@ class PurifyState {
|
|
|
110
109
|
private initCannotPurify() {
|
|
111
110
|
const manager = this.manager;
|
|
112
111
|
this.forEachApp((expr) => {
|
|
113
|
-
if (manager.getArgs(expr).some((arg) => !manager.
|
|
112
|
+
if (manager.getArgs(expr).some((arg) => !manager.isGroundApp(arg)))
|
|
114
113
|
this.cannotPurify.add(manager.decls[expr]);
|
|
115
114
|
});
|
|
116
115
|
}
|
|
@@ -253,7 +252,7 @@ class PurifyRewriter extends RewriterTpl {
|
|
|
253
252
|
const expr = this.mk(decl, args, SORT_INT);
|
|
254
253
|
const processed = this.state.appToFresh.get(expr);
|
|
255
254
|
if (processed !== undefined) return processed;
|
|
256
|
-
this.processIdiv(
|
|
255
|
+
this.processIdiv(decl, args);
|
|
257
256
|
return this.state.appToFresh.get(expr) as number;
|
|
258
257
|
}
|
|
259
258
|
|
|
@@ -377,9 +376,9 @@ class PurifyRewriter extends RewriterTpl {
|
|
|
377
376
|
return -1;
|
|
378
377
|
}
|
|
379
378
|
|
|
380
|
-
// Inside [-1, 1], k is asin
|
|
381
|
-
//
|
|
382
|
-
private
|
|
379
|
+
// Inside [-1, 1], k is asin on its principal range. Outside it, k is asin-u when the
|
|
380
|
+
// purification is complete.
|
|
381
|
+
private processAsin(decl: number, x: number) {
|
|
383
382
|
const state = this.state;
|
|
384
383
|
if (!state.options.isElimInverses) return -1;
|
|
385
384
|
const expr = this.mk(decl, [x], SORT_REAL);
|
|
@@ -387,27 +386,61 @@ class PurifyRewriter extends RewriterTpl {
|
|
|
387
386
|
if (processed !== undefined) return processed;
|
|
388
387
|
const fresh = this.mkFreshVar(false);
|
|
389
388
|
this.cacheResult(expr, fresh);
|
|
390
|
-
const isAsin = decl === OP_ASIN;
|
|
391
389
|
const one = this.mkNumeral(Rational.one, false);
|
|
392
390
|
const minusOne = this.mkNumeral(Rational.minusOne, false);
|
|
393
|
-
const
|
|
394
|
-
const
|
|
391
|
+
const halfPi = this.mkHalfPi(1n);
|
|
392
|
+
const minusHalfPi = this.mkHalfPi(-1n);
|
|
395
393
|
const xGeMinusOne = this.mk(OP_GE, [x, minusOne]);
|
|
394
|
+
const xLtMinusOne = this.mk(OP_NOT, [xGeMinusOne]);
|
|
396
395
|
const xLeOne = this.mk(OP_LE, [x, one]);
|
|
397
|
-
const outside = this.mk(OP_OR, [
|
|
398
|
-
const
|
|
399
|
-
const
|
|
396
|
+
const outside = this.mk(OP_OR, [xLtMinusOne, this.mk(OP_NOT, [xLeOne])]);
|
|
397
|
+
const sinEq = this.mk(OP_EQ, [x, this.mk(OP_SIN, [fresh], SORT_REAL)]);
|
|
398
|
+
const freshGeMinusHalfPi = this.mk(OP_GE, [fresh, minusHalfPi]);
|
|
400
399
|
this.pushConstraint(
|
|
401
400
|
this.mk(OP_OR, [
|
|
402
401
|
outside,
|
|
403
402
|
this.mk(OP_AND, [
|
|
404
|
-
|
|
405
|
-
this.mk(OP_AND, [
|
|
403
|
+
sinEq,
|
|
404
|
+
this.mk(OP_AND, [freshGeMinusHalfPi, this.mk(OP_LE, [fresh, halfPi])]),
|
|
406
405
|
]),
|
|
407
406
|
]),
|
|
408
407
|
);
|
|
409
408
|
if (state.options.isComplete) {
|
|
410
|
-
const unspecified = this.mk(
|
|
409
|
+
const unspecified = this.mk(OP_U_ASIN, [x], SORT_REAL);
|
|
410
|
+
this.pushConstraint(this.mk(OP_OR, [xGeMinusOne, this.mk(OP_EQ, [fresh, unspecified])]));
|
|
411
|
+
this.pushConstraint(this.mk(OP_OR, [xLeOne, this.mk(OP_EQ, [fresh, unspecified])]));
|
|
412
|
+
}
|
|
413
|
+
return fresh;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
// Inside [-1, 1], k is acos on its principal range. Outside it, k is acos-u when the
|
|
417
|
+
// purification is complete.
|
|
418
|
+
private processAcos(decl: number, x: number) {
|
|
419
|
+
const state = this.state;
|
|
420
|
+
if (!state.options.isElimInverses) return -1;
|
|
421
|
+
const expr = this.mk(decl, [x], SORT_REAL);
|
|
422
|
+
const processed = state.appToFresh.get(expr);
|
|
423
|
+
if (processed !== undefined) return processed;
|
|
424
|
+
const fresh = this.mkFreshVar(false);
|
|
425
|
+
this.cacheResult(expr, fresh);
|
|
426
|
+
const one = this.mkNumeral(Rational.one, false);
|
|
427
|
+
const minusOne = this.mkNumeral(Rational.minusOne, false);
|
|
428
|
+
const pi = this.manager.piExpr;
|
|
429
|
+
const zero = this.mkNumeral(Rational.zero, false);
|
|
430
|
+
const xGeMinusOne = this.mk(OP_GE, [x, minusOne]);
|
|
431
|
+
const xLtMinusOne = this.mk(OP_NOT, [xGeMinusOne]);
|
|
432
|
+
const xLeOne = this.mk(OP_LE, [x, one]);
|
|
433
|
+
const outside = this.mk(OP_OR, [xLtMinusOne, this.mk(OP_NOT, [xLeOne])]);
|
|
434
|
+
const cosEq = this.mk(OP_EQ, [x, this.mk(OP_COS, [fresh], SORT_REAL)]);
|
|
435
|
+
const freshGeZero = this.mk(OP_GE, [fresh, zero]);
|
|
436
|
+
this.pushConstraint(
|
|
437
|
+
this.mk(OP_OR, [
|
|
438
|
+
outside,
|
|
439
|
+
this.mk(OP_AND, [cosEq, this.mk(OP_AND, [freshGeZero, this.mk(OP_LE, [fresh, pi])])]),
|
|
440
|
+
]),
|
|
441
|
+
);
|
|
442
|
+
if (state.options.isComplete) {
|
|
443
|
+
const unspecified = this.mk(OP_U_ACOS, [x], SORT_REAL);
|
|
411
444
|
this.pushConstraint(this.mk(OP_OR, [xGeMinusOne, this.mk(OP_EQ, [fresh, unspecified])]));
|
|
412
445
|
this.pushConstraint(this.mk(OP_OR, [xLeOne, this.mk(OP_EQ, [fresh, unspecified])]));
|
|
413
446
|
}
|
|
@@ -459,8 +492,9 @@ class PurifyRewriter extends RewriterTpl {
|
|
|
459
492
|
case OP_POWER:
|
|
460
493
|
return this.processPower(decl, args);
|
|
461
494
|
case OP_ASIN:
|
|
495
|
+
return this.processAsin(decl, args[0]);
|
|
462
496
|
case OP_ACOS:
|
|
463
|
-
return this.
|
|
497
|
+
return this.processAcos(decl, args[0]);
|
|
464
498
|
case OP_SIN:
|
|
465
499
|
return this.processSinCos(true, decl, args[0]);
|
|
466
500
|
case OP_COS:
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/qe_arith_plugin.cpp, src/smt/arith_eq_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -364,8 +362,9 @@ class ArithQeUtil {
|
|
|
364
362
|
? manager.getArg(expr, 1)
|
|
365
363
|
: expr;
|
|
366
364
|
};
|
|
365
|
+
const ids = manager.ids;
|
|
367
366
|
const args = [...manager.getArgs(simplified)].sort(
|
|
368
|
-
(first, second) => strip(first) - strip(second),
|
|
367
|
+
(first, second) => ids[strip(first)] - ids[strip(second)],
|
|
369
368
|
);
|
|
370
369
|
return this.mkAddN(args);
|
|
371
370
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/qe_mbp.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -8,7 +7,6 @@ import {
|
|
|
8
7
|
FAMILY_DATATYPE,
|
|
9
8
|
FAMILY_SEQ,
|
|
10
9
|
KIND_APP,
|
|
11
|
-
KIND_QUANTIFIER,
|
|
12
10
|
OP_EQ,
|
|
13
11
|
SORT_BOOL,
|
|
14
12
|
} from "./ast";
|
|
@@ -20,24 +18,10 @@ import { applyMbpQel } from "./mbp/mbp-qel";
|
|
|
20
18
|
import { filterRefVector } from "./mbp/mbp-term-graph";
|
|
21
19
|
import type { ProtoModel } from "./proto-model";
|
|
22
20
|
import { applyQel } from "./qel";
|
|
21
|
+
import { hasSubterm } from "./recfun-decl-plugin";
|
|
23
22
|
import { RefVector } from "./ref-vector";
|
|
24
23
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
25
24
|
|
|
26
|
-
const getSubterms = (manager: AstManager, roots: readonly number[]) => {
|
|
27
|
-
const visited = new Set<number>();
|
|
28
|
-
const todo = [...roots];
|
|
29
|
-
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
30
|
-
if (visited.has(expr)) continue;
|
|
31
|
-
visited.add(expr);
|
|
32
|
-
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
33
|
-
else if (manager.kinds[expr] === KIND_QUANTIFIER) todo.push(manager.getQuantifier(expr).body);
|
|
34
|
-
}
|
|
35
|
-
return visited;
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
const isOccurring = (manager: AstManager, variable: number, expr: number) =>
|
|
39
|
-
getSubterms(manager, [expr]).has(variable);
|
|
40
|
-
|
|
41
25
|
const hasSortFamily = (manager: AstManager, expr: number, families: readonly number[]) =>
|
|
42
26
|
families.includes(manager.getSortFamily(manager.sorts[expr])) ||
|
|
43
27
|
(manager.kinds[expr] === KIND_APP && families.includes(manager.getFamily(expr)));
|
|
@@ -58,7 +42,7 @@ export class Mbproj {
|
|
|
58
42
|
apply(isForceElim: boolean, vars: RefVector, model: ProtoModel, fmls: RefVector) {
|
|
59
43
|
const manager = this.manager;
|
|
60
44
|
const context = new MbpContext(manager, model);
|
|
61
|
-
const isUnsupportedTh =
|
|
45
|
+
const isUnsupportedTh = hasSubterm(manager, fmls.items, (expr) =>
|
|
62
46
|
hasSortFamily(manager, expr, [FAMILY_SEQ, FAMILY_CHAR]),
|
|
63
47
|
);
|
|
64
48
|
if (isUnsupportedTh) this.mbp(context, isForceElim, vars, fmls);
|
|
@@ -96,7 +80,7 @@ export class Mbproj {
|
|
|
96
80
|
const manager = this.manager;
|
|
97
81
|
// The term graph's rules for arrays and datatypes, and spacer_qe_lite, are not ported.
|
|
98
82
|
if (
|
|
99
|
-
|
|
83
|
+
hasSubterm(manager, [formula], (expr) =>
|
|
100
84
|
hasSortFamily(manager, expr, [FAMILY_ARRAY, FAMILY_DATATYPE]),
|
|
101
85
|
)
|
|
102
86
|
)
|
|
@@ -117,7 +101,7 @@ export class Mbproj {
|
|
|
117
101
|
if (
|
|
118
102
|
!vars.items.includes(innerVar) &&
|
|
119
103
|
!otherVars.items.includes(innerVar) &&
|
|
120
|
-
|
|
104
|
+
hasSubterm(manager, [result], (expr) => expr === innerVar)
|
|
121
105
|
)
|
|
122
106
|
otherVars.push(innerVar);
|
|
123
107
|
if (otherVars.size > 0) {
|
|
@@ -161,7 +145,8 @@ export class Mbproj {
|
|
|
161
145
|
}
|
|
162
146
|
const term = terms.find(
|
|
163
147
|
(candidate) =>
|
|
164
|
-
context.eval(candidate, false) === value &&
|
|
148
|
+
context.eval(candidate, false) === value &&
|
|
149
|
+
!hasSubterm(manager, [candidate], (expr) => expr === innerVar),
|
|
165
150
|
);
|
|
166
151
|
if (term === undefined) {
|
|
167
152
|
vars.set(kept++, innerVar);
|
|
@@ -221,13 +206,13 @@ export class Mbproj {
|
|
|
221
206
|
filterRefVector(vars, (innerVar) => visited.has(innerVar));
|
|
222
207
|
this.projectBools(context, vars, fmls);
|
|
223
208
|
let isProgress = true;
|
|
224
|
-
while (isProgress && vars.size > 0 && fmls.size > 0) {
|
|
209
|
+
while (isProgress && vars.size > 0 && fmls.size > 0 && manager.limit.inc()) {
|
|
225
210
|
const newVars = new RefVector(manager);
|
|
226
211
|
isProgress = false;
|
|
227
212
|
const remaining = [...vars.items];
|
|
228
213
|
arith.project(remaining, fmls);
|
|
229
214
|
filterRefVector(vars, (innerVar) => remaining.includes(innerVar));
|
|
230
|
-
while (vars.size > 0 && fmls.size > 0) {
|
|
215
|
+
while (vars.size > 0 && fmls.size > 0 && manager.limit.inc()) {
|
|
231
216
|
const innerVar = vars.items[vars.size - 1];
|
|
232
217
|
manager.incRef(innerVar);
|
|
233
218
|
vars.pop();
|
|
@@ -236,7 +221,7 @@ export class Mbproj {
|
|
|
236
221
|
else newVars.push(innerVar);
|
|
237
222
|
manager.decRef(innerVar);
|
|
238
223
|
}
|
|
239
|
-
if (!isProgress && newVars.size > 0 && fmls.size > 0 && isForceElim) {
|
|
224
|
+
if (!isProgress && newVars.size > 0 && fmls.size > 0 && isForceElim && manager.limit.inc()) {
|
|
240
225
|
const innerVar = newVars.items[newVars.size - 1];
|
|
241
226
|
const subst = new ExprSafeReplace(manager);
|
|
242
227
|
subst.insert(innerVar, context.eval(innerVar));
|
|
@@ -252,6 +237,10 @@ export class Mbproj {
|
|
|
252
237
|
subst.release();
|
|
253
238
|
isProgress = true;
|
|
254
239
|
}
|
|
240
|
+
if (!manager.limit.inc()) {
|
|
241
|
+
newVars.reset();
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
255
244
|
for (const innerVar of newVars.items) vars.push(innerVar);
|
|
256
245
|
newVars.reset();
|
|
257
246
|
if (isProgress) this.preprocessSolve(context, vars, fmls);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/qe.cpp, src/qe/qe_tactic.cpp, src/qe/qe_bool_plugin.cpp,
|
|
2
|
-
// src/qe/qe_bv_plugin.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -31,6 +29,7 @@ import { ObjHashtable } from "./hashtable";
|
|
|
31
29
|
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
32
30
|
import type { ProtoModel } from "./proto-model";
|
|
33
31
|
import { ArithPlugin } from "./qe-arith-plugin";
|
|
32
|
+
import { hasSubterm } from "./recfun-decl-plugin";
|
|
34
33
|
import { RefVector } from "./ref-vector";
|
|
35
34
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
36
35
|
import { InvVarShifter, RewriterTpl, VarShifter } from "./rewriter-tpl";
|
|
@@ -1206,33 +1205,49 @@ class QuantElim {
|
|
|
1206
1205
|
const result = this.eliminateExists(vars, formula, freeVars, false);
|
|
1207
1206
|
const bound = freeVars.filter((x) => new ContainsApp(manager, x).has(result));
|
|
1208
1207
|
if (bound.length === 0) return result;
|
|
1209
|
-
return this.pin(
|
|
1208
|
+
return this.pin(mkQuantifierOver(manager, QUANTIFIER_EXISTS, bound, result, this));
|
|
1210
1209
|
}
|
|
1211
1210
|
}
|
|
1212
1211
|
|
|
1213
|
-
//
|
|
1214
|
-
const
|
|
1212
|
+
// mk_exists and mk_forall over the constants an abstracted body had.
|
|
1213
|
+
export const mkQuantifierOfConsts = (
|
|
1215
1214
|
manager: AstManager,
|
|
1215
|
+
kind: number,
|
|
1216
1216
|
vars: readonly number[],
|
|
1217
|
-
|
|
1218
|
-
|
|
1219
|
-
) =>
|
|
1220
|
-
|
|
1221
|
-
|
|
1222
|
-
replace.insert(x, quantElim.pin(manager.mkVar(vars.length - 1 - index, manager.sorts[x]))),
|
|
1223
|
-
);
|
|
1224
|
-
const body = quantElim.pinOwned(replace.apply(formula));
|
|
1225
|
-
replace.release();
|
|
1226
|
-
return manager.mkQuantifier({
|
|
1227
|
-
kind: QUANTIFIER_EXISTS,
|
|
1217
|
+
body: number,
|
|
1218
|
+
weight: number,
|
|
1219
|
+
) =>
|
|
1220
|
+
manager.mkQuantifier({
|
|
1221
|
+
kind,
|
|
1228
1222
|
sorts: vars.map((x) => manager.sorts[x]),
|
|
1229
1223
|
names: vars.map((x) => manager.getDeclName(x)),
|
|
1230
1224
|
body,
|
|
1231
1225
|
patterns: [],
|
|
1232
1226
|
noPatterns: [],
|
|
1233
|
-
weight
|
|
1227
|
+
weight,
|
|
1234
1228
|
qid: "",
|
|
1235
1229
|
});
|
|
1230
|
+
|
|
1231
|
+
interface Pins {
|
|
1232
|
+
pin(expr: number): number;
|
|
1233
|
+
pinOwned(expr: number): number;
|
|
1234
|
+
}
|
|
1235
|
+
|
|
1236
|
+
// expr_abstract and mk_quantifier: binds the constants, the last one to (:var 0).
|
|
1237
|
+
const mkQuantifierOver = (
|
|
1238
|
+
manager: AstManager,
|
|
1239
|
+
kind: number,
|
|
1240
|
+
vars: readonly number[],
|
|
1241
|
+
formula: number,
|
|
1242
|
+
pins: Pins,
|
|
1243
|
+
) => {
|
|
1244
|
+
const replace = new ExprSafeReplace(manager);
|
|
1245
|
+
vars.forEach((x, index) =>
|
|
1246
|
+
replace.insert(x, pins.pin(manager.mkVar(vars.length - 1 - index, manager.sorts[x]))),
|
|
1247
|
+
);
|
|
1248
|
+
const body = pins.pinOwned(replace.apply(formula));
|
|
1249
|
+
replace.release();
|
|
1250
|
+
return mkQuantifierOfConsts(manager, kind, vars, body, 1);
|
|
1236
1251
|
};
|
|
1237
1252
|
|
|
1238
1253
|
// The body of the quantifier over fresh constants for its variables, with a reference.
|
|
@@ -1430,22 +1445,7 @@ class SimplifyRewriter extends RewriterTpl {
|
|
|
1430
1445
|
manager.incRef(result);
|
|
1431
1446
|
return result;
|
|
1432
1447
|
}
|
|
1433
|
-
const
|
|
1434
|
-
vars.forEach((x, index) =>
|
|
1435
|
-
replace.insert(x, context.pin(manager.mkVar(vars.length - 1 - index, manager.sorts[x]))),
|
|
1436
|
-
);
|
|
1437
|
-
const abstracted = context.pinOwned(replace.apply(result));
|
|
1438
|
-
replace.release();
|
|
1439
|
-
const quantifier = manager.mkQuantifier({
|
|
1440
|
-
kind: data.kind,
|
|
1441
|
-
sorts: vars.map((x) => manager.sorts[x]),
|
|
1442
|
-
names: vars.map((x) => manager.getDeclName(x)),
|
|
1443
|
-
body: abstracted,
|
|
1444
|
-
patterns: [],
|
|
1445
|
-
noPatterns: [],
|
|
1446
|
-
weight: 1,
|
|
1447
|
-
qid: "",
|
|
1448
|
-
});
|
|
1448
|
+
const quantifier = mkQuantifierOver(manager, data.kind, vars, result, context);
|
|
1449
1449
|
manager.incRef(quantifier);
|
|
1450
1450
|
return quantifier;
|
|
1451
1451
|
}
|
|
@@ -1484,25 +1484,15 @@ export const runQe = (manager: AstManager) => (goal: Goal) => {
|
|
|
1484
1484
|
}
|
|
1485
1485
|
};
|
|
1486
1486
|
|
|
1487
|
-
const
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1499
|
-
data.sorts.some((sort) =>
|
|
1500
|
-
[FAMILY_ARRAY, FAMILY_DATATYPE].includes(manager.getSortFamily(sort)),
|
|
1501
|
-
)
|
|
1502
|
-
)
|
|
1503
|
-
return true;
|
|
1504
|
-
todo.push(data.body);
|
|
1505
|
-
}
|
|
1506
|
-
}
|
|
1507
|
-
return false;
|
|
1508
|
-
};
|
|
1487
|
+
const isArrayOrDatatype = (manager: AstManager, sort: number) =>
|
|
1488
|
+
manager.getSortFamily(sort) === FAMILY_ARRAY || manager.getSortFamily(sort) === FAMILY_DATATYPE;
|
|
1489
|
+
|
|
1490
|
+
const hasUnsupportedSort = (manager: AstManager, formula: number) =>
|
|
1491
|
+
hasSubterm(
|
|
1492
|
+
manager,
|
|
1493
|
+
[formula],
|
|
1494
|
+
(expr) =>
|
|
1495
|
+
isArrayOrDatatype(manager, manager.sorts[expr]) ||
|
|
1496
|
+
(manager.kinds[expr] === KIND_QUANTIFIER &&
|
|
1497
|
+
manager.getQuantifier(expr).sorts.some((sort) => isArrayOrDatatype(manager, sort))),
|
|
1498
|
+
);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/qi_queue.cpp, src/smt/smt_checker.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, KIND_VAR, OP_AND, OP_EQ, OP_FALSE, OP_ITE, OP_NOT, OP_OR, OP_TRUE } from "./ast";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
3
|
import type { Enode } from "./enode";
|