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
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
import {
|
|
2
|
+
FAMILY_USER,
|
|
3
|
+
KIND_APP,
|
|
4
|
+
KIND_QUANTIFIER,
|
|
5
|
+
KIND_VAR,
|
|
6
|
+
OP_AND,
|
|
7
|
+
OP_OR,
|
|
8
|
+
QUANTIFIER_EXISTS,
|
|
9
|
+
SORT_BOOL,
|
|
10
|
+
} from "../ast";
|
|
11
|
+
import { L_FALSE, L_TRUE } from "../lbool";
|
|
12
|
+
import { FuncInterp, type ProtoModel } from "../proto-model";
|
|
13
|
+
import { VarSubst } from "../var-subst";
|
|
14
|
+
import type { DatalogContext } from "./dl-context";
|
|
15
|
+
import { getUsedVars, type Rule } from "./dl-rule";
|
|
16
|
+
|
|
17
|
+
export class HornSubsumeModelConverter {
|
|
18
|
+
private delayHeads: number[] = [];
|
|
19
|
+
private delayBodies: number[] = [];
|
|
20
|
+
private funcs: number[] = [];
|
|
21
|
+
private bodies: number[] = [];
|
|
22
|
+
|
|
23
|
+
constructor(private context: DatalogContext) {}
|
|
24
|
+
|
|
25
|
+
insert(head: number, body: readonly number[]) {
|
|
26
|
+
const manager = this.context.manager;
|
|
27
|
+
const conjunction = this.context.rewriter.mkAnd([...body]);
|
|
28
|
+
manager.incRef(head);
|
|
29
|
+
manager.incRef(conjunction);
|
|
30
|
+
this.delayHeads.push(head);
|
|
31
|
+
this.delayBodies.push(conjunction);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// The predicate of the head is the body with the head's arguments as the variables above the
|
|
35
|
+
// existentially bound ones. The result comes with a reference.
|
|
36
|
+
mkHorn(head: number, body: number) {
|
|
37
|
+
const manager = this.context.manager;
|
|
38
|
+
const args = manager.getArgs(head);
|
|
39
|
+
const sorts = getUsedVars(manager, [head, body]).map((sort) => sort ?? SORT_BOOL);
|
|
40
|
+
if (args.length === 0 && sorts.length === 0) {
|
|
41
|
+
manager.incRef(body);
|
|
42
|
+
return body;
|
|
43
|
+
}
|
|
44
|
+
const conjs = [body];
|
|
45
|
+
const subst: number[] = [];
|
|
46
|
+
args.forEach((arg, index) => {
|
|
47
|
+
const variable = manager.mkVar(sorts.length + index, manager.sorts[arg]);
|
|
48
|
+
if (manager.kinds[arg] !== KIND_VAR) {
|
|
49
|
+
conjs.push(manager.mkEq(variable, arg));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const argIndex = manager.values[arg];
|
|
53
|
+
while (subst.length <= argIndex) subst.push(-1);
|
|
54
|
+
if (subst[argIndex] === -1) subst[argIndex] = variable;
|
|
55
|
+
else conjs.push(manager.mkEq(variable, subst[argIndex]));
|
|
56
|
+
});
|
|
57
|
+
const conjunction = manager.mkApp(OP_AND, conjs, SORT_BOOL);
|
|
58
|
+
manager.incRef(conjunction);
|
|
59
|
+
const varSubst = new VarSubst(manager, false);
|
|
60
|
+
const substituted = varSubst.apply(conjunction, subst);
|
|
61
|
+
varSubst.release();
|
|
62
|
+
manager.decRef(conjunction);
|
|
63
|
+
if (sorts.length === 0) return substituted;
|
|
64
|
+
const quantified = manager.mkQuantifier({
|
|
65
|
+
kind: QUANTIFIER_EXISTS,
|
|
66
|
+
sorts: sorts.reverse(),
|
|
67
|
+
names: sorts.map((_, index) => sorts.length - index - 1),
|
|
68
|
+
body: substituted,
|
|
69
|
+
patterns: [],
|
|
70
|
+
noPatterns: [],
|
|
71
|
+
weight: 0,
|
|
72
|
+
qid: "",
|
|
73
|
+
});
|
|
74
|
+
manager.incRef(quantified);
|
|
75
|
+
manager.decRef(substituted);
|
|
76
|
+
const result = this.context.simplify(quantified);
|
|
77
|
+
manager.decRef(quantified);
|
|
78
|
+
return result;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
// add_default_proc under for_each_expr: the predicates the model leaves open are false.
|
|
82
|
+
private addDefaultFalseInterpretation(root: number, model: ProtoModel) {
|
|
83
|
+
const manager = this.context.manager;
|
|
84
|
+
const visited = new Set<number>([root]);
|
|
85
|
+
const exprs = [root];
|
|
86
|
+
const positions = [0];
|
|
87
|
+
while (exprs.length > 0) {
|
|
88
|
+
const current = exprs[exprs.length - 1];
|
|
89
|
+
const quantifier =
|
|
90
|
+
manager.kinds[current] === KIND_QUANTIFIER ? manager.getQuantifier(current) : undefined;
|
|
91
|
+
const children =
|
|
92
|
+
quantifier !== undefined
|
|
93
|
+
? [quantifier.body, ...quantifier.patterns, ...quantifier.noPatterns]
|
|
94
|
+
: manager.kinds[current] === KIND_APP
|
|
95
|
+
? manager.getArgs(current)
|
|
96
|
+
: [];
|
|
97
|
+
const position = positions[positions.length - 1];
|
|
98
|
+
if (position < children.length) {
|
|
99
|
+
positions[positions.length - 1]++;
|
|
100
|
+
const child = children[position];
|
|
101
|
+
if (visited.has(child)) continue;
|
|
102
|
+
visited.add(child);
|
|
103
|
+
exprs.push(child);
|
|
104
|
+
positions.push(0);
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
exprs.pop();
|
|
108
|
+
positions.pop();
|
|
109
|
+
if (manager.kinds[current] !== KIND_APP || manager.sorts[current] !== SORT_BOOL) continue;
|
|
110
|
+
const decl = manager.decls[current];
|
|
111
|
+
const info = manager.funcDecls[decl];
|
|
112
|
+
if (
|
|
113
|
+
info.family !== FAMILY_USER ||
|
|
114
|
+
model.constInterps.has(decl) ||
|
|
115
|
+
model.funcInterps.has(decl)
|
|
116
|
+
)
|
|
117
|
+
continue;
|
|
118
|
+
if (info.domain.length === 0) {
|
|
119
|
+
model.registerConst(decl, manager.falseExpr);
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
122
|
+
const interp = new FuncInterp(manager, info.domain.length);
|
|
123
|
+
interp.setElse(manager.falseExpr);
|
|
124
|
+
model.registerFunc(decl, interp);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
apply(model: ProtoModel) {
|
|
129
|
+
const manager = this.context.manager;
|
|
130
|
+
this.delayHeads.forEach((head, index) => {
|
|
131
|
+
this.funcs.push(manager.decls[head]);
|
|
132
|
+
this.bodies.push(this.mkHorn(head, this.delayBodies[index]));
|
|
133
|
+
});
|
|
134
|
+
this.delayHeads = [];
|
|
135
|
+
this.delayBodies = [];
|
|
136
|
+
for (let index = this.funcs.length - 1; index >= 0; index--) {
|
|
137
|
+
const decl = this.funcs[index];
|
|
138
|
+
this.addDefaultFalseInterpretation(this.bodies[index], model);
|
|
139
|
+
const body = model.eval(this.bodies[index], false);
|
|
140
|
+
if (manager.funcDecls[decl].domain.length === 0) {
|
|
141
|
+
const old = model.constInterps.get(decl);
|
|
142
|
+
const merged = old === undefined ? body : manager.mkApp(OP_OR, [old, body], SORT_BOOL);
|
|
143
|
+
const simplified = this.context.simplify(merged);
|
|
144
|
+
model.registerConst(decl, simplified);
|
|
145
|
+
manager.decRef(simplified);
|
|
146
|
+
manager.decRef(body);
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
const old = model.funcInterps.get(decl);
|
|
150
|
+
const interp = old ?? new FuncInterp(manager, manager.funcDecls[decl].domain.length);
|
|
151
|
+
if (old === undefined) model.registerFunc(decl, interp);
|
|
152
|
+
const oldElse = old === undefined ? null : old.elseExpr;
|
|
153
|
+
const merged = oldElse === null ? body : manager.mkApp(OP_OR, [oldElse, body], SORT_BOOL);
|
|
154
|
+
const simplified = this.context.simplify(merged);
|
|
155
|
+
interp.setElse(simplified);
|
|
156
|
+
manager.decRef(simplified);
|
|
157
|
+
manager.decRef(body);
|
|
158
|
+
}
|
|
159
|
+
return model;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
// del_rule of dl_util.cpp.
|
|
163
|
+
delRule(rule: Rule, unreachable: number) {
|
|
164
|
+
const manager = this.context.manager;
|
|
165
|
+
this.insert(
|
|
166
|
+
rule.head,
|
|
167
|
+
unreachable === L_TRUE
|
|
168
|
+
? [manager.trueExpr]
|
|
169
|
+
: unreachable === L_FALSE
|
|
170
|
+
? [manager.falseExpr]
|
|
171
|
+
: rule.tail.map((literal, index) =>
|
|
172
|
+
rule.isNegated[index] ? manager.mkNot(literal) : literal,
|
|
173
|
+
),
|
|
174
|
+
);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/fp/horn_tactic.cpp, src/muz/fp/dl_register_engine.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -20,7 +18,7 @@ import { RefVector } from "../ref-vector";
|
|
|
20
18
|
import type { RewriterOptions } from "../rewriter";
|
|
21
19
|
import { getFreeVarSorts } from "../var-subst";
|
|
22
20
|
import { DatalogContext, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
23
|
-
import { mkForall } from "./dl-rule";
|
|
21
|
+
import { mkForall, mkPp } from "./dl-rule";
|
|
24
22
|
import { SpacerDlInterface } from "./spacer-dl-interface";
|
|
25
23
|
|
|
26
24
|
export const createDatalogContext = (
|
|
@@ -158,7 +156,8 @@ class HornTactic {
|
|
|
158
156
|
const queries: number[] = [];
|
|
159
157
|
for (const form of goal.forms.items) {
|
|
160
158
|
const kind = this.getFormulaKind(form);
|
|
161
|
-
if (kind === undefined)
|
|
159
|
+
if (kind === undefined)
|
|
160
|
+
throw new SmtTacticError(`formula is not in Horn fragment: ${mkPp(manager, form)}\n`);
|
|
162
161
|
if (kind.isRule) context.addRule(kind.formula);
|
|
163
162
|
else queries.push(kind.formula);
|
|
164
163
|
}
|
|
@@ -173,11 +172,21 @@ class HornTactic {
|
|
|
173
172
|
}
|
|
174
173
|
queries.length = 0;
|
|
175
174
|
queries.push(query);
|
|
175
|
+
goal.addConverter(manager.decls[query]);
|
|
176
176
|
}
|
|
177
177
|
const reachable = context.query(queries[0]);
|
|
178
178
|
goal.depth++;
|
|
179
179
|
if (reachable === L_TRUE && context.isMonotone()) goal.assert(manager.falseExpr);
|
|
180
|
-
if (reachable === L_FALSE)
|
|
180
|
+
if (reachable === L_FALSE) {
|
|
181
|
+
goal.reset();
|
|
182
|
+
// model2model_converter: the interpretations go to the goal's model in table order.
|
|
183
|
+
const found = context.getModel();
|
|
184
|
+
goal.addModelConversion((model) => {
|
|
185
|
+
for (const [decl, value] of found.constInterps) model.registerConst(decl, value);
|
|
186
|
+
for (const [decl, interp] of found.funcInterps) model.registerFunc(decl, interp.copy());
|
|
187
|
+
return model;
|
|
188
|
+
});
|
|
189
|
+
}
|
|
181
190
|
return [goal];
|
|
182
191
|
}
|
|
183
192
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
1
|
+
import { SmtTacticError } from "../../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
5
4
|
FAMILY_USER,
|
|
5
|
+
getSymbolName,
|
|
6
6
|
KIND_APP,
|
|
7
7
|
KIND_QUANTIFIER,
|
|
8
8
|
KIND_VAR,
|
|
@@ -10,11 +10,14 @@ import {
|
|
|
10
10
|
OP_DIV,
|
|
11
11
|
OP_DIV0,
|
|
12
12
|
OP_DT_ACCESSOR,
|
|
13
|
+
OP_DT_IS,
|
|
14
|
+
OP_DT_RECOGNISER,
|
|
13
15
|
OP_FUN_DEFINED,
|
|
14
16
|
OP_EQ,
|
|
15
17
|
OP_IDIV,
|
|
16
18
|
OP_IDIV0,
|
|
17
19
|
OP_IMPLIES,
|
|
20
|
+
OP_ITE,
|
|
18
21
|
OP_MOD,
|
|
19
22
|
OP_MOD0,
|
|
20
23
|
OP_OR,
|
|
@@ -23,22 +26,39 @@ import {
|
|
|
23
26
|
SORT_SIZE_INFINITE,
|
|
24
27
|
QUANTIFIER_EXISTS,
|
|
25
28
|
} from "../ast";
|
|
29
|
+
import {
|
|
30
|
+
getAccessorConstructor,
|
|
31
|
+
getDatatypeConstructors,
|
|
32
|
+
getRecognizerConstructor,
|
|
33
|
+
} from "../datatype-decl-plugin";
|
|
34
|
+
import { ObjMap } from "../hashtable";
|
|
35
|
+
import { Rewriter } from "../rewriter";
|
|
26
36
|
import type { DatalogContext } from "./dl-context";
|
|
27
|
-
import type
|
|
37
|
+
import { mkPp, type Rule } from "./dl-rule";
|
|
28
38
|
import type { RuleSet } from "./dl-rule-set";
|
|
29
39
|
|
|
40
|
+
// quantifier::get_child: the body, then the patterns, then the no-patterns.
|
|
41
|
+
const getQuantifierChildren = (manager: AstManager, expr: number) => {
|
|
42
|
+
const quantifier = manager.getQuantifier(expr);
|
|
43
|
+
return [quantifier.body, ...quantifier.patterns, ...quantifier.noPatterns];
|
|
44
|
+
};
|
|
45
|
+
|
|
30
46
|
const DIVISION_OPS = new Set([OP_DIV, OP_IDIV, OP_MOD, OP_REM]);
|
|
31
47
|
const DIVISION_BY_ZERO_OPS = new Set([OP_DIV0, OP_IDIV0, OP_MOD0, OP_POWER0]);
|
|
32
48
|
|
|
33
49
|
export class RuleProperties {
|
|
34
|
-
private quantifiers
|
|
35
|
-
private uninterpretedFuncs
|
|
50
|
+
private quantifiers: ObjMap<Rule>;
|
|
51
|
+
private uninterpretedFuncs: ObjMap<Rule>;
|
|
36
52
|
private interpretedPredicateRules: Rule[] = [];
|
|
37
53
|
private negativeRules: Rule[] = [];
|
|
38
54
|
private infiniteSortRules: Rule[] = [];
|
|
39
55
|
isMonotone = true;
|
|
40
56
|
|
|
41
|
-
constructor(private context: DatalogContext) {
|
|
57
|
+
constructor(private context: DatalogContext) {
|
|
58
|
+
const manager = context.manager;
|
|
59
|
+
this.quantifiers = new ObjMap((expr) => manager.hashes[expr]);
|
|
60
|
+
this.uninterpretedFuncs = new ObjMap((decl) => manager.getDeclHash(decl));
|
|
61
|
+
}
|
|
42
62
|
|
|
43
63
|
private get manager(): AstManager {
|
|
44
64
|
return this.context.manager;
|
|
@@ -65,21 +85,37 @@ export class RuleProperties {
|
|
|
65
85
|
}
|
|
66
86
|
}
|
|
67
87
|
|
|
88
|
+
// for_each_expr_core, which marks every expression and visits the patterns of a quantifier.
|
|
68
89
|
private visit(rule: Rule, root: number, visited: Set<number>) {
|
|
69
90
|
const manager = this.manager;
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
91
|
+
if (visited.has(root)) return;
|
|
92
|
+
visited.add(root);
|
|
93
|
+
const stack = [root];
|
|
94
|
+
const positions = [0];
|
|
95
|
+
while (stack.length > 0) {
|
|
96
|
+
const top = stack.length - 1;
|
|
97
|
+
const current = stack[top];
|
|
98
|
+
const kind = manager.kinds[current];
|
|
99
|
+
const children =
|
|
100
|
+
kind === KIND_VAR
|
|
101
|
+
? []
|
|
102
|
+
: kind === KIND_QUANTIFIER
|
|
103
|
+
? getQuantifierChildren(manager, current)
|
|
104
|
+
: manager.getArgs(current);
|
|
105
|
+
while (positions[top] < children.length && visited.has(children[positions[top]]))
|
|
106
|
+
positions[top]++;
|
|
107
|
+
if (positions[top] < children.length) {
|
|
108
|
+
const child = children[positions[top]++];
|
|
109
|
+
visited.add(child);
|
|
110
|
+
stack.push(child);
|
|
111
|
+
positions.push(0);
|
|
112
|
+
continue;
|
|
82
113
|
}
|
|
114
|
+
stack.pop();
|
|
115
|
+
positions.pop();
|
|
116
|
+
if (kind === KIND_VAR) this.checkSort(rule, manager.sorts[current]);
|
|
117
|
+
else if (kind === KIND_QUANTIFIER) this.quantifiers.set(current, rule);
|
|
118
|
+
else this.visitApp(rule, current);
|
|
83
119
|
}
|
|
84
120
|
}
|
|
85
121
|
|
|
@@ -87,24 +123,139 @@ export class RuleProperties {
|
|
|
87
123
|
const manager = this.manager;
|
|
88
124
|
const decl = manager.decls[expr];
|
|
89
125
|
const op = manager.getOp(expr);
|
|
90
|
-
const addUninterpreted = () => {
|
|
91
|
-
if (!this.uninterpretedFuncs.has(decl)) this.uninterpretedFuncs.set(decl, rule);
|
|
92
|
-
};
|
|
93
126
|
if (this.context.isPredicate(expr)) {
|
|
94
127
|
const rules = this.interpretedPredicateRules;
|
|
95
128
|
if (rules[rules.length - 1] !== rule) rules.push(rule);
|
|
96
|
-
} else if (manager.getFamily(expr) === FAMILY_USER)
|
|
97
|
-
else if (op === OP_DT_ACCESSOR)
|
|
98
|
-
|
|
99
|
-
else if (
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
129
|
+
} else if (manager.getFamily(expr) === FAMILY_USER) this.uninterpretedFuncs.set(decl, rule);
|
|
130
|
+
else if (op === OP_DT_ACCESSOR) {
|
|
131
|
+
if (!this.checkAccessor(rule, expr)) this.uninterpretedFuncs.set(decl, rule);
|
|
132
|
+
} else if (
|
|
133
|
+
DIVISION_BY_ZERO_OPS.has(op) ||
|
|
134
|
+
op === OP_FUN_DEFINED ||
|
|
135
|
+
(DIVISION_OPS.has(op) && !this.evaluatesToNonZeroNumeral(manager.getArg(expr, 1)))
|
|
136
|
+
)
|
|
137
|
+
this.uninterpretedFuncs.set(decl, rule);
|
|
105
138
|
this.checkSort(rule, manager.sorts[expr]);
|
|
106
139
|
}
|
|
107
140
|
|
|
141
|
+
// Whether a recognizer of the accessor's constructor guards each use of it in the tail.
|
|
142
|
+
private checkAccessor(rule: Rule, accessor: number) {
|
|
143
|
+
const manager = this.manager;
|
|
144
|
+
const subject = manager.getArg(accessor, 0);
|
|
145
|
+
const constructors = getDatatypeConstructors(manager, manager.sorts[subject]);
|
|
146
|
+
if (constructors.length <= 1) return true;
|
|
147
|
+
const constructor = getAccessorConstructor(manager, manager.decls[accessor]);
|
|
148
|
+
const ctors: number[] = [];
|
|
149
|
+
const isSubjectRecognizer = (term: number) =>
|
|
150
|
+
(manager.getOp(term) === OP_DT_RECOGNISER || manager.getOp(term) === OP_DT_IS) &&
|
|
151
|
+
manager.getArg(term, 0) === subject;
|
|
152
|
+
const addRecognizer = (term: number) => {
|
|
153
|
+
if (!isSubjectRecognizer(term)) return;
|
|
154
|
+
const other = getRecognizerConstructor(manager, manager.decls[term]);
|
|
155
|
+
if (other !== constructor) ctors.push(other);
|
|
156
|
+
};
|
|
157
|
+
const addNotRecognizer = (term: number) => {
|
|
158
|
+
if (manager.isNot(term)) addRecognizer(manager.getArg(term, 0));
|
|
159
|
+
};
|
|
160
|
+
const isRecognizerBase = (term: number) =>
|
|
161
|
+
isSubjectRecognizer(term) &&
|
|
162
|
+
getRecognizerConstructor(manager, manager.decls[term]) === constructor;
|
|
163
|
+
const isRecognizer = (term: number) =>
|
|
164
|
+
(manager.getOp(term) === OP_AND && manager.getArgs(term).some(isRecognizerBase)) ||
|
|
165
|
+
isRecognizerBase(term);
|
|
166
|
+
for (let index = rule.uninterpretedSize; index < rule.tail.length; index++) {
|
|
167
|
+
if (isRecognizer(rule.tail[index])) return true;
|
|
168
|
+
addNotRecognizer(rule.tail[index]);
|
|
169
|
+
}
|
|
170
|
+
// The parents of every subterm of the tail, where -1 marks a tail formula itself.
|
|
171
|
+
const useList = new Map<number, number[]>();
|
|
172
|
+
const addUse = (term: number, parent: number) => {
|
|
173
|
+
const parents = useList.get(term);
|
|
174
|
+
if (parents === undefined) useList.set(term, [parent]);
|
|
175
|
+
else parents.push(parent);
|
|
176
|
+
};
|
|
177
|
+
for (let index = rule.uninterpretedSize; index < rule.tail.length; index++) {
|
|
178
|
+
addUse(rule.tail[index], -1);
|
|
179
|
+
const marked = new Set<number>();
|
|
180
|
+
const stack = [rule.tail[index]];
|
|
181
|
+
while (stack.length > 0) {
|
|
182
|
+
const sub = stack[stack.length - 1];
|
|
183
|
+
marked.add(sub);
|
|
184
|
+
if (manager.kinds[sub] === KIND_APP)
|
|
185
|
+
for (const arg of manager.getArgs(sub)) {
|
|
186
|
+
addUse(arg, sub);
|
|
187
|
+
stack.push(arg);
|
|
188
|
+
}
|
|
189
|
+
else if (manager.kinds[sub] === KIND_QUANTIFIER)
|
|
190
|
+
stack.push(manager.getQuantifier(sub).body);
|
|
191
|
+
while (stack.length > 0 && marked.has(stack[stack.length - 1])) stack.pop();
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
const exprs = [accessor];
|
|
195
|
+
const ctorSizes = [0];
|
|
196
|
+
const isVisited = [false];
|
|
197
|
+
while (exprs.length > 0) {
|
|
198
|
+
const top = exprs.length - 1;
|
|
199
|
+
const current = exprs[top];
|
|
200
|
+
if (isVisited[top]) {
|
|
201
|
+
ctors.length = Math.min(ctors.length, ctorSizes[top]);
|
|
202
|
+
exprs.pop();
|
|
203
|
+
ctorSizes.pop();
|
|
204
|
+
isVisited.pop();
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
isVisited[top] = true;
|
|
208
|
+
const parents = useList.get(current);
|
|
209
|
+
if (parents === undefined) return false;
|
|
210
|
+
for (const parent of parents) {
|
|
211
|
+
if (parent === -1) {
|
|
212
|
+
const unguarded = constructors.filter((other) => !ctors.includes(other));
|
|
213
|
+
if (unguarded.length === 1 && unguarded[0] === constructor) continue;
|
|
214
|
+
return false;
|
|
215
|
+
}
|
|
216
|
+
if (isRecognizer(parent)) continue;
|
|
217
|
+
const op = manager.getOp(parent);
|
|
218
|
+
if (op === OP_ITE) {
|
|
219
|
+
const condition = manager.getArg(parent, 0);
|
|
220
|
+
if (
|
|
221
|
+
manager.getArg(parent, 1) === current &&
|
|
222
|
+
isRecognizer(condition) &&
|
|
223
|
+
manager.getArg(parent, 2) !== current
|
|
224
|
+
)
|
|
225
|
+
continue;
|
|
226
|
+
addRecognizer(condition);
|
|
227
|
+
}
|
|
228
|
+
if (op === OP_AND) for (const arg of manager.getArgs(parent)) addNotRecognizer(arg);
|
|
229
|
+
let isGuarded = false;
|
|
230
|
+
if (op === OP_OR)
|
|
231
|
+
for (const arg of manager.getArgs(parent)) {
|
|
232
|
+
addRecognizer(arg);
|
|
233
|
+
if (manager.isNot(arg) && isRecognizer(manager.getArg(arg, 0))) {
|
|
234
|
+
isGuarded = true;
|
|
235
|
+
break;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
if (isGuarded) continue;
|
|
239
|
+
exprs.push(parent);
|
|
240
|
+
ctorSizes.push(ctors.length);
|
|
241
|
+
isVisited.push(false);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
return true;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
// evaluates_to_numeral, with the zero test of its caller.
|
|
248
|
+
private evaluatesToNonZeroNumeral(expr: number) {
|
|
249
|
+
const manager = this.manager;
|
|
250
|
+
if (manager.isNumeral(expr)) return !manager.getRationalValue(expr).isZero();
|
|
251
|
+
const rewriter = new Rewriter(manager, this.context.rewriterOptions);
|
|
252
|
+
const value = rewriter.rewrite(expr);
|
|
253
|
+
const isNonZeroNumeral = manager.isNumeral(value) && !manager.getRationalValue(value).isZero();
|
|
254
|
+
manager.decRef(value);
|
|
255
|
+
rewriter.release();
|
|
256
|
+
return isNonZeroNumeral;
|
|
257
|
+
}
|
|
258
|
+
|
|
108
259
|
private checkSort(rule: Rule, sort: number) {
|
|
109
260
|
const manager = this.manager;
|
|
110
261
|
if (manager.isArraySort(sort) || manager.getSortSize(sort) === SORT_SIZE_INFINITE)
|
|
@@ -112,21 +263,26 @@ export class RuleProperties {
|
|
|
112
263
|
}
|
|
113
264
|
|
|
114
265
|
checkForNegatedPredicates() {
|
|
115
|
-
if (this.negativeRules.length > 0)
|
|
266
|
+
if (this.negativeRules.length > 0)
|
|
267
|
+
throw new SmtTacticError(
|
|
268
|
+
`Rule contains negative predicate ${this.negativeRules[0].display(this.context)}`,
|
|
269
|
+
);
|
|
116
270
|
}
|
|
117
271
|
|
|
118
272
|
checkUninterpretedFree() {
|
|
119
|
-
const first = this.uninterpretedFuncs.
|
|
273
|
+
const first = this.uninterpretedFuncs.entries().next();
|
|
120
274
|
if (first.done !== true)
|
|
121
275
|
throw new SmtTacticError(
|
|
122
|
-
`Uninterpreted '${this.manager.funcDecls[first.value].name}' in
|
|
276
|
+
`Uninterpreted '${getSymbolName(this.manager.funcDecls[first.value[0]].name)}' in ${first.value[1].display(this.context)}`,
|
|
123
277
|
);
|
|
124
278
|
}
|
|
125
279
|
|
|
126
280
|
checkExistsFree() {
|
|
127
|
-
for (const
|
|
128
|
-
if (this.manager.getQuantifier(
|
|
129
|
-
throw new SmtTacticError(
|
|
281
|
+
for (const entry of this.quantifiers)
|
|
282
|
+
if (this.manager.getQuantifier(entry[0]).kind === QUANTIFIER_EXISTS)
|
|
283
|
+
throw new SmtTacticError(
|
|
284
|
+
`cannot process EXISTS quantifier in rule ${entry[1].display(this.context)}`,
|
|
285
|
+
);
|
|
130
286
|
}
|
|
131
287
|
|
|
132
288
|
checkBackgroundFree() {
|
|
@@ -160,7 +316,9 @@ export class RuleProperties {
|
|
|
160
316
|
}
|
|
161
317
|
for (const expr of toCheck)
|
|
162
318
|
if (this.containsPredicate(expr))
|
|
163
|
-
throw new SmtTacticError(
|
|
319
|
+
throw new SmtTacticError(
|
|
320
|
+
`recursive predicate ${mkPp(manager, expr)} occurs nested in the body of a rule`,
|
|
321
|
+
);
|
|
164
322
|
}
|
|
165
323
|
|
|
166
324
|
private containsPredicate(root: number) {
|