tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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 +4 -1
- package/dist/index.d.ts +4 -1
- 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 +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- 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/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- 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/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- 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 +5 -3
- 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 +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- 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 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- 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 +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 +50 -3
- 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/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 +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +3 -6
- 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 +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- 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 +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 +1 -4
- 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 +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- 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 +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-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +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 +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 +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- 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 +21 -97
- 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 +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- 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 +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- 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 +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 +0 -1
- 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 +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 +0 -1
- 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 +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- 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 +9 -2
- 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 +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- 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 +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- 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 -2
- 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 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- 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 +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- 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 +194 -93
- 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 +112 -99
- 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 +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 +15 -10
- 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 +0 -1
- 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 +14 -20
- 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 +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- 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 +0 -1
- 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 +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +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 +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 +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- 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 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- 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 +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- 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 +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- 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 +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- 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 +31 -34
- 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 +8 -3
- 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 +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- 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 +0 -2
- 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 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- 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 -26
- 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 +2 -3
- 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 +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 +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- 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/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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/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";
|
|
@@ -317,7 +316,8 @@ class SearchTree {
|
|
|
317
316
|
}
|
|
318
317
|
|
|
319
318
|
consumeVars(vars: number[]) {
|
|
320
|
-
|
|
319
|
+
for (let variable = vars.pop(); variable !== undefined; variable = vars.pop())
|
|
320
|
+
this.vars.push(variable);
|
|
321
321
|
}
|
|
322
322
|
|
|
323
323
|
isUnit() {
|
|
@@ -446,7 +446,7 @@ const partitionVars = (contains: readonly ContainsApp[], args: readonly number[]
|
|
|
446
446
|
}
|
|
447
447
|
if (nonSharedVars.length === 0) return undefined;
|
|
448
448
|
const root0 = find(0);
|
|
449
|
-
if (!nonSharedVars.some((
|
|
449
|
+
if (!nonSharedVars.some((_value, index) => index > 0 && find(index) !== root0)) return undefined;
|
|
450
450
|
const roots: number[] = partition.length > 0 ? [-1] : [];
|
|
451
451
|
for (const [index, x] of nonSharedVars.entries()) {
|
|
452
452
|
const root = nonSharedVars[find(index)];
|
|
@@ -1206,33 +1206,49 @@ class QuantElim {
|
|
|
1206
1206
|
const result = this.eliminateExists(vars, formula, freeVars, false);
|
|
1207
1207
|
const bound = freeVars.filter((x) => new ContainsApp(manager, x).has(result));
|
|
1208
1208
|
if (bound.length === 0) return result;
|
|
1209
|
-
return this.pin(
|
|
1209
|
+
return this.pin(mkQuantifierOver(manager, QUANTIFIER_EXISTS, bound, result, this));
|
|
1210
1210
|
}
|
|
1211
1211
|
}
|
|
1212
1212
|
|
|
1213
|
-
//
|
|
1214
|
-
const
|
|
1213
|
+
// mk_exists and mk_forall over the constants an abstracted body had.
|
|
1214
|
+
export const mkQuantifierOfConsts = (
|
|
1215
1215
|
manager: AstManager,
|
|
1216
|
+
kind: number,
|
|
1216
1217
|
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,
|
|
1218
|
+
body: number,
|
|
1219
|
+
weight: number,
|
|
1220
|
+
) =>
|
|
1221
|
+
manager.mkQuantifier({
|
|
1222
|
+
kind,
|
|
1228
1223
|
sorts: vars.map((x) => manager.sorts[x]),
|
|
1229
1224
|
names: vars.map((x) => manager.getDeclName(x)),
|
|
1230
1225
|
body,
|
|
1231
1226
|
patterns: [],
|
|
1232
1227
|
noPatterns: [],
|
|
1233
|
-
weight
|
|
1228
|
+
weight,
|
|
1234
1229
|
qid: "",
|
|
1235
1230
|
});
|
|
1231
|
+
|
|
1232
|
+
interface Pins {
|
|
1233
|
+
pin(expr: number): number;
|
|
1234
|
+
pinOwned(expr: number): number;
|
|
1235
|
+
}
|
|
1236
|
+
|
|
1237
|
+
// expr_abstract and mk_quantifier: binds the constants, the last one to (:var 0).
|
|
1238
|
+
const mkQuantifierOver = (
|
|
1239
|
+
manager: AstManager,
|
|
1240
|
+
kind: number,
|
|
1241
|
+
vars: readonly number[],
|
|
1242
|
+
formula: number,
|
|
1243
|
+
pins: Pins,
|
|
1244
|
+
) => {
|
|
1245
|
+
const replace = new ExprSafeReplace(manager);
|
|
1246
|
+
vars.forEach((x, index) =>
|
|
1247
|
+
replace.insert(x, pins.pin(manager.mkVar(vars.length - 1 - index, manager.sorts[x]))),
|
|
1248
|
+
);
|
|
1249
|
+
const body = pins.pinOwned(replace.apply(formula));
|
|
1250
|
+
replace.release();
|
|
1251
|
+
return mkQuantifierOfConsts(manager, kind, vars, body, 1);
|
|
1236
1252
|
};
|
|
1237
1253
|
|
|
1238
1254
|
// The body of the quantifier over fresh constants for its variables, with a reference.
|
|
@@ -1430,22 +1446,7 @@ class SimplifyRewriter extends RewriterTpl {
|
|
|
1430
1446
|
manager.incRef(result);
|
|
1431
1447
|
return result;
|
|
1432
1448
|
}
|
|
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
|
-
});
|
|
1449
|
+
const quantifier = mkQuantifierOver(manager, data.kind, vars, result, context);
|
|
1449
1450
|
manager.incRef(quantifier);
|
|
1450
1451
|
return quantifier;
|
|
1451
1452
|
}
|
|
@@ -1484,25 +1485,15 @@ export const runQe = (manager: AstManager) => (goal: Goal) => {
|
|
|
1484
1485
|
}
|
|
1485
1486
|
};
|
|
1486
1487
|
|
|
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
|
-
};
|
|
1488
|
+
const isArrayOrDatatype = (manager: AstManager, sort: number) =>
|
|
1489
|
+
manager.getSortFamily(sort) === FAMILY_ARRAY || manager.getSortFamily(sort) === FAMILY_DATATYPE;
|
|
1490
|
+
|
|
1491
|
+
const hasUnsupportedSort = (manager: AstManager, formula: number) =>
|
|
1492
|
+
hasSubterm(
|
|
1493
|
+
manager,
|
|
1494
|
+
[formula],
|
|
1495
|
+
(expr) =>
|
|
1496
|
+
isArrayOrDatatype(manager, manager.sorts[expr]) ||
|
|
1497
|
+
(manager.kinds[expr] === KIND_QUANTIFIER &&
|
|
1498
|
+
manager.getQuantifier(expr).sorts.some((sort) => isArrayOrDatatype(manager, sort))),
|
|
1499
|
+
);
|
|
@@ -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";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/qsat.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError, SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -14,12 +13,13 @@ import {
|
|
|
14
13
|
} from "./ast";
|
|
15
14
|
import { hasUninterpreted, isAppOf, pushNotOwned } from "./ast-util";
|
|
16
15
|
import { MBQI_MAX_ITERATIONS } from "./context";
|
|
17
|
-
import { extractVars } from "./qe";
|
|
16
|
+
import { extractVars, mkQuantifierOfConsts } from "./qe";
|
|
18
17
|
import type { Goal } from "./goal";
|
|
19
18
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
20
19
|
import type { ProtoModel } from "./proto-model";
|
|
21
20
|
import { Mbproj } from "./qe-mbp";
|
|
22
21
|
import { QuantifierHoister } from "./quant-hoist";
|
|
22
|
+
import { hasSubterm } from "./recfun-decl-plugin";
|
|
23
23
|
import { RefVector } from "./ref-vector";
|
|
24
24
|
import { SmtKernel } from "./smt-kernel";
|
|
25
25
|
|
|
@@ -61,18 +61,6 @@ const hasQuantifiedUninterpreted = (manager: AstManager, expr: number) => {
|
|
|
61
61
|
return false;
|
|
62
62
|
};
|
|
63
63
|
|
|
64
|
-
const isGround = (manager: AstManager, expr: number) => {
|
|
65
|
-
const visited = new Set<number>();
|
|
66
|
-
const todo = [expr];
|
|
67
|
-
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
68
|
-
if (visited.has(current)) continue;
|
|
69
|
-
visited.add(current);
|
|
70
|
-
if (manager.kinds[current] !== KIND_APP) return false;
|
|
71
|
-
manager.pushArgs(current, todo);
|
|
72
|
-
}
|
|
73
|
-
return true;
|
|
74
|
-
};
|
|
75
|
-
|
|
76
64
|
// pred_abs::get_free_vars: the uninterpreted constants of a formula.
|
|
77
65
|
export const getFreeVars = (manager: AstManager, formula: number, vars: RefVector) => {
|
|
78
66
|
const marked = new Set<number>();
|
|
@@ -182,22 +170,27 @@ class PredAbs {
|
|
|
182
170
|
return;
|
|
183
171
|
}
|
|
184
172
|
if (level === 0) return;
|
|
185
|
-
const
|
|
173
|
+
const isFalseIn = (pred: number) => {
|
|
186
174
|
const value = model.eval(pred, true);
|
|
187
175
|
const isFalse = manager.isFalse(value);
|
|
188
176
|
manager.decRef(value);
|
|
189
|
-
return isFalse
|
|
177
|
+
return isFalse;
|
|
190
178
|
};
|
|
191
179
|
for (let index = 0; index <= level - 1; index++)
|
|
192
|
-
for (const pred of this.preds[index])
|
|
180
|
+
for (const pred of this.preds[index]) {
|
|
181
|
+
const isFalse = isFalseIn(pred);
|
|
182
|
+
if (!manager.limit.inc()) return;
|
|
183
|
+
this.asms.push(isFalse ? this.pin(manager.mkNot(pred)) : pred);
|
|
184
|
+
}
|
|
193
185
|
for (const asm of this.asms.items) asms.push(asm);
|
|
194
186
|
for (let index = level + 1; index < this.preds.length; index += 2)
|
|
195
187
|
for (const pred of this.preds[index]) {
|
|
188
|
+
if (!manager.limit.inc()) return;
|
|
196
189
|
const predLevel = this.elevel.get(pred) as MaxLevel;
|
|
197
190
|
const isUsed =
|
|
198
191
|
(predLevel.fa === index && (predLevel.ex === NO_LEVEL || predLevel.ex < level)) ||
|
|
199
192
|
(predLevel.ex === index && (predLevel.fa === NO_LEVEL || predLevel.fa < level));
|
|
200
|
-
if (isUsed) asms.push(
|
|
193
|
+
if (isUsed) asms.push(isFalseIn(pred) ? this.pin(manager.mkNot(pred)) : pred);
|
|
201
194
|
}
|
|
202
195
|
}
|
|
203
196
|
|
|
@@ -430,22 +423,25 @@ class Qsat {
|
|
|
430
423
|
for (;;) {
|
|
431
424
|
manager.limit.checkpoint();
|
|
432
425
|
const asms = new RefVector(manager);
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
if (
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
426
|
+
try {
|
|
427
|
+
for (const asm of this.asms.items) asms.push(asm);
|
|
428
|
+
this.predAbs.getAssumptions(this.model, asms);
|
|
429
|
+
const kernel = this.getKernel(this.level).solver;
|
|
430
|
+
const result = kernel.check(asms.items);
|
|
431
|
+
if (result === L_TRUE) {
|
|
432
|
+
this.setModel(kernel.context.getModel());
|
|
433
|
+
if (this.level === 0) this.setModelSave(this.model);
|
|
434
|
+
this.push();
|
|
435
|
+
} else if (result === L_FALSE) {
|
|
436
|
+
if (this.level === 0) return L_FALSE;
|
|
437
|
+
if (this.level === 1 && this.mode === QSAT_SAT) return L_TRUE;
|
|
438
|
+
if (this.model === undefined) this.pop(1);
|
|
439
|
+
else if (this.level === 1) this.projectQe(asms);
|
|
440
|
+
else if (!this.project(asms)) return L_UNDEF;
|
|
441
|
+
} else return result;
|
|
442
|
+
} finally {
|
|
443
|
+
asms.reset();
|
|
444
|
+
}
|
|
449
445
|
}
|
|
450
446
|
}
|
|
451
447
|
|
|
@@ -506,28 +502,31 @@ class Qsat {
|
|
|
506
502
|
const pullInto = (target: RefVector) => {
|
|
507
503
|
result = this.pinOwned(hoister.pullQuantifier(isForall, result, target));
|
|
508
504
|
};
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
505
|
+
try {
|
|
506
|
+
if (this.mode !== QSAT_SAT) {
|
|
507
|
+
isForall = true;
|
|
508
|
+
const vars = new RefVector(manager);
|
|
509
|
+
pullInto(vars);
|
|
510
|
+
this.vars.push(vars);
|
|
511
|
+
this.filterVars(vars);
|
|
512
|
+
} else {
|
|
513
|
+
const vars = new RefVector(manager);
|
|
514
|
+
pullInto(vars);
|
|
515
|
+
for (const innerVar of vars.items) freeVars.push(innerVar);
|
|
516
|
+
this.filterVars(vars);
|
|
517
|
+
vars.reset();
|
|
518
|
+
}
|
|
519
|
+
for (;;) {
|
|
520
|
+
isForall = !isForall;
|
|
521
|
+
const vars = new RefVector(manager);
|
|
522
|
+
pullInto(vars);
|
|
523
|
+
this.vars.push(vars);
|
|
524
|
+
this.filterVars(vars);
|
|
525
|
+
if (vars.size === 0) break;
|
|
526
|
+
}
|
|
527
|
+
} finally {
|
|
528
|
+
hoister.release();
|
|
529
529
|
}
|
|
530
|
-
hoister.release();
|
|
531
530
|
this.initializeLevels();
|
|
532
531
|
return result;
|
|
533
532
|
}
|
|
@@ -683,38 +682,32 @@ class Qsat {
|
|
|
683
682
|
if (manager.hasQuantifierFlags[formula]) return -1;
|
|
684
683
|
this.reset();
|
|
685
684
|
const exists = this.pin(
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
weight: 0,
|
|
694
|
-
qid: "",
|
|
695
|
-
}),
|
|
685
|
+
mkQuantifierOfConsts(
|
|
686
|
+
manager,
|
|
687
|
+
QUANTIFIER_EXISTS,
|
|
688
|
+
vars.items,
|
|
689
|
+
this.abstractVars(vars, formula),
|
|
690
|
+
0,
|
|
691
|
+
),
|
|
696
692
|
);
|
|
697
693
|
const hoisted = this.hoist(this.pinOwned(pushNotOwned(manager, exists)));
|
|
698
694
|
this.assertFormula(hoisted);
|
|
699
695
|
if (this.checkSat() !== L_FALSE) return -1;
|
|
700
696
|
let result = this.pin(manager.mkAnd(this.answer.items));
|
|
701
697
|
const freeVars = this.freeVars.items.filter((innerVar) =>
|
|
702
|
-
|
|
698
|
+
hasSubterm(manager, [result], (expr) => expr === innerVar),
|
|
703
699
|
);
|
|
704
700
|
if (freeVars.length > 0) {
|
|
705
701
|
const subVars = new RefVector(manager);
|
|
706
702
|
for (const innerVar of freeVars) subVars.push(innerVar);
|
|
707
703
|
result = this.pin(
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
weight: 0,
|
|
716
|
-
qid: "",
|
|
717
|
-
}),
|
|
704
|
+
mkQuantifierOfConsts(
|
|
705
|
+
manager,
|
|
706
|
+
QUANTIFIER_EXISTS,
|
|
707
|
+
freeVars,
|
|
708
|
+
this.abstractVars(subVars, result),
|
|
709
|
+
0,
|
|
710
|
+
),
|
|
718
711
|
);
|
|
719
712
|
subVars.reset();
|
|
720
713
|
}
|
|
@@ -753,7 +746,7 @@ class Qsat {
|
|
|
753
746
|
|
|
754
747
|
private assertFormula(formula: number) {
|
|
755
748
|
const manager = this.manager;
|
|
756
|
-
if (!
|
|
749
|
+
if (!manager.isGroundApp(formula)) throw new SmtTacticError("formula is not hoistable");
|
|
757
750
|
const defs = new RefVector(manager);
|
|
758
751
|
this.predAbs.abstractAtoms(formula, mkLevel(), defs);
|
|
759
752
|
const abstracted = this.predAbs.mkAbstract(formula);
|
|
@@ -811,20 +804,6 @@ class Qsat {
|
|
|
811
804
|
}
|
|
812
805
|
}
|
|
813
806
|
|
|
814
|
-
const isOccurringIn = (manager: AstManager, variable: number, expr: number) => {
|
|
815
|
-
const visited = new Set<number>();
|
|
816
|
-
const todo = [expr];
|
|
817
|
-
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
818
|
-
if (current === variable) return true;
|
|
819
|
-
if (visited.has(current)) continue;
|
|
820
|
-
visited.add(current);
|
|
821
|
-
if (manager.kinds[current] === KIND_APP) manager.pushArgs(current, todo);
|
|
822
|
-
else if (manager.kinds[current] === KIND_QUANTIFIER)
|
|
823
|
-
todo.push(manager.getQuantifier(current).body);
|
|
824
|
-
}
|
|
825
|
-
return false;
|
|
826
|
-
};
|
|
827
|
-
|
|
828
807
|
export const runQsat = (manager: AstManager, mode: number) => (goal: Goal) => {
|
|
829
808
|
const qsat = new Qsat(manager, mode);
|
|
830
809
|
try {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/smtlogics/quant_tactics.cpp, src/tactic/core/simplify_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
// This strategy skips elim-uncnstr's elimination and the simplifier's local_ctx option, as they
|
|
3
2
|
// change almost none of tlapm's obligations.
|
|
4
3
|
import type { AstManager } from "./ast";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
KIND_APP,
|
|
4
3
|
KIND_VAR,
|
|
@@ -232,7 +231,7 @@ export class QuantifierAnalyzer {
|
|
|
232
231
|
|
|
233
232
|
private isVarPlusGround(expr: number) {
|
|
234
233
|
const manager = this.manager;
|
|
235
|
-
if (manager.getOp(expr) !== OP_ADD || manager.
|
|
234
|
+
if (manager.getOp(expr) !== OP_ADD || manager.isGroundApp(expr)) return undefined;
|
|
236
235
|
const args: number[] = [];
|
|
237
236
|
let variable: number | undefined;
|
|
238
237
|
let isInverted = false;
|
|
@@ -247,7 +246,7 @@ export class QuantifierAnalyzer {
|
|
|
247
246
|
isStopped = true;
|
|
248
247
|
}
|
|
249
248
|
const negated = this.manager.getTimesMinusOneArg(arg);
|
|
250
|
-
if (this.manager.
|
|
249
|
+
if (this.manager.isGroundApp(arg)) args.push(arg);
|
|
251
250
|
else if (this.isVar(arg)) {
|
|
252
251
|
if (variable !== undefined) return undefined;
|
|
253
252
|
variable = arg;
|
|
@@ -267,12 +266,12 @@ export class QuantifierAnalyzer {
|
|
|
267
266
|
}
|
|
268
267
|
|
|
269
268
|
private isVarAndGround(lhs: number, rhs: number) {
|
|
270
|
-
if (this.isVar(lhs) && this.manager.
|
|
269
|
+
if (this.isVar(lhs) && this.manager.isGroundApp(rhs))
|
|
271
270
|
return { variable: lhs, term: rhs, isInverted: false };
|
|
272
|
-
if (this.isVar(rhs) && this.manager.
|
|
271
|
+
if (this.isVar(rhs) && this.manager.isGroundApp(lhs))
|
|
273
272
|
return { variable: rhs, term: lhs, isInverted: false };
|
|
274
273
|
const left = this.isVarPlusGround(lhs);
|
|
275
|
-
if (left !== undefined && this.manager.
|
|
274
|
+
if (left !== undefined && this.manager.isGroundApp(rhs))
|
|
276
275
|
return {
|
|
277
276
|
variable: left.variable,
|
|
278
277
|
term: left.isInverted
|
|
@@ -281,7 +280,7 @@ export class QuantifierAnalyzer {
|
|
|
281
280
|
isInverted: left.isInverted,
|
|
282
281
|
};
|
|
283
282
|
const right = this.isVarPlusGround(rhs);
|
|
284
|
-
if (right !== undefined && this.manager.
|
|
283
|
+
if (right !== undefined && this.manager.isGroundApp(lhs))
|
|
285
284
|
return {
|
|
286
285
|
variable: right.variable,
|
|
287
286
|
term: right.isInverted
|
|
@@ -337,7 +336,7 @@ export class QuantifierAnalyzer {
|
|
|
337
336
|
}
|
|
338
337
|
|
|
339
338
|
private visitFormula(expr: number, polarity: Polarity) {
|
|
340
|
-
if (this.manager.
|
|
339
|
+
if (this.manager.isGroundApp(expr)) return;
|
|
341
340
|
const cache = polarity === "pos" ? this.posCache : this.negCache;
|
|
342
341
|
if (cache.has(expr)) return;
|
|
343
342
|
this.ftodo.push([expr, polarity]);
|
|
@@ -345,7 +344,7 @@ export class QuantifierAnalyzer {
|
|
|
345
344
|
}
|
|
346
345
|
|
|
347
346
|
private visitTerm(expr: number) {
|
|
348
|
-
if (this.manager.
|
|
347
|
+
if (this.manager.isGroundApp(expr) || this.posCache.has(expr)) return;
|
|
349
348
|
this.ttodo.push(expr);
|
|
350
349
|
this.posCache.add(expr);
|
|
351
350
|
}
|
|
@@ -531,7 +530,7 @@ export class QuantifierAnalyzer {
|
|
|
531
530
|
for (const literal of literals) {
|
|
532
531
|
const isNegated = manager.isNot(literal);
|
|
533
532
|
const atom = isNegated ? manager.getArg(literal, 0) : literal;
|
|
534
|
-
if (!this.manager.
|
|
533
|
+
if (!this.manager.isGroundApp(atom)) this.processLiteral(atom, isNegated);
|
|
535
534
|
}
|
|
536
535
|
} else this.visitFormula(body, "pos");
|
|
537
536
|
while (this.ftodo.length > 0 || this.ttodo.length > 0) {
|