tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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 +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +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 +43 -40
- 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 +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +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/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/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 +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- 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 +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 +664 -287
- 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 +4 -11
- 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 +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +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/md5.ts +26 -29
- 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 +37 -16
- 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 +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/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,6 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_checker.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
|
-
import { KIND_APP, OP_NOT, OP_OR, SORT_BOOL
|
|
2
|
+
import { KIND_APP, OP_NOT, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
5
4
|
import { Context } from "./context";
|
|
6
5
|
import type { Enode } from "./enode";
|
|
@@ -12,7 +11,6 @@ import { RefVector } from "./ref-vector";
|
|
|
12
11
|
import { VarSubst } from "./var-subst";
|
|
13
12
|
|
|
14
13
|
const MBQI_MAX_CEXS = 1;
|
|
15
|
-
const MBQI_MAX_ITERATIONS = 1000;
|
|
16
14
|
|
|
17
15
|
interface Instance {
|
|
18
16
|
quantifier: number;
|
|
@@ -23,13 +21,19 @@ interface Instance {
|
|
|
23
21
|
class AuxContext {
|
|
24
22
|
private context: Context;
|
|
25
23
|
private asserted: AssertedFormulas;
|
|
26
|
-
private polyQhead = 0;
|
|
27
|
-
private polyAssumption = -1;
|
|
28
24
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
this.
|
|
25
|
+
// init_aux_context copies the kernel's smt_params and theories, so the context has a model
|
|
26
|
+
// finder too, though it never sees a quantifier.
|
|
27
|
+
constructor(parent: Context) {
|
|
28
|
+
this.asserted = new AssertedFormulas(parent.manager);
|
|
29
|
+
this.context = new Context(parent.manager, {
|
|
30
|
+
...parent.params,
|
|
31
|
+
relevancyLevel: 0,
|
|
32
|
+
isArrayFakeSupport: true,
|
|
33
|
+
});
|
|
34
|
+
this.context.config = { ...parent.config, relevancyLevel: 0 };
|
|
35
|
+
for (const theory of parent.theories) this.context.registerFamily(theory.id);
|
|
36
|
+
this.context.setupContext(parent.setup, false, this.asserted);
|
|
33
37
|
}
|
|
34
38
|
|
|
35
39
|
push() {
|
|
@@ -40,7 +44,6 @@ class AuxContext {
|
|
|
40
44
|
pop() {
|
|
41
45
|
this.context.pop(1);
|
|
42
46
|
this.asserted.pop();
|
|
43
|
-
this.polyQhead = 0;
|
|
44
47
|
}
|
|
45
48
|
|
|
46
49
|
assert(formula: number) {
|
|
@@ -51,19 +54,7 @@ class AuxContext {
|
|
|
51
54
|
check() {
|
|
52
55
|
const context = this.context;
|
|
53
56
|
context.popToBaseLevel();
|
|
54
|
-
context.
|
|
55
|
-
const manager = this.manager;
|
|
56
|
-
const numFormulas = this.asserted.getNumFormulas();
|
|
57
|
-
const isAssuming = numFormulas !== this.polyQhead;
|
|
58
|
-
this.polyQhead = numFormulas;
|
|
59
|
-
if (isAssuming) {
|
|
60
|
-
const assumption = manager.mkFreshConst("poly", SORT_BOOL);
|
|
61
|
-
manager.incRef(assumption);
|
|
62
|
-
if (this.polyAssumption !== -1) manager.decRef(this.polyAssumption);
|
|
63
|
-
this.polyAssumption = assumption;
|
|
64
|
-
}
|
|
65
|
-
context.initAssumptions(isAssuming ? [this.polyAssumption] : []);
|
|
66
|
-
const result = context.search();
|
|
57
|
+
const result = context.checkResearching(this.asserted, []);
|
|
67
58
|
return result === L_TRUE ? context.getModel() : result === L_FALSE ? "unsat" : "unknown";
|
|
68
59
|
}
|
|
69
60
|
}
|
|
@@ -95,7 +86,7 @@ export class ModelChecker {
|
|
|
95
86
|
const value2expr = new Map<number, number>();
|
|
96
87
|
for (const entry of this.root2value) {
|
|
97
88
|
const node = this.getEqEnodeWithMinGen(entry[0]);
|
|
98
|
-
if (!this.manager.
|
|
89
|
+
if (!this.manager.isValue(node.owner)) value2expr.set(entry[1], node.owner);
|
|
99
90
|
}
|
|
100
91
|
this.value2expr = value2expr;
|
|
101
92
|
return value2expr;
|
|
@@ -203,7 +194,7 @@ export class ModelChecker {
|
|
|
203
194
|
|
|
204
195
|
private checkQuantifier(quantifier: number, model: ProtoModel) {
|
|
205
196
|
const manager = this.manager;
|
|
206
|
-
const aux = this.aux ?? new AuxContext(
|
|
197
|
+
const aux = this.aux ?? new AuxContext(this.context);
|
|
207
198
|
this.aux = aux;
|
|
208
199
|
aux.push();
|
|
209
200
|
const sks = new RefVector(manager);
|
|
@@ -270,7 +261,7 @@ export class ModelChecker {
|
|
|
270
261
|
check(model: ProtoModel, root2value: Map<Enode, number>) {
|
|
271
262
|
this.root2value = root2value;
|
|
272
263
|
if (this.qmanager.quantifiers.length === 0) return true;
|
|
273
|
-
if (this.iterationIndex >=
|
|
264
|
+
if (this.iterationIndex >= this.context.params.mbqiMaxIterations) return false;
|
|
274
265
|
this.value2expr = null;
|
|
275
266
|
model.compress();
|
|
276
267
|
const first = this.checkQuantifiers(model);
|
|
@@ -1,36 +1,56 @@
|
|
|
1
|
-
|
|
1
|
+
import { mkArrayApp } from "./array-decl-plugin";
|
|
2
2
|
import {
|
|
3
3
|
FAMILY_ARITH,
|
|
4
|
+
FAMILY_BASIC,
|
|
5
|
+
FAMILY_LABEL,
|
|
6
|
+
FAMILY_ARRAY,
|
|
7
|
+
FAMILY_FPA,
|
|
8
|
+
FAMILY_MODEL_VALUE,
|
|
9
|
+
FAMILY_RECFUN,
|
|
4
10
|
FAMILY_USER,
|
|
5
11
|
KIND_APP,
|
|
6
12
|
KIND_QUANTIFIER,
|
|
7
13
|
OP_AND,
|
|
14
|
+
OP_AS_ARRAY,
|
|
15
|
+
OP_CONST_ARRAY,
|
|
8
16
|
OP_DIV,
|
|
9
17
|
OP_DIV0,
|
|
18
|
+
OP_DT_ACCESSOR,
|
|
19
|
+
OP_DT_CONSTRUCTOR,
|
|
10
20
|
OP_EQ,
|
|
21
|
+
OP_FPA_FP,
|
|
11
22
|
OP_IDIV,
|
|
12
23
|
OP_IDIV0,
|
|
13
24
|
OP_ITE,
|
|
14
25
|
OP_LE,
|
|
15
26
|
OP_MOD,
|
|
16
27
|
OP_MOD0,
|
|
28
|
+
OP_REM,
|
|
29
|
+
OP_SELECT,
|
|
30
|
+
OP_STORE,
|
|
17
31
|
SORT_BOOL,
|
|
18
32
|
} from "./ast";
|
|
19
33
|
import type { AstManager } from "./ast";
|
|
20
|
-
import {
|
|
34
|
+
import { DEFAULT_BV_OPTIONS } from "./bv-rewriter";
|
|
35
|
+
import { isConsideredUninterpreted } from "./fpa-decl-plugin";
|
|
36
|
+
import { FuncInterp, getManagerSomeValue } from "./proto-model";
|
|
21
37
|
import type { ProtoModel } from "./proto-model";
|
|
22
38
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
23
39
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
24
40
|
import type { Rewrite } from "./rewriter-tpl";
|
|
25
41
|
import { Rational } from "./rational";
|
|
42
|
+
import { mkRecFunApp } from "./recfun-rewriter";
|
|
26
43
|
import { VarSubst } from "./var-subst";
|
|
27
44
|
|
|
28
45
|
const BY_ZERO_OPS = new Map([
|
|
29
46
|
[OP_DIV, OP_DIV0],
|
|
30
47
|
[OP_IDIV, OP_IDIV0],
|
|
31
48
|
[OP_MOD, OP_MOD0],
|
|
49
|
+
[OP_REM, OP_MOD0],
|
|
32
50
|
]);
|
|
33
51
|
|
|
52
|
+
const BUILTIN_FAMILIES = new Set([FAMILY_BASIC, FAMILY_USER, FAMILY_MODEL_VALUE, FAMILY_LABEL]);
|
|
53
|
+
|
|
34
54
|
export class ModelEvaluator extends RewriterTpl {
|
|
35
55
|
private rewriter: Rewriter;
|
|
36
56
|
private isModelCompletion = false;
|
|
@@ -41,7 +61,10 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
41
61
|
private model: ProtoModel,
|
|
42
62
|
) {
|
|
43
63
|
super(manager);
|
|
44
|
-
this.rewriter = new Rewriter(manager,
|
|
64
|
+
this.rewriter = new Rewriter(manager, {
|
|
65
|
+
...TACTIC_REWRITER_OPTIONS,
|
|
66
|
+
bv: { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0, isMkbv2num: true },
|
|
67
|
+
});
|
|
45
68
|
this.rewriter.releaseResult = () => this.setLastResult(-1);
|
|
46
69
|
}
|
|
47
70
|
|
|
@@ -70,6 +93,11 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
70
93
|
const manager = this.manager;
|
|
71
94
|
const model = this.model;
|
|
72
95
|
const family = manager.funcDecls[decl].family;
|
|
96
|
+
if (family === FAMILY_ARRAY && manager.funcDecls[decl].op === OP_AS_ARRAY) {
|
|
97
|
+
const arrayDecl = manager.funcDecls[decl].parameters[0];
|
|
98
|
+
const arrayInterp = model.funcInterps.get(arrayDecl)?.getArrayInterp(arrayDecl);
|
|
99
|
+
if (arrayInterp !== undefined) return { expr: arrayInterp, depth: 1 };
|
|
100
|
+
}
|
|
73
101
|
if (family === FAMILY_USER) {
|
|
74
102
|
if (args.length > 0) {
|
|
75
103
|
const result = this.evaluate(decl, args);
|
|
@@ -83,15 +111,29 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
83
111
|
model.registerConst(decl, some);
|
|
84
112
|
return some;
|
|
85
113
|
}
|
|
114
|
+
if (manager.funcDecls[decl].op === OP_EQ && manager.isArraySort(manager.sorts[args[0]])) {
|
|
115
|
+
const reduced = this.mkArrayEq(args[0], args[1]);
|
|
116
|
+
if (reduced !== undefined) return reduced;
|
|
117
|
+
}
|
|
86
118
|
if (manager.funcDecls[decl].op === OP_AND) {
|
|
87
119
|
const reduced = this.mkArithAndCore(args);
|
|
88
120
|
if (reduced !== undefined) return reduced;
|
|
89
121
|
}
|
|
122
|
+
if (family === FAMILY_LABEL && args.length === 1) return args[0];
|
|
123
|
+
if (family === FAMILY_RECFUN) {
|
|
124
|
+
const unfolded = mkRecFunApp(manager, decl, args, true);
|
|
125
|
+
if (unfolded !== undefined) return unfolded;
|
|
126
|
+
const interp = model.funcInterps.get(decl);
|
|
127
|
+
if (interp === undefined) return -1;
|
|
128
|
+
if (interp.isPartial()) interp.setElse(model.getSomeValue(sort));
|
|
129
|
+
const result = this.substitute(interp.getInterp() as number, args);
|
|
130
|
+
return manager.isGroundApp(result) ? { expr: result, depth: Infinity } : result;
|
|
131
|
+
}
|
|
90
132
|
const rewritten = this.rewriter.reduceAppCore(decl, args);
|
|
91
133
|
const reduced =
|
|
92
|
-
rewritten
|
|
93
|
-
?
|
|
94
|
-
:
|
|
134
|
+
rewritten !== -1 || BUILTIN_FAMILIES.has(family)
|
|
135
|
+
? rewritten
|
|
136
|
+
: this.evaluatePartialTheoryFunc(decl, args, sort);
|
|
95
137
|
if (
|
|
96
138
|
family !== FAMILY_ARITH ||
|
|
97
139
|
typeof reduced !== "number" ||
|
|
@@ -121,8 +163,10 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
121
163
|
private evaluatePartialTheoryFunc(decl: number, args: number[], sort: number): number | Rewrite {
|
|
122
164
|
const manager = this.manager;
|
|
123
165
|
const model = this.model;
|
|
124
|
-
const
|
|
125
|
-
|
|
166
|
+
const info = manager.funcDecls[decl];
|
|
167
|
+
if (info.family === FAMILY_FPA && !isConsideredUninterpreted(manager, decl, args)) return -1;
|
|
168
|
+
const op = info.op;
|
|
169
|
+
const byZero = info.family === FAMILY_ARITH ? BY_ZERO_OPS.get(op) : undefined;
|
|
126
170
|
let interp = model.funcInterps.get(decl);
|
|
127
171
|
if (interp === undefined && byZero !== undefined && !manager.isNumeral(args[1])) {
|
|
128
172
|
const definition = model.funcInterps.get(byZero)?.getInterp();
|
|
@@ -135,16 +179,146 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
135
179
|
sort,
|
|
136
180
|
);
|
|
137
181
|
}
|
|
138
|
-
if (interp === undefined) {
|
|
182
|
+
if (interp === undefined && info.family === FAMILY_ARITH) {
|
|
139
183
|
const isByZero = byZero !== undefined && manager.getRationalValue(args[1]).isZero();
|
|
140
184
|
if (!isByZero && op !== OP_DIV0 && op !== OP_IDIV0 && op !== OP_MOD0) return -1;
|
|
141
185
|
interp = isByZero ? model.funcInterps.get(byZero) : undefined;
|
|
142
186
|
if (interp === undefined) return manager.mkNumeralOfSort(Rational.zero, sort);
|
|
143
187
|
}
|
|
144
|
-
if (interp.
|
|
188
|
+
if (interp === undefined && info.family === FAMILY_FPA)
|
|
189
|
+
return getManagerSomeValue(manager, sort);
|
|
190
|
+
if (op === OP_DT_ACCESSOR) {
|
|
191
|
+
if (interp === undefined && manager.isValue(args[0])) {
|
|
192
|
+
const value = model.getSomeValue(sort);
|
|
193
|
+
const created = new FuncInterp(manager, args.length);
|
|
194
|
+
created.setElse(value);
|
|
195
|
+
model.registerFunc(decl, created);
|
|
196
|
+
return value;
|
|
197
|
+
}
|
|
198
|
+
if (!manager.isGroundApp(args[0])) return manager.mkApp(decl, args, sort);
|
|
199
|
+
}
|
|
200
|
+
if (op === OP_DT_CONSTRUCTOR) return manager.mkApp(decl, args, sort);
|
|
201
|
+
if (interp === undefined) return -1;
|
|
202
|
+
if (interp.isPartial()) interp.setElse(getManagerSomeValue(manager, sort));
|
|
145
203
|
return { expr: this.substitute(interp.getInterp() as number, args), depth: Infinity };
|
|
146
204
|
}
|
|
147
205
|
|
|
206
|
+
// Like Z3, only the indices of the stores of a store chain decide whether they are unique.
|
|
207
|
+
private extractArrayFuncInterp(inputArray: number) {
|
|
208
|
+
const manager = this.manager;
|
|
209
|
+
const stores: number[][] = [];
|
|
210
|
+
let array = inputArray;
|
|
211
|
+
let areUnique = true;
|
|
212
|
+
while (manager.getFamily(array) === FAMILY_ARRAY && manager.getOp(array) === OP_STORE) {
|
|
213
|
+
const store = manager.getArgs(array).slice(1);
|
|
214
|
+
areUnique &&= store.slice(0, -1).every((index) => manager.isUniqueValue(index));
|
|
215
|
+
stores.push(store);
|
|
216
|
+
array = manager.getArg(array, 0);
|
|
217
|
+
}
|
|
218
|
+
if (manager.getFamily(array) === FAMILY_ARRAY && manager.getOp(array) === OP_CONST_ARRAY)
|
|
219
|
+
return { stores, elseExpr: manager.getArg(array, 0), areUnique };
|
|
220
|
+
if (manager.getFamily(array) !== FAMILY_ARRAY || manager.getOp(array) !== OP_AS_ARRAY)
|
|
221
|
+
return undefined;
|
|
222
|
+
const interp = this.model.funcInterps.get(
|
|
223
|
+
manager.funcDecls[manager.decls[array]].parameters[0],
|
|
224
|
+
);
|
|
225
|
+
const elseExpr = interp?.elseExpr ?? null;
|
|
226
|
+
if (interp === undefined || elseExpr === null) return undefined;
|
|
227
|
+
let isGround = manager.isGroundApp(elseExpr);
|
|
228
|
+
for (const entry of interp.entries) {
|
|
229
|
+
if (entry.result === elseExpr) continue;
|
|
230
|
+
const store = [...entry.args, entry.result];
|
|
231
|
+
isGround &&= store.every((arg) => manager.isGroundApp(arg));
|
|
232
|
+
stores.push(store);
|
|
233
|
+
}
|
|
234
|
+
return isGround ? { stores, elseExpr, areUnique } : undefined;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
private mkArrayEq(first: number, second: number): number | Rewrite | undefined {
|
|
238
|
+
const manager = this.manager;
|
|
239
|
+
if (first === second) return manager.trueExpr;
|
|
240
|
+
const firstInterp = this.extractArrayFuncInterp(first);
|
|
241
|
+
const secondInterp = this.extractArrayFuncInterp(second);
|
|
242
|
+
if (firstInterp === undefined || secondInterp === undefined) return undefined;
|
|
243
|
+
const firstElse = firstInterp.elseExpr;
|
|
244
|
+
const secondElse = secondInterp.elseExpr;
|
|
245
|
+
const areUnique = firstInterp.areUnique && secondInterp.areUnique;
|
|
246
|
+
const sort = manager.sorts[first];
|
|
247
|
+
const domain = manager.getSortParameters(sort).slice(0, -1);
|
|
248
|
+
const domainSize = domain.reduce((size, index) => {
|
|
249
|
+
const indexSize = manager.getSortSize(index);
|
|
250
|
+
return size < 0n || indexSize < 0n ? -1n : size * indexSize;
|
|
251
|
+
}, 1n);
|
|
252
|
+
const stores = [...firstInterp.stores, ...secondInterp.stores];
|
|
253
|
+
const isFullyCovered =
|
|
254
|
+
areUnique &&
|
|
255
|
+
firstElse !== secondElse &&
|
|
256
|
+
domainSize >= 0n &&
|
|
257
|
+
stores.length > 0 &&
|
|
258
|
+
BigInt(new Set(stores.map((store) => store.slice(0, -1).join(","))).size) >= domainSize;
|
|
259
|
+
const conjuncts: number[] = [];
|
|
260
|
+
const isElseInfinite = manager.getSortSize(manager.sorts[firstElse]) < 0n;
|
|
261
|
+
if (firstElse !== secondElse && !isFullyCovered) {
|
|
262
|
+
if (manager.areDistinct(firstElse, secondElse) && isElseInfinite) return manager.falseExpr;
|
|
263
|
+
conjuncts.push(manager.mkEq(firstElse, secondElse));
|
|
264
|
+
}
|
|
265
|
+
if (areUnique && firstInterp.stores.length > 0)
|
|
266
|
+
return this.mkArrayEqCore(
|
|
267
|
+
firstInterp.stores,
|
|
268
|
+
firstElse,
|
|
269
|
+
secondInterp.stores,
|
|
270
|
+
secondElse,
|
|
271
|
+
conjuncts,
|
|
272
|
+
);
|
|
273
|
+
for (const store of stores) {
|
|
274
|
+
const indices = store.slice(0, -1);
|
|
275
|
+
conjuncts.push(
|
|
276
|
+
manager.mkEq(
|
|
277
|
+
mkArrayApp(manager, OP_SELECT, [first, ...indices]),
|
|
278
|
+
mkArrayApp(manager, OP_SELECT, [second, ...indices]),
|
|
279
|
+
),
|
|
280
|
+
);
|
|
281
|
+
}
|
|
282
|
+
return { expr: manager.mkAnd(conjuncts), depth: Infinity };
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
private mkArrayEqCore(
|
|
286
|
+
firstStores: number[][],
|
|
287
|
+
firstElse: number,
|
|
288
|
+
secondStores: number[][],
|
|
289
|
+
secondElse: number,
|
|
290
|
+
conjuncts: number[],
|
|
291
|
+
): number | Rewrite {
|
|
292
|
+
const manager = this.manager;
|
|
293
|
+
const arity = firstStores[0].length - 1;
|
|
294
|
+
const getKey = (store: number[]) => store.slice(0, arity).join(",");
|
|
295
|
+
const firstTable = new Map<string, number[]>();
|
|
296
|
+
// A store of a smaller index takes precedence.
|
|
297
|
+
for (const store of [...firstStores].reverse()) firstTable.set(getKey(store), store);
|
|
298
|
+
const secondKeys = new Set<string>();
|
|
299
|
+
// A pair that is neither equal nor distinct is left as an equality.
|
|
300
|
+
const isDistinct = (left: number, right: number) => {
|
|
301
|
+
if (left === right) return false;
|
|
302
|
+
if (manager.areDistinct(left, right)) return true;
|
|
303
|
+
conjuncts.push(manager.mkEq(left, right));
|
|
304
|
+
return false;
|
|
305
|
+
};
|
|
306
|
+
for (const store of secondStores) {
|
|
307
|
+
const key = getKey(store);
|
|
308
|
+
if (secondKeys.has(key)) continue;
|
|
309
|
+
secondKeys.add(key);
|
|
310
|
+
const value = store[arity];
|
|
311
|
+
const match = firstTable.get(key);
|
|
312
|
+
if (match !== undefined) firstTable.delete(key);
|
|
313
|
+
const isDifferent =
|
|
314
|
+
match === undefined ? isDistinct(firstElse, value) : isDistinct(value, match[arity]);
|
|
315
|
+
if (isDifferent) return manager.falseExpr;
|
|
316
|
+
}
|
|
317
|
+
for (const store of firstTable.values())
|
|
318
|
+
if (isDistinct(store[arity], secondElse)) return manager.falseExpr;
|
|
319
|
+
return { expr: manager.mkAnd(conjuncts), depth: Infinity };
|
|
320
|
+
}
|
|
321
|
+
|
|
148
322
|
private substitute(expr: number, args: number[]) {
|
|
149
323
|
const subst = new VarSubst(this.manager, false);
|
|
150
324
|
const result = subst.apply(expr, args);
|
|
@@ -155,17 +329,19 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
155
329
|
|
|
156
330
|
private containsRedex(expr: number) {
|
|
157
331
|
const manager = this.manager;
|
|
332
|
+
if (manager.getOp(expr) === OP_AS_ARRAY) return true;
|
|
158
333
|
if (manager.kinds[expr] !== KIND_APP || manager.getNumArgs(expr) === 0) return false;
|
|
159
334
|
const visited = new Set<number>();
|
|
160
335
|
const todo = [expr];
|
|
161
336
|
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
162
337
|
if (visited.has(current)) continue;
|
|
163
338
|
visited.add(current);
|
|
164
|
-
|
|
339
|
+
const op = manager.getOp(current);
|
|
340
|
+
if (op === OP_AS_ARRAY || op === OP_EQ || op === OP_FPA_FP) return true;
|
|
165
341
|
if (manager.kinds[current] === KIND_APP) manager.pushArgs(current, todo);
|
|
166
342
|
else if (manager.kinds[current] === KIND_QUANTIFIER) {
|
|
167
343
|
const data = manager.getQuantifier(current);
|
|
168
|
-
todo.push(data.body, ...data.patterns);
|
|
344
|
+
todo.push(data.body, ...data.patterns, ...data.noPatterns);
|
|
169
345
|
}
|
|
170
346
|
}
|
|
171
347
|
return false;
|
|
@@ -1,34 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
FAMILY_MODEL_VALUE,
|
|
4
|
-
FAMILY_USER,
|
|
5
|
-
type FuncDecl,
|
|
6
|
-
OP_DIV0,
|
|
7
|
-
OP_IDIV0,
|
|
8
|
-
OP_MOD0,
|
|
9
|
-
SORT_BOOL,
|
|
10
|
-
isArithSort,
|
|
11
|
-
} from "./ast";
|
|
1
|
+
import { FAMILY_BASIC, FAMILY_USER, SORT_BOOL } from "./ast";
|
|
12
2
|
import type { Context } from "./context";
|
|
13
|
-
import
|
|
3
|
+
import { Enode } from "./enode";
|
|
14
4
|
import { FuncInterp, ProtoModel } from "./proto-model";
|
|
5
|
+
import type { DependentValue } from "./theory";
|
|
15
6
|
|
|
16
7
|
export interface GeneratedModel {
|
|
17
8
|
model: ProtoModel;
|
|
18
9
|
root2value: Map<Enode, number>;
|
|
19
10
|
}
|
|
20
11
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
12
|
+
// include_func_interp: the model interprets uninterpreted functions, the decls that their theory
|
|
13
|
+
// asks for, such as theory_lra's divisions by zero, and the decls of a family without a theory, such
|
|
14
|
+
// as model values, which stand for themselves.
|
|
15
|
+
const isIncludedFuncInterp = (context: Context, decl: number) => {
|
|
16
|
+
const family = context.manager.funcDecls[decl].family;
|
|
17
|
+
if (family === FAMILY_USER) return true;
|
|
18
|
+
if (family === FAMILY_BASIC) return false;
|
|
19
|
+
return context.getTheory(family)?.includeFuncInterp(decl) ?? true;
|
|
20
|
+
};
|
|
27
21
|
|
|
28
22
|
export const mkModel = (context: Context): GeneratedModel => {
|
|
29
23
|
const manager = context.manager;
|
|
30
24
|
const model = new ProtoModel(manager);
|
|
31
|
-
context.theory
|
|
25
|
+
for (const theory of context.theories) theory.initModel(model);
|
|
32
26
|
for (const node of context.enodes)
|
|
33
27
|
if (node.root === node && context.isRelevant(node.owner) && manager.isModelValue(node.owner))
|
|
34
28
|
model.registerValue(node.owner);
|
|
@@ -42,25 +36,56 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
42
36
|
}
|
|
43
37
|
const root2value = new Map<Enode, number>();
|
|
44
38
|
const freshRoots: Enode[] = [];
|
|
39
|
+
const dependentValues = new Map<Enode, DependentValue>();
|
|
45
40
|
for (const node of context.enodes) {
|
|
46
41
|
if (node.root !== node) continue;
|
|
47
42
|
const expr = node.owner;
|
|
48
|
-
if (!context.isRelevant(expr) && !manager.
|
|
43
|
+
if (!context.isRelevant(expr) && !manager.isValue(expr)) continue;
|
|
49
44
|
const sort = manager.sorts[expr];
|
|
45
|
+
const theory = context.getTheory(manager.getSortFamily(sort));
|
|
50
46
|
if (sort === SORT_BOOL)
|
|
51
47
|
root2value.set(node, context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr);
|
|
52
|
-
else if (manager.
|
|
53
|
-
else if (
|
|
54
|
-
const value =
|
|
48
|
+
else if (manager.isModelValue(expr)) root2value.set(node, expr);
|
|
49
|
+
else if (theory !== undefined && theory.buildModels()) {
|
|
50
|
+
const value = node.getThVar(theory.id) < 0 ? undefined : theory.mkValue(node);
|
|
55
51
|
if (value === undefined) freshRoots.push(node);
|
|
56
|
-
else
|
|
57
|
-
|
|
52
|
+
else if (typeof value === "number")
|
|
53
|
+
root2value.set(node, manager.isValue(expr) ? expr : value);
|
|
54
|
+
else dependentValues.set(node, value);
|
|
55
|
+
} else {
|
|
56
|
+
const value = model.getFreshValue(sort) ?? model.getSomeValue(sort);
|
|
57
|
+
root2value.set(node, manager.isValue(expr) ? expr : value);
|
|
58
|
+
}
|
|
58
59
|
}
|
|
59
60
|
for (const value of root2value.values()) model.registerValue(value);
|
|
60
|
-
|
|
61
|
+
// A value that depends on others comes after them, and before the fresh values of its sort.
|
|
62
|
+
const getFreshValue = (node: Enode) => {
|
|
61
63
|
const sort = manager.sorts[node.owner];
|
|
62
|
-
|
|
63
|
-
|
|
64
|
+
const freshValue = model.getFreshValue(sort) ?? model.getSomeValue(sort);
|
|
65
|
+
const value = manager.isValue(node.owner) ? node.owner : freshValue;
|
|
66
|
+
root2value.set(node, value);
|
|
67
|
+
return value;
|
|
68
|
+
};
|
|
69
|
+
const getDependentValue = (node: Enode): number => {
|
|
70
|
+
const existing = root2value.get(node);
|
|
71
|
+
if (existing !== undefined) return existing;
|
|
72
|
+
const dependent = dependentValues.get(node);
|
|
73
|
+
if (dependent === undefined) return getFreshValue(node);
|
|
74
|
+
dependentValues.delete(node);
|
|
75
|
+
const values = dependent.dependencies.map((dependency) => {
|
|
76
|
+
if (dependency instanceof Enode) return getDependentValue(dependency.root);
|
|
77
|
+
dependency.value ??=
|
|
78
|
+
model.getFreshValue(dependency.sort) ?? model.getSomeValue(dependency.sort);
|
|
79
|
+
return dependency.value;
|
|
80
|
+
});
|
|
81
|
+
// A class whose root is a value, such as a constant array, takes it after its dependencies.
|
|
82
|
+
const value = manager.isValue(node.owner) ? node.owner : dependent.mkValue(values);
|
|
83
|
+
model.registerValue(value);
|
|
84
|
+
root2value.set(node, value);
|
|
85
|
+
return value;
|
|
86
|
+
};
|
|
87
|
+
for (const node of dependentValues.keys()) getDependentValue(node);
|
|
88
|
+
for (const node of freshRoots) if (!root2value.has(node)) getFreshValue(node);
|
|
64
89
|
const getValue = (node: Enode) =>
|
|
65
90
|
root2value.get(node.root) ?? model.getSomeValue(manager.sorts[node.owner]);
|
|
66
91
|
for (const node of context.enodes)
|
|
@@ -68,7 +93,7 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
68
93
|
model.registerConst(manager.decls[node.owner], getValue(node));
|
|
69
94
|
for (const node of context.enodes) {
|
|
70
95
|
const expr = node.owner;
|
|
71
|
-
if (!context.isRelevant(expr) || !isIncludedFuncInterp(
|
|
96
|
+
if (!context.isRelevant(expr) || !isIncludedFuncInterp(context, node.decl)) continue;
|
|
72
97
|
if (node.numArgs === 0) {
|
|
73
98
|
model.registerConst(node.decl, getValue(node));
|
|
74
99
|
continue;
|
|
@@ -79,8 +104,12 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
79
104
|
interp = new FuncInterp(manager, node.numArgs);
|
|
80
105
|
model.registerFunc(node.decl, interp);
|
|
81
106
|
}
|
|
82
|
-
const args = Array.from({ length: node.numArgs }, (
|
|
107
|
+
const args = Array.from({ length: node.numArgs }, (_value, index) =>
|
|
108
|
+
getValue(node.getArg(index)),
|
|
109
|
+
);
|
|
83
110
|
if (interp.getEntry(args) === undefined) interp.insertNewEntry(args, getValue(node));
|
|
84
111
|
}
|
|
112
|
+
for (const theory of context.theories) theory.finalizeModel();
|
|
113
|
+
context.macros?.registerInterpretations(model);
|
|
85
114
|
return { model, root2value };
|
|
86
115
|
};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/model/model_macro_solver.cpp, src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_BASIC,
|
|
4
3
|
FAMILY_USER,
|
|
@@ -15,6 +14,7 @@ import {
|
|
|
15
14
|
OP_OR,
|
|
16
15
|
SORT_BOOL,
|
|
17
16
|
type AstManager,
|
|
17
|
+
QUANTIFIER_FORALL,
|
|
18
18
|
} from "./ast";
|
|
19
19
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
20
20
|
import { Rational } from "./rational";
|
|
@@ -62,7 +62,7 @@ const isLiteral = (manager: AstManager, expr: number) =>
|
|
|
62
62
|
const getPolyArgs = (manager: AstManager, expr: number) =>
|
|
63
63
|
manager.getOp(expr) === OP_ADD ? manager.getArgs(expr) : [expr];
|
|
64
64
|
|
|
65
|
-
const isMacroHead = (manager: AstManager, expr: number, numDecls: number) => {
|
|
65
|
+
export const isMacroHead = (manager: AstManager, expr: number, numDecls: number) => {
|
|
66
66
|
if (!isUserApp(manager, expr) || manager.getNumArgs(expr) !== numDecls) return false;
|
|
67
67
|
const seen = new Set<number>();
|
|
68
68
|
for (let argIndex = 0; argIndex < manager.getNumArgs(expr); argIndex++) {
|
|
@@ -89,6 +89,20 @@ const isQuasiMacroHead = (manager: AstManager, expr: number, numDecls: number) =
|
|
|
89
89
|
return found.size === numDecls;
|
|
90
90
|
};
|
|
91
91
|
|
|
92
|
+
export const normalizeMacroDef = (manager: AstManager, head: number, expr: number) => {
|
|
93
|
+
const mapping = new Map<number, number>();
|
|
94
|
+
for (let index = 0; index < manager.getNumArgs(head); index++)
|
|
95
|
+
mapping.set(manager.values[manager.getArg(head, index)], index);
|
|
96
|
+
return [...mapping].every((entry) => entry[0] === entry[1])
|
|
97
|
+
? expr
|
|
98
|
+
: replaceFreeVars(manager, expr, (variable, index, shift) => {
|
|
99
|
+
const target = mapping.get(index);
|
|
100
|
+
return target === undefined
|
|
101
|
+
? variable
|
|
102
|
+
: manager.mkVar(target + shift, manager.sorts[variable]);
|
|
103
|
+
});
|
|
104
|
+
};
|
|
105
|
+
|
|
92
106
|
const getHintHeadVars = (manager: AstManager, expr: number) => {
|
|
93
107
|
const vars: number[] = [];
|
|
94
108
|
if (!isUserApp(manager, expr)) return vars;
|
|
@@ -102,7 +116,7 @@ const getHintHeadVars = (manager: AstManager, expr: number) => {
|
|
|
102
116
|
const isVarsOfSubset = (manager: AstManager, expr: number, vars: number[]) => {
|
|
103
117
|
const visited = new Set<number>();
|
|
104
118
|
const visit = (current: number): boolean => {
|
|
105
|
-
if (manager.
|
|
119
|
+
if (manager.isGroundApp(current) || visited.has(current)) return true;
|
|
106
120
|
visited.add(current);
|
|
107
121
|
const kind = manager.kinds[current];
|
|
108
122
|
if (kind === KIND_VAR) return vars.includes(current);
|
|
@@ -137,11 +151,16 @@ export const collectMacroCandidates = (
|
|
|
137
151
|
quantifier: number,
|
|
138
152
|
) => {
|
|
139
153
|
const data = manager.getQuantifier(quantifier);
|
|
140
|
-
const qa =
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
154
|
+
const qa =
|
|
155
|
+
data.kind === QUANTIFIER_FORALL
|
|
156
|
+
? quantifier
|
|
157
|
+
: manager.withTemporaries(() =>
|
|
158
|
+
manager.mkQuantifier({
|
|
159
|
+
...data,
|
|
160
|
+
kind: QUANTIFIER_FORALL,
|
|
161
|
+
body: manager.mkNot(data.body),
|
|
162
|
+
}),
|
|
163
|
+
);
|
|
145
164
|
const candidates = manager.hasQuantifierFlags[manager.getQuantifier(qa).body]
|
|
146
165
|
? []
|
|
147
166
|
: collectCandidates(manager, rewriter, qa);
|
|
@@ -202,24 +221,11 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
|
|
|
202
221
|
if (cond !== null) manager.decRef(cond);
|
|
203
222
|
};
|
|
204
223
|
|
|
205
|
-
const normalize = (head: number, expr: number) => {
|
|
206
|
-
const mapping = new Map<number, number>();
|
|
207
|
-
for (let index = 0; index < manager.getNumArgs(head); index++)
|
|
208
|
-
mapping.set(manager.values[manager.getArg(head, index)], index);
|
|
209
|
-
return [...mapping].every((entry) => entry[0] === entry[1])
|
|
210
|
-
? expr
|
|
211
|
-
: replaceFreeVars(manager, expr, (variable, index, shift) => {
|
|
212
|
-
const target = mapping.get(index);
|
|
213
|
-
return target === undefined
|
|
214
|
-
? variable
|
|
215
|
-
: manager.mkVar(target + shift, manager.sorts[variable]);
|
|
216
|
-
});
|
|
217
|
-
};
|
|
218
|
-
|
|
219
224
|
const insertMacro = (head: number, def: number, cond: number | null, isHint: boolean) =>
|
|
220
225
|
scope(() => {
|
|
221
|
-
const normDef =
|
|
222
|
-
const normCond =
|
|
226
|
+
const normDef = normalizeMacroDef(manager, head, def);
|
|
227
|
+
const normCond =
|
|
228
|
+
cond !== null ? normalizeMacroDef(manager, head, cond) : isHint ? null : manager.trueExpr;
|
|
223
229
|
manager.incRef(normDef);
|
|
224
230
|
if (normCond !== null) manager.incRef(normCond);
|
|
225
231
|
candidates.push({
|
|
@@ -362,7 +368,12 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
|
|
|
362
368
|
return candidates;
|
|
363
369
|
};
|
|
364
370
|
|
|
365
|
-
const setElseInterp = (
|
|
371
|
+
export const setElseInterp = (
|
|
372
|
+
manager: AstManager,
|
|
373
|
+
model: ProtoModel,
|
|
374
|
+
decl: number,
|
|
375
|
+
elseExpr: number,
|
|
376
|
+
) => {
|
|
366
377
|
let interp = model.funcInterps.get(decl);
|
|
367
378
|
if (interp === undefined) {
|
|
368
379
|
interp = new FuncInterp(manager, manager.funcDecls[decl].domain.length);
|
|
@@ -543,7 +554,7 @@ const collectNgFuncDecls = (manager: AstManager, expr: number) => {
|
|
|
543
554
|
visit(manager.getArg(current, index));
|
|
544
555
|
if (
|
|
545
556
|
manager.getNumArgs(current) > 0 &&
|
|
546
|
-
!manager.
|
|
557
|
+
!manager.isGroundApp(current) &&
|
|
547
558
|
isUserApp(manager, current)
|
|
548
559
|
)
|
|
549
560
|
decls.add(manager.decls[current]);
|
|
@@ -580,7 +591,7 @@ const nonAufMacroSolver = (manager: AstManager, model: ProtoModel, getInfo: GetI
|
|
|
580
591
|
const isBetterMacro = (first: CondMacro, second: CondMacro | null) => {
|
|
581
592
|
if (second === null || !first.isHint) return true;
|
|
582
593
|
if (!second.isHint) return false;
|
|
583
|
-
return manager.
|
|
594
|
+
return manager.isGroundApp(first.def) && !manager.isGroundApp(second.def);
|
|
584
595
|
};
|
|
585
596
|
const getMacroFor = (decl: number, quantifier: number) => {
|
|
586
597
|
let result: CondMacro | null = null;
|