tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +6 -16
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -7
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +25 -6
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +0 -1
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -14
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +91 -55
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +0 -1
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +66 -16
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_rule_inliner.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
2
|
+
import { L_FALSE, L_UNDEF } from "../lbool";
|
|
3
3
|
import type { DatalogContext } from "./dl-context";
|
|
4
4
|
import { MkInterpTailSimplifier } from "./dl-mk-interp-tail-simplifier";
|
|
5
5
|
import { getRuleVars, type Rule } from "./dl-rule";
|
|
6
6
|
import { RuleSet } from "./dl-rule-set";
|
|
7
7
|
import { removeDuplicateTails, type RuleTransformerPlugin } from "./dl-rule-transformer";
|
|
8
|
+
import { HornSubsumeModelConverter } from "./horn-subsume-model-converter";
|
|
8
9
|
import { Substitution } from "./substitution";
|
|
9
10
|
|
|
10
11
|
class RuleUnifier {
|
|
@@ -50,7 +51,7 @@ class RuleUnifier {
|
|
|
50
51
|
this.subst.apply(target.head, 0, this.deltas),
|
|
51
52
|
tail,
|
|
52
53
|
isNegated,
|
|
53
|
-
`${target.
|
|
54
|
+
`${target.getNameText()};${source.getNameText()}`,
|
|
54
55
|
),
|
|
55
56
|
true,
|
|
56
57
|
);
|
|
@@ -58,9 +59,6 @@ class RuleUnifier {
|
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
61
|
|
|
61
|
-
const hasQuantifier = (context: DatalogContext, rule: Rule) =>
|
|
62
|
-
context.ruleManager.hasQuantifiers(rule);
|
|
63
|
-
|
|
64
62
|
// The rules at a position of a head or tail, and which of them can still be expanded or removed.
|
|
65
63
|
class Visitor {
|
|
66
64
|
readonly positions = new Map<number, number[]>();
|
|
@@ -98,6 +96,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
98
96
|
private tailVisitor = new Visitor();
|
|
99
97
|
// Z3 throws has_new_quantifier when it would inline a rule that has a quantifier.
|
|
100
98
|
private hasNewQuantifier = false;
|
|
99
|
+
private modelConverter: HornSubsumeModelConverter | undefined;
|
|
101
100
|
|
|
102
101
|
constructor(
|
|
103
102
|
private context: DatalogContext,
|
|
@@ -109,7 +108,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
109
108
|
|
|
110
109
|
private tryToInlineRule(target: Rule, source: Rule, tailIndex: number): Rule | undefined {
|
|
111
110
|
this.context.ruleManager.normVars(target);
|
|
112
|
-
if (
|
|
111
|
+
if (this.context.ruleManager.hasQuantifiers(source)) {
|
|
113
112
|
this.hasNewQuantifier = true;
|
|
114
113
|
return undefined;
|
|
115
114
|
}
|
|
@@ -213,10 +212,18 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
213
212
|
if (this.forbidMultipleMultipliers(source, candidates))
|
|
214
213
|
candidates = this.createAllowedRuleSet(source);
|
|
215
214
|
for (const stratum of candidates.getStrats())
|
|
216
|
-
for (const rule of candidates.getPredicateRules(stratum.values().next().value as number))
|
|
215
|
+
for (const rule of candidates.getPredicateRules(stratum.values().next().value as number)) {
|
|
217
216
|
this.transformRule(source, rule, this.inlinedRules);
|
|
217
|
+
// Z3 does not catch the has_new_quantifier that plan_inlining throws, and aborts.
|
|
218
|
+
if (this.hasNewQuantifier)
|
|
219
|
+
throw new SmtUnsupportedError("inlining a rule with a quantifier");
|
|
220
|
+
}
|
|
221
|
+
for (const rule of this.inlinedRules.rules) this.modelConverter?.delRule(rule, L_UNDEF);
|
|
218
222
|
}
|
|
219
223
|
|
|
224
|
+
// Deviation from Z3: transform_rule keeps a rule that has a quantifier without inlining the rest
|
|
225
|
+
// of its tail, although the rules of those predicates are dropped, so Z3 answers unreachable for
|
|
226
|
+
// a reachable query (dl_mk_rule_inliner.cpp). The rest of the tail is inlined here.
|
|
220
227
|
private transformRule(source: RuleSet, original: Rule, target: RuleSet) {
|
|
221
228
|
const manager = this.context.manager;
|
|
222
229
|
let isModified = false;
|
|
@@ -239,6 +246,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
239
246
|
if (result !== undefined) todo.push(result);
|
|
240
247
|
}
|
|
241
248
|
}
|
|
249
|
+
if (isModified) this.modelConverter?.delRule(original, L_UNDEF);
|
|
242
250
|
return isModified;
|
|
243
251
|
}
|
|
244
252
|
|
|
@@ -253,6 +261,10 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
253
261
|
isDone = true;
|
|
254
262
|
if (this.hasNewQuantifier) break;
|
|
255
263
|
}
|
|
264
|
+
if (isDone)
|
|
265
|
+
for (const rule of source.rules)
|
|
266
|
+
if (this.isInliningAllowed(source, rule.getDecl(manager)))
|
|
267
|
+
this.modelConverter?.delRule(rule, L_UNDEF);
|
|
256
268
|
return isDone;
|
|
257
269
|
}
|
|
258
270
|
|
|
@@ -297,9 +309,15 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
297
309
|
candidate = predicateRule;
|
|
298
310
|
}
|
|
299
311
|
if (isAmbiguous) continue;
|
|
300
|
-
if (candidate === undefined)
|
|
312
|
+
if (candidate === undefined) {
|
|
313
|
+
this.modelConverter?.delRule(rule, L_FALSE);
|
|
314
|
+
return null;
|
|
315
|
+
}
|
|
301
316
|
if (!this.isOrientedRewriter(candidate, rules)) continue;
|
|
302
|
-
|
|
317
|
+
const inlined = this.tryToInlineRule(rule, candidate, index);
|
|
318
|
+
if (inlined !== undefined) return inlined;
|
|
319
|
+
this.modelConverter?.delRule(rule, L_FALSE);
|
|
320
|
+
return null;
|
|
303
321
|
}
|
|
304
322
|
return undefined;
|
|
305
323
|
}
|
|
@@ -384,6 +402,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
384
402
|
canExpand[index] = canExpand[other];
|
|
385
403
|
if (tailUnifiers.length === 1) {
|
|
386
404
|
isValid[other] = false;
|
|
405
|
+
this.modelConverter?.delRule(otherRule, L_UNDEF);
|
|
387
406
|
this.delRule(otherRule, other);
|
|
388
407
|
}
|
|
389
408
|
}
|
|
@@ -397,8 +416,14 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
397
416
|
|
|
398
417
|
apply(source: RuleSet) {
|
|
399
418
|
if (source.rules.length === 0) return undefined;
|
|
400
|
-
if (source.rules.some((rule) =>
|
|
419
|
+
if (source.rules.some((rule) => this.context.ruleManager.hasQuantifiers(rule)))
|
|
420
|
+
return undefined;
|
|
401
421
|
this.hasNewQuantifier = false;
|
|
422
|
+
this.modelConverter =
|
|
423
|
+
this.context.modelConverters === undefined
|
|
424
|
+
? undefined
|
|
425
|
+
: new HornSubsumeModelConverter(this.context);
|
|
426
|
+
const converter = this.modelConverter;
|
|
402
427
|
let isDone = false;
|
|
403
428
|
let result = new RuleSet(this.context);
|
|
404
429
|
if (this.context.params.getBool("xform.inline_eager", true)) {
|
|
@@ -422,6 +447,9 @@ export class MkRuleInliner implements RuleTransformerPlugin {
|
|
|
422
447
|
}
|
|
423
448
|
}
|
|
424
449
|
if (this.hasNewQuantifier) throw new SmtUnsupportedError("inlining a rule with a quantifier");
|
|
425
|
-
|
|
450
|
+
if (!isDone) return undefined;
|
|
451
|
+
if (converter !== undefined)
|
|
452
|
+
this.context.modelConverters?.push((model) => converter.apply(model));
|
|
453
|
+
return result;
|
|
426
454
|
}
|
|
427
455
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_slice.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { getSymbolName, KIND_VAR, OP_EQ, OP_ITE, SORT_BOOL } from "../ast";
|
|
3
2
|
import { flattenAndVector } from "../ast-util";
|
|
3
|
+
import { ObjMap } from "../hashtable";
|
|
4
|
+
import { FuncInterp, ProtoModel } from "../proto-model";
|
|
4
5
|
import { RefVector } from "../ref-vector";
|
|
5
|
-
import { getFreeVarSorts } from "../var-subst";
|
|
6
|
+
import { getFreeVarSorts, VarSubst } from "../var-subst";
|
|
6
7
|
import type { DatalogContext } from "./dl-context";
|
|
7
8
|
import type { Rule } from "./dl-rule";
|
|
8
9
|
import { RuleSet } from "./dl-rule-set";
|
|
@@ -10,14 +11,19 @@ import type { RuleTransformerPlugin } from "./dl-rule-transformer";
|
|
|
10
11
|
|
|
11
12
|
export class MkSlice implements RuleTransformerPlugin {
|
|
12
13
|
readonly priority = 1;
|
|
13
|
-
private sliceable
|
|
14
|
+
private sliceable: ObjMap<boolean[]>;
|
|
14
15
|
private input: boolean[] = [];
|
|
15
16
|
private output: boolean[] = [];
|
|
16
17
|
private isVarSliceable: boolean[] = [];
|
|
17
18
|
private solvedVars: number[] = [];
|
|
18
19
|
readonly predicates = new Map<number, number>();
|
|
20
|
+
// slice_model_converter::m_slice2old
|
|
21
|
+
private slice2old: ObjMap<number>;
|
|
19
22
|
|
|
20
|
-
constructor(private context: DatalogContext) {
|
|
23
|
+
constructor(private context: DatalogContext) {
|
|
24
|
+
this.sliceable = new ObjMap((decl) => context.manager.getDeclHash(decl));
|
|
25
|
+
this.slice2old = new ObjMap((decl) => context.manager.getDeclHash(decl));
|
|
26
|
+
}
|
|
21
27
|
|
|
22
28
|
private getPredicateSlice(predicate: number) {
|
|
23
29
|
const existing = this.sliceable.get(predicate);
|
|
@@ -82,7 +88,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
82
88
|
const manager = this.context.manager;
|
|
83
89
|
if (manager.getOp(expr) === OP_ITE) {
|
|
84
90
|
const thenEq = this.getEq(manager.getArg(expr, 1));
|
|
85
|
-
const elseEq = this.getEq(manager.getArg(expr, 2));
|
|
91
|
+
const elseEq = thenEq === undefined ? undefined : this.getEq(manager.getArg(expr, 2));
|
|
86
92
|
if (thenEq !== undefined && elseEq !== undefined && thenEq.index === elseEq.index)
|
|
87
93
|
return {
|
|
88
94
|
index: thenEq.index,
|
|
@@ -95,11 +101,13 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
95
101
|
}
|
|
96
102
|
if (manager.kinds[expr] === KIND_VAR)
|
|
97
103
|
return { index: manager.values[expr], value: manager.trueExpr };
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
if (manager.
|
|
101
|
-
|
|
102
|
-
|
|
104
|
+
// is_not rebinds the expression to its argument, so the equation under a negation is solved.
|
|
105
|
+
const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
|
|
106
|
+
if (atom !== expr && manager.kinds[atom] === KIND_VAR)
|
|
107
|
+
return { index: manager.values[atom], value: manager.falseExpr };
|
|
108
|
+
if (manager.getOp(atom) !== OP_EQ) return undefined;
|
|
109
|
+
const left = manager.getArg(atom, 0);
|
|
110
|
+
const right = manager.getArg(atom, 1);
|
|
103
111
|
if (manager.kinds[left] === KIND_VAR) return { index: manager.values[left], value: right };
|
|
104
112
|
if (manager.kinds[right] === KIND_VAR) return { index: manager.values[right], value: left };
|
|
105
113
|
return undefined;
|
|
@@ -214,6 +222,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
214
222
|
);
|
|
215
223
|
this.predicates.set(predicate, sliced);
|
|
216
224
|
target.inheritPredicate(source, predicate, sliced);
|
|
225
|
+
this.slice2old.set(sliced, predicate);
|
|
217
226
|
} else if (source.isOutputPredicate(predicate)) {
|
|
218
227
|
target.setOutputPredicate(predicate);
|
|
219
228
|
hasOutput = true;
|
|
@@ -246,16 +255,14 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
246
255
|
return;
|
|
247
256
|
}
|
|
248
257
|
this.initVars(rule);
|
|
258
|
+
const head = this.updatePredicate(rule.head);
|
|
249
259
|
const tail = rule.tail
|
|
250
260
|
.slice(0, rule.uninterpretedSize)
|
|
251
261
|
.map((atom) => this.updatePredicate(atom));
|
|
252
262
|
const conjs = this.getTailConjs(rule);
|
|
253
263
|
tail.push(...conjs.items);
|
|
254
264
|
const ruleManager = this.context.ruleManager;
|
|
255
|
-
const updated = ruleManager.fixUnboundVars(
|
|
256
|
-
ruleManager.mk(this.updatePredicate(rule.head), tail, [], rule.name),
|
|
257
|
-
false,
|
|
258
|
-
);
|
|
265
|
+
const updated = ruleManager.fixUnboundVars(ruleManager.mk(head, tail, [], rule.name), false);
|
|
259
266
|
conjs.reset();
|
|
260
267
|
target.addRule(updated);
|
|
261
268
|
}
|
|
@@ -273,6 +280,61 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
273
280
|
this.declarePredicates(source, result);
|
|
274
281
|
if (this.predicates.size === 0) return undefined;
|
|
275
282
|
for (const rule of source.rules) this.updateRule(rule, result);
|
|
283
|
+
const slice2old = this.slice2old;
|
|
284
|
+
const sliceable = new Map([...this.sliceable].map((entry) => [entry[0], [...entry[1]]]));
|
|
285
|
+
this.context.modelConverters?.push((model) => this.convertModel(model, slice2old, sliceable));
|
|
276
286
|
return result;
|
|
277
287
|
}
|
|
288
|
+
|
|
289
|
+
// slice_model_converter::operator(): the interpretation of a sliced predicate over the
|
|
290
|
+
// arguments of the predicate it was sliced from.
|
|
291
|
+
private convertModel(
|
|
292
|
+
model: ProtoModel,
|
|
293
|
+
slice2old: ObjMap<number>,
|
|
294
|
+
sliceable: ReadonlyMap<number, boolean[]>,
|
|
295
|
+
) {
|
|
296
|
+
const manager = this.context.manager;
|
|
297
|
+
const oldModel = new ProtoModel(manager);
|
|
298
|
+
const varSubst = new VarSubst(manager, false);
|
|
299
|
+
for (const [sliced, predicate] of slice2old) {
|
|
300
|
+
// Z3 drops the interpretation of a predicate that has every argument sliced.
|
|
301
|
+
if (manager.funcDecls[sliced].domain.length === 0) continue;
|
|
302
|
+
const slice = sliceable.get(predicate) ?? [];
|
|
303
|
+
const domain = manager.funcDecls[predicate].domain;
|
|
304
|
+
const subst = domain
|
|
305
|
+
.map((sort, index) => manager.mkVar(index, sort))
|
|
306
|
+
.filter((_, index) => !slice[index]);
|
|
307
|
+
const interp = model.funcInterps.get(sliced);
|
|
308
|
+
if (interp === undefined) continue;
|
|
309
|
+
const oldInterp = new FuncInterp(manager, slice.length);
|
|
310
|
+
if (interp.elseExpr !== null) {
|
|
311
|
+
const elseExpr = varSubst.apply(interp.elseExpr, subst);
|
|
312
|
+
oldInterp.setElse(elseExpr);
|
|
313
|
+
manager.decRef(elseExpr);
|
|
314
|
+
}
|
|
315
|
+
for (const entry of interp.entries) {
|
|
316
|
+
let next = 0;
|
|
317
|
+
const args = domain.map((sort, index) =>
|
|
318
|
+
slice[index] ? manager.mkVar(index, sort) : varSubst.apply(entry.args[next++], subst),
|
|
319
|
+
);
|
|
320
|
+
const result = varSubst.apply(entry.result, subst);
|
|
321
|
+
oldInterp.insertEntry(args, result);
|
|
322
|
+
manager.decRef(result);
|
|
323
|
+
args.forEach((arg, index) => {
|
|
324
|
+
if (!slice[index]) manager.decRef(arg);
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
oldModel.registerFunc(predicate, oldInterp);
|
|
328
|
+
}
|
|
329
|
+
for (const decl of model.getConstDecls()) {
|
|
330
|
+
const value = model.constInterps.get(decl);
|
|
331
|
+
if (value !== undefined && !slice2old.has(decl)) oldModel.registerConst(decl, value);
|
|
332
|
+
}
|
|
333
|
+
for (const decl of model.getFuncDecls()) {
|
|
334
|
+
const interp = model.funcInterps.get(decl);
|
|
335
|
+
if (interp !== undefined && !slice2old.has(decl)) oldModel.registerFunc(decl, interp.copy());
|
|
336
|
+
}
|
|
337
|
+
varSubst.release();
|
|
338
|
+
return oldModel;
|
|
339
|
+
}
|
|
278
340
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_subsumption_checker.cpp,
|
|
2
|
-
// src/muz/base/dl_rule_subsumption_index.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { KIND_VAR } from "../ast";
|
|
2
|
+
import { ObjHashtable } from "../hashtable";
|
|
4
3
|
import type { DatalogContext } from "./dl-context";
|
|
5
4
|
import type { Rule } from "./dl-rule";
|
|
6
5
|
import { RuleSet } from "./dl-rule-set";
|
|
@@ -28,14 +27,16 @@ class RuleSubsumptionIndex {
|
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
export class MkSubsumptionChecker implements RuleTransformerPlugin {
|
|
31
|
-
private totalRelations
|
|
30
|
+
private totalRelations: ObjHashtable;
|
|
32
31
|
private definingRules = new Map<number, Rule>();
|
|
33
32
|
private hasNewTotalRule = false;
|
|
34
33
|
|
|
35
34
|
constructor(
|
|
36
35
|
private context: DatalogContext,
|
|
37
36
|
readonly priority: number,
|
|
38
|
-
) {
|
|
37
|
+
) {
|
|
38
|
+
this.totalRelations = new ObjHashtable((decl) => context.manager.getDeclHash(decl));
|
|
39
|
+
}
|
|
39
40
|
|
|
40
41
|
private isTotalRule(rule: Rule) {
|
|
41
42
|
const manager = this.context.manager;
|
|
@@ -136,6 +137,10 @@ export class MkSubsumptionChecker implements RuleTransformerPlugin {
|
|
|
136
137
|
index.add(transformed);
|
|
137
138
|
}
|
|
138
139
|
target.inheritPredicates(source);
|
|
140
|
+
if (this.totalRelations.size > 0)
|
|
141
|
+
this.context.addGenericModelConverter(
|
|
142
|
+
[...this.totalRelations].map((decl) => ({ decl, def: manager.trueExpr })),
|
|
143
|
+
);
|
|
139
144
|
return isModified;
|
|
140
145
|
}
|
|
141
146
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_rule_set.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError } from "../../../../errors";
|
|
3
2
|
import { type AstManager, KIND_APP, KIND_QUANTIFIER } from "../ast";
|
|
4
3
|
import type { DatalogContext } from "./dl-context";
|
|
@@ -178,10 +177,6 @@ export class RuleSet {
|
|
|
178
177
|
return this.pred2orig.get(predicate) ?? predicate;
|
|
179
178
|
}
|
|
180
179
|
|
|
181
|
-
getPred(orig: number) {
|
|
182
|
-
return this.orig2pred.get(orig) ?? orig;
|
|
183
|
-
}
|
|
184
|
-
|
|
185
180
|
inheritPredicates(other: RuleSet) {
|
|
186
181
|
for (const predicate of other.outputPredicates) this.outputPredicates.add(predicate);
|
|
187
182
|
for (const [orig, predicate] of other.orig2pred) this.orig2pred.set(orig, predicate);
|
|
@@ -203,31 +198,6 @@ export class RuleSet {
|
|
|
203
198
|
else existing.push(rule);
|
|
204
199
|
}
|
|
205
200
|
|
|
206
|
-
delRule(rule: Rule) {
|
|
207
|
-
const remove = (rules: Rule[]) => {
|
|
208
|
-
for (let index = rules.length - 1; index >= 0; index--) {
|
|
209
|
-
if (rules[index] !== rule) continue;
|
|
210
|
-
rules[index] = rules[rules.length - 1];
|
|
211
|
-
rules.pop();
|
|
212
|
-
break;
|
|
213
|
-
}
|
|
214
|
-
};
|
|
215
|
-
remove(this.head2rules.get(rule.getDecl(this.manager)) ?? []);
|
|
216
|
-
remove(this.rules);
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
replaceRule(rule: Rule, other: Rule) {
|
|
220
|
-
const replace = (rules: Rule[]) => {
|
|
221
|
-
for (let index = rules.length - 1; index >= 0; index--) {
|
|
222
|
-
if (rules[index] !== rule) continue;
|
|
223
|
-
rules[index] = other;
|
|
224
|
-
break;
|
|
225
|
-
}
|
|
226
|
-
};
|
|
227
|
-
replace(this.head2rules.get(rule.getDecl(this.manager)) ?? []);
|
|
228
|
-
replace(this.rules);
|
|
229
|
-
}
|
|
230
|
-
|
|
231
201
|
isClosed() {
|
|
232
202
|
return this.stratifier !== undefined;
|
|
233
203
|
}
|
|
@@ -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(
|
|
@@ -46,11 +64,22 @@ export class Rule {
|
|
|
46
64
|
return false;
|
|
47
65
|
}
|
|
48
66
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
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`;
|
|
54
83
|
}
|
|
55
84
|
}
|
|
56
85
|
|
|
@@ -107,46 +136,71 @@ export class BindVariables {
|
|
|
107
136
|
const bound = new Map<number, number>();
|
|
108
137
|
const names: string[] = [];
|
|
109
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.
|
|
110
141
|
const abstract = (term: number, scope: number, cache: Map<number, number>): number => {
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
if (
|
|
116
|
-
|
|
117
|
-
|
|
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);
|
|
118
154
|
const innerScope = scope + data.sorts.length;
|
|
119
155
|
const innerCache = new Map<number, number>();
|
|
120
156
|
const patterns = data.patterns.map((pattern) =>
|
|
121
157
|
abstract(pattern, innerScope, innerCache),
|
|
122
158
|
);
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
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)) {
|
|
130
168
|
const existing =
|
|
131
|
-
bound.get(
|
|
169
|
+
bound.get(current) ??
|
|
132
170
|
(() => {
|
|
133
|
-
const variable = manager.mkVar(names.length, manager.sorts[
|
|
134
|
-
names.push(manager.getDeclName(
|
|
135
|
-
sorts.push(manager.sorts[
|
|
136
|
-
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);
|
|
137
175
|
return variable;
|
|
138
176
|
})();
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
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
|
+
);
|
|
142
200
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
: manager.mkApp(manager.decls[term], args, manager.sorts[term]);
|
|
147
|
-
})();
|
|
148
|
-
cache.set(term, result);
|
|
149
|
-
return result;
|
|
201
|
+
todo.pop();
|
|
202
|
+
}
|
|
203
|
+
return cache.get(term) ?? term;
|
|
150
204
|
};
|
|
151
205
|
const body = abstract(fml, 0, new Map());
|
|
152
206
|
if (names.length === 0) return body;
|
|
@@ -294,17 +348,6 @@ export class RuleManager {
|
|
|
294
348
|
return rule;
|
|
295
349
|
}
|
|
296
350
|
|
|
297
|
-
mkFrom(source: Rule, head = source.head, name = source.name) {
|
|
298
|
-
return new Rule(
|
|
299
|
-
this.pin(head),
|
|
300
|
-
[...source.tail],
|
|
301
|
-
[...source.isNegated],
|
|
302
|
-
source.uninterpretedSize,
|
|
303
|
-
source.positiveSize,
|
|
304
|
-
name,
|
|
305
|
-
);
|
|
306
|
-
}
|
|
307
|
-
|
|
308
351
|
normVars(rule: Rule) {
|
|
309
352
|
const manager = this.manager;
|
|
310
353
|
const used = getRuleVars(manager, rule);
|
|
@@ -320,14 +363,6 @@ export class RuleManager {
|
|
|
320
363
|
subst.release();
|
|
321
364
|
}
|
|
322
365
|
|
|
323
|
-
substitute(rule: Rule, values: number[]) {
|
|
324
|
-
const subst = new VarSubst(this.manager, false);
|
|
325
|
-
const head = subst.apply(rule.head, values);
|
|
326
|
-
const tail = rule.tail.map((literal) => subst.apply(literal, values));
|
|
327
|
-
subst.release();
|
|
328
|
-
return this.mk(head, tail, rule.isNegated, rule.name, false);
|
|
329
|
-
}
|
|
330
|
-
|
|
331
366
|
toFormula(rule: Rule) {
|
|
332
367
|
const manager = this.manager;
|
|
333
368
|
const body = rule.tail.map((literal, index) =>
|
|
@@ -385,6 +420,7 @@ export class RuleManager {
|
|
|
385
420
|
names.reverse();
|
|
386
421
|
const queryPredicate = this.context.mkFreshHeadPredicate("query", "", domain);
|
|
387
422
|
rules.setOutputPredicate(queryPredicate);
|
|
423
|
+
this.context.addGenericModelConverter([{ decl: queryPredicate, def: -1 }]);
|
|
388
424
|
const head = manager.mkApp(
|
|
389
425
|
queryPredicate,
|
|
390
426
|
domain.map((sort, index) => manager.mkVar(domain.length - index - 1, sort)),
|
|
@@ -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);
|