tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/model/model_macro_solver.cpp, src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_BASIC,
|
|
4
3
|
FAMILY_USER,
|
|
@@ -117,7 +116,7 @@ const getHintHeadVars = (manager: AstManager, expr: number) => {
|
|
|
117
116
|
const isVarsOfSubset = (manager: AstManager, expr: number, vars: number[]) => {
|
|
118
117
|
const visited = new Set<number>();
|
|
119
118
|
const visit = (current: number): boolean => {
|
|
120
|
-
if (manager.
|
|
119
|
+
if (manager.isGroundApp(current) || visited.has(current)) return true;
|
|
121
120
|
visited.add(current);
|
|
122
121
|
const kind = manager.kinds[current];
|
|
123
122
|
if (kind === KIND_VAR) return vars.includes(current);
|
|
@@ -555,7 +554,7 @@ const collectNgFuncDecls = (manager: AstManager, expr: number) => {
|
|
|
555
554
|
visit(manager.getArg(current, index));
|
|
556
555
|
if (
|
|
557
556
|
manager.getNumArgs(current) > 0 &&
|
|
558
|
-
!manager.
|
|
557
|
+
!manager.isGroundApp(current) &&
|
|
559
558
|
isUserApp(manager, current)
|
|
560
559
|
)
|
|
561
560
|
decls.add(manager.decls[current]);
|
|
@@ -592,7 +591,7 @@ const nonAufMacroSolver = (manager: AstManager, model: ProtoModel, getInfo: GetI
|
|
|
592
591
|
const isBetterMacro = (first: CondMacro, second: CondMacro | null) => {
|
|
593
592
|
if (second === null || !first.isHint) return true;
|
|
594
593
|
if (!second.isHint) return false;
|
|
595
|
-
return manager.
|
|
594
|
+
return manager.isGroundApp(first.def) && !manager.isGroundApp(second.def);
|
|
596
595
|
};
|
|
597
596
|
const getMacroFor = (decl: number, quantifier: number) => {
|
|
598
597
|
let result: CondMacro | null = null;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/mpf.h, src/util/mpf.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "./rational";
|
|
3
2
|
|
|
4
3
|
export const MPF_ROUND_NEAREST_TEVEN = 0;
|
|
@@ -45,9 +44,9 @@ const getRoot = (value: bigint) => {
|
|
|
45
44
|
return low * low === value ? { root: low, isExact: true } : { root: low + 1n, isExact: false };
|
|
46
45
|
};
|
|
47
46
|
|
|
48
|
-
|
|
47
|
+
const mkBotExp = (ebits: number) => -(2 ** (ebits - 1) - 1);
|
|
49
48
|
|
|
50
|
-
|
|
49
|
+
const mkTopExp = (ebits: number) => 2 ** (ebits - 1);
|
|
51
50
|
|
|
52
51
|
export const mkMinExp = (ebits: number) => mkBotExp(ebits) + 1;
|
|
53
52
|
|
|
@@ -99,8 +98,6 @@ export const isPzero = (value: Mpf) => !value.sign && isZero(value);
|
|
|
99
98
|
|
|
100
99
|
export const isNeg = (value: Mpf) => value.sign && !isNan(value);
|
|
101
100
|
|
|
102
|
-
export const isPos = (value: Mpf) => !value.sign && !isNan(value);
|
|
103
|
-
|
|
104
101
|
export const isDenormal = (value: Mpf) => !isZero(value) && hasBotExp(value);
|
|
105
102
|
|
|
106
103
|
export const isNormal = (value: Mpf) => !(hasTopExp(value) || isDenormal(value) || isZero(value));
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/mus.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { AstManager } from "./ast";
|
|
3
2
|
import { mkNot } from "./ast-util";
|
|
4
3
|
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -11,7 +10,7 @@ export class Mus {
|
|
|
11
10
|
|
|
12
11
|
constructor(
|
|
13
12
|
private manager: AstManager,
|
|
14
|
-
private solver: MaxsatSolver,
|
|
13
|
+
private solver: Pick<MaxsatSolver, "checkSat" | "getUnsatCore">,
|
|
15
14
|
) {
|
|
16
15
|
this.lit2expr = new RefVector(manager);
|
|
17
16
|
this.trail = new RefVector(manager);
|
|
@@ -34,8 +33,7 @@ export class Mus {
|
|
|
34
33
|
return L_TRUE;
|
|
35
34
|
}
|
|
36
35
|
let unknown = [...literals];
|
|
37
|
-
|
|
38
|
-
const literal = unknown.pop() as number;
|
|
36
|
+
for (let literal = unknown.pop(); literal !== undefined; literal = unknown.pop()) {
|
|
39
37
|
const notLiteral = mkNot(this.manager, literal);
|
|
40
38
|
this.trail.push(notLiteral);
|
|
41
39
|
const status = this.solver.checkSat([...mus.items, ...unknown, notLiteral]);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_context.cpp, src/muz/base/dl_engine_base.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -11,6 +9,9 @@ import {
|
|
|
11
9
|
SORT_BOOL,
|
|
12
10
|
SORT_SIZE_INFINITE,
|
|
13
11
|
} from "../ast";
|
|
12
|
+
import type { Definition } from "../goal";
|
|
13
|
+
import { ModelEvaluator } from "../model-evaluator";
|
|
14
|
+
import { FuncInterp, type ProtoModel } from "../proto-model";
|
|
14
15
|
import { type RewriterOptions, Rewriter } from "../rewriter";
|
|
15
16
|
import { RefVector } from "../ref-vector";
|
|
16
17
|
import { applyQeLiteToConjuncts } from "../qe-lite";
|
|
@@ -37,9 +38,13 @@ const ENGINE_NAMES = new Map([
|
|
|
37
38
|
["ddnf", ENGINE_DDNF],
|
|
38
39
|
]);
|
|
39
40
|
|
|
40
|
-
//
|
|
41
|
+
// As in Z3, these are copied when the context is made, so a later fp option doesn't apply.
|
|
41
42
|
export class FpParams {
|
|
42
|
-
|
|
43
|
+
private parameters: ReadonlyMap<string, string>;
|
|
44
|
+
|
|
45
|
+
constructor(parameters: ReadonlyMap<string, string>) {
|
|
46
|
+
this.parameters = new Map(parameters);
|
|
47
|
+
}
|
|
43
48
|
|
|
44
49
|
getBool(name: string, defaultValue: boolean) {
|
|
45
50
|
const value = this.parameters.get(`fp.${name}`);
|
|
@@ -56,8 +61,45 @@ export class FpParams {
|
|
|
56
61
|
}
|
|
57
62
|
}
|
|
58
63
|
|
|
64
|
+
export type ModelConverter = (model: ProtoModel) => ProtoModel;
|
|
65
|
+
|
|
66
|
+
// generic_model_converter::operator() over predicates, where a definition of -1 hides the
|
|
67
|
+
// declaration.
|
|
68
|
+
const applyDefinitions = (definitions: readonly Definition[], model: ProtoModel) => {
|
|
69
|
+
const manager = model.manager;
|
|
70
|
+
let evaluator = new ModelEvaluator(manager, model);
|
|
71
|
+
evaluator.setModelCompletion(true);
|
|
72
|
+
for (let index = definitions.length - 1; index >= 0; index--) {
|
|
73
|
+
const definition = definitions[index];
|
|
74
|
+
if (definition.def === -1) {
|
|
75
|
+
model.unregisterDecl(definition.decl);
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
const value = evaluator.rewrite(definition.def);
|
|
79
|
+
const arity = manager.funcDecls[definition.decl].domain.length;
|
|
80
|
+
const oldInterp = model.funcInterps.get(definition.decl);
|
|
81
|
+
const old = arity === 0 ? model.constInterps.get(definition.decl) : oldInterp?.elseExpr;
|
|
82
|
+
if (old !== value) {
|
|
83
|
+
if (arity === 0) model.registerConst(definition.decl, value);
|
|
84
|
+
else {
|
|
85
|
+
const interp = new FuncInterp(manager, arity);
|
|
86
|
+
interp.setElse(value);
|
|
87
|
+
model.registerFunc(definition.decl, interp);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
manager.decRef(value);
|
|
91
|
+
if (old === value || (arity === 0 ? old === undefined : oldInterp === undefined)) continue;
|
|
92
|
+
evaluator.release();
|
|
93
|
+
evaluator = new ModelEvaluator(manager, model);
|
|
94
|
+
evaluator.setModelCompletion(true);
|
|
95
|
+
}
|
|
96
|
+
evaluator.release();
|
|
97
|
+
return model;
|
|
98
|
+
};
|
|
99
|
+
|
|
59
100
|
export interface Engine {
|
|
60
101
|
query(query: number): number;
|
|
102
|
+
getModel(): ProtoModel;
|
|
61
103
|
}
|
|
62
104
|
|
|
63
105
|
type EngineFactory = (context: DatalogContext, engine: number) => Engine;
|
|
@@ -69,7 +111,6 @@ export class DatalogContext {
|
|
|
69
111
|
private bindVariables: BindVariables;
|
|
70
112
|
private isBindingVariables = true;
|
|
71
113
|
ruleSet: RuleSet;
|
|
72
|
-
transformedRuleSet: RuleSet;
|
|
73
114
|
private ruleFmls: number[] = [];
|
|
74
115
|
private ruleNames: string[] = [];
|
|
75
116
|
private ruleFmlsHead = 0;
|
|
@@ -78,19 +119,20 @@ export class DatalogContext {
|
|
|
78
119
|
private engineType = ENGINE_LAST;
|
|
79
120
|
private engine: Engine | undefined;
|
|
80
121
|
readonly rewriter: Rewriter;
|
|
81
|
-
|
|
122
|
+
// m_mc: the converters since the last query, or undefined before one.
|
|
123
|
+
modelConverters: ModelConverter[] | undefined;
|
|
124
|
+
isBounded = false;
|
|
82
125
|
|
|
83
126
|
constructor(
|
|
84
127
|
readonly manager: AstManager,
|
|
85
128
|
readonly params: FpParams,
|
|
86
|
-
rewriterOptions: RewriterOptions,
|
|
129
|
+
readonly rewriterOptions: RewriterOptions,
|
|
87
130
|
private engineFactory: EngineFactory,
|
|
88
131
|
) {
|
|
89
132
|
this.ruleManager = new RuleManager(manager, this);
|
|
90
133
|
this.ruleProperties = new RuleProperties(this);
|
|
91
134
|
this.bindVariables = new BindVariables(manager);
|
|
92
135
|
this.ruleSet = new RuleSet(this);
|
|
93
|
-
this.transformedRuleSet = new RuleSet(this);
|
|
94
136
|
this.rewriter = new Rewriter(manager, rewriterOptions);
|
|
95
137
|
}
|
|
96
138
|
|
|
@@ -109,10 +151,6 @@ export class DatalogContext {
|
|
|
109
151
|
this.preds.add(decl);
|
|
110
152
|
}
|
|
111
153
|
|
|
112
|
-
getPredicates(): ReadonlySet<number> {
|
|
113
|
-
return this.preds;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
154
|
isPredicateDecl(decl: number) {
|
|
117
155
|
return this.preds.has(decl);
|
|
118
156
|
}
|
|
@@ -217,10 +255,6 @@ export class DatalogContext {
|
|
|
217
255
|
this.ruleSet.replaceRules(rules);
|
|
218
256
|
}
|
|
219
257
|
|
|
220
|
-
recordTransformedRules() {
|
|
221
|
-
this.transformedRuleSet.replaceRules(this.ruleSet);
|
|
222
|
-
}
|
|
223
|
-
|
|
224
258
|
getEngine(query = -1) {
|
|
225
259
|
this.configureEngine(query);
|
|
226
260
|
return this.engineType;
|
|
@@ -298,12 +332,26 @@ export class DatalogContext {
|
|
|
298
332
|
}
|
|
299
333
|
|
|
300
334
|
query(query: number) {
|
|
301
|
-
this.
|
|
335
|
+
this.modelConverters = [];
|
|
336
|
+
this.isBounded = false;
|
|
302
337
|
this.getEngine(query);
|
|
303
338
|
this.flushAddRules();
|
|
304
339
|
return this.ensureEngine(query).query(query);
|
|
305
340
|
}
|
|
306
341
|
|
|
342
|
+
addGenericModelConverter(definitions: readonly Definition[]) {
|
|
343
|
+
if (this.modelConverters === undefined) return;
|
|
344
|
+
for (const definition of definitions) {
|
|
345
|
+
this.manager.incDeclRef(definition.decl);
|
|
346
|
+
if (definition.def !== -1) this.manager.incRef(definition.def);
|
|
347
|
+
}
|
|
348
|
+
this.modelConverters.push((model) => applyDefinitions(definitions, model));
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
getModel() {
|
|
352
|
+
return this.ensureEngine().getModel();
|
|
353
|
+
}
|
|
354
|
+
|
|
307
355
|
// engine_base::query over one relation.
|
|
308
356
|
relQuery(relation: number) {
|
|
309
357
|
const manager = this.manager;
|
|
@@ -320,7 +368,7 @@ export class DatalogContext {
|
|
|
320
368
|
: mkExists(
|
|
321
369
|
manager,
|
|
322
370
|
[...domain].reverse(),
|
|
323
|
-
domain.map((
|
|
371
|
+
domain.map((_value, index) => String(index)).reverse(),
|
|
324
372
|
atom,
|
|
325
373
|
);
|
|
326
374
|
manager.incRef(query);
|
|
@@ -353,7 +401,7 @@ export class DatalogContext {
|
|
|
353
401
|
...conjs.items.map((conj) => this.ruleManager.ensureApp(conj)),
|
|
354
402
|
];
|
|
355
403
|
const isNegated = tail.map(
|
|
356
|
-
(
|
|
404
|
+
(_value, index) => index < rule.uninterpretedSize && rule.isNegated[index],
|
|
357
405
|
);
|
|
358
406
|
const reduced = this.ruleManager.mk(rule.head, tail, isNegated, rule.name);
|
|
359
407
|
conjs.reset();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_bit_blast.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, FAMILY_USER, getSymbolName, OP_MKBV, SORT_BOOL } from "../ast";
|
|
3
2
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
4
3
|
import { type Rewrite, RewriterTpl } from "../rewriter-tpl";
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
// src/muz/dataflow/reachability.h), MIT license, see z3-license.txt.
|
|
1
|
+
import { ObjHashtable, ObjMap } from "../hashtable";
|
|
3
2
|
import type { DatalogContext } from "./dl-context";
|
|
3
|
+
import type { Rule } from "./dl-rule";
|
|
4
|
+
import { HornSubsumeModelConverter } from "./horn-subsume-model-converter";
|
|
4
5
|
import { RuleSet } from "./dl-rule-set";
|
|
5
6
|
import type { RuleTransformerPlugin } from "./dl-rule-transformer";
|
|
6
7
|
|
|
@@ -15,30 +16,50 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
15
16
|
return this.bottomUp(topDown ?? source) ?? topDown;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
//
|
|
19
|
-
|
|
19
|
+
// dataflow_engine<reachability_info>::run_bottom_up: whether the rules of a predicate can
|
|
20
|
+
// derive a fact, for the predicates the engine reached.
|
|
21
|
+
private runBottomUp(source: RuleSet) {
|
|
20
22
|
const manager = this.context.manager;
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
reachable.add(head);
|
|
33
|
-
isChanged = true;
|
|
23
|
+
const getHash = (decl: number) => manager.getDeclHash(decl);
|
|
24
|
+
const facts = new ObjMap<boolean>(getHash);
|
|
25
|
+
const body2rules = new Map<number, Rule[]>();
|
|
26
|
+
const todos = [new ObjHashtable(getHash), new ObjHashtable(getHash)];
|
|
27
|
+
let todoIndex = 0;
|
|
28
|
+
for (const rule of source.rules) {
|
|
29
|
+
for (let index = 0; index < rule.uninterpretedSize; index++) {
|
|
30
|
+
const decl = rule.getTailDecl(manager, index);
|
|
31
|
+
const users = body2rules.get(decl);
|
|
32
|
+
if (users === undefined) body2rules.set(decl, [rule]);
|
|
33
|
+
else users.push(rule);
|
|
34
34
|
}
|
|
35
|
+
const head = rule.getDecl(manager);
|
|
36
|
+
if (rule.positiveSize !== 0 || facts.get(head) === true) continue;
|
|
37
|
+
facts.set(head, true);
|
|
38
|
+
todos[todoIndex].add(head);
|
|
35
39
|
}
|
|
36
|
-
|
|
40
|
+
while (todos[todoIndex].size > 0) {
|
|
41
|
+
for (const decl of todos[todoIndex])
|
|
42
|
+
for (const rule of body2rules.get(decl) ?? []) {
|
|
43
|
+
const head = rule.getDecl(manager);
|
|
44
|
+
if (!facts.has(head)) facts.set(head, false);
|
|
45
|
+
if (facts.get(head) === true) continue;
|
|
46
|
+
let isFiring = true;
|
|
47
|
+
for (let index = 0; isFiring && index < rule.positiveSize; index++)
|
|
48
|
+
isFiring = facts.get(rule.getTailDecl(manager, index)) === true;
|
|
49
|
+
if (!isFiring) continue;
|
|
50
|
+
facts.set(head, true);
|
|
51
|
+
todos[1 - todoIndex].add(head);
|
|
52
|
+
}
|
|
53
|
+
todos[todoIndex] = new ObjHashtable(getHash);
|
|
54
|
+
todoIndex = 1 - todoIndex;
|
|
55
|
+
}
|
|
56
|
+
return facts;
|
|
37
57
|
}
|
|
38
58
|
|
|
39
59
|
private bottomUp(source: RuleSet) {
|
|
40
60
|
const manager = this.context.manager;
|
|
41
|
-
const
|
|
61
|
+
const facts = this.runBottomUp(source);
|
|
62
|
+
const unreachable = new ObjHashtable((decl) => manager.getDeclHash(decl));
|
|
42
63
|
const result = new RuleSet(this.context);
|
|
43
64
|
result.inheritPredicates(source);
|
|
44
65
|
for (const rule of source.rules) {
|
|
@@ -46,7 +67,8 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
46
67
|
let newTail: number[] | undefined;
|
|
47
68
|
let newNegated: boolean[] = [];
|
|
48
69
|
for (let index = 0; index < rule.uninterpretedSize; index++) {
|
|
49
|
-
const isReachable =
|
|
70
|
+
const isReachable = facts.get(rule.getTailDecl(manager, index)) === true;
|
|
71
|
+
if (!isReachable) unreachable.add(rule.getTailDecl(manager, index));
|
|
50
72
|
if (rule.isNegated[index]) {
|
|
51
73
|
if (!isReachable && newTail === undefined) {
|
|
52
74
|
newTail = rule.tail.slice(0, index);
|
|
@@ -73,6 +95,12 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
73
95
|
}
|
|
74
96
|
if (result.rules.length === source.rules.length) return undefined;
|
|
75
97
|
result.close();
|
|
98
|
+
if (this.context.modelConverters !== undefined) {
|
|
99
|
+
for (const [decl, isReachable] of facts) if (!isReachable) unreachable.add(decl);
|
|
100
|
+
this.context.addGenericModelConverter(
|
|
101
|
+
[...unreachable].map((decl) => ({ decl, def: manager.falseExpr })),
|
|
102
|
+
);
|
|
103
|
+
}
|
|
76
104
|
return result;
|
|
77
105
|
}
|
|
78
106
|
|
|
@@ -103,6 +131,7 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
103
131
|
const result = new RuleSet(this.context);
|
|
104
132
|
result.inheritPredicates(source);
|
|
105
133
|
const seen = new Set<number>();
|
|
134
|
+
const prunedPreds = new ObjHashtable((decl) => manager.getDeclHash(decl));
|
|
106
135
|
for (const rule of source.rules) {
|
|
107
136
|
const predicate = rule.getDecl(manager);
|
|
108
137
|
if (seen.has(predicate)) continue;
|
|
@@ -111,11 +140,28 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
111
140
|
for (const kept of source.getPredicateRules(predicate)) result.addRule(kept);
|
|
112
141
|
continue;
|
|
113
142
|
}
|
|
114
|
-
if (
|
|
143
|
+
if (this.context.modelConverters === undefined) continue;
|
|
115
144
|
for (const pruned of source.getPredicateRules(predicate))
|
|
116
145
|
for (let index = 0; index < pruned.uninterpretedSize; index++)
|
|
117
146
|
if (pruned.getTailDecl(manager, index) !== predicate) return undefined;
|
|
147
|
+
prunedPreds.add(predicate);
|
|
118
148
|
}
|
|
119
|
-
|
|
149
|
+
if (result.rules.length === source.rules.length) return undefined;
|
|
150
|
+
if (this.context.modelConverters !== undefined && prunedPreds.size > 0) {
|
|
151
|
+
const horn = new HornSubsumeModelConverter(this.context);
|
|
152
|
+
this.context.addGenericModelConverter(
|
|
153
|
+
[...prunedPreds].map((decl) => ({
|
|
154
|
+
decl,
|
|
155
|
+
def: manager.mkOr(
|
|
156
|
+
source
|
|
157
|
+
.getPredicateRules(decl)
|
|
158
|
+
.map((rule) =>
|
|
159
|
+
horn.mkHorn(rule.head, manager.mkAnd(rule.tail.slice(rule.uninterpretedSize))),
|
|
160
|
+
),
|
|
161
|
+
),
|
|
162
|
+
})),
|
|
163
|
+
);
|
|
164
|
+
}
|
|
165
|
+
return result;
|
|
120
166
|
}
|
|
121
167
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_elim_term_ite.cpp,
|
|
2
|
-
// src/ast/simplifiers/blast_term_ite_simplifier.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import { type AstManager, KIND_APP, KIND_QUANTIFIER, OP_ITE, SORT_BOOL } from "../ast";
|
|
5
3
|
import { flattenAndVector, getNumExprs } from "../ast-util";
|
|
@@ -24,7 +22,13 @@ class BlastTermIte extends RewriterTpl {
|
|
|
24
22
|
reduceApp(decl: number, args: number[], sort: number): number | Rewrite {
|
|
25
23
|
const manager = this.manager;
|
|
26
24
|
if (decl === OP_ITE) return -1;
|
|
27
|
-
|
|
25
|
+
// The product wraps as Z3's unsigned one does.
|
|
26
|
+
if (
|
|
27
|
+
this.maxInflation < 0xffffffff &&
|
|
28
|
+
this.initTermSize > 0 &&
|
|
29
|
+
Math.imul(this.maxInflation, this.initTermSize) >>> 0 < this.numFresh
|
|
30
|
+
)
|
|
31
|
+
return -1;
|
|
28
32
|
for (let index = 0; index < args.length; index++) {
|
|
29
33
|
const arg = args[index];
|
|
30
34
|
if (manager.sorts[arg] === SORT_BOOL || manager.getOp(arg) !== OP_ITE) continue;
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_interp_tail_simplifier.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
KIND_APP,
|
|
6
4
|
KIND_VAR,
|
|
7
5
|
OP_AND,
|
|
8
6
|
OP_EQ,
|
|
9
|
-
OP_GE,
|
|
10
|
-
OP_LE,
|
|
11
7
|
OP_NOT,
|
|
12
8
|
OP_OR,
|
|
13
9
|
SORT_BOOL,
|
|
@@ -236,8 +232,6 @@ export class MkInterpTailSimplifier implements RuleTransformerPlugin {
|
|
|
236
232
|
tryUnify(first, manager.falseExpr);
|
|
237
233
|
else if (manager.kinds[first] === KIND_VAR && isNeg && manager.isFalse(second))
|
|
238
234
|
tryUnify(first, manager.trueExpr);
|
|
239
|
-
} else if (!isNeg && (op === OP_LE || op === OP_GE)) {
|
|
240
|
-
// Z3 collects the differences of the inequalities but never unifies them.
|
|
241
235
|
}
|
|
242
236
|
}
|
|
243
237
|
if (!isFound) return undefined;
|
|
@@ -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
|
}
|