tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.68b2c4968
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/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- 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/codegen.ts +6 -2
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +36 -6
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +24 -13
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- 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 +634 -186
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- 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 +45 -20
- 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 +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- 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 +13 -7
- 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 +1 -8
- 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 +26 -7
- 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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- 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 +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- 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 +18 -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 +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- 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 +59 -10
- 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 +66 -11
- 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 +167 -85
- 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 +220 -0
- 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 +324 -0
- 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 +163 -99
- 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 +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- 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 +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- 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 +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +29 -8
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- 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 +20 -5
- package/src/prover/zenon/parse.ts +6 -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 +7 -5
- 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 +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +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 +165 -78
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +42 -23
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,18 +1,41 @@
|
|
|
1
|
-
|
|
1
|
+
import { mkArrayApp } from "./array-decl-plugin";
|
|
2
|
+
import { ArrayRewriter } from "./array-rewriter";
|
|
3
|
+
import { mkRecFunApp } from "./recfun-rewriter";
|
|
4
|
+
import { mkDatatypeAppCore, mkDatatypeEqCore } from "./datatype-rewriter";
|
|
2
5
|
import { ArithRewriter, KERNEL_ARITH_OPTIONS, TACTIC_ARITH_OPTIONS } from "./arith-rewriter";
|
|
6
|
+
import { type BvRewriterOptions, BvRewriter, DEFAULT_BV_OPTIONS } from "./bv-rewriter";
|
|
7
|
+
import { isAssociativeBvOp } from "./bv-decl-plugin";
|
|
3
8
|
import type { ArithRewriterOptions } from "./poly-rewriter";
|
|
4
9
|
import { isAstLess } from "./ast-lt";
|
|
5
10
|
import { Der } from "./der";
|
|
11
|
+
import { type Dependency, joinDependencies } from "./goal";
|
|
12
|
+
import { mkFpaAppCore, mkFpaEqCore } from "./fpa-rewriter";
|
|
13
|
+
import { mkPbAppCore } from "./pb-rewriter";
|
|
14
|
+
import { SeqRewriter } from "./seq-rewriter";
|
|
6
15
|
import {
|
|
7
16
|
type AstManager,
|
|
8
17
|
FAMILY_ARITH,
|
|
18
|
+
FAMILY_ARRAY,
|
|
9
19
|
FAMILY_BASIC,
|
|
20
|
+
FAMILY_BV,
|
|
21
|
+
FAMILY_CHAR,
|
|
22
|
+
FAMILY_DATATYPE,
|
|
23
|
+
FAMILY_FPA,
|
|
24
|
+
FAMILY_PB,
|
|
25
|
+
FAMILY_RECFUN,
|
|
26
|
+
FAMILY_SEQ,
|
|
10
27
|
KIND_APP,
|
|
11
28
|
KIND_QUANTIFIER,
|
|
12
29
|
KIND_VAR,
|
|
13
30
|
OP_ABS,
|
|
14
31
|
OP_ADD,
|
|
15
32
|
OP_AND,
|
|
33
|
+
OP_BADD,
|
|
34
|
+
OP_BAND,
|
|
35
|
+
OP_BCOMP,
|
|
36
|
+
OP_BMUL,
|
|
37
|
+
OP_BOR,
|
|
38
|
+
OP_BXOR,
|
|
16
39
|
OP_DISTINCT,
|
|
17
40
|
OP_DIV,
|
|
18
41
|
OP_EQ,
|
|
@@ -21,31 +44,54 @@ import {
|
|
|
21
44
|
OP_IDIV,
|
|
22
45
|
OP_IMPLIES,
|
|
23
46
|
OP_IS_INT,
|
|
47
|
+
OP_POWER,
|
|
48
|
+
OP_SIN,
|
|
49
|
+
OP_COS,
|
|
50
|
+
OP_TAN,
|
|
51
|
+
OP_ASIN,
|
|
52
|
+
OP_ACOS,
|
|
53
|
+
OP_ATAN,
|
|
54
|
+
OP_SINH,
|
|
55
|
+
OP_COSH,
|
|
56
|
+
OP_TANH,
|
|
24
57
|
OP_ITE,
|
|
25
58
|
OP_LE,
|
|
26
59
|
OP_LT,
|
|
27
60
|
OP_MOD,
|
|
61
|
+
OP_REM,
|
|
28
62
|
OP_MUL,
|
|
29
63
|
OP_NOT,
|
|
30
64
|
OP_OR,
|
|
31
65
|
OP_SUB,
|
|
32
66
|
OP_TO_INT,
|
|
33
67
|
OP_TO_REAL,
|
|
68
|
+
OP_UBV2INT,
|
|
34
69
|
OP_UMINUS,
|
|
35
70
|
OP_UNINTERPRETED,
|
|
36
71
|
OP_XOR,
|
|
37
72
|
SORT_BOOL,
|
|
38
73
|
isArithSort,
|
|
74
|
+
OP_CONST_ARRAY,
|
|
75
|
+
QUANTIFIER_FORALL,
|
|
76
|
+
QUANTIFIER_LAMBDA,
|
|
39
77
|
} from "./ast";
|
|
40
78
|
import { getRewriteDepth, type Rewrite, RewriterTpl } from "./rewriter-tpl";
|
|
41
79
|
import { sortByKey } from "./sort";
|
|
42
80
|
import { UnusedVarsEliminator } from "./var-subst";
|
|
43
81
|
|
|
44
|
-
interface RewriterOptions {
|
|
82
|
+
export interface RewriterOptions {
|
|
45
83
|
readonly isEliminatingAnd: boolean;
|
|
46
84
|
readonly arith: ArithRewriterOptions;
|
|
47
85
|
readonly isRewritingPatterns: boolean;
|
|
48
86
|
readonly isPullingCheapIte?: boolean;
|
|
87
|
+
readonly isPushingIteBv?: boolean;
|
|
88
|
+
readonly isKeepingDistinct?: boolean;
|
|
89
|
+
readonly blastDistinctThreshold?: number;
|
|
90
|
+
readonly bv?: BvRewriterOptions;
|
|
91
|
+
readonly isFlatAndOr?: boolean;
|
|
92
|
+
readonly localCtxLimit?: number;
|
|
93
|
+
readonly isCoalescingChars?: boolean;
|
|
94
|
+
readonly isSortingStore?: boolean;
|
|
49
95
|
}
|
|
50
96
|
|
|
51
97
|
export const KERNEL_REWRITER_OPTIONS: RewriterOptions = {
|
|
@@ -69,10 +115,16 @@ interface ReduceFrame {
|
|
|
69
115
|
|
|
70
116
|
export class Rewriter extends RewriterTpl {
|
|
71
117
|
private arith: ArithRewriter;
|
|
118
|
+
private bv: BvRewriter;
|
|
119
|
+
private array: ArrayRewriter;
|
|
120
|
+
private seq: SeqRewriter;
|
|
72
121
|
private substitution = new Map<number, number>();
|
|
122
|
+
private substitutionDependencies = new Map<number, Dependency | undefined>();
|
|
123
|
+
usedDependencies: Dependency | undefined;
|
|
73
124
|
private unusedVarsEliminator: UnusedVarsEliminator;
|
|
74
125
|
private der: Der;
|
|
75
126
|
releaseResult = () => this.setLastResult(-1);
|
|
127
|
+
private localCtxCost = 0;
|
|
76
128
|
|
|
77
129
|
constructor(
|
|
78
130
|
manager: AstManager,
|
|
@@ -81,6 +133,16 @@ export class Rewriter extends RewriterTpl {
|
|
|
81
133
|
) {
|
|
82
134
|
super(manager);
|
|
83
135
|
this.arith = new ArithRewriter(manager, options.arith);
|
|
136
|
+
const bvOptions = options.bv ?? { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0 };
|
|
137
|
+
this.bv = new BvRewriter(manager, options.arith, bvOptions, {
|
|
138
|
+
mkEq: (left, right) => this.mkEq(left, right),
|
|
139
|
+
mkIte: (condition, thenExpr, elseExpr) => {
|
|
140
|
+
const result = this.mkIte(condition, thenExpr, elseExpr);
|
|
141
|
+
return typeof result === "number" ? result : result.expr;
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
this.array = new ArrayRewriter(manager, options.isSortingStore);
|
|
145
|
+
this.seq = new SeqRewriter(manager, options.isCoalescingChars ?? true, this);
|
|
84
146
|
this.unusedVarsEliminator = new UnusedVarsEliminator(manager);
|
|
85
147
|
this.der = new Der(manager);
|
|
86
148
|
}
|
|
@@ -88,6 +150,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
88
150
|
release() {
|
|
89
151
|
this.unusedVarsEliminator.release();
|
|
90
152
|
this.der.release();
|
|
153
|
+
this.seq.release();
|
|
91
154
|
super.release();
|
|
92
155
|
}
|
|
93
156
|
|
|
@@ -122,18 +185,42 @@ export class Rewriter extends RewriterTpl {
|
|
|
122
185
|
this.options = { ...this.options, isEliminatingAnd };
|
|
123
186
|
}
|
|
124
187
|
|
|
125
|
-
|
|
188
|
+
setEq2Ineq(isEq2Ineq: boolean) {
|
|
189
|
+
this.arith.isEq2Ineq = isEq2Ineq;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
// The caller may extend the substitution between rewrites without a reset.
|
|
193
|
+
setSubstitution(
|
|
194
|
+
substitution: Map<number, number>,
|
|
195
|
+
dependencies = new Map<number, Dependency | undefined>(),
|
|
196
|
+
) {
|
|
126
197
|
this.substitution = substitution;
|
|
198
|
+
this.substitutionDependencies = dependencies;
|
|
127
199
|
this.reset();
|
|
128
200
|
}
|
|
129
201
|
|
|
130
202
|
getSubst(expr: number) {
|
|
131
|
-
|
|
203
|
+
const replacement = this.substitution.size === 0 ? undefined : this.substitution.get(expr);
|
|
204
|
+
if (replacement !== undefined)
|
|
205
|
+
this.usedDependencies = joinDependencies(
|
|
206
|
+
this.usedDependencies,
|
|
207
|
+
this.substitutionDependencies.get(expr),
|
|
208
|
+
);
|
|
209
|
+
return replacement;
|
|
132
210
|
}
|
|
133
211
|
|
|
134
212
|
isFlatAssoc(decl: number) {
|
|
135
213
|
const op = this.manager.funcDecls[decl].op;
|
|
136
|
-
return
|
|
214
|
+
return (
|
|
215
|
+
this.options.arith.isFlat !== false &&
|
|
216
|
+
(op === OP_AND ||
|
|
217
|
+
op === OP_OR ||
|
|
218
|
+
op === OP_ADD ||
|
|
219
|
+
op === OP_BADD ||
|
|
220
|
+
op === OP_BOR ||
|
|
221
|
+
op === OP_BAND ||
|
|
222
|
+
op === OP_BXOR)
|
|
223
|
+
);
|
|
137
224
|
}
|
|
138
225
|
|
|
139
226
|
isRewritingPatterns() {
|
|
@@ -161,33 +248,51 @@ export class Rewriter extends RewriterTpl {
|
|
|
161
248
|
private reduceQuantifierCore(expr: number, body: number, newPatterns: number[]) {
|
|
162
249
|
const manager = this.manager;
|
|
163
250
|
const data = manager.getQuantifier(expr);
|
|
251
|
+
const isLambda = data.kind === QUANTIFIER_LAMBDA;
|
|
164
252
|
const isNegated = manager.isNot(body);
|
|
165
253
|
const junction = isNegated ? manager.getArg(body, 0) : body;
|
|
166
254
|
if (
|
|
167
|
-
|
|
255
|
+
!isLambda &&
|
|
256
|
+
manager.getOp(junction) ===
|
|
257
|
+
((data.kind === QUANTIFIER_FORALL) !== isNegated ? OP_AND : OP_OR) &&
|
|
168
258
|
manager.someArg(junction, (arg) => {
|
|
169
259
|
const atom = manager.isNot(arg) ? manager.getArg(arg, 0) : arg;
|
|
170
260
|
return manager.kinds[atom] === KIND_VAR && manager.values[atom] < data.sorts.length;
|
|
171
261
|
})
|
|
172
262
|
)
|
|
173
|
-
return data.
|
|
263
|
+
return data.kind === QUANTIFIER_FORALL ? manager.falseExpr : manager.trueExpr;
|
|
174
264
|
const nested =
|
|
175
265
|
manager.kinds[body] === KIND_QUANTIFIER ? manager.getQuantifier(body) : undefined;
|
|
176
|
-
const
|
|
177
|
-
const merged =
|
|
266
|
+
const isMerging =
|
|
178
267
|
nested !== undefined &&
|
|
179
|
-
nested.
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
268
|
+
nested.kind === data.kind &&
|
|
269
|
+
!isLambda &&
|
|
270
|
+
data.patterns.length + data.noPatterns.length === 0 &&
|
|
271
|
+
nested.patterns.length + nested.noPatterns.length === 0;
|
|
272
|
+
if (!isMerging && isLambda && manager.isGroundApp(body))
|
|
273
|
+
return mkArrayApp(manager, OP_CONST_ARRAY, [body], [manager.sorts[expr]]);
|
|
274
|
+
if (!isMerging && isLambda) {
|
|
275
|
+
const reduced = this.array.mkLambdaCore(expr, body);
|
|
276
|
+
if (reduced !== -1) return reduced;
|
|
277
|
+
}
|
|
278
|
+
const patterns = newPatterns.filter((pattern, index) => newPatterns.indexOf(pattern) === index);
|
|
279
|
+
const merged = isMerging
|
|
280
|
+
? manager.mkQuantifier({
|
|
281
|
+
...data,
|
|
282
|
+
sorts: [...data.sorts, ...nested.sorts],
|
|
283
|
+
names: [...data.names, ...nested.names],
|
|
284
|
+
body: nested.body,
|
|
285
|
+
patterns: [],
|
|
286
|
+
weight: Math.min(data.weight, nested.weight),
|
|
287
|
+
})
|
|
288
|
+
: manager.mkQuantifier({
|
|
289
|
+
...data,
|
|
290
|
+
body,
|
|
291
|
+
patterns: this.substitutePatterns(patterns),
|
|
292
|
+
noPatterns: data.noPatterns.filter(
|
|
293
|
+
(noPattern, index) => data.noPatterns.indexOf(noPattern) === index,
|
|
294
|
+
),
|
|
295
|
+
});
|
|
191
296
|
const reduced = this.unusedVarsEliminator.apply(merged);
|
|
192
297
|
manager.releaseLater(reduced);
|
|
193
298
|
if (
|
|
@@ -234,6 +339,34 @@ export class Rewriter extends RewriterTpl {
|
|
|
234
339
|
: reduced.expr;
|
|
235
340
|
}
|
|
236
341
|
|
|
342
|
+
// bool_rewriter::mk_app, for a Boolean operator: an equality is not passed to the theories.
|
|
343
|
+
mkBoolApp(decl: number, args: number[], sort: number) {
|
|
344
|
+
const op = this.manager.funcDecls[decl].op;
|
|
345
|
+
const reduced =
|
|
346
|
+
op === OP_EQ
|
|
347
|
+
? this.mkEqCore(args[0], args[1])
|
|
348
|
+
: op === OP_DISTINCT
|
|
349
|
+
? this.mkDistinct(args)
|
|
350
|
+
: op === OP_AND
|
|
351
|
+
? this.mkAndCore(args)
|
|
352
|
+
: op === OP_OR
|
|
353
|
+
? this.mkOr(args)
|
|
354
|
+
: op === OP_NOT
|
|
355
|
+
? this.mkNot(args[0])
|
|
356
|
+
: op === OP_ITE
|
|
357
|
+
? this.mkIte(args[0], args[1], args[2])
|
|
358
|
+
: op === OP_IMPLIES
|
|
359
|
+
? this.mkOr([this.mkNot(args[0]), args[1]])
|
|
360
|
+
: op === OP_XOR
|
|
361
|
+
? this.mkEq(this.mkNot(args[0]), args[1])
|
|
362
|
+
: undefined;
|
|
363
|
+
return reduced === undefined || reduced === -1
|
|
364
|
+
? this.manager.mkApp(decl, args, sort)
|
|
365
|
+
: typeof reduced === "number"
|
|
366
|
+
? reduced
|
|
367
|
+
: reduced.expr;
|
|
368
|
+
}
|
|
369
|
+
|
|
237
370
|
mkAppCore(decl: number, args: number[], sort: number): number {
|
|
238
371
|
const reduced = this.reduceAppTop(decl, args, sort);
|
|
239
372
|
return reduced === -1
|
|
@@ -245,8 +378,23 @@ export class Rewriter extends RewriterTpl {
|
|
|
245
378
|
|
|
246
379
|
private reduceAppTop(decl: number, args: number[], sort: number) {
|
|
247
380
|
const manager = this.manager;
|
|
248
|
-
const
|
|
249
|
-
if (typeof
|
|
381
|
+
const core = this.reduceAppCore(decl, args);
|
|
382
|
+
if (typeof core !== "number") return core;
|
|
383
|
+
const reduced =
|
|
384
|
+
this.options.isPushingIteBv !== true
|
|
385
|
+
? core
|
|
386
|
+
: core === -1
|
|
387
|
+
? decl === OP_ITE
|
|
388
|
+
? (this.pushIte(args[0], args[1], args[2]) ?? -1)
|
|
389
|
+
: -1
|
|
390
|
+
: this.isIte(core)
|
|
391
|
+
? (this.pushIte(
|
|
392
|
+
manager.getArg(core, 0),
|
|
393
|
+
manager.getArg(core, 1),
|
|
394
|
+
manager.getArg(core, 2),
|
|
395
|
+
) ?? core)
|
|
396
|
+
: core;
|
|
397
|
+
if (this.options.isPullingCheapIte !== true) return reduced;
|
|
250
398
|
if (reduced === -1)
|
|
251
399
|
return (args.length === 2 ? this.pullIte(decl, args[0], args[1], sort) : undefined) ?? -1;
|
|
252
400
|
return manager.kinds[reduced] === KIND_APP && manager.getNumArgs(reduced) === 2
|
|
@@ -259,6 +407,60 @@ export class Rewriter extends RewriterTpl {
|
|
|
259
407
|
: reduced;
|
|
260
408
|
}
|
|
261
409
|
|
|
410
|
+
private pushIte(condition: number, thenExpr: number, elseExpr: number) {
|
|
411
|
+
const manager = this.manager;
|
|
412
|
+
const isBvApp = (expr: number) =>
|
|
413
|
+
manager.kinds[expr] === KIND_APP && manager.getFamily(expr) === FAMILY_BV;
|
|
414
|
+
const isThenApp = isBvApp(thenExpr);
|
|
415
|
+
if (!isThenApp && !isBvApp(elseExpr)) return undefined;
|
|
416
|
+
const app = isThenApp ? thenExpr : elseExpr;
|
|
417
|
+
const unified = this.unify(app, isThenApp ? elseExpr : thenExpr);
|
|
418
|
+
if (unified === undefined) return undefined;
|
|
419
|
+
const [newThen, newElse] = isThenApp ? unified.args : [unified.args[1], unified.args[0]];
|
|
420
|
+
const ite = manager.mkApp(OP_ITE, [condition, newThen, newElse], manager.sorts[newThen]);
|
|
421
|
+
const decl = manager.decls[app];
|
|
422
|
+
return manager.mkApp(
|
|
423
|
+
decl,
|
|
424
|
+
unified.isCommonFirst ? [unified.common, ite] : [ite, unified.common],
|
|
425
|
+
manager.funcDecls[decl].range,
|
|
426
|
+
);
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
private unify(app: number, other: number) {
|
|
430
|
+
const manager = this.manager;
|
|
431
|
+
if (manager.getNumArgs(app) !== 2) return undefined;
|
|
432
|
+
const first = manager.getArg(app, 0);
|
|
433
|
+
const second = manager.getArg(app, 1);
|
|
434
|
+
const op = manager.getOp(app);
|
|
435
|
+
const getNeutral = () =>
|
|
436
|
+
op === OP_BADD || op === OP_BMUL
|
|
437
|
+
? manager.mkBvNumeral(op === OP_BADD ? 0n : 1n, manager.getBvSize(manager.sorts[app]))
|
|
438
|
+
: undefined;
|
|
439
|
+
if (other === second || other === first) {
|
|
440
|
+
const neutral = getNeutral();
|
|
441
|
+
return neutral === undefined
|
|
442
|
+
? undefined
|
|
443
|
+
: other === second
|
|
444
|
+
? { args: [first, neutral], common: second, isCommonFirst: false }
|
|
445
|
+
: { args: [second, neutral], common: first, isCommonFirst: true };
|
|
446
|
+
}
|
|
447
|
+
if (manager.kinds[other] !== KIND_APP || manager.decls[other] !== manager.decls[app])
|
|
448
|
+
return undefined;
|
|
449
|
+
if (manager.getNumArgs(other) !== 2) return undefined;
|
|
450
|
+
const otherFirst = manager.getArg(other, 0);
|
|
451
|
+
const otherSecond = manager.getArg(other, 1);
|
|
452
|
+
if (second === otherSecond)
|
|
453
|
+
return { args: [first, otherFirst], common: second, isCommonFirst: false };
|
|
454
|
+
if (first === otherFirst)
|
|
455
|
+
return { args: [second, otherSecond], common: first, isCommonFirst: true };
|
|
456
|
+
if (!isAssociativeBvOp(op) && op !== OP_BCOMP) return undefined;
|
|
457
|
+
if (first === otherSecond)
|
|
458
|
+
return { args: [second, otherFirst], common: first, isCommonFirst: true };
|
|
459
|
+
if (second === otherFirst)
|
|
460
|
+
return { args: [first, otherSecond], common: second, isCommonFirst: false };
|
|
461
|
+
return undefined;
|
|
462
|
+
}
|
|
463
|
+
|
|
262
464
|
private pullIte(decl: number, first: number, second: number, sort: number): Rewrite | undefined {
|
|
263
465
|
const manager = this.manager;
|
|
264
466
|
if (sort === SORT_BOOL && manager.sorts[first] !== SORT_BOOL) {
|
|
@@ -283,7 +485,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
283
485
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
284
486
|
}
|
|
285
487
|
const family = manager.funcDecls[decl].family;
|
|
286
|
-
if (family !== FAMILY_BASIC && family !== FAMILY_ARITH
|
|
488
|
+
if (family !== FAMILY_BASIC && family !== FAMILY_ARITH && family !== FAMILY_BV)
|
|
489
|
+
return undefined;
|
|
287
490
|
if (manager.isUniqueValue(first) && this.isIteValueTree(second))
|
|
288
491
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
289
492
|
if (manager.isUniqueValue(second) && this.isIteValueTree(first))
|
|
@@ -324,14 +527,59 @@ export class Rewriter extends RewriterTpl {
|
|
|
324
527
|
return true;
|
|
325
528
|
}
|
|
326
529
|
|
|
530
|
+
private reduceEq(left: number, right: number) {
|
|
531
|
+
const manager = this.manager;
|
|
532
|
+
const sort = manager.sorts[left];
|
|
533
|
+
const theoryResult = isArithSort(sort)
|
|
534
|
+
? this.arith.mkEq(left, right)
|
|
535
|
+
: manager.isBvSort(sort)
|
|
536
|
+
? this.bv.mkEqCore(left, right)
|
|
537
|
+
: manager.isDatatypeSort(sort)
|
|
538
|
+
? mkDatatypeEqCore(manager, left, right)
|
|
539
|
+
: manager.isArraySort(sort)
|
|
540
|
+
? this.array.mkEqCore(left, right)
|
|
541
|
+
: manager.getSortFamily(sort) === FAMILY_FPA
|
|
542
|
+
? mkFpaEqCore(manager, left, right)
|
|
543
|
+
: manager.getSortFamily(sort) === FAMILY_SEQ
|
|
544
|
+
? this.seq.mkEqCore(left, right)
|
|
545
|
+
: undefined;
|
|
546
|
+
if (theoryResult !== undefined) return theoryResult;
|
|
547
|
+
if (manager.getOp(left) === OP_UBV2INT || manager.getOp(right) === OP_UBV2INT) {
|
|
548
|
+
const bv2intResult = this.bv.mkEqBv2int(left, right);
|
|
549
|
+
if (bv2intResult !== undefined) return bv2intResult;
|
|
550
|
+
}
|
|
551
|
+
return this.applyTamagotchi(left, right) ?? this.applyTamagotchi(right, left);
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
private applyTamagotchi(eq: number, other: number): Rewrite | undefined {
|
|
555
|
+
const manager = this.manager;
|
|
556
|
+
const eqBit = this.bv.getEqBit(eq);
|
|
557
|
+
if (eqBit === undefined) return undefined;
|
|
558
|
+
const bit = manager.mkBvNumeral(eqBit.bit, 1);
|
|
559
|
+
const otherBit = manager.mkBvNumeral(1n - eqBit.bit, 1);
|
|
560
|
+
const ite = manager.mkApp(OP_ITE, [other, bit, otherBit], manager.sorts[bit]);
|
|
561
|
+
return { expr: manager.mkEq(eqBit.term, ite), depth: 2 };
|
|
562
|
+
}
|
|
563
|
+
|
|
327
564
|
reduceAppCore(decl: number, args: number[]): number | Rewrite {
|
|
328
565
|
const manager = this.manager;
|
|
329
|
-
const
|
|
566
|
+
const funcDecl = manager.funcDecls[decl];
|
|
567
|
+
if (funcDecl.family === FAMILY_BV) return this.bv.mkAppCore(decl, args) ?? -1;
|
|
568
|
+
if (funcDecl.family === FAMILY_ARRAY) return this.array.mkAppCore(funcDecl.op, args) ?? -1;
|
|
569
|
+
if (funcDecl.family === FAMILY_DATATYPE) return mkDatatypeAppCore(manager, decl, args) ?? -1;
|
|
570
|
+
if (funcDecl.family === FAMILY_FPA) return mkFpaAppCore(manager, decl, args) ?? -1;
|
|
571
|
+
if (funcDecl.family === FAMILY_PB) return mkPbAppCore(manager, decl, args);
|
|
572
|
+
if (funcDecl.family === FAMILY_SEQ || funcDecl.family === FAMILY_CHAR)
|
|
573
|
+
return this.seq.mkAppCore(decl, args) ?? -1;
|
|
574
|
+
if (funcDecl.family === FAMILY_RECFUN) return mkRecFunApp(manager, decl, args) ?? -1;
|
|
575
|
+
const op = funcDecl.op;
|
|
330
576
|
switch (op) {
|
|
331
577
|
case OP_AND:
|
|
332
|
-
return
|
|
578
|
+
return (
|
|
579
|
+
(manager.isReUsed ? this.seq.mkBoolApp(true, args) : undefined) ?? this.mkAndCore(args)
|
|
580
|
+
);
|
|
333
581
|
case OP_OR:
|
|
334
|
-
return this.mkOr(args);
|
|
582
|
+
return (manager.isReUsed ? this.seq.mkBoolApp(false, args) : undefined) ?? this.mkOr(args);
|
|
335
583
|
case OP_NOT:
|
|
336
584
|
return this.mkNot(args[0]);
|
|
337
585
|
case OP_IMPLIES:
|
|
@@ -340,14 +588,25 @@ export class Rewriter extends RewriterTpl {
|
|
|
340
588
|
return this.mkEq(this.mkNot(args[0]), args[1]);
|
|
341
589
|
case OP_EQ:
|
|
342
590
|
return (
|
|
343
|
-
|
|
591
|
+
this.reduceEq(args[0], args[1]) ??
|
|
592
|
+
(manager.isSeqUsed && manager.getFamily(args[0]) === FAMILY_SEQ
|
|
593
|
+
? this.seq.mkEqCore(args[0], args[1])
|
|
594
|
+
: undefined) ??
|
|
344
595
|
this.mkEqCore(args[0], args[1]) ??
|
|
345
596
|
-1
|
|
346
597
|
);
|
|
347
598
|
case OP_DISTINCT:
|
|
348
|
-
return
|
|
599
|
+
return (
|
|
600
|
+
(args.length > 0 && manager.isBvSort(manager.sorts[args[0]])
|
|
601
|
+
? this.bv.mkDistinct(args)
|
|
602
|
+
: undefined) ?? this.mkDistinct(args)
|
|
603
|
+
);
|
|
349
604
|
case OP_ITE:
|
|
350
|
-
return
|
|
605
|
+
return (
|
|
606
|
+
(manager.isBvSort(manager.sorts[args[1]])
|
|
607
|
+
? this.bv.mkIteCore(args[0], args[1], args[2])
|
|
608
|
+
: undefined) ?? this.mkIte(args[0], args[1], args[2])
|
|
609
|
+
);
|
|
351
610
|
case OP_LE:
|
|
352
611
|
return this.arith.mkLe(args[0], args[1]) ?? -1;
|
|
353
612
|
case OP_GE:
|
|
@@ -357,7 +616,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
357
616
|
case OP_GT:
|
|
358
617
|
return this.arith.mkGt(args[0], args[1]);
|
|
359
618
|
case OP_ADD:
|
|
360
|
-
return this.arith.
|
|
619
|
+
return this.arith.mkAddCore(args) ?? -1;
|
|
361
620
|
case OP_SUB:
|
|
362
621
|
return this.arith.mkSub(args);
|
|
363
622
|
case OP_UMINUS:
|
|
@@ -368,6 +627,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
368
627
|
return this.arith.mkIdiv(args[0], args[1]) ?? -1;
|
|
369
628
|
case OP_MOD:
|
|
370
629
|
return this.arith.mkMod(args[0], args[1]) ?? -1;
|
|
630
|
+
case OP_REM:
|
|
631
|
+
return this.arith.mkRem(args[0], args[1]) ?? -1;
|
|
371
632
|
case OP_ABS:
|
|
372
633
|
return this.arith.mkAbs(args[0]);
|
|
373
634
|
case OP_DIV:
|
|
@@ -378,6 +639,24 @@ export class Rewriter extends RewriterTpl {
|
|
|
378
639
|
return this.arith.mkToInt(args[0]) ?? -1;
|
|
379
640
|
case OP_IS_INT:
|
|
380
641
|
return this.arith.mkIsInt(args[0]);
|
|
642
|
+
case OP_POWER:
|
|
643
|
+
return this.arith.mkPower(args[0], args[1]) ?? -1;
|
|
644
|
+
case OP_SIN:
|
|
645
|
+
return this.arith.mkSin(args[0]) ?? -1;
|
|
646
|
+
case OP_COS:
|
|
647
|
+
return this.arith.mkCos(args[0]) ?? -1;
|
|
648
|
+
case OP_TAN:
|
|
649
|
+
return this.arith.mkTan(args[0]) ?? -1;
|
|
650
|
+
case OP_ASIN:
|
|
651
|
+
return this.arith.mkAsin(args[0]) ?? -1;
|
|
652
|
+
case OP_ACOS:
|
|
653
|
+
return this.arith.mkAcos(args[0]) ?? -1;
|
|
654
|
+
case OP_ATAN:
|
|
655
|
+
return this.arith.mkAtan(args[0]) ?? -1;
|
|
656
|
+
case OP_SINH:
|
|
657
|
+
case OP_COSH:
|
|
658
|
+
case OP_TANH:
|
|
659
|
+
return this.arith.mkHyperbolic(op, args[0]) ?? -1;
|
|
381
660
|
default:
|
|
382
661
|
return -1;
|
|
383
662
|
}
|
|
@@ -393,7 +672,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
393
672
|
|
|
394
673
|
mkOr(args: number[]): number {
|
|
395
674
|
const manager = this.manager;
|
|
396
|
-
const isNested =
|
|
675
|
+
const isNested =
|
|
676
|
+
this.options.isFlatAndOr !== false && args.some((arg) => manager.getOp(arg) === OP_OR);
|
|
397
677
|
const flatArgs = isNested ? this.flattenArgs(args, OP_OR) : args;
|
|
398
678
|
const literals = manager.flatLiterals;
|
|
399
679
|
literals.clear();
|
|
@@ -403,6 +683,14 @@ export class Rewriter extends RewriterTpl {
|
|
|
403
683
|
if (literals.add(arg)) return manager.trueExpr;
|
|
404
684
|
}
|
|
405
685
|
const result = literals.list;
|
|
686
|
+
const limit = this.options.localCtxLimit;
|
|
687
|
+
if (result.length > 1 && limit !== undefined && this.localCtxCost <= limit) {
|
|
688
|
+
const simplified = manager.withTemporaries(() => this.simplifyLocalCtx([...result]));
|
|
689
|
+
if (simplified !== -1) {
|
|
690
|
+
manager.releaseLater(simplified);
|
|
691
|
+
return simplified;
|
|
692
|
+
}
|
|
693
|
+
}
|
|
406
694
|
const isOutOfOrder = result.some(
|
|
407
695
|
(arg, index) => index > 0 && isAstLess(manager, arg, result[index - 1]),
|
|
408
696
|
);
|
|
@@ -411,10 +699,144 @@ export class Rewriter extends RewriterTpl {
|
|
|
411
699
|
return manager.mkOr(result);
|
|
412
700
|
}
|
|
413
701
|
|
|
702
|
+
private simplifyNestedNotOr(args: number[], negatives: Set<number>, positives: Set<number>) {
|
|
703
|
+
const manager = this.manager;
|
|
704
|
+
this.localCtxCost += args.length;
|
|
705
|
+
const kept: number[] = [];
|
|
706
|
+
let isSimplified = false;
|
|
707
|
+
for (const arg of args) {
|
|
708
|
+
if (negatives.has(arg)) return manager.falseExpr;
|
|
709
|
+
if (positives.has(arg)) {
|
|
710
|
+
isSimplified = true;
|
|
711
|
+
continue;
|
|
712
|
+
}
|
|
713
|
+
if (manager.isNot(arg)) {
|
|
714
|
+
const atom = manager.getArg(arg, 0);
|
|
715
|
+
if (negatives.has(atom)) {
|
|
716
|
+
isSimplified = true;
|
|
717
|
+
continue;
|
|
718
|
+
}
|
|
719
|
+
if (positives.has(atom)) return manager.falseExpr;
|
|
720
|
+
}
|
|
721
|
+
kept.push(arg);
|
|
722
|
+
}
|
|
723
|
+
if (!isSimplified) return -1;
|
|
724
|
+
if (kept.length === 0) return manager.trueExpr;
|
|
725
|
+
return kept.length === 1 ? this.mkNot(kept[0]) : manager.mkNot(manager.mkOr(kept));
|
|
726
|
+
}
|
|
727
|
+
|
|
728
|
+
private simplifyLiteral(arg: number, negatives: Set<number>, positives: Set<number>) {
|
|
729
|
+
const manager = this.manager;
|
|
730
|
+
const isNegated = manager.isNot(arg);
|
|
731
|
+
const atom = isNegated ? manager.getArg(arg, 0) : arg;
|
|
732
|
+
if (negatives.has(atom)) return isNegated ? manager.falseExpr : manager.trueExpr;
|
|
733
|
+
if (positives.has(atom)) return isNegated ? manager.trueExpr : manager.falseExpr;
|
|
734
|
+
return arg;
|
|
735
|
+
}
|
|
736
|
+
|
|
737
|
+
private mkNestedIte(condition: number, thenExpr: number, elseExpr: number) {
|
|
738
|
+
const manager = this.manager;
|
|
739
|
+
if (manager.isTrue(condition)) return thenExpr;
|
|
740
|
+
if (manager.isFalse(condition)) return elseExpr;
|
|
741
|
+
if (thenExpr === elseExpr) return thenExpr;
|
|
742
|
+
if (manager.sorts[thenExpr] === SORT_BOOL) {
|
|
743
|
+
if (manager.isTrue(thenExpr))
|
|
744
|
+
return manager.isFalse(elseExpr) ? condition : manager.mkOr([condition, elseExpr]);
|
|
745
|
+
if (manager.isFalse(thenExpr))
|
|
746
|
+
return manager.isTrue(elseExpr)
|
|
747
|
+
? this.mkNot(condition)
|
|
748
|
+
: manager.mkNot(manager.mkOr([condition, this.mkNot(elseExpr)]));
|
|
749
|
+
if (manager.isTrue(elseExpr)) return manager.mkOr([this.mkNot(condition), thenExpr]);
|
|
750
|
+
if (manager.isFalse(elseExpr) || condition === elseExpr)
|
|
751
|
+
return manager.mkNot(manager.mkOr([this.mkNot(condition), this.mkNot(thenExpr)]));
|
|
752
|
+
if (condition === thenExpr) return manager.mkOr([condition, elseExpr]);
|
|
753
|
+
if (
|
|
754
|
+
(manager.isNot(thenExpr) && manager.getArg(thenExpr, 0) === elseExpr) ||
|
|
755
|
+
(manager.isNot(elseExpr) && manager.getArg(elseExpr, 0) === thenExpr)
|
|
756
|
+
)
|
|
757
|
+
return this.mkEq(condition, thenExpr);
|
|
758
|
+
}
|
|
759
|
+
return manager.mkApp(OP_ITE, [condition, thenExpr, elseExpr], manager.sorts[thenExpr]);
|
|
760
|
+
}
|
|
761
|
+
|
|
762
|
+
private simplifyNestedEqIte(form: number, negatives: Set<number>, positives: Set<number>) {
|
|
763
|
+
const manager = this.manager;
|
|
764
|
+
this.localCtxCost += 3;
|
|
765
|
+
const isNegated = manager.isNot(form);
|
|
766
|
+
const atom = isNegated ? manager.getArg(form, 0) : form;
|
|
767
|
+
const op = manager.getOp(atom);
|
|
768
|
+
if (op !== OP_EQ && op !== OP_ITE) return -1;
|
|
769
|
+
const args = manager.getArgs(atom);
|
|
770
|
+
const simplified = args.map((arg) => this.simplifyLiteral(arg, negatives, positives));
|
|
771
|
+
if (simplified.every((arg, index) => arg === args[index])) return -1;
|
|
772
|
+
const result =
|
|
773
|
+
op === OP_EQ
|
|
774
|
+
? this.mkEq(simplified[0], simplified[1])
|
|
775
|
+
: this.mkNestedIte(simplified[0], simplified[1], simplified[2]);
|
|
776
|
+
return isNegated ? this.mkNot(result) : result;
|
|
777
|
+
}
|
|
778
|
+
|
|
779
|
+
private simplifyLocalCtx(initialArgs: number[]) {
|
|
780
|
+
const manager = this.manager;
|
|
781
|
+
let args = initialArgs;
|
|
782
|
+
let isSimplified = false;
|
|
783
|
+
let isModified = false;
|
|
784
|
+
let isForward = true;
|
|
785
|
+
for (;;) {
|
|
786
|
+
const negatives = new Set<number>();
|
|
787
|
+
const positives = new Set<number>();
|
|
788
|
+
const kept: number[] = [];
|
|
789
|
+
const push = (arg: number) => {
|
|
790
|
+
const isNegated = manager.isNot(arg);
|
|
791
|
+
const marks = isNegated ? negatives : positives;
|
|
792
|
+
const atom = isNegated ? manager.getArg(arg, 0) : arg;
|
|
793
|
+
if (marks.has(atom)) return;
|
|
794
|
+
marks.add(atom);
|
|
795
|
+
kept.push(arg);
|
|
796
|
+
};
|
|
797
|
+
this.localCtxCost += 2 * args.length;
|
|
798
|
+
const order = isForward ? args : [...args].reverse();
|
|
799
|
+
for (const original of order) {
|
|
800
|
+
let arg = original;
|
|
801
|
+
if (manager.isNot(arg) && manager.getOp(manager.getArg(arg, 0)) === OP_OR) {
|
|
802
|
+
const nested = this.simplifyNestedNotOr(
|
|
803
|
+
manager.getArgs(manager.getArg(arg, 0)),
|
|
804
|
+
negatives,
|
|
805
|
+
positives,
|
|
806
|
+
);
|
|
807
|
+
if (nested !== -1) {
|
|
808
|
+
isModified = true;
|
|
809
|
+
isSimplified = true;
|
|
810
|
+
arg = nested;
|
|
811
|
+
}
|
|
812
|
+
}
|
|
813
|
+
const nested = this.simplifyNestedEqIte(arg, negatives, positives);
|
|
814
|
+
if (nested !== -1) {
|
|
815
|
+
isModified = true;
|
|
816
|
+
isSimplified = true;
|
|
817
|
+
arg = nested;
|
|
818
|
+
}
|
|
819
|
+
if (manager.isFalse(arg)) continue;
|
|
820
|
+
if (manager.isTrue(arg)) return arg;
|
|
821
|
+
if (this.options.isFlatAndOr !== false && manager.getOp(arg) === OP_OR)
|
|
822
|
+
for (const inner of manager.getArgs(arg)) push(inner);
|
|
823
|
+
else push(arg);
|
|
824
|
+
}
|
|
825
|
+
if (!isForward) {
|
|
826
|
+
if (!isModified) return isSimplified ? manager.mkOr(args) : -1;
|
|
827
|
+
kept.reverse();
|
|
828
|
+
isModified = false;
|
|
829
|
+
}
|
|
830
|
+
isForward = !isForward;
|
|
831
|
+
args = kept;
|
|
832
|
+
}
|
|
833
|
+
}
|
|
834
|
+
|
|
414
835
|
private mkAndCore(args: number[]): number | Rewrite {
|
|
415
836
|
const manager = this.manager;
|
|
416
837
|
if (this.options.isEliminatingAnd) return this.mkAndAsOr(args);
|
|
417
|
-
if (!args.some((arg) => manager.getOp(arg) === OP_AND))
|
|
838
|
+
if (this.options.isFlatAndOr === false || !args.some((arg) => manager.getOp(arg) === OP_AND))
|
|
839
|
+
return this.mkNflatAnd(args);
|
|
418
840
|
return { expr: this.mkNflatAnd(this.flattenArgs(args, OP_AND)), depth: 1 };
|
|
419
841
|
}
|
|
420
842
|
|
|
@@ -631,15 +1053,32 @@ export class Rewriter extends RewriterTpl {
|
|
|
631
1053
|
|
|
632
1054
|
// Z3 keeps a distinct of more than two arguments, which tlapm does not send, where this expands it into disequalities.
|
|
633
1055
|
private mkDistinct(args: number[]): number | Rewrite {
|
|
1056
|
+
const manager = this.manager;
|
|
1057
|
+
if (args.length <= 1) return manager.trueExpr;
|
|
634
1058
|
if (args.length === 2) return { expr: this.mkNot(this.mkEq(args[0], args[1])), depth: 2 };
|
|
1059
|
+
if (new Set(args).size < args.length) return manager.falseExpr;
|
|
1060
|
+
const firstNonValue = args.findIndex((arg) => !manager.isUniqueValue(arg));
|
|
1061
|
+
const isAllDifferent = args.every(
|
|
1062
|
+
(arg, index) =>
|
|
1063
|
+
firstNonValue === -1 ||
|
|
1064
|
+
index < firstNonValue ||
|
|
1065
|
+
args.slice(0, index).every((previous) => manager.areDistinct(arg, previous)),
|
|
1066
|
+
);
|
|
1067
|
+
if (isAllDifferent) return manager.trueExpr;
|
|
1068
|
+
if (manager.sorts[args[0]] === SORT_BOOL) return manager.falseExpr;
|
|
1069
|
+
if (
|
|
1070
|
+
this.options.isKeepingDistinct === true ||
|
|
1071
|
+
args.length >= (this.options.blastDistinctThreshold ?? Infinity)
|
|
1072
|
+
)
|
|
1073
|
+
return -1;
|
|
635
1074
|
const pairs: number[] = [];
|
|
636
1075
|
for (let left = 0; left < args.length; left++)
|
|
637
1076
|
for (let right = left + 1; right < args.length; right++)
|
|
638
|
-
pairs.push(
|
|
639
|
-
return
|
|
1077
|
+
pairs.push(manager.mkNot(manager.mkEq(args[left], args[right])));
|
|
1078
|
+
return { expr: manager.mkAnd(pairs), depth: 3 };
|
|
640
1079
|
}
|
|
641
1080
|
|
|
642
|
-
|
|
1081
|
+
mkIte(inputCondition: number, inputThen: number, inputElse: number): number | Rewrite {
|
|
643
1082
|
const manager = this.manager;
|
|
644
1083
|
const isNegated = manager.isNot(inputCondition);
|
|
645
1084
|
const condition = isNegated ? manager.getArg(inputCondition, 0) : inputCondition;
|