tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,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
|
|
|
@@ -314,10 +307,6 @@ class PredAbs {
|
|
|
314
307
|
const concrete = this.mkConcrete(fmls.items, this.pred2Lit);
|
|
315
308
|
concrete.forEach((formula, index) => fmls.set(index, formula));
|
|
316
309
|
}
|
|
317
|
-
|
|
318
|
-
release() {
|
|
319
|
-
this.reset();
|
|
320
|
-
}
|
|
321
310
|
}
|
|
322
311
|
|
|
323
312
|
class Kernel {
|
|
@@ -375,7 +364,7 @@ class Kernel {
|
|
|
375
364
|
}
|
|
376
365
|
}
|
|
377
366
|
|
|
378
|
-
|
|
367
|
+
class Qsat {
|
|
379
368
|
private mbp: Mbproj;
|
|
380
369
|
private fa: Kernel;
|
|
381
370
|
private ex: Kernel;
|
|
@@ -434,22 +423,25 @@ export class Qsat {
|
|
|
434
423
|
for (;;) {
|
|
435
424
|
manager.limit.checkpoint();
|
|
436
425
|
const asms = new RefVector(manager);
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
if (
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
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
|
+
}
|
|
453
445
|
}
|
|
454
446
|
}
|
|
455
447
|
|
|
@@ -492,7 +484,6 @@ export class Qsat {
|
|
|
492
484
|
this.setModelSave(undefined);
|
|
493
485
|
this.avars.reset();
|
|
494
486
|
this.trail.reset();
|
|
495
|
-
this.predAbs.release();
|
|
496
487
|
this.mbp.release();
|
|
497
488
|
}
|
|
498
489
|
|
|
@@ -511,28 +502,31 @@ export class Qsat {
|
|
|
511
502
|
const pullInto = (target: RefVector) => {
|
|
512
503
|
result = this.pinOwned(hoister.pullQuantifier(isForall, result, target));
|
|
513
504
|
};
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
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();
|
|
534
529
|
}
|
|
535
|
-
hoister.release();
|
|
536
530
|
this.initializeLevels();
|
|
537
531
|
return result;
|
|
538
532
|
}
|
|
@@ -688,38 +682,32 @@ export class Qsat {
|
|
|
688
682
|
if (manager.hasQuantifierFlags[formula]) return -1;
|
|
689
683
|
this.reset();
|
|
690
684
|
const exists = this.pin(
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
weight: 0,
|
|
699
|
-
qid: "",
|
|
700
|
-
}),
|
|
685
|
+
mkQuantifierOfConsts(
|
|
686
|
+
manager,
|
|
687
|
+
QUANTIFIER_EXISTS,
|
|
688
|
+
vars.items,
|
|
689
|
+
this.abstractVars(vars, formula),
|
|
690
|
+
0,
|
|
691
|
+
),
|
|
701
692
|
);
|
|
702
693
|
const hoisted = this.hoist(this.pinOwned(pushNotOwned(manager, exists)));
|
|
703
694
|
this.assertFormula(hoisted);
|
|
704
695
|
if (this.checkSat() !== L_FALSE) return -1;
|
|
705
696
|
let result = this.pin(manager.mkAnd(this.answer.items));
|
|
706
697
|
const freeVars = this.freeVars.items.filter((innerVar) =>
|
|
707
|
-
|
|
698
|
+
hasSubterm(manager, [result], (expr) => expr === innerVar),
|
|
708
699
|
);
|
|
709
700
|
if (freeVars.length > 0) {
|
|
710
701
|
const subVars = new RefVector(manager);
|
|
711
702
|
for (const innerVar of freeVars) subVars.push(innerVar);
|
|
712
703
|
result = this.pin(
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
weight: 0,
|
|
721
|
-
qid: "",
|
|
722
|
-
}),
|
|
704
|
+
mkQuantifierOfConsts(
|
|
705
|
+
manager,
|
|
706
|
+
QUANTIFIER_EXISTS,
|
|
707
|
+
freeVars,
|
|
708
|
+
this.abstractVars(subVars, result),
|
|
709
|
+
0,
|
|
710
|
+
),
|
|
723
711
|
);
|
|
724
712
|
subVars.reset();
|
|
725
713
|
}
|
|
@@ -758,7 +746,7 @@ export class Qsat {
|
|
|
758
746
|
|
|
759
747
|
private assertFormula(formula: number) {
|
|
760
748
|
const manager = this.manager;
|
|
761
|
-
if (!
|
|
749
|
+
if (!manager.isGroundApp(formula)) throw new SmtTacticError("formula is not hoistable");
|
|
762
750
|
const defs = new RefVector(manager);
|
|
763
751
|
this.predAbs.abstractAtoms(formula, mkLevel(), defs);
|
|
764
752
|
const abstracted = this.predAbs.mkAbstract(formula);
|
|
@@ -816,20 +804,6 @@ export class Qsat {
|
|
|
816
804
|
}
|
|
817
805
|
}
|
|
818
806
|
|
|
819
|
-
const isOccurringIn = (manager: AstManager, variable: number, expr: number) => {
|
|
820
|
-
const visited = new Set<number>();
|
|
821
|
-
const todo = [expr];
|
|
822
|
-
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
823
|
-
if (current === variable) return true;
|
|
824
|
-
if (visited.has(current)) continue;
|
|
825
|
-
visited.add(current);
|
|
826
|
-
if (manager.kinds[current] === KIND_APP) manager.pushArgs(current, todo);
|
|
827
|
-
else if (manager.kinds[current] === KIND_QUANTIFIER)
|
|
828
|
-
todo.push(manager.getQuantifier(current).body);
|
|
829
|
-
}
|
|
830
|
-
return false;
|
|
831
|
-
};
|
|
832
|
-
|
|
833
807
|
export const runQsat = (manager: AstManager, mode: number) => (goal: Goal) => {
|
|
834
808
|
const qsat = new Qsat(manager, mode);
|
|
835
809
|
try {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/quant_hoist.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
KIND_APP,
|
|
@@ -10,6 +9,7 @@ import {
|
|
|
10
9
|
OP_OR,
|
|
11
10
|
SORT_BOOL,
|
|
12
11
|
QUANTIFIER_FORALL,
|
|
12
|
+
QUANTIFIER_LAMBDA,
|
|
13
13
|
} from "./ast";
|
|
14
14
|
import { isAppOf } from "./ast-util";
|
|
15
15
|
import { RefVector } from "./ref-vector";
|
|
@@ -140,6 +140,7 @@ export class QuantifierHoister {
|
|
|
140
140
|
const kind = manager.kinds[formula];
|
|
141
141
|
if (kind === KIND_QUANTIFIER) {
|
|
142
142
|
const data = manager.getQuantifier(formula);
|
|
143
|
+
if (data.kind === QUANTIFIER_LAMBDA) return formula;
|
|
143
144
|
if (!isCompatible(type.value, data.kind === QUANTIFIER_FORALL)) return formula;
|
|
144
145
|
setQuantifierType(type, data.kind === QUANTIFIER_FORALL);
|
|
145
146
|
return this.pull(this.extractQuantifier(formula, vars), type, vars);
|
|
@@ -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) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_quantifier.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { CHECK_MODEL_RESTART, CHECK_MODEL_SAT, CHECK_MODEL_UNKNOWN, type Context } from "./context";
|
|
3
2
|
import { FC_CONTINUE, FC_DONE } from "./theory";
|
|
4
3
|
import { Mam } from "./e-matching";
|
|
@@ -26,17 +25,21 @@ export class DefaultQuantifierManager {
|
|
|
26
25
|
private lazyMatchingIndex = 0;
|
|
27
26
|
private mbqi: Mbqi | null = null;
|
|
28
27
|
|
|
29
|
-
constructor(
|
|
30
|
-
private context: Context,
|
|
31
|
-
isMbqi: boolean,
|
|
32
|
-
) {
|
|
28
|
+
constructor(private context: Context) {
|
|
33
29
|
this.qiQueue = new QiQueue(context);
|
|
34
30
|
const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
|
|
35
31
|
this.addInstance(quantifier, bindings, maxGeneration);
|
|
36
32
|
this.mam = new Mam(context, onMatch);
|
|
37
33
|
this.lazyMam = new Mam(context, onMatch);
|
|
38
|
-
|
|
34
|
+
this.updateParams();
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// As in Z3, smt.mbqi is read each time the model finder would run.
|
|
38
|
+
updateParams() {
|
|
39
|
+
const context = this.context;
|
|
40
|
+
if (!context.params.isMbqi || this.mbqi !== null) return;
|
|
39
41
|
const finder = new ModelFinder(context);
|
|
42
|
+
for (let level = 0; level < context.scopeLevel; level++) finder.pushScope();
|
|
40
43
|
this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
|
|
41
44
|
}
|
|
42
45
|
|
|
@@ -47,7 +50,7 @@ export class DefaultQuantifierManager {
|
|
|
47
50
|
add(quantifier: number, generation: number) {
|
|
48
51
|
this.quantifiers.push(quantifier);
|
|
49
52
|
this.generations.set(quantifier, generation);
|
|
50
|
-
this.mbqi?.finder.registerQuantifier(quantifier);
|
|
53
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.registerQuantifier(quantifier);
|
|
51
54
|
}
|
|
52
55
|
|
|
53
56
|
del(quantifier: number) {
|
|
@@ -150,20 +153,21 @@ export class DefaultQuantifierManager {
|
|
|
150
153
|
}
|
|
151
154
|
|
|
152
155
|
restartEh() {
|
|
156
|
+
if (!this.context.params.isMbqi) return;
|
|
153
157
|
this.mbqi?.finder.restartEh();
|
|
154
158
|
this.mbqi?.checker.restartEh();
|
|
155
159
|
}
|
|
156
160
|
|
|
157
161
|
isModelBased() {
|
|
158
|
-
return this.
|
|
162
|
+
return this.context.params.isMbqi;
|
|
159
163
|
}
|
|
160
164
|
|
|
161
165
|
adjustModel(model: ProtoModel) {
|
|
162
|
-
this.mbqi?.finder.fixModel(model);
|
|
166
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.fixModel(model);
|
|
163
167
|
}
|
|
164
168
|
|
|
165
169
|
checkModel(model: ProtoModel, root2value: Map<Enode, number>) {
|
|
166
|
-
const checker = this.mbqi?.checker;
|
|
170
|
+
const checker = this.context.params.isMbqi ? this.mbqi?.checker : undefined;
|
|
167
171
|
if (this.quantifiers.length === 0) return CHECK_MODEL_SAT;
|
|
168
172
|
if (checker === undefined) return CHECK_MODEL_UNKNOWN;
|
|
169
173
|
if (checker.check(model, root2value)) return CHECK_MODEL_SAT;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/macros/quasi_macros.cpp, src/tactic/ufbv/quasi_macros_tactic.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
FAMILY_USER,
|
|
@@ -15,6 +13,7 @@ import {
|
|
|
15
13
|
} from "./ast";
|
|
16
14
|
import type { Goal } from "./goal";
|
|
17
15
|
import { MacroManager } from "./macro-finder";
|
|
16
|
+
import { hasSubterm } from "./recfun-decl-plugin";
|
|
18
17
|
import { RefVector } from "./ref-vector";
|
|
19
18
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
20
19
|
|
|
@@ -24,25 +23,10 @@ interface QuasiMacro {
|
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
const isNonGroundUninterp = (manager: AstManager, expr: number) =>
|
|
27
|
-
!manager.
|
|
26
|
+
!manager.isGroundApp(expr) &&
|
|
28
27
|
manager.kinds[expr] === KIND_APP &&
|
|
29
28
|
manager.funcDecls[manager.decls[expr]].family === FAMILY_USER;
|
|
30
29
|
|
|
31
|
-
const isDependingOn = (manager: AstManager, expr: number, decl: number) => {
|
|
32
|
-
const visited = new Set<number>();
|
|
33
|
-
const todo = [expr];
|
|
34
|
-
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
35
|
-
if (visited.has(current)) continue;
|
|
36
|
-
if (manager.kinds[current] === KIND_APP) {
|
|
37
|
-
if (manager.decls[current] === decl) return true;
|
|
38
|
-
for (let index = manager.getNumArgs(current); index > 0; index--)
|
|
39
|
-
todo.push(manager.getArg(current, index - 1));
|
|
40
|
-
}
|
|
41
|
-
visited.add(current);
|
|
42
|
-
}
|
|
43
|
-
return false;
|
|
44
|
-
};
|
|
45
|
-
|
|
46
30
|
const isFullyDependingOn = (manager: AstManager, app: number, numDecls: number) => {
|
|
47
31
|
const isUsed = Array.from({ length: numDecls }, () => false);
|
|
48
32
|
for (const arg of manager.getArgs(app))
|
|
@@ -96,7 +80,12 @@ class QuasiMacros {
|
|
|
96
80
|
return (
|
|
97
81
|
isNonGroundUninterp(manager, lhs) &&
|
|
98
82
|
this.isUnique(manager.decls[lhs]) &&
|
|
99
|
-
!
|
|
83
|
+
!hasSubterm(
|
|
84
|
+
manager,
|
|
85
|
+
[rhs],
|
|
86
|
+
(expr) => manager.kinds[expr] === KIND_APP && manager.decls[expr] === manager.decls[lhs],
|
|
87
|
+
false,
|
|
88
|
+
) &&
|
|
100
89
|
isFullyDependingOn(manager, lhs, numDecls)
|
|
101
90
|
);
|
|
102
91
|
}
|
|
@@ -145,7 +134,7 @@ class QuasiMacros {
|
|
|
145
134
|
let numSeen = 0;
|
|
146
135
|
for (const [index, arg] of manager.getArgs(macro.head).entries()) {
|
|
147
136
|
const isVar = manager.kinds[arg] === KIND_VAR;
|
|
148
|
-
if (!isVar && !manager.
|
|
137
|
+
if (!isVar && !manager.isGroundApp(arg)) return -1;
|
|
149
138
|
if (isVar && !isSeen[manager.values[arg]]) {
|
|
150
139
|
this.newVars.push(arg);
|
|
151
140
|
isSeen[manager.values[arg]] = true;
|