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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_rule_transformer.cpp, src/muz/transforms/dl_transforms.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import type { DatalogContext } from "./dl-context";
|
|
5
3
|
import { MkBitBlast } from "./dl-mk-bit-blast";
|
|
@@ -12,7 +10,6 @@ import { RuleSet } from "./dl-rule-set";
|
|
|
12
10
|
|
|
13
11
|
export interface RuleTransformerPlugin {
|
|
14
12
|
readonly priority: number;
|
|
15
|
-
readonly canDestratifyNegation?: boolean;
|
|
16
13
|
apply(source: RuleSet): RuleSet | undefined;
|
|
17
14
|
}
|
|
18
15
|
|
|
@@ -50,7 +47,6 @@ export const transformRules = (context: DatalogContext, plugins: RuleTransformer
|
|
|
50
47
|
context.manager.limit.checkpoint();
|
|
51
48
|
const result = plugin.apply(rules);
|
|
52
49
|
if (result === undefined) continue;
|
|
53
|
-
if (plugin.canDestratifyNegation === true && !result.isClosed() && !result.close()) continue;
|
|
54
50
|
isModified = true;
|
|
55
51
|
rules = result;
|
|
56
52
|
rules.ensureClosed();
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_rule.cpp, src/muz/base/bind_variables.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
4
|
+
getSymbolName,
|
|
6
5
|
KIND_APP,
|
|
7
6
|
KIND_QUANTIFIER,
|
|
8
7
|
KIND_VAR,
|
|
@@ -14,6 +13,7 @@ import {
|
|
|
14
13
|
} from "../ast";
|
|
15
14
|
import { flattenAndVector } from "../ast-util";
|
|
16
15
|
import { RefVector } from "../ref-vector";
|
|
16
|
+
import { DEFAULT_PRINT_OPTIONS, printExpr } from "../smt2-printer";
|
|
17
17
|
import { getFreeVarSorts, VarSubst } from "../var-subst";
|
|
18
18
|
import { simplifyQuantifiers } from "../qe";
|
|
19
19
|
import { QuantifierHoister } from "../quant-hoist";
|
|
@@ -21,6 +21,24 @@ import type { DatalogContext } from "./dl-context";
|
|
|
21
21
|
import { Hnf } from "./hnf";
|
|
22
22
|
import type { RuleSet } from "./dl-rule-set";
|
|
23
23
|
|
|
24
|
+
const PRINT_ENVIRONMENT = {
|
|
25
|
+
options: DEFAULT_PRINT_OPTIONS,
|
|
26
|
+
isUsed: () => false,
|
|
27
|
+
isClashing: () => false,
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
export const mkPp = (manager: AstManager, expr: number) =>
|
|
31
|
+
printExpr(manager, PRINT_ENVIRONMENT, expr);
|
|
32
|
+
|
|
33
|
+
// output_predicate of src/muz/base/dl_util.cpp.
|
|
34
|
+
const outputPredicate = (manager: AstManager, predicate: number) =>
|
|
35
|
+
`${getSymbolName(manager.funcDecls[manager.decls[predicate]].name)}(${manager
|
|
36
|
+
.getArgs(predicate)
|
|
37
|
+
.map((arg) =>
|
|
38
|
+
manager.kinds[arg] === KIND_VAR ? `#${manager.values[arg]}` : mkPp(manager, arg),
|
|
39
|
+
)
|
|
40
|
+
.join(",")})`;
|
|
41
|
+
|
|
24
42
|
// The tail lists the positive predicates, then the negated ones, then the interpreted formulas.
|
|
25
43
|
export class Rule {
|
|
26
44
|
constructor(
|
|
@@ -45,6 +63,24 @@ export class Rule {
|
|
|
45
63
|
if (this.isNegated[index]) return true;
|
|
46
64
|
return false;
|
|
47
65
|
}
|
|
66
|
+
|
|
67
|
+
// symbol::str of the name, where the empty name is the null symbol.
|
|
68
|
+
getNameText() {
|
|
69
|
+
return this.name === "" ? "<null>" : this.name;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
display(context: DatalogContext) {
|
|
73
|
+
const manager = context.manager;
|
|
74
|
+
const head = `${this.getNameText()}:\n${outputPredicate(manager, this.head)}`;
|
|
75
|
+
if (this.tail.length === 0) return `${head}.\n`;
|
|
76
|
+
const tail = this.tail.map(
|
|
77
|
+
(literal, index) =>
|
|
78
|
+
`\n ${this.isNegated[index] ? "not " : ""}${
|
|
79
|
+
context.isPredicate(literal) ? outputPredicate(manager, literal) : mkPp(manager, literal)
|
|
80
|
+
}`,
|
|
81
|
+
);
|
|
82
|
+
return `${head} :- ${tail.join(",")}.\n`;
|
|
83
|
+
}
|
|
48
84
|
}
|
|
49
85
|
|
|
50
86
|
// The sorts of the free variables of the expressions, by index, as Z3's used_vars collects them.
|
|
@@ -100,46 +136,71 @@ export class BindVariables {
|
|
|
100
136
|
const bound = new Map<number, number>();
|
|
101
137
|
const names: string[] = [];
|
|
102
138
|
const sorts: number[] = [];
|
|
139
|
+
const todo: number[] = [];
|
|
140
|
+
// The arguments of an application are abstracted last to first, as Z3's stack pops them.
|
|
103
141
|
const abstract = (term: number, scope: number, cache: Map<number, number>): number => {
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (
|
|
109
|
-
|
|
110
|
-
|
|
142
|
+
const size = todo.length;
|
|
143
|
+
todo.push(term);
|
|
144
|
+
while (todo.length > size) {
|
|
145
|
+
const current = todo[todo.length - 1];
|
|
146
|
+
if (cache.has(current)) {
|
|
147
|
+
todo.pop();
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
const kind = manager.kinds[current];
|
|
151
|
+
if (kind === KIND_VAR) cache.set(current, current);
|
|
152
|
+
else if (kind === KIND_QUANTIFIER) {
|
|
153
|
+
const data = manager.getQuantifier(current);
|
|
111
154
|
const innerScope = scope + data.sorts.length;
|
|
112
155
|
const innerCache = new Map<number, number>();
|
|
113
156
|
const patterns = data.patterns.map((pattern) =>
|
|
114
157
|
abstract(pattern, innerScope, innerCache),
|
|
115
158
|
);
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
159
|
+
cache.set(
|
|
160
|
+
current,
|
|
161
|
+
manager.mkQuantifier({
|
|
162
|
+
...data,
|
|
163
|
+
patterns,
|
|
164
|
+
body: abstract(data.body, innerScope, innerCache),
|
|
165
|
+
}),
|
|
166
|
+
);
|
|
167
|
+
} else if (this.vars.includes(current)) {
|
|
123
168
|
const existing =
|
|
124
|
-
bound.get(
|
|
169
|
+
bound.get(current) ??
|
|
125
170
|
(() => {
|
|
126
|
-
const variable = manager.mkVar(names.length, manager.sorts[
|
|
127
|
-
names.push(manager.getDeclName(
|
|
128
|
-
sorts.push(manager.sorts[
|
|
129
|
-
bound.set(
|
|
171
|
+
const variable = manager.mkVar(names.length, manager.sorts[current]);
|
|
172
|
+
names.push(manager.getDeclName(current));
|
|
173
|
+
sorts.push(manager.sorts[current]);
|
|
174
|
+
bound.set(current, variable);
|
|
130
175
|
return variable;
|
|
131
176
|
})();
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
177
|
+
cache.set(
|
|
178
|
+
current,
|
|
179
|
+
scope === 0
|
|
180
|
+
? existing
|
|
181
|
+
: manager.mkVar(scope + manager.values[existing], manager.sorts[existing]),
|
|
182
|
+
);
|
|
183
|
+
} else {
|
|
184
|
+
const args: number[] = [];
|
|
185
|
+
let isAllVisited = true;
|
|
186
|
+
for (const arg of manager.getArgs(current)) {
|
|
187
|
+
const abstracted = cache.get(arg);
|
|
188
|
+
if (abstracted === undefined) {
|
|
189
|
+
todo.push(arg);
|
|
190
|
+
isAllVisited = false;
|
|
191
|
+
} else if (isAllVisited) args.push(abstracted);
|
|
192
|
+
}
|
|
193
|
+
if (!isAllVisited) continue;
|
|
194
|
+
cache.set(
|
|
195
|
+
current,
|
|
196
|
+
args.every((arg, index) => arg === manager.getArg(current, index))
|
|
197
|
+
? current
|
|
198
|
+
: manager.mkApp(manager.decls[current], args, manager.sorts[current]),
|
|
199
|
+
);
|
|
135
200
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
: manager.mkApp(manager.decls[term], args, manager.sorts[term]);
|
|
140
|
-
})();
|
|
141
|
-
cache.set(term, result);
|
|
142
|
-
return result;
|
|
201
|
+
todo.pop();
|
|
202
|
+
}
|
|
203
|
+
return cache.get(term) ?? term;
|
|
143
204
|
};
|
|
144
205
|
const body = abstract(fml, 0, new Map());
|
|
145
206
|
if (names.length === 0) return body;
|
|
@@ -321,7 +382,7 @@ export class RuleManager {
|
|
|
321
382
|
return mkForall(
|
|
322
383
|
manager,
|
|
323
384
|
sorts,
|
|
324
|
-
sorts.map((
|
|
385
|
+
sorts.map((_value, index) => getVarName(index)),
|
|
325
386
|
matrix,
|
|
326
387
|
);
|
|
327
388
|
}
|
|
@@ -359,6 +420,7 @@ export class RuleManager {
|
|
|
359
420
|
names.reverse();
|
|
360
421
|
const queryPredicate = this.context.mkFreshHeadPredicate("query", "", domain);
|
|
361
422
|
rules.setOutputPredicate(queryPredicate);
|
|
423
|
+
this.context.addGenericModelConverter([{ decl: queryPredicate, def: -1 }]);
|
|
362
424
|
const head = manager.mkApp(
|
|
363
425
|
queryPredicate,
|
|
364
426
|
domain.map((sort, index) => manager.mkVar(domain.length - index - 1, sort)),
|
|
@@ -417,7 +479,7 @@ export class RuleManager {
|
|
|
417
479
|
const preQuant = this.pin(varSubst.apply(unboundTail, subst));
|
|
418
480
|
varSubst.release();
|
|
419
481
|
sorts.reverse();
|
|
420
|
-
const names = sorts.map((
|
|
482
|
+
const names = sorts.map((_value, index) => String(sorts.length - 1 - index));
|
|
421
483
|
const quantified = this.pin(mkExists(manager, sorts, names, preQuant));
|
|
422
484
|
let fixed = isTryingQe ? this.pin(simplifyQuantifiers(manager, quantified)) : quantified;
|
|
423
485
|
if (manager.kinds[fixed] !== KIND_APP) fixed = this.pin(manager.mkEq(fixed, manager.trueExpr));
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/hnf.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_USER,
|
|
@@ -47,8 +46,10 @@ export class Hnf {
|
|
|
47
46
|
if (visited.has(current)) continue;
|
|
48
47
|
visited.add(current);
|
|
49
48
|
const kind = manager.kinds[current];
|
|
50
|
-
if (kind === KIND_QUANTIFIER)
|
|
51
|
-
|
|
49
|
+
if (kind === KIND_QUANTIFIER) {
|
|
50
|
+
const quantifier = manager.getQuantifier(current);
|
|
51
|
+
todo.push(quantifier.body, ...quantifier.patterns, ...quantifier.noPatterns);
|
|
52
|
+
} else if (kind === KIND_APP) {
|
|
52
53
|
if (this.isPredicate(current)) return true;
|
|
53
54
|
manager.pushArgs(current, todo);
|
|
54
55
|
}
|
|
@@ -172,12 +173,11 @@ export class Hnf {
|
|
|
172
173
|
used.forEach((sort, index) => {
|
|
173
174
|
if (sort !== undefined) args.push(manager.mkVar(index, sort));
|
|
174
175
|
});
|
|
176
|
+
// Z3 passes an empty suffix that is not the null symbol, so the name has two separators.
|
|
175
177
|
const decl = manager.mkFreshFuncDecl(
|
|
176
|
-
this.name
|
|
178
|
+
`${this.name}!`,
|
|
177
179
|
args.map((arg) => manager.sorts[arg]),
|
|
178
180
|
SORT_BOOL,
|
|
179
|
-
true,
|
|
180
|
-
"",
|
|
181
181
|
);
|
|
182
182
|
manager.incDeclRef(decl);
|
|
183
183
|
this.freshPredicates.push(decl);
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
import {
|
|
2
|
+
FAMILY_USER,
|
|
3
|
+
KIND_APP,
|
|
4
|
+
KIND_QUANTIFIER,
|
|
5
|
+
KIND_VAR,
|
|
6
|
+
OP_AND,
|
|
7
|
+
OP_OR,
|
|
8
|
+
QUANTIFIER_EXISTS,
|
|
9
|
+
SORT_BOOL,
|
|
10
|
+
} from "../ast";
|
|
11
|
+
import { L_FALSE, L_TRUE } from "../lbool";
|
|
12
|
+
import { FuncInterp, type ProtoModel } from "../proto-model";
|
|
13
|
+
import { VarSubst } from "../var-subst";
|
|
14
|
+
import type { DatalogContext } from "./dl-context";
|
|
15
|
+
import { getUsedVars, type Rule } from "./dl-rule";
|
|
16
|
+
|
|
17
|
+
export class HornSubsumeModelConverter {
|
|
18
|
+
private delayHeads: number[] = [];
|
|
19
|
+
private delayBodies: number[] = [];
|
|
20
|
+
private funcs: number[] = [];
|
|
21
|
+
private bodies: number[] = [];
|
|
22
|
+
|
|
23
|
+
constructor(private context: DatalogContext) {}
|
|
24
|
+
|
|
25
|
+
insert(head: number, body: readonly number[]) {
|
|
26
|
+
const manager = this.context.manager;
|
|
27
|
+
const conjunction = this.context.rewriter.mkAnd([...body]);
|
|
28
|
+
manager.incRef(head);
|
|
29
|
+
manager.incRef(conjunction);
|
|
30
|
+
this.delayHeads.push(head);
|
|
31
|
+
this.delayBodies.push(conjunction);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// The predicate of the head is the body with the head's arguments as the variables above the
|
|
35
|
+
// existentially bound ones. The result comes with a reference.
|
|
36
|
+
mkHorn(head: number, body: number) {
|
|
37
|
+
const manager = this.context.manager;
|
|
38
|
+
const args = manager.getArgs(head);
|
|
39
|
+
const sorts = getUsedVars(manager, [head, body]).map((sort) => sort ?? SORT_BOOL);
|
|
40
|
+
if (args.length === 0 && sorts.length === 0) {
|
|
41
|
+
manager.incRef(body);
|
|
42
|
+
return body;
|
|
43
|
+
}
|
|
44
|
+
const conjs = [body];
|
|
45
|
+
const subst: number[] = [];
|
|
46
|
+
args.forEach((arg, index) => {
|
|
47
|
+
const variable = manager.mkVar(sorts.length + index, manager.sorts[arg]);
|
|
48
|
+
if (manager.kinds[arg] !== KIND_VAR) {
|
|
49
|
+
conjs.push(manager.mkEq(variable, arg));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const argIndex = manager.values[arg];
|
|
53
|
+
while (subst.length <= argIndex) subst.push(-1);
|
|
54
|
+
if (subst[argIndex] === -1) subst[argIndex] = variable;
|
|
55
|
+
else conjs.push(manager.mkEq(variable, subst[argIndex]));
|
|
56
|
+
});
|
|
57
|
+
const conjunction = manager.mkApp(OP_AND, conjs, SORT_BOOL);
|
|
58
|
+
manager.incRef(conjunction);
|
|
59
|
+
const varSubst = new VarSubst(manager, false);
|
|
60
|
+
const substituted = varSubst.apply(conjunction, subst);
|
|
61
|
+
varSubst.release();
|
|
62
|
+
manager.decRef(conjunction);
|
|
63
|
+
if (sorts.length === 0) return substituted;
|
|
64
|
+
const quantified = manager.mkQuantifier({
|
|
65
|
+
kind: QUANTIFIER_EXISTS,
|
|
66
|
+
sorts: sorts.reverse(),
|
|
67
|
+
names: sorts.map((_value, index) => sorts.length - index - 1),
|
|
68
|
+
body: substituted,
|
|
69
|
+
patterns: [],
|
|
70
|
+
noPatterns: [],
|
|
71
|
+
weight: 0,
|
|
72
|
+
qid: "",
|
|
73
|
+
});
|
|
74
|
+
manager.incRef(quantified);
|
|
75
|
+
manager.decRef(substituted);
|
|
76
|
+
const result = this.context.simplify(quantified);
|
|
77
|
+
manager.decRef(quantified);
|
|
78
|
+
return result;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
// add_default_proc under for_each_expr: the predicates the model leaves open are false.
|
|
82
|
+
private addDefaultFalseInterpretation(root: number, model: ProtoModel) {
|
|
83
|
+
const manager = this.context.manager;
|
|
84
|
+
const visited = new Set<number>([root]);
|
|
85
|
+
const exprs = [root];
|
|
86
|
+
const positions = [0];
|
|
87
|
+
while (exprs.length > 0) {
|
|
88
|
+
const current = exprs[exprs.length - 1];
|
|
89
|
+
const quantifier =
|
|
90
|
+
manager.kinds[current] === KIND_QUANTIFIER ? manager.getQuantifier(current) : undefined;
|
|
91
|
+
const children =
|
|
92
|
+
quantifier !== undefined
|
|
93
|
+
? [quantifier.body, ...quantifier.patterns, ...quantifier.noPatterns]
|
|
94
|
+
: manager.kinds[current] === KIND_APP
|
|
95
|
+
? manager.getArgs(current)
|
|
96
|
+
: [];
|
|
97
|
+
const position = positions[positions.length - 1];
|
|
98
|
+
if (position < children.length) {
|
|
99
|
+
positions[positions.length - 1]++;
|
|
100
|
+
const child = children[position];
|
|
101
|
+
if (visited.has(child)) continue;
|
|
102
|
+
visited.add(child);
|
|
103
|
+
exprs.push(child);
|
|
104
|
+
positions.push(0);
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
exprs.pop();
|
|
108
|
+
positions.pop();
|
|
109
|
+
if (manager.kinds[current] !== KIND_APP || manager.sorts[current] !== SORT_BOOL) continue;
|
|
110
|
+
const decl = manager.decls[current];
|
|
111
|
+
const info = manager.funcDecls[decl];
|
|
112
|
+
if (
|
|
113
|
+
info.family !== FAMILY_USER ||
|
|
114
|
+
model.constInterps.has(decl) ||
|
|
115
|
+
model.funcInterps.has(decl)
|
|
116
|
+
)
|
|
117
|
+
continue;
|
|
118
|
+
if (info.domain.length === 0) {
|
|
119
|
+
model.registerConst(decl, manager.falseExpr);
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
122
|
+
const interp = new FuncInterp(manager, info.domain.length);
|
|
123
|
+
interp.setElse(manager.falseExpr);
|
|
124
|
+
model.registerFunc(decl, interp);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
apply(model: ProtoModel) {
|
|
129
|
+
const manager = this.context.manager;
|
|
130
|
+
this.delayHeads.forEach((head, index) => {
|
|
131
|
+
this.funcs.push(manager.decls[head]);
|
|
132
|
+
this.bodies.push(this.mkHorn(head, this.delayBodies[index]));
|
|
133
|
+
});
|
|
134
|
+
this.delayHeads = [];
|
|
135
|
+
this.delayBodies = [];
|
|
136
|
+
for (let index = this.funcs.length - 1; index >= 0; index--) {
|
|
137
|
+
const decl = this.funcs[index];
|
|
138
|
+
this.addDefaultFalseInterpretation(this.bodies[index], model);
|
|
139
|
+
const body = model.eval(this.bodies[index], false);
|
|
140
|
+
if (manager.funcDecls[decl].domain.length === 0) {
|
|
141
|
+
const old = model.constInterps.get(decl);
|
|
142
|
+
const merged = old === undefined ? body : manager.mkApp(OP_OR, [old, body], SORT_BOOL);
|
|
143
|
+
const simplified = this.context.simplify(merged);
|
|
144
|
+
model.registerConst(decl, simplified);
|
|
145
|
+
manager.decRef(simplified);
|
|
146
|
+
manager.decRef(body);
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
const old = model.funcInterps.get(decl);
|
|
150
|
+
const interp = old ?? new FuncInterp(manager, manager.funcDecls[decl].domain.length);
|
|
151
|
+
if (old === undefined) model.registerFunc(decl, interp);
|
|
152
|
+
const oldElse = old === undefined ? null : old.elseExpr;
|
|
153
|
+
const merged = oldElse === null ? body : manager.mkApp(OP_OR, [oldElse, body], SORT_BOOL);
|
|
154
|
+
const simplified = this.context.simplify(merged);
|
|
155
|
+
interp.setElse(simplified);
|
|
156
|
+
manager.decRef(simplified);
|
|
157
|
+
manager.decRef(body);
|
|
158
|
+
}
|
|
159
|
+
return model;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
// del_rule of dl_util.cpp.
|
|
163
|
+
delRule(rule: Rule, unreachable: number) {
|
|
164
|
+
const manager = this.context.manager;
|
|
165
|
+
this.insert(
|
|
166
|
+
rule.head,
|
|
167
|
+
unreachable === L_TRUE
|
|
168
|
+
? [manager.trueExpr]
|
|
169
|
+
: unreachable === L_FALSE
|
|
170
|
+
? [manager.falseExpr]
|
|
171
|
+
: rule.tail.map((literal, index) =>
|
|
172
|
+
rule.isNegated[index] ? manager.mkNot(literal) : literal,
|
|
173
|
+
),
|
|
174
|
+
);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/fp/horn_tactic.cpp, src/muz/fp/dl_register_engine.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -20,7 +18,7 @@ import { RefVector } from "../ref-vector";
|
|
|
20
18
|
import type { RewriterOptions } from "../rewriter";
|
|
21
19
|
import { getFreeVarSorts } from "../var-subst";
|
|
22
20
|
import { DatalogContext, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
23
|
-
import { mkForall } from "./dl-rule";
|
|
21
|
+
import { mkForall, mkPp } from "./dl-rule";
|
|
24
22
|
import { SpacerDlInterface } from "./spacer-dl-interface";
|
|
25
23
|
|
|
26
24
|
export const createDatalogContext = (
|
|
@@ -140,7 +138,7 @@ class HornTactic {
|
|
|
140
138
|
);
|
|
141
139
|
if (sorts.length === 0) return formula;
|
|
142
140
|
sorts.reverse();
|
|
143
|
-
const names = sorts.map((
|
|
141
|
+
const names = sorts.map((_value, index) => String(sorts.length - index - 1));
|
|
144
142
|
const result = mkForall(manager, sorts, names, formula);
|
|
145
143
|
manager.incRef(result);
|
|
146
144
|
return result;
|
|
@@ -158,7 +156,8 @@ class HornTactic {
|
|
|
158
156
|
const queries: number[] = [];
|
|
159
157
|
for (const form of goal.forms.items) {
|
|
160
158
|
const kind = this.getFormulaKind(form);
|
|
161
|
-
if (kind === undefined)
|
|
159
|
+
if (kind === undefined)
|
|
160
|
+
throw new SmtTacticError(`formula is not in Horn fragment: ${mkPp(manager, form)}\n`);
|
|
162
161
|
if (kind.isRule) context.addRule(kind.formula);
|
|
163
162
|
else queries.push(kind.formula);
|
|
164
163
|
}
|
|
@@ -173,11 +172,21 @@ class HornTactic {
|
|
|
173
172
|
}
|
|
174
173
|
queries.length = 0;
|
|
175
174
|
queries.push(query);
|
|
175
|
+
goal.addConverter(manager.decls[query]);
|
|
176
176
|
}
|
|
177
177
|
const reachable = context.query(queries[0]);
|
|
178
178
|
goal.depth++;
|
|
179
179
|
if (reachable === L_TRUE && context.isMonotone()) goal.assert(manager.falseExpr);
|
|
180
|
-
if (reachable === L_FALSE)
|
|
180
|
+
if (reachable === L_FALSE) {
|
|
181
|
+
goal.reset();
|
|
182
|
+
// model2model_converter: the interpretations go to the goal's model in table order.
|
|
183
|
+
const found = context.getModel();
|
|
184
|
+
goal.addModelConversion((model) => {
|
|
185
|
+
for (const [decl, value] of found.constInterps) model.registerConst(decl, value);
|
|
186
|
+
for (const [decl, interp] of found.funcInterps) model.registerFunc(decl, interp.copy());
|
|
187
|
+
return model;
|
|
188
|
+
});
|
|
189
|
+
}
|
|
181
190
|
return [goal];
|
|
182
191
|
}
|
|
183
192
|
}
|