tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- 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 +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- 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 +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- 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 +1 -3
- 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 +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- 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 +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +14 -13
- 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 +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- 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 +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- 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 +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 +734 -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 +886 -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 +178 -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 +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +1 -10
- 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 +1 -2
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- 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 +68 -17
- 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 +122 -90
- 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 +310 -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 +106 -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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 +9 -8
- 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 +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -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 +39 -19
- 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 +829 -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 +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- 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 +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +1210 -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 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- 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 +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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,55 @@ 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;
|
|
95
|
+
readonly isExpandingSelects?: boolean;
|
|
49
96
|
}
|
|
50
97
|
|
|
51
98
|
export const KERNEL_REWRITER_OPTIONS: RewriterOptions = {
|
|
@@ -69,10 +116,16 @@ interface ReduceFrame {
|
|
|
69
116
|
|
|
70
117
|
export class Rewriter extends RewriterTpl {
|
|
71
118
|
private arith: ArithRewriter;
|
|
119
|
+
private bv: BvRewriter;
|
|
120
|
+
private array: ArrayRewriter;
|
|
121
|
+
private seq: SeqRewriter;
|
|
72
122
|
private substitution = new Map<number, number>();
|
|
123
|
+
private substitutionDependencies = new Map<number, Dependency | undefined>();
|
|
124
|
+
usedDependencies: Dependency | undefined;
|
|
73
125
|
private unusedVarsEliminator: UnusedVarsEliminator;
|
|
74
126
|
private der: Der;
|
|
75
127
|
releaseResult = () => this.setLastResult(-1);
|
|
128
|
+
private localCtxCost = 0;
|
|
76
129
|
|
|
77
130
|
constructor(
|
|
78
131
|
manager: AstManager,
|
|
@@ -81,6 +134,16 @@ export class Rewriter extends RewriterTpl {
|
|
|
81
134
|
) {
|
|
82
135
|
super(manager);
|
|
83
136
|
this.arith = new ArithRewriter(manager, options.arith);
|
|
137
|
+
const bvOptions = options.bv ?? { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0 };
|
|
138
|
+
this.bv = new BvRewriter(manager, options.arith, bvOptions, {
|
|
139
|
+
mkEq: (left, right) => this.mkEq(left, right),
|
|
140
|
+
mkIte: (condition, thenExpr, elseExpr) => {
|
|
141
|
+
const result = this.mkIte(condition, thenExpr, elseExpr);
|
|
142
|
+
return typeof result === "number" ? result : result.expr;
|
|
143
|
+
},
|
|
144
|
+
});
|
|
145
|
+
this.array = new ArrayRewriter(manager, options.isSortingStore, options.isExpandingSelects);
|
|
146
|
+
this.seq = new SeqRewriter(manager, options.isCoalescingChars ?? true, this);
|
|
84
147
|
this.unusedVarsEliminator = new UnusedVarsEliminator(manager);
|
|
85
148
|
this.der = new Der(manager);
|
|
86
149
|
}
|
|
@@ -88,9 +151,21 @@ export class Rewriter extends RewriterTpl {
|
|
|
88
151
|
release() {
|
|
89
152
|
this.unusedVarsEliminator.release();
|
|
90
153
|
this.der.release();
|
|
154
|
+
this.seq.release();
|
|
91
155
|
super.release();
|
|
92
156
|
}
|
|
93
157
|
|
|
158
|
+
// A rewrite that the spent resource limit stops answers its input instead of failing.
|
|
159
|
+
rewrite(expr: number) {
|
|
160
|
+
try {
|
|
161
|
+
return super.rewrite(expr);
|
|
162
|
+
} catch (error) {
|
|
163
|
+
if (this.manager.limit.inc()) throw error;
|
|
164
|
+
this.manager.incRef(expr);
|
|
165
|
+
return expr;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
94
169
|
private reduceTo(expr: number, depth: number): number {
|
|
95
170
|
const manager = this.manager;
|
|
96
171
|
const frames: ReduceFrame[] = [];
|
|
@@ -122,18 +197,42 @@ export class Rewriter extends RewriterTpl {
|
|
|
122
197
|
this.options = { ...this.options, isEliminatingAnd };
|
|
123
198
|
}
|
|
124
199
|
|
|
125
|
-
|
|
200
|
+
setEq2Ineq(isEq2Ineq: boolean) {
|
|
201
|
+
this.arith.isEq2Ineq = isEq2Ineq;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
// The caller may extend the substitution between rewrites without a reset.
|
|
205
|
+
setSubstitution(
|
|
206
|
+
substitution: Map<number, number>,
|
|
207
|
+
dependencies = new Map<number, Dependency | undefined>(),
|
|
208
|
+
) {
|
|
126
209
|
this.substitution = substitution;
|
|
210
|
+
this.substitutionDependencies = dependencies;
|
|
127
211
|
this.reset();
|
|
128
212
|
}
|
|
129
213
|
|
|
130
214
|
getSubst(expr: number) {
|
|
131
|
-
|
|
215
|
+
const replacement = this.substitution.size === 0 ? undefined : this.substitution.get(expr);
|
|
216
|
+
if (replacement !== undefined)
|
|
217
|
+
this.usedDependencies = joinDependencies(
|
|
218
|
+
this.usedDependencies,
|
|
219
|
+
this.substitutionDependencies.get(expr),
|
|
220
|
+
);
|
|
221
|
+
return replacement;
|
|
132
222
|
}
|
|
133
223
|
|
|
134
224
|
isFlatAssoc(decl: number) {
|
|
135
225
|
const op = this.manager.funcDecls[decl].op;
|
|
136
|
-
return
|
|
226
|
+
return (
|
|
227
|
+
this.options.arith.isFlat !== false &&
|
|
228
|
+
(op === OP_AND ||
|
|
229
|
+
op === OP_OR ||
|
|
230
|
+
op === OP_ADD ||
|
|
231
|
+
op === OP_BADD ||
|
|
232
|
+
op === OP_BOR ||
|
|
233
|
+
op === OP_BAND ||
|
|
234
|
+
op === OP_BXOR)
|
|
235
|
+
);
|
|
137
236
|
}
|
|
138
237
|
|
|
139
238
|
isRewritingPatterns() {
|
|
@@ -161,33 +260,51 @@ export class Rewriter extends RewriterTpl {
|
|
|
161
260
|
private reduceQuantifierCore(expr: number, body: number, newPatterns: number[]) {
|
|
162
261
|
const manager = this.manager;
|
|
163
262
|
const data = manager.getQuantifier(expr);
|
|
263
|
+
const isLambda = data.kind === QUANTIFIER_LAMBDA;
|
|
164
264
|
const isNegated = manager.isNot(body);
|
|
165
265
|
const junction = isNegated ? manager.getArg(body, 0) : body;
|
|
166
266
|
if (
|
|
167
|
-
|
|
267
|
+
!isLambda &&
|
|
268
|
+
manager.getOp(junction) ===
|
|
269
|
+
((data.kind === QUANTIFIER_FORALL) !== isNegated ? OP_AND : OP_OR) &&
|
|
168
270
|
manager.someArg(junction, (arg) => {
|
|
169
271
|
const atom = manager.isNot(arg) ? manager.getArg(arg, 0) : arg;
|
|
170
272
|
return manager.kinds[atom] === KIND_VAR && manager.values[atom] < data.sorts.length;
|
|
171
273
|
})
|
|
172
274
|
)
|
|
173
|
-
return data.
|
|
275
|
+
return data.kind === QUANTIFIER_FORALL ? manager.falseExpr : manager.trueExpr;
|
|
174
276
|
const nested =
|
|
175
277
|
manager.kinds[body] === KIND_QUANTIFIER ? manager.getQuantifier(body) : undefined;
|
|
176
|
-
const
|
|
177
|
-
const merged =
|
|
278
|
+
const isMerging =
|
|
178
279
|
nested !== undefined &&
|
|
179
|
-
nested.
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
280
|
+
nested.kind === data.kind &&
|
|
281
|
+
!isLambda &&
|
|
282
|
+
data.patterns.length + data.noPatterns.length === 0 &&
|
|
283
|
+
nested.patterns.length + nested.noPatterns.length === 0;
|
|
284
|
+
if (!isMerging && isLambda && manager.isGroundApp(body))
|
|
285
|
+
return mkArrayApp(manager, OP_CONST_ARRAY, [body], [manager.sorts[expr]]);
|
|
286
|
+
if (!isMerging && isLambda) {
|
|
287
|
+
const reduced = this.array.mkLambdaCore(expr, body);
|
|
288
|
+
if (reduced !== -1) return reduced;
|
|
289
|
+
}
|
|
290
|
+
const patterns = newPatterns.filter((pattern, index) => newPatterns.indexOf(pattern) === index);
|
|
291
|
+
const merged = isMerging
|
|
292
|
+
? manager.mkQuantifier({
|
|
293
|
+
...data,
|
|
294
|
+
sorts: [...data.sorts, ...nested.sorts],
|
|
295
|
+
names: [...data.names, ...nested.names],
|
|
296
|
+
body: nested.body,
|
|
297
|
+
patterns: [],
|
|
298
|
+
weight: Math.min(data.weight, nested.weight),
|
|
299
|
+
})
|
|
300
|
+
: manager.mkQuantifier({
|
|
301
|
+
...data,
|
|
302
|
+
body,
|
|
303
|
+
patterns: this.substitutePatterns(patterns),
|
|
304
|
+
noPatterns: data.noPatterns.filter(
|
|
305
|
+
(noPattern, index) => data.noPatterns.indexOf(noPattern) === index,
|
|
306
|
+
),
|
|
307
|
+
});
|
|
191
308
|
const reduced = this.unusedVarsEliminator.apply(merged);
|
|
192
309
|
manager.releaseLater(reduced);
|
|
193
310
|
if (
|
|
@@ -234,6 +351,34 @@ export class Rewriter extends RewriterTpl {
|
|
|
234
351
|
: reduced.expr;
|
|
235
352
|
}
|
|
236
353
|
|
|
354
|
+
// bool_rewriter::mk_app, for a Boolean operator: an equality is not passed to the theories.
|
|
355
|
+
mkBoolApp(decl: number, args: number[], sort: number) {
|
|
356
|
+
const op = this.manager.funcDecls[decl].op;
|
|
357
|
+
const reduced =
|
|
358
|
+
op === OP_EQ
|
|
359
|
+
? this.mkEqCore(args[0], args[1])
|
|
360
|
+
: op === OP_DISTINCT
|
|
361
|
+
? this.mkDistinct(args)
|
|
362
|
+
: op === OP_AND
|
|
363
|
+
? this.mkAndCore(args)
|
|
364
|
+
: op === OP_OR
|
|
365
|
+
? this.mkOr(args)
|
|
366
|
+
: op === OP_NOT
|
|
367
|
+
? this.mkNot(args[0])
|
|
368
|
+
: op === OP_ITE
|
|
369
|
+
? this.mkIte(args[0], args[1], args[2])
|
|
370
|
+
: op === OP_IMPLIES
|
|
371
|
+
? this.mkOr([this.mkNot(args[0]), args[1]])
|
|
372
|
+
: op === OP_XOR
|
|
373
|
+
? this.mkEq(this.mkNot(args[0]), args[1])
|
|
374
|
+
: undefined;
|
|
375
|
+
return reduced === undefined || reduced === -1
|
|
376
|
+
? this.manager.mkApp(decl, args, sort)
|
|
377
|
+
: typeof reduced === "number"
|
|
378
|
+
? reduced
|
|
379
|
+
: reduced.expr;
|
|
380
|
+
}
|
|
381
|
+
|
|
237
382
|
mkAppCore(decl: number, args: number[], sort: number): number {
|
|
238
383
|
const reduced = this.reduceAppTop(decl, args, sort);
|
|
239
384
|
return reduced === -1
|
|
@@ -245,8 +390,23 @@ export class Rewriter extends RewriterTpl {
|
|
|
245
390
|
|
|
246
391
|
private reduceAppTop(decl: number, args: number[], sort: number) {
|
|
247
392
|
const manager = this.manager;
|
|
248
|
-
const
|
|
249
|
-
if (typeof
|
|
393
|
+
const core = this.reduceAppCore(decl, args);
|
|
394
|
+
if (typeof core !== "number") return core;
|
|
395
|
+
const reduced =
|
|
396
|
+
this.options.isPushingIteBv !== true
|
|
397
|
+
? core
|
|
398
|
+
: core === -1
|
|
399
|
+
? decl === OP_ITE
|
|
400
|
+
? (this.pushIte(args[0], args[1], args[2]) ?? -1)
|
|
401
|
+
: -1
|
|
402
|
+
: this.isIte(core)
|
|
403
|
+
? (this.pushIte(
|
|
404
|
+
manager.getArg(core, 0),
|
|
405
|
+
manager.getArg(core, 1),
|
|
406
|
+
manager.getArg(core, 2),
|
|
407
|
+
) ?? core)
|
|
408
|
+
: core;
|
|
409
|
+
if (this.options.isPullingCheapIte !== true) return reduced;
|
|
250
410
|
if (reduced === -1)
|
|
251
411
|
return (args.length === 2 ? this.pullIte(decl, args[0], args[1], sort) : undefined) ?? -1;
|
|
252
412
|
return manager.kinds[reduced] === KIND_APP && manager.getNumArgs(reduced) === 2
|
|
@@ -259,11 +419,65 @@ export class Rewriter extends RewriterTpl {
|
|
|
259
419
|
: reduced;
|
|
260
420
|
}
|
|
261
421
|
|
|
422
|
+
private pushIte(condition: number, thenExpr: number, elseExpr: number) {
|
|
423
|
+
const manager = this.manager;
|
|
424
|
+
const isBvApp = (expr: number) =>
|
|
425
|
+
manager.kinds[expr] === KIND_APP && manager.getFamily(expr) === FAMILY_BV;
|
|
426
|
+
const isThenApp = isBvApp(thenExpr);
|
|
427
|
+
if (!isThenApp && !isBvApp(elseExpr)) return undefined;
|
|
428
|
+
const app = isThenApp ? thenExpr : elseExpr;
|
|
429
|
+
const unified = this.unify(app, isThenApp ? elseExpr : thenExpr);
|
|
430
|
+
if (unified === undefined) return undefined;
|
|
431
|
+
const [newThen, newElse] = isThenApp ? unified.args : [unified.args[1], unified.args[0]];
|
|
432
|
+
const ite = manager.mkApp(OP_ITE, [condition, newThen, newElse], manager.sorts[newThen]);
|
|
433
|
+
const decl = manager.decls[app];
|
|
434
|
+
return manager.mkApp(
|
|
435
|
+
decl,
|
|
436
|
+
unified.isCommonFirst ? [unified.common, ite] : [ite, unified.common],
|
|
437
|
+
manager.funcDecls[decl].range,
|
|
438
|
+
);
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
private unify(app: number, other: number) {
|
|
442
|
+
const manager = this.manager;
|
|
443
|
+
if (manager.getNumArgs(app) !== 2) return undefined;
|
|
444
|
+
const first = manager.getArg(app, 0);
|
|
445
|
+
const second = manager.getArg(app, 1);
|
|
446
|
+
const op = manager.getOp(app);
|
|
447
|
+
const getNeutral = () =>
|
|
448
|
+
op === OP_BADD || op === OP_BMUL
|
|
449
|
+
? manager.mkBvNumeral(op === OP_BADD ? 0n : 1n, manager.getBvSize(manager.sorts[app]))
|
|
450
|
+
: undefined;
|
|
451
|
+
if (other === second || other === first) {
|
|
452
|
+
const neutral = getNeutral();
|
|
453
|
+
return neutral === undefined
|
|
454
|
+
? undefined
|
|
455
|
+
: other === second
|
|
456
|
+
? { args: [first, neutral], common: second, isCommonFirst: false }
|
|
457
|
+
: { args: [second, neutral], common: first, isCommonFirst: true };
|
|
458
|
+
}
|
|
459
|
+
if (manager.kinds[other] !== KIND_APP || manager.decls[other] !== manager.decls[app])
|
|
460
|
+
return undefined;
|
|
461
|
+
if (manager.getNumArgs(other) !== 2) return undefined;
|
|
462
|
+
const otherFirst = manager.getArg(other, 0);
|
|
463
|
+
const otherSecond = manager.getArg(other, 1);
|
|
464
|
+
if (second === otherSecond)
|
|
465
|
+
return { args: [first, otherFirst], common: second, isCommonFirst: false };
|
|
466
|
+
if (first === otherFirst)
|
|
467
|
+
return { args: [second, otherSecond], common: first, isCommonFirst: true };
|
|
468
|
+
if (!isAssociativeBvOp(op) && op !== OP_BCOMP) return undefined;
|
|
469
|
+
if (first === otherSecond)
|
|
470
|
+
return { args: [second, otherFirst], common: first, isCommonFirst: true };
|
|
471
|
+
if (second === otherFirst)
|
|
472
|
+
return { args: [first, otherSecond], common: second, isCommonFirst: false };
|
|
473
|
+
return undefined;
|
|
474
|
+
}
|
|
475
|
+
|
|
262
476
|
private pullIte(decl: number, first: number, second: number, sort: number): Rewrite | undefined {
|
|
263
477
|
const manager = this.manager;
|
|
264
478
|
if (sort === SORT_BOOL && manager.sorts[first] !== SORT_BOOL) {
|
|
265
479
|
if (this.isIte(first)) {
|
|
266
|
-
if (manager.
|
|
480
|
+
if (manager.isValue(second) && manager.getRefCount(first) === 1)
|
|
267
481
|
return this.pullIteCore(decl, first, second, sort, false);
|
|
268
482
|
if (this.isIte(second) && manager.getArg(first, 0) === manager.getArg(second, 0)) {
|
|
269
483
|
const branches = [1, 2].map((index) =>
|
|
@@ -279,14 +493,15 @@ export class Rewriter extends RewriterTpl {
|
|
|
279
493
|
};
|
|
280
494
|
}
|
|
281
495
|
}
|
|
282
|
-
if (this.isIte(second) && manager.
|
|
496
|
+
if (this.isIte(second) && manager.isValue(first) && manager.getRefCount(second) === 1)
|
|
283
497
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
284
498
|
}
|
|
285
499
|
const family = manager.funcDecls[decl].family;
|
|
286
|
-
if (family !== FAMILY_BASIC && family !== FAMILY_ARITH
|
|
287
|
-
|
|
500
|
+
if (family !== FAMILY_BASIC && family !== FAMILY_ARITH && family !== FAMILY_BV)
|
|
501
|
+
return undefined;
|
|
502
|
+
if (manager.isValue(first) && this.isIteValueTree(second))
|
|
288
503
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
289
|
-
if (manager.
|
|
504
|
+
if (manager.isValue(second) && this.isIteValueTree(first))
|
|
290
505
|
return this.pullIteCore(decl, first, second, sort, false);
|
|
291
506
|
return undefined;
|
|
292
507
|
}
|
|
@@ -303,7 +518,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
303
518
|
manager.funcDecls[decl].op === OP_EQ
|
|
304
519
|
? branch === value
|
|
305
520
|
? manager.trueExpr
|
|
306
|
-
:
|
|
521
|
+
: manager.areDistinct(branch, value)
|
|
307
522
|
? manager.falseExpr
|
|
308
523
|
: manager.mkEq(branch, value)
|
|
309
524
|
: manager.mkApp(decl, isSwapped ? [value, branch] : [branch, value], sort),
|
|
@@ -318,20 +533,65 @@ export class Rewriter extends RewriterTpl {
|
|
|
318
533
|
for (let ite = todo.pop(); ite !== undefined; ite = todo.pop()) {
|
|
319
534
|
for (const branch of [manager.getArg(ite, 1), manager.getArg(ite, 2)]) {
|
|
320
535
|
if (this.isIte(branch) && manager.getRefCount(branch) === 1) todo.push(branch);
|
|
321
|
-
else if (!manager.
|
|
536
|
+
else if (!manager.isValue(branch)) return false;
|
|
322
537
|
}
|
|
323
538
|
}
|
|
324
539
|
return true;
|
|
325
540
|
}
|
|
326
541
|
|
|
542
|
+
private reduceEq(left: number, right: number) {
|
|
543
|
+
const manager = this.manager;
|
|
544
|
+
const sort = manager.sorts[left];
|
|
545
|
+
const theoryResult = isArithSort(sort)
|
|
546
|
+
? this.arith.mkEq(left, right)
|
|
547
|
+
: manager.isBvSort(sort)
|
|
548
|
+
? this.bv.mkEqCore(left, right)
|
|
549
|
+
: manager.isDatatypeSort(sort)
|
|
550
|
+
? mkDatatypeEqCore(manager, left, right)
|
|
551
|
+
: manager.isArraySort(sort)
|
|
552
|
+
? this.array.mkEqCore(left, right)
|
|
553
|
+
: manager.getSortFamily(sort) === FAMILY_FPA
|
|
554
|
+
? mkFpaEqCore(manager, left, right)
|
|
555
|
+
: manager.getSortFamily(sort) === FAMILY_SEQ
|
|
556
|
+
? this.seq.mkEqCore(left, right)
|
|
557
|
+
: undefined;
|
|
558
|
+
if (theoryResult !== undefined) return theoryResult;
|
|
559
|
+
if (manager.getOp(left) === OP_UBV2INT || manager.getOp(right) === OP_UBV2INT) {
|
|
560
|
+
const bv2intResult = this.bv.mkEqBv2int(left, right);
|
|
561
|
+
if (bv2intResult !== undefined) return bv2intResult;
|
|
562
|
+
}
|
|
563
|
+
return this.applyTamagotchi(left, right) ?? this.applyTamagotchi(right, left);
|
|
564
|
+
}
|
|
565
|
+
|
|
566
|
+
private applyTamagotchi(eq: number, other: number): Rewrite | undefined {
|
|
567
|
+
const manager = this.manager;
|
|
568
|
+
const eqBit = this.bv.getEqBit(eq);
|
|
569
|
+
if (eqBit === undefined) return undefined;
|
|
570
|
+
const bit = manager.mkBvNumeral(eqBit.bit, 1);
|
|
571
|
+
const otherBit = manager.mkBvNumeral(1n - eqBit.bit, 1);
|
|
572
|
+
const ite = manager.mkApp(OP_ITE, [other, bit, otherBit], manager.sorts[bit]);
|
|
573
|
+
return { expr: manager.mkEq(eqBit.term, ite), depth: 2 };
|
|
574
|
+
}
|
|
575
|
+
|
|
327
576
|
reduceAppCore(decl: number, args: number[]): number | Rewrite {
|
|
328
577
|
const manager = this.manager;
|
|
329
|
-
const
|
|
578
|
+
const funcDecl = manager.funcDecls[decl];
|
|
579
|
+
if (funcDecl.family === FAMILY_BV) return this.bv.mkAppCore(decl, args) ?? -1;
|
|
580
|
+
if (funcDecl.family === FAMILY_ARRAY) return this.array.mkAppCore(funcDecl.op, args) ?? -1;
|
|
581
|
+
if (funcDecl.family === FAMILY_DATATYPE) return mkDatatypeAppCore(manager, decl, args) ?? -1;
|
|
582
|
+
if (funcDecl.family === FAMILY_FPA) return mkFpaAppCore(manager, decl, args) ?? -1;
|
|
583
|
+
if (funcDecl.family === FAMILY_PB) return mkPbAppCore(manager, decl, args);
|
|
584
|
+
if (funcDecl.family === FAMILY_SEQ || funcDecl.family === FAMILY_CHAR)
|
|
585
|
+
return this.seq.mkAppCore(decl, args) ?? -1;
|
|
586
|
+
if (funcDecl.family === FAMILY_RECFUN) return mkRecFunApp(manager, decl, args) ?? -1;
|
|
587
|
+
const op = funcDecl.op;
|
|
330
588
|
switch (op) {
|
|
331
589
|
case OP_AND:
|
|
332
|
-
return
|
|
590
|
+
return (
|
|
591
|
+
(manager.isReUsed ? this.seq.mkBoolApp(true, args) : undefined) ?? this.mkAndCore(args)
|
|
592
|
+
);
|
|
333
593
|
case OP_OR:
|
|
334
|
-
return this.mkOr(args);
|
|
594
|
+
return (manager.isReUsed ? this.seq.mkBoolApp(false, args) : undefined) ?? this.mkOr(args);
|
|
335
595
|
case OP_NOT:
|
|
336
596
|
return this.mkNot(args[0]);
|
|
337
597
|
case OP_IMPLIES:
|
|
@@ -340,14 +600,25 @@ export class Rewriter extends RewriterTpl {
|
|
|
340
600
|
return this.mkEq(this.mkNot(args[0]), args[1]);
|
|
341
601
|
case OP_EQ:
|
|
342
602
|
return (
|
|
343
|
-
|
|
603
|
+
this.reduceEq(args[0], args[1]) ??
|
|
604
|
+
(manager.isSeqUsed && manager.getFamily(args[0]) === FAMILY_SEQ
|
|
605
|
+
? this.seq.mkEqCore(args[0], args[1])
|
|
606
|
+
: undefined) ??
|
|
344
607
|
this.mkEqCore(args[0], args[1]) ??
|
|
345
608
|
-1
|
|
346
609
|
);
|
|
347
610
|
case OP_DISTINCT:
|
|
348
|
-
return
|
|
611
|
+
return (
|
|
612
|
+
(args.length > 0 && manager.isBvSort(manager.sorts[args[0]])
|
|
613
|
+
? this.bv.mkDistinct(args)
|
|
614
|
+
: undefined) ?? this.mkDistinct(args)
|
|
615
|
+
);
|
|
349
616
|
case OP_ITE:
|
|
350
|
-
return
|
|
617
|
+
return (
|
|
618
|
+
(manager.isBvSort(manager.sorts[args[1]])
|
|
619
|
+
? this.bv.mkIteCore(args[0], args[1], args[2])
|
|
620
|
+
: undefined) ?? this.mkIte(args[0], args[1], args[2])
|
|
621
|
+
);
|
|
351
622
|
case OP_LE:
|
|
352
623
|
return this.arith.mkLe(args[0], args[1]) ?? -1;
|
|
353
624
|
case OP_GE:
|
|
@@ -357,7 +628,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
357
628
|
case OP_GT:
|
|
358
629
|
return this.arith.mkGt(args[0], args[1]);
|
|
359
630
|
case OP_ADD:
|
|
360
|
-
return this.arith.
|
|
631
|
+
return this.arith.mkAddCore(args) ?? -1;
|
|
361
632
|
case OP_SUB:
|
|
362
633
|
return this.arith.mkSub(args);
|
|
363
634
|
case OP_UMINUS:
|
|
@@ -368,6 +639,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
368
639
|
return this.arith.mkIdiv(args[0], args[1]) ?? -1;
|
|
369
640
|
case OP_MOD:
|
|
370
641
|
return this.arith.mkMod(args[0], args[1]) ?? -1;
|
|
642
|
+
case OP_REM:
|
|
643
|
+
return this.arith.mkRem(args[0], args[1]) ?? -1;
|
|
371
644
|
case OP_ABS:
|
|
372
645
|
return this.arith.mkAbs(args[0]);
|
|
373
646
|
case OP_DIV:
|
|
@@ -378,6 +651,24 @@ export class Rewriter extends RewriterTpl {
|
|
|
378
651
|
return this.arith.mkToInt(args[0]) ?? -1;
|
|
379
652
|
case OP_IS_INT:
|
|
380
653
|
return this.arith.mkIsInt(args[0]);
|
|
654
|
+
case OP_POWER:
|
|
655
|
+
return this.arith.mkPower(args[0], args[1]) ?? -1;
|
|
656
|
+
case OP_SIN:
|
|
657
|
+
return this.arith.mkSin(args[0]) ?? -1;
|
|
658
|
+
case OP_COS:
|
|
659
|
+
return this.arith.mkCos(args[0]) ?? -1;
|
|
660
|
+
case OP_TAN:
|
|
661
|
+
return this.arith.mkTan(args[0]) ?? -1;
|
|
662
|
+
case OP_ASIN:
|
|
663
|
+
return this.arith.mkAsin(args[0]) ?? -1;
|
|
664
|
+
case OP_ACOS:
|
|
665
|
+
return this.arith.mkAcos(args[0]) ?? -1;
|
|
666
|
+
case OP_ATAN:
|
|
667
|
+
return this.arith.mkAtan(args[0]) ?? -1;
|
|
668
|
+
case OP_SINH:
|
|
669
|
+
case OP_COSH:
|
|
670
|
+
case OP_TANH:
|
|
671
|
+
return this.arith.mkHyperbolic(op, args[0]) ?? -1;
|
|
381
672
|
default:
|
|
382
673
|
return -1;
|
|
383
674
|
}
|
|
@@ -393,7 +684,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
393
684
|
|
|
394
685
|
mkOr(args: number[]): number {
|
|
395
686
|
const manager = this.manager;
|
|
396
|
-
const isNested =
|
|
687
|
+
const isNested =
|
|
688
|
+
this.options.isFlatAndOr !== false && args.some((arg) => manager.getOp(arg) === OP_OR);
|
|
397
689
|
const flatArgs = isNested ? this.flattenArgs(args, OP_OR) : args;
|
|
398
690
|
const literals = manager.flatLiterals;
|
|
399
691
|
literals.clear();
|
|
@@ -403,6 +695,14 @@ export class Rewriter extends RewriterTpl {
|
|
|
403
695
|
if (literals.add(arg)) return manager.trueExpr;
|
|
404
696
|
}
|
|
405
697
|
const result = literals.list;
|
|
698
|
+
const limit = this.options.localCtxLimit;
|
|
699
|
+
if (result.length > 1 && limit !== undefined && this.localCtxCost <= limit) {
|
|
700
|
+
const simplified = manager.withTemporaries(() => this.simplifyLocalCtx([...result]));
|
|
701
|
+
if (simplified !== -1) {
|
|
702
|
+
manager.releaseLater(simplified);
|
|
703
|
+
return simplified;
|
|
704
|
+
}
|
|
705
|
+
}
|
|
406
706
|
const isOutOfOrder = result.some(
|
|
407
707
|
(arg, index) => index > 0 && isAstLess(manager, arg, result[index - 1]),
|
|
408
708
|
);
|
|
@@ -411,10 +711,144 @@ export class Rewriter extends RewriterTpl {
|
|
|
411
711
|
return manager.mkOr(result);
|
|
412
712
|
}
|
|
413
713
|
|
|
714
|
+
private simplifyNestedNotOr(args: number[], negatives: Set<number>, positives: Set<number>) {
|
|
715
|
+
const manager = this.manager;
|
|
716
|
+
this.localCtxCost += args.length;
|
|
717
|
+
const kept: number[] = [];
|
|
718
|
+
let isSimplified = false;
|
|
719
|
+
for (const arg of args) {
|
|
720
|
+
if (negatives.has(arg)) return manager.falseExpr;
|
|
721
|
+
if (positives.has(arg)) {
|
|
722
|
+
isSimplified = true;
|
|
723
|
+
continue;
|
|
724
|
+
}
|
|
725
|
+
if (manager.isNot(arg)) {
|
|
726
|
+
const atom = manager.getArg(arg, 0);
|
|
727
|
+
if (negatives.has(atom)) {
|
|
728
|
+
isSimplified = true;
|
|
729
|
+
continue;
|
|
730
|
+
}
|
|
731
|
+
if (positives.has(atom)) return manager.falseExpr;
|
|
732
|
+
}
|
|
733
|
+
kept.push(arg);
|
|
734
|
+
}
|
|
735
|
+
if (!isSimplified) return -1;
|
|
736
|
+
if (kept.length === 0) return manager.trueExpr;
|
|
737
|
+
return kept.length === 1 ? this.mkNot(kept[0]) : manager.mkNot(manager.mkOr(kept));
|
|
738
|
+
}
|
|
739
|
+
|
|
740
|
+
private simplifyLiteral(arg: number, negatives: Set<number>, positives: Set<number>) {
|
|
741
|
+
const manager = this.manager;
|
|
742
|
+
const isNegated = manager.isNot(arg);
|
|
743
|
+
const atom = isNegated ? manager.getArg(arg, 0) : arg;
|
|
744
|
+
if (negatives.has(atom)) return isNegated ? manager.falseExpr : manager.trueExpr;
|
|
745
|
+
if (positives.has(atom)) return isNegated ? manager.trueExpr : manager.falseExpr;
|
|
746
|
+
return arg;
|
|
747
|
+
}
|
|
748
|
+
|
|
749
|
+
private mkNestedIte(condition: number, thenExpr: number, elseExpr: number) {
|
|
750
|
+
const manager = this.manager;
|
|
751
|
+
if (manager.isTrue(condition)) return thenExpr;
|
|
752
|
+
if (manager.isFalse(condition)) return elseExpr;
|
|
753
|
+
if (thenExpr === elseExpr) return thenExpr;
|
|
754
|
+
if (manager.sorts[thenExpr] === SORT_BOOL) {
|
|
755
|
+
if (manager.isTrue(thenExpr))
|
|
756
|
+
return manager.isFalse(elseExpr) ? condition : manager.mkOr([condition, elseExpr]);
|
|
757
|
+
if (manager.isFalse(thenExpr))
|
|
758
|
+
return manager.isTrue(elseExpr)
|
|
759
|
+
? this.mkNot(condition)
|
|
760
|
+
: manager.mkNot(manager.mkOr([condition, this.mkNot(elseExpr)]));
|
|
761
|
+
if (manager.isTrue(elseExpr)) return manager.mkOr([this.mkNot(condition), thenExpr]);
|
|
762
|
+
if (manager.isFalse(elseExpr) || condition === elseExpr)
|
|
763
|
+
return manager.mkNot(manager.mkOr([this.mkNot(condition), this.mkNot(thenExpr)]));
|
|
764
|
+
if (condition === thenExpr) return manager.mkOr([condition, elseExpr]);
|
|
765
|
+
if (
|
|
766
|
+
(manager.isNot(thenExpr) && manager.getArg(thenExpr, 0) === elseExpr) ||
|
|
767
|
+
(manager.isNot(elseExpr) && manager.getArg(elseExpr, 0) === thenExpr)
|
|
768
|
+
)
|
|
769
|
+
return this.mkEq(condition, thenExpr);
|
|
770
|
+
}
|
|
771
|
+
return manager.mkApp(OP_ITE, [condition, thenExpr, elseExpr], manager.sorts[thenExpr]);
|
|
772
|
+
}
|
|
773
|
+
|
|
774
|
+
private simplifyNestedEqIte(form: number, negatives: Set<number>, positives: Set<number>) {
|
|
775
|
+
const manager = this.manager;
|
|
776
|
+
this.localCtxCost += 3;
|
|
777
|
+
const isNegated = manager.isNot(form);
|
|
778
|
+
const atom = isNegated ? manager.getArg(form, 0) : form;
|
|
779
|
+
const op = manager.getOp(atom);
|
|
780
|
+
if (op !== OP_EQ && op !== OP_ITE) return -1;
|
|
781
|
+
const args = manager.getArgs(atom);
|
|
782
|
+
const simplified = args.map((arg) => this.simplifyLiteral(arg, negatives, positives));
|
|
783
|
+
if (simplified.every((arg, index) => arg === args[index])) return -1;
|
|
784
|
+
const result =
|
|
785
|
+
op === OP_EQ
|
|
786
|
+
? this.mkEq(simplified[0], simplified[1])
|
|
787
|
+
: this.mkNestedIte(simplified[0], simplified[1], simplified[2]);
|
|
788
|
+
return isNegated ? this.mkNot(result) : result;
|
|
789
|
+
}
|
|
790
|
+
|
|
791
|
+
private simplifyLocalCtx(initialArgs: number[]) {
|
|
792
|
+
const manager = this.manager;
|
|
793
|
+
let args = initialArgs;
|
|
794
|
+
let isSimplified = false;
|
|
795
|
+
let isModified = false;
|
|
796
|
+
let isForward = true;
|
|
797
|
+
for (;;) {
|
|
798
|
+
const negatives = new Set<number>();
|
|
799
|
+
const positives = new Set<number>();
|
|
800
|
+
const kept: number[] = [];
|
|
801
|
+
const push = (arg: number) => {
|
|
802
|
+
const isNegated = manager.isNot(arg);
|
|
803
|
+
const marks = isNegated ? negatives : positives;
|
|
804
|
+
const atom = isNegated ? manager.getArg(arg, 0) : arg;
|
|
805
|
+
if (marks.has(atom)) return;
|
|
806
|
+
marks.add(atom);
|
|
807
|
+
kept.push(arg);
|
|
808
|
+
};
|
|
809
|
+
this.localCtxCost += 2 * args.length;
|
|
810
|
+
const order = isForward ? args : [...args].reverse();
|
|
811
|
+
for (const original of order) {
|
|
812
|
+
let arg = original;
|
|
813
|
+
if (manager.isNot(arg) && manager.getOp(manager.getArg(arg, 0)) === OP_OR) {
|
|
814
|
+
const nested = this.simplifyNestedNotOr(
|
|
815
|
+
manager.getArgs(manager.getArg(arg, 0)),
|
|
816
|
+
negatives,
|
|
817
|
+
positives,
|
|
818
|
+
);
|
|
819
|
+
if (nested !== -1) {
|
|
820
|
+
isModified = true;
|
|
821
|
+
isSimplified = true;
|
|
822
|
+
arg = nested;
|
|
823
|
+
}
|
|
824
|
+
}
|
|
825
|
+
const nested = this.simplifyNestedEqIte(arg, negatives, positives);
|
|
826
|
+
if (nested !== -1) {
|
|
827
|
+
isModified = true;
|
|
828
|
+
isSimplified = true;
|
|
829
|
+
arg = nested;
|
|
830
|
+
}
|
|
831
|
+
if (manager.isFalse(arg)) continue;
|
|
832
|
+
if (manager.isTrue(arg)) return arg;
|
|
833
|
+
if (this.options.isFlatAndOr !== false && manager.getOp(arg) === OP_OR)
|
|
834
|
+
for (const inner of manager.getArgs(arg)) push(inner);
|
|
835
|
+
else push(arg);
|
|
836
|
+
}
|
|
837
|
+
if (!isForward) {
|
|
838
|
+
if (!isModified) return isSimplified ? manager.mkOr(args) : -1;
|
|
839
|
+
kept.reverse();
|
|
840
|
+
isModified = false;
|
|
841
|
+
}
|
|
842
|
+
isForward = !isForward;
|
|
843
|
+
args = kept;
|
|
844
|
+
}
|
|
845
|
+
}
|
|
846
|
+
|
|
414
847
|
private mkAndCore(args: number[]): number | Rewrite {
|
|
415
848
|
const manager = this.manager;
|
|
416
849
|
if (this.options.isEliminatingAnd) return this.mkAndAsOr(args);
|
|
417
|
-
if (!args.some((arg) => manager.getOp(arg) === OP_AND))
|
|
850
|
+
if (this.options.isFlatAndOr === false || !args.some((arg) => manager.getOp(arg) === OP_AND))
|
|
851
|
+
return this.mkNflatAnd(args);
|
|
418
852
|
return { expr: this.mkNflatAnd(this.flattenArgs(args, OP_AND)), depth: 1 };
|
|
419
853
|
}
|
|
420
854
|
|
|
@@ -457,9 +891,9 @@ export class Rewriter extends RewriterTpl {
|
|
|
457
891
|
private tryIteEq(ite: number, other: number): Rewrite | undefined {
|
|
458
892
|
const manager = this.manager;
|
|
459
893
|
if (!this.isIte(ite)) return undefined;
|
|
460
|
-
if (manager.getArg(ite, 1) === other &&
|
|
894
|
+
if (manager.getArg(ite, 1) === other && manager.areDistinct(manager.getArg(ite, 2), other))
|
|
461
895
|
return { expr: manager.getArg(ite, 0), depth: 1 };
|
|
462
|
-
if (manager.getArg(ite, 2) === other &&
|
|
896
|
+
if (manager.getArg(ite, 2) === other && manager.areDistinct(manager.getArg(ite, 1), other))
|
|
463
897
|
return { expr: manager.mkNot(manager.getArg(ite, 0)), depth: 1 };
|
|
464
898
|
return undefined;
|
|
465
899
|
}
|
|
@@ -468,15 +902,10 @@ export class Rewriter extends RewriterTpl {
|
|
|
468
902
|
return this.manager.getOp(expr) === OP_ITE;
|
|
469
903
|
}
|
|
470
904
|
|
|
471
|
-
private areDistinct(first: number, second: number) {
|
|
472
|
-
const manager = this.manager;
|
|
473
|
-
return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
|
|
474
|
-
}
|
|
475
|
-
|
|
476
905
|
private mkIteValueEq(left: number, right: number): number | Rewrite | undefined {
|
|
477
906
|
const manager = this.manager;
|
|
478
|
-
if (this.isIte(left) && manager.
|
|
479
|
-
if (this.isIte(right) && manager.
|
|
907
|
+
if (this.isIte(left) && manager.isValue(right)) return this.tryIteValue(left, right);
|
|
908
|
+
if (this.isIte(right) && manager.isValue(left)) return this.tryIteValue(right, left);
|
|
480
909
|
if (
|
|
481
910
|
!this.isIte(left) ||
|
|
482
911
|
!this.isIte(right) ||
|
|
@@ -485,7 +914,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
485
914
|
manager.getArg(left, 2),
|
|
486
915
|
manager.getArg(right, 1),
|
|
487
916
|
manager.getArg(right, 2),
|
|
488
|
-
].every((arg) => manager.
|
|
917
|
+
].every((arg) => manager.isValue(arg))
|
|
489
918
|
)
|
|
490
919
|
return undefined;
|
|
491
920
|
const mkOr = (args: number[]) => manager.mkApp(OP_OR, args, SORT_BOOL);
|
|
@@ -528,16 +957,16 @@ export class Rewriter extends RewriterTpl {
|
|
|
528
957
|
const mkPlainEq = (branch: number) =>
|
|
529
958
|
branch === value
|
|
530
959
|
? manager.trueExpr
|
|
531
|
-
:
|
|
960
|
+
: manager.areDistinct(branch, value)
|
|
532
961
|
? manager.falseExpr
|
|
533
962
|
: manager.mkEq(branch, value);
|
|
534
963
|
const mkAnd = (first: number, second: number) =>
|
|
535
964
|
manager.mkApp(OP_AND, [first, second], SORT_BOOL);
|
|
536
965
|
const mkOr = (first: number, second: number) =>
|
|
537
966
|
manager.mkApp(OP_OR, [first, second], SORT_BOOL);
|
|
538
|
-
if (
|
|
967
|
+
if (manager.areDistinct(value, elseExpr))
|
|
539
968
|
return { expr: mkAnd(mkBranchEq(thenExpr), condition), depth: 2 };
|
|
540
|
-
if (
|
|
969
|
+
if (manager.areDistinct(value, thenExpr))
|
|
541
970
|
return { expr: mkAnd(mkBranchEq(elseExpr), manager.mkNot(condition)), depth: 2 };
|
|
542
971
|
if (value === thenExpr)
|
|
543
972
|
return value === elseExpr
|
|
@@ -547,8 +976,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
547
976
|
return { expr: mkOr(write(this.mkEq(thenExpr, value)), manager.mkNot(condition)), depth: 2 };
|
|
548
977
|
const isValueIte = (expr: number) =>
|
|
549
978
|
this.isIte(expr) &&
|
|
550
|
-
manager.
|
|
551
|
-
manager.
|
|
979
|
+
manager.isValue(manager.getArg(expr, 1)) &&
|
|
980
|
+
manager.isValue(manager.getArg(expr, 2));
|
|
552
981
|
const getExpr = (result: number | Rewrite) =>
|
|
553
982
|
typeof result === "number" ? result : result.expr;
|
|
554
983
|
const thenEq = isValueIte(thenExpr) ? this.tryIteValue(thenExpr, value) : undefined;
|
|
@@ -573,7 +1002,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
573
1002
|
const expr = todo.pop() ?? ite;
|
|
574
1003
|
if (visited.has(expr)) continue;
|
|
575
1004
|
visited.add(expr);
|
|
576
|
-
if (
|
|
1005
|
+
if (manager.isValue(expr) && manager.areDistinct(expr, value)) continue;
|
|
577
1006
|
if (!this.isIte(expr)) return false;
|
|
578
1007
|
todo.push(manager.getArg(expr, 1), manager.getArg(expr, 2));
|
|
579
1008
|
}
|
|
@@ -592,8 +1021,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
592
1021
|
private mkEqCore(inputLeft: number, inputRight: number): number | Rewrite | undefined {
|
|
593
1022
|
const manager = this.manager;
|
|
594
1023
|
if (inputLeft === inputRight) return manager.trueExpr;
|
|
595
|
-
if (manager.
|
|
596
|
-
return manager.falseExpr;
|
|
1024
|
+
if (manager.areDistinct(inputLeft, inputRight)) return manager.falseExpr;
|
|
597
1025
|
const iteEq = this.tryIteEq(inputLeft, inputRight) ?? this.tryIteEq(inputRight, inputLeft);
|
|
598
1026
|
if (iteEq !== undefined) return iteEq;
|
|
599
1027
|
const iteValueEq = this.mkIteValueEq(inputLeft, inputRight);
|
|
@@ -631,15 +1059,32 @@ export class Rewriter extends RewriterTpl {
|
|
|
631
1059
|
|
|
632
1060
|
// Z3 keeps a distinct of more than two arguments, which tlapm does not send, where this expands it into disequalities.
|
|
633
1061
|
private mkDistinct(args: number[]): number | Rewrite {
|
|
1062
|
+
const manager = this.manager;
|
|
1063
|
+
if (args.length <= 1) return manager.trueExpr;
|
|
634
1064
|
if (args.length === 2) return { expr: this.mkNot(this.mkEq(args[0], args[1])), depth: 2 };
|
|
1065
|
+
if (new Set(args).size < args.length) return manager.falseExpr;
|
|
1066
|
+
const firstNonValue = args.findIndex((arg) => !manager.isUniqueValue(arg));
|
|
1067
|
+
const isAllDifferent = args.every(
|
|
1068
|
+
(arg, index) =>
|
|
1069
|
+
firstNonValue === -1 ||
|
|
1070
|
+
index < firstNonValue ||
|
|
1071
|
+
args.slice(0, index).every((previous) => manager.areDistinct(arg, previous)),
|
|
1072
|
+
);
|
|
1073
|
+
if (isAllDifferent) return manager.trueExpr;
|
|
1074
|
+
if (manager.sorts[args[0]] === SORT_BOOL) return manager.falseExpr;
|
|
1075
|
+
if (
|
|
1076
|
+
this.options.isKeepingDistinct === true ||
|
|
1077
|
+
args.length >= (this.options.blastDistinctThreshold ?? Infinity)
|
|
1078
|
+
)
|
|
1079
|
+
return -1;
|
|
635
1080
|
const pairs: number[] = [];
|
|
636
1081
|
for (let left = 0; left < args.length; left++)
|
|
637
1082
|
for (let right = left + 1; right < args.length; right++)
|
|
638
|
-
pairs.push(
|
|
639
|
-
return
|
|
1083
|
+
pairs.push(manager.mkNot(manager.mkEq(args[left], args[right])));
|
|
1084
|
+
return { expr: manager.mkAnd(pairs), depth: 3 };
|
|
640
1085
|
}
|
|
641
1086
|
|
|
642
|
-
|
|
1087
|
+
mkIte(inputCondition: number, inputThen: number, inputElse: number): number | Rewrite {
|
|
643
1088
|
const manager = this.manager;
|
|
644
1089
|
const isNegated = manager.isNot(inputCondition);
|
|
645
1090
|
const condition = isNegated ? manager.getArg(inputCondition, 0) : inputCondition;
|