tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- 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 -16
- 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 +626 -56
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- 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 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- 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 +39 -30
- 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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- 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 +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +179 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- 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 +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 -21
- 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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- 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 +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +21 -26
- 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 +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -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 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- 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 -16
- 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 +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- 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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -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 +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- 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 +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type AstManager,
|
|
3
|
+
KIND_APP,
|
|
4
|
+
KIND_QUANTIFIER,
|
|
5
|
+
OP_AND,
|
|
6
|
+
OP_EQ,
|
|
7
|
+
OP_IMPLIES,
|
|
8
|
+
OP_ITE,
|
|
9
|
+
OP_OR,
|
|
10
|
+
SORT_BOOL,
|
|
11
|
+
QUANTIFIER_FORALL,
|
|
12
|
+
QUANTIFIER_LAMBDA,
|
|
13
|
+
} from "./ast";
|
|
14
|
+
import { isAppOf } from "./ast-util";
|
|
15
|
+
import { RefVector } from "./ref-vector";
|
|
16
|
+
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
17
|
+
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
18
|
+
import { InvVarShifter } from "./rewriter-tpl";
|
|
19
|
+
import { VarSubst } from "./var-subst";
|
|
20
|
+
|
|
21
|
+
const Q_FORALL_POS = 0x10;
|
|
22
|
+
const Q_EXISTS_POS = 0x20;
|
|
23
|
+
const Q_NONE_POS = 0x40;
|
|
24
|
+
const Q_FORALL_NEG = 0x11;
|
|
25
|
+
const Q_EXISTS_NEG = 0x21;
|
|
26
|
+
const Q_NONE_NEG = 0x41;
|
|
27
|
+
|
|
28
|
+
interface QuantifierType {
|
|
29
|
+
value: number;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const negate = (type: QuantifierType) => {
|
|
33
|
+
type.value ^= 0x1;
|
|
34
|
+
return type;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
const isCompatible = (type: number, isForall: boolean) =>
|
|
38
|
+
type === Q_FORALL_POS || type === Q_EXISTS_NEG
|
|
39
|
+
? isForall
|
|
40
|
+
: type === Q_EXISTS_POS || type === Q_FORALL_NEG
|
|
41
|
+
? !isForall
|
|
42
|
+
: true;
|
|
43
|
+
|
|
44
|
+
const setQuantifierType = (type: QuantifierType, isForall: boolean) => {
|
|
45
|
+
if (type.value === Q_NONE_POS) type.value = isForall ? Q_FORALL_POS : Q_EXISTS_POS;
|
|
46
|
+
else if (type.value === Q_NONE_NEG) type.value = isForall ? Q_EXISTS_NEG : Q_FORALL_NEG;
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
// Brings the quantifiers of one kind into prenex form, with fresh constants for their variables.
|
|
50
|
+
export class QuantifierHoister {
|
|
51
|
+
private rewriter: Rewriter;
|
|
52
|
+
private trail: RefVector;
|
|
53
|
+
|
|
54
|
+
constructor(private manager: AstManager) {
|
|
55
|
+
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
56
|
+
this.trail = new RefVector(manager);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
release() {
|
|
60
|
+
this.rewriter.release();
|
|
61
|
+
this.trail.reset();
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// The result comes with a reference, which the caller releases.
|
|
65
|
+
pullQuantifier(isForall: boolean, formula: number, vars: RefVector) {
|
|
66
|
+
const result = this.pull(formula, { value: isForall ? Q_FORALL_POS : Q_EXISTS_POS }, vars);
|
|
67
|
+
this.manager.incRef(result);
|
|
68
|
+
this.trail.reset();
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// The overload with sorts and names: the variables of the pulled quantifiers stay bound, numbered
|
|
73
|
+
// after the free ones, and their sorts and names go in front of those of the prefix. The result
|
|
74
|
+
// comes with a reference, which the caller releases.
|
|
75
|
+
pullQuantifierBound(isForall: boolean, formula: number, sorts: number[], names: string[]) {
|
|
76
|
+
const manager = this.manager;
|
|
77
|
+
let index = manager.freeVarBounds[formula];
|
|
78
|
+
let current = formula;
|
|
79
|
+
while (
|
|
80
|
+
manager.kinds[current] === KIND_QUANTIFIER &&
|
|
81
|
+
(manager.getQuantifier(current).kind === QUANTIFIER_FORALL) === isForall
|
|
82
|
+
) {
|
|
83
|
+
const data = manager.getQuantifier(current);
|
|
84
|
+
index += data.sorts.length;
|
|
85
|
+
names.push(...data.names.map(String));
|
|
86
|
+
sorts.push(...data.sorts);
|
|
87
|
+
current = data.body;
|
|
88
|
+
}
|
|
89
|
+
if (!manager.hasQuantifierFlags[current]) {
|
|
90
|
+
manager.incRef(current);
|
|
91
|
+
return current;
|
|
92
|
+
}
|
|
93
|
+
const vars = new RefVector(manager);
|
|
94
|
+
const pulled = this.pullQuantifier(isForall, current, vars);
|
|
95
|
+
if (vars.size === 0) {
|
|
96
|
+
vars.reset();
|
|
97
|
+
return pulled;
|
|
98
|
+
}
|
|
99
|
+
const replace = new ExprSafeReplace(manager);
|
|
100
|
+
for (const variable of vars.items)
|
|
101
|
+
replace.insert(variable, manager.mkVar(index++, manager.sorts[variable]));
|
|
102
|
+
const result = replace.apply(pulled);
|
|
103
|
+
replace.release();
|
|
104
|
+
manager.decRef(pulled);
|
|
105
|
+
names.unshift(...vars.items.map((variable) => manager.getDeclName(variable)).reverse());
|
|
106
|
+
sorts.unshift(...vars.items.map((variable) => manager.sorts[variable]).reverse());
|
|
107
|
+
vars.reset();
|
|
108
|
+
return result;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private pin(expr: number) {
|
|
112
|
+
this.trail.push(expr);
|
|
113
|
+
return expr;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
private pinOwned(expr: number) {
|
|
117
|
+
this.trail.pushOwned(expr);
|
|
118
|
+
return expr;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
private extractQuantifier(quantifier: number, vars: RefVector) {
|
|
122
|
+
const manager = this.manager;
|
|
123
|
+
const data = manager.getQuantifier(quantifier);
|
|
124
|
+
const fresh = data.sorts.map((sort, index) =>
|
|
125
|
+
this.pin(manager.mkFreshConst(String(data.names[index]), sort)),
|
|
126
|
+
);
|
|
127
|
+
for (const expr of fresh) vars.push(expr);
|
|
128
|
+
const subst = new VarSubst(manager, true);
|
|
129
|
+
const substituted = this.pinOwned(subst.apply(data.body, fresh));
|
|
130
|
+
subst.release();
|
|
131
|
+
const shifter = new InvVarShifter(manager);
|
|
132
|
+
const result = this.pinOwned(shifter.shift(substituted, fresh.length));
|
|
133
|
+
shifter.release();
|
|
134
|
+
return result;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
private pull(formula: number, type: QuantifierType, vars: RefVector): number {
|
|
138
|
+
const manager = this.manager;
|
|
139
|
+
if (!manager.hasQuantifierFlags[formula]) return formula;
|
|
140
|
+
const kind = manager.kinds[formula];
|
|
141
|
+
if (kind === KIND_QUANTIFIER) {
|
|
142
|
+
const data = manager.getQuantifier(formula);
|
|
143
|
+
if (data.kind === QUANTIFIER_LAMBDA) return formula;
|
|
144
|
+
if (!isCompatible(type.value, data.kind === QUANTIFIER_FORALL)) return formula;
|
|
145
|
+
setQuantifierType(type, data.kind === QUANTIFIER_FORALL);
|
|
146
|
+
return this.pull(this.extractQuantifier(formula, vars), type, vars);
|
|
147
|
+
}
|
|
148
|
+
if (kind !== KIND_APP) return formula;
|
|
149
|
+
const args = manager.getArgs(formula);
|
|
150
|
+
const mkNot = (expr: number) => this.pin(manager.mkNot(expr));
|
|
151
|
+
const mkOr = (first: number, second: number) => this.pin(manager.mkOr([first, second]));
|
|
152
|
+
if (isAppOf(manager, formula, OP_AND) || isAppOf(manager, formula, OP_OR)) {
|
|
153
|
+
const pulled = args.map((arg) => this.pull(arg, type, vars));
|
|
154
|
+
const isAnd = isAppOf(manager, formula, OP_AND);
|
|
155
|
+
return this.pinOwned(
|
|
156
|
+
manager.withTemporaries(() =>
|
|
157
|
+
isAnd ? this.rewriter.mkAnd(pulled) : this.rewriter.mkOr(pulled),
|
|
158
|
+
),
|
|
159
|
+
);
|
|
160
|
+
}
|
|
161
|
+
if (manager.isNot(formula)) {
|
|
162
|
+
const pulled = this.pull(args[0], negate(type), vars);
|
|
163
|
+
negate(type);
|
|
164
|
+
return mkNot(pulled);
|
|
165
|
+
}
|
|
166
|
+
if (isAppOf(manager, formula, OP_IMPLIES)) {
|
|
167
|
+
const premise = this.pull(args[0], negate(type), vars);
|
|
168
|
+
negate(type);
|
|
169
|
+
const conclusion = this.pull(args[1], type, vars);
|
|
170
|
+
return this.pin(manager.mkApp(OP_IMPLIES, [premise, conclusion], SORT_BOOL));
|
|
171
|
+
}
|
|
172
|
+
if (isAppOf(manager, formula, OP_ITE)) {
|
|
173
|
+
const [condition, thenExpr, elseExpr] = args;
|
|
174
|
+
const pulledThen = this.pull(thenExpr, type, vars);
|
|
175
|
+
const pulledElse = this.pull(elseExpr, type, vars);
|
|
176
|
+
if (!manager.hasQuantifierFlags[condition])
|
|
177
|
+
return this.pin(
|
|
178
|
+
manager.mkApp(OP_ITE, [condition, pulledThen, pulledElse], manager.sorts[formula]),
|
|
179
|
+
);
|
|
180
|
+
const pulledCondition = this.pull(condition, type, vars);
|
|
181
|
+
const pulledNegated = this.pull(mkNot(condition), type, vars);
|
|
182
|
+
return this.pin(
|
|
183
|
+
manager.mkAnd([mkOr(pulledNegated, pulledThen), mkOr(pulledCondition, pulledElse)]),
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
if (isAppOf(manager, formula, OP_EQ) && manager.sorts[args[0]] === SORT_BOOL) {
|
|
187
|
+
const pulled1 = this.pull(args[0], type, vars);
|
|
188
|
+
const pulled2 = this.pull(args[1], type, vars);
|
|
189
|
+
const negated1 = this.pull(mkNot(args[0]), type, vars);
|
|
190
|
+
const negated2 = this.pull(mkNot(args[1]), type, vars);
|
|
191
|
+
return this.pin(manager.mkAnd([mkOr(negated1, pulled2), mkOr(negated2, pulled1)]));
|
|
192
|
+
}
|
|
193
|
+
// The formula has a quantifier, but out of reach.
|
|
194
|
+
return formula;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
@@ -1,61 +1,36 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
|
|
4
|
-
// elimination and the simplifier's local_ctx option are not ported, as they change almost none of
|
|
5
|
-
// tlapm's obligations.
|
|
6
|
-
import { type AstManager, KIND_APP, KIND_QUANTIFIER } from "./ast";
|
|
1
|
+
// This strategy skips elim-uncnstr's elimination and the simplifier's local_ctx option, as they
|
|
2
|
+
// change almost none of tlapm's obligations.
|
|
3
|
+
import type { AstManager } from "./ast";
|
|
7
4
|
import { ctxSimplify } from "./ctx-simplify";
|
|
5
|
+
import { collectUnconstrained, disableQuantified } from "./elim-uncnstr";
|
|
8
6
|
import { Goal } from "./goal";
|
|
9
7
|
import { propagateValues } from "./propagate-values";
|
|
10
8
|
import { applyQeLite } from "./qe-lite";
|
|
11
|
-
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
9
|
+
import { Rewriter, type RewriterOptions, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
10
|
+
import { RefVector } from "./ref-vector";
|
|
12
11
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
13
12
|
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
export const simplifyGoal = (manager: AstManager, goal: Goal, options: RewriterOptions) => {
|
|
14
|
+
goal.depth++;
|
|
16
15
|
if (goal.isInconsistent) return;
|
|
17
|
-
const rewriter = new Rewriter(manager,
|
|
16
|
+
const rewriter = new Rewriter(manager, options);
|
|
18
17
|
const size = goal.forms.size;
|
|
19
18
|
let rewritten = -1;
|
|
20
19
|
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
21
20
|
const result = rewriter.rewrite(goal.forms.items[index]);
|
|
22
21
|
if (rewritten !== -1) manager.decRef(rewritten);
|
|
23
22
|
rewritten = result;
|
|
24
|
-
goal.update(index, rewritten);
|
|
23
|
+
goal.update(index, rewritten, goal.getDependency(index));
|
|
25
24
|
}
|
|
26
25
|
if (rewritten !== -1) manager.decRef(rewritten);
|
|
27
26
|
goal.elimRedundancies();
|
|
28
27
|
rewriter.release();
|
|
29
28
|
};
|
|
30
29
|
|
|
31
|
-
//
|
|
32
|
-
// a quantifier's patterns are not visited.
|
|
33
|
-
const hasUnconstrainedConst = (manager: AstManager, goal: Goal) => {
|
|
34
|
-
const visited = new Set<number>();
|
|
35
|
-
const consts: number[] = [];
|
|
36
|
-
const repeated = new Set<number>();
|
|
37
|
-
const todo = [...goal.forms.items];
|
|
38
|
-
while (todo.length > 0) {
|
|
39
|
-
const expr = todo.pop() as number;
|
|
40
|
-
const isConst = manager.isUninterpretedConst(expr);
|
|
41
|
-
if (visited.has(expr)) {
|
|
42
|
-
if (isConst) repeated.add(expr);
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
visited.add(expr);
|
|
46
|
-
if (isConst) consts.push(expr);
|
|
47
|
-
else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
48
|
-
else if (manager.kinds[expr] === KIND_QUANTIFIER) todo.push(manager.getQuantifier(expr).body);
|
|
49
|
-
}
|
|
50
|
-
return consts.some((expr) => !repeated.has(expr));
|
|
51
|
-
};
|
|
52
|
-
|
|
53
|
-
// elim_uncnstr_tactic::run without the elimination. Its rewriter still runs over the formulas when
|
|
54
|
-
// some constant is unconstrained, and counts its steps. The rewriter starts as if the formulas had
|
|
55
|
-
// changed, so it makes a second round.
|
|
30
|
+
// Z3's elim_uncnstr rewriter runs twice over the formulas and counts its steps, though the elimination is not ported.
|
|
56
31
|
const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
57
|
-
const isRewriting =
|
|
58
|
-
|
|
32
|
+
const isRewriting = collectUnconstrained(manager, goal).size > 0;
|
|
33
|
+
disableQuantified(manager, goal, new RefVector(manager));
|
|
59
34
|
if (!isRewriting) return;
|
|
60
35
|
const rewriter = new RewriterTpl(manager);
|
|
61
36
|
for (let round = 0; round < 2; round++) {
|
|
@@ -65,48 +40,16 @@ const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
|
65
40
|
rewriter.release();
|
|
66
41
|
};
|
|
67
42
|
|
|
68
|
-
// elim_uncnstr_tactic::disable_quantified: the tactic holds the body of each quantifier until it is
|
|
69
|
-
// destroyed after the search.
|
|
70
|
-
const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
|
|
71
|
-
const visited = new Set<number>();
|
|
72
|
-
const disabled = new Set<number>();
|
|
73
|
-
const disable = (body: number) => {
|
|
74
|
-
if (disabled.has(body)) return;
|
|
75
|
-
manager.incRef(body);
|
|
76
|
-
const todo = [body];
|
|
77
|
-
while (todo.length > 0) {
|
|
78
|
-
const expr = todo.pop() as number;
|
|
79
|
-
if (disabled.has(expr)) continue;
|
|
80
|
-
disabled.add(expr);
|
|
81
|
-
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
82
|
-
}
|
|
83
|
-
};
|
|
84
|
-
const todo = [...goal.forms.items];
|
|
85
|
-
while (todo.length > 0) {
|
|
86
|
-
const expr = todo.pop() as number;
|
|
87
|
-
if (visited.has(expr)) continue;
|
|
88
|
-
visited.add(expr);
|
|
89
|
-
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
90
|
-
const body = manager.getQuantifier(expr).body;
|
|
91
|
-
disable(body);
|
|
92
|
-
todo.push(body);
|
|
93
|
-
} else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
|
|
97
|
-
// mk_ufnia_tactic, up to the SMT kernel: mk_quant_preprocessor without solve-eqs, then qe-lite.
|
|
98
43
|
export const applyUfniaTactic = (manager: AstManager, assertions: number[]) => {
|
|
99
44
|
const goal = new Goal(manager);
|
|
100
45
|
for (const assertion of assertions) goal.assert(assertion);
|
|
101
|
-
|
|
102
|
-
// and_then runs the next tactic only on a goal that is not decided: one that is consistent and
|
|
103
|
-
// has formulas left.
|
|
46
|
+
simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS);
|
|
104
47
|
const steps = [
|
|
105
48
|
() => propagateValues(manager, goal),
|
|
106
|
-
() => ctxSimplify(manager, goal),
|
|
107
|
-
() =>
|
|
49
|
+
() => ctxSimplify(manager, goal, 30, 5000000),
|
|
50
|
+
() => simplifyGoal(manager, goal, { ...TACTIC_REWRITER_OPTIONS, isPullingCheapIte: true }),
|
|
108
51
|
() => elimUncnstr(manager, goal),
|
|
109
|
-
() =>
|
|
52
|
+
() => simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS),
|
|
110
53
|
() => applyQeLite(manager, goal),
|
|
111
54
|
];
|
|
112
55
|
for (const step of steps) {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. The quantifier analyzer of the model finder, which collects how the
|
|
3
|
-
// variables of each quantifier occur, and the quantifier info where it records what it learns.
|
|
4
1
|
import {
|
|
5
2
|
KIND_APP,
|
|
6
3
|
KIND_VAR,
|
|
@@ -25,11 +22,6 @@ import { Rational } from "./rational";
|
|
|
25
22
|
import { Rewriter } from "./rewriter";
|
|
26
23
|
import { AufSolver, type Evaluate, InstantiationSet, Node } from "./auf-solver";
|
|
27
24
|
|
|
28
|
-
// smt_params' mbqi_force_template: macros of quantifiers with at least this weight are used even
|
|
29
|
-
// in the AUF fragment.
|
|
30
|
-
export const MBQI_FORCE_TEMPLATE = 10;
|
|
31
|
-
|
|
32
|
-
// qinfo: a bit of information about how a variable occurs in a quantifier.
|
|
33
25
|
type QInfo =
|
|
34
26
|
| { kind: "f_var"; decl: number; argIndex: number; varIndex: number }
|
|
35
27
|
| { kind: "f_var_plus_offset"; decl: number; argIndex: number; varIndex: number; offset: number }
|
|
@@ -42,31 +34,29 @@ const isSameQInfo = (first: QInfo, second: QInfo) =>
|
|
|
42
34
|
const mkVarPair = (kind: "x_eq_y" | "x_neq_y" | "x_leq_y", first: number, second: number): QInfo =>
|
|
43
35
|
first > second ? { kind, first: second, second: first } : { kind, first, second };
|
|
44
36
|
|
|
45
|
-
// quantifier_info: what the analyzer learned about one quantifier.
|
|
46
37
|
export class QuantifierInfo {
|
|
38
|
+
private manager: AstManager;
|
|
47
39
|
readonly flatQ: number;
|
|
48
40
|
qinfos: QInfo[] = [];
|
|
49
41
|
isAuf = true;
|
|
50
|
-
hasXEqY = false;
|
|
51
42
|
readonly ngDecls = new Set<number>();
|
|
52
43
|
theOne: number | null = null;
|
|
53
44
|
private uvarInstSets: (InstantiationSet | null)[] | null = null;
|
|
54
45
|
readonly condMacros;
|
|
55
46
|
|
|
56
47
|
constructor(
|
|
57
|
-
private manager: AstManager,
|
|
58
48
|
private context: Context,
|
|
59
49
|
readonly quantifier: number,
|
|
60
50
|
macroRewriter: Rewriter,
|
|
61
51
|
) {
|
|
62
|
-
|
|
52
|
+
const manager = context.manager;
|
|
53
|
+
this.manager = manager;
|
|
63
54
|
const isNested = manager.hasQuantifierFlags[manager.getQuantifier(quantifier).body];
|
|
64
55
|
this.flatQ = isNested ? pullQuant(manager, quantifier) : quantifier;
|
|
65
56
|
if (!isNested) manager.incRef(quantifier);
|
|
66
57
|
this.condMacros = collectMacroCandidates(manager, macroRewriter, this.flatQ);
|
|
67
58
|
}
|
|
68
59
|
|
|
69
|
-
// ~quantifier_info: the conditional macros go before the flat quantifier.
|
|
70
60
|
release() {
|
|
71
61
|
releaseCondMacros(this.manager, this.condMacros);
|
|
72
62
|
this.manager.decRef(this.flatQ);
|
|
@@ -141,7 +131,6 @@ export class QuantifierInfo {
|
|
|
141
131
|
const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
|
|
142
132
|
const sJ = solver.getUvar(flatQ, info.varIndex).getRoot();
|
|
143
133
|
if (aFI === sJ) {
|
|
144
|
-
// There is no finite fixpoint, so the arguments minus the offset join the set.
|
|
145
134
|
for (const enode of context.enodesOf(info.decl))
|
|
146
135
|
if (context.isRelevant(enode.owner)) {
|
|
147
136
|
const arg = enode.getArg(info.argIndex);
|
|
@@ -161,7 +150,6 @@ export class QuantifierInfo {
|
|
|
161
150
|
case "x_eq_t": {
|
|
162
151
|
const sort = sorts[sorts.length - info.varIndex - 1];
|
|
163
152
|
if (manager.isUninterpretedSort(sort)) {
|
|
164
|
-
// Every term of the sort joins the set, see Section 4.1 of the paper.
|
|
165
153
|
const node = solver.getUvar(flatQ, info.varIndex);
|
|
166
154
|
for (const enode of context.enodes)
|
|
167
155
|
if (context.isRelevant(enode.owner) && manager.sorts[enode.owner] === sort)
|
|
@@ -177,7 +165,6 @@ export class QuantifierInfo {
|
|
|
177
165
|
break;
|
|
178
166
|
}
|
|
179
167
|
}
|
|
180
|
-
// The second pass for the offsets: A_f_i - k is in S_j and S_j + k is in A_f_i.
|
|
181
168
|
for (const info of this.qinfos) {
|
|
182
169
|
if (info.kind !== "f_var_plus_offset") continue;
|
|
183
170
|
const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
|
|
@@ -197,7 +184,6 @@ export class QuantifierInfo {
|
|
|
197
184
|
);
|
|
198
185
|
}
|
|
199
186
|
|
|
200
|
-
// populate_macro_based_inst_sets: the sets of a quantifier that a macro satisfies.
|
|
201
187
|
getMacroBasedInstSet(varIndex: number, evaluate: Evaluate) {
|
|
202
188
|
const theOne = this.theOne;
|
|
203
189
|
if (theOne === null) return null;
|
|
@@ -227,8 +213,6 @@ export class QuantifierInfo {
|
|
|
227
213
|
|
|
228
214
|
type Polarity = "pos" | "neg";
|
|
229
215
|
|
|
230
|
-
// quantifier_analyzer.
|
|
231
|
-
// One analyzer runs per quantifier and records what it learns in the quantifier's info.
|
|
232
216
|
export class QuantifierAnalyzer {
|
|
233
217
|
private posCache = new Set<number>();
|
|
234
218
|
private negCache = new Set<number>();
|
|
@@ -241,18 +225,13 @@ export class QuantifierAnalyzer {
|
|
|
241
225
|
private info: QuantifierInfo,
|
|
242
226
|
) {}
|
|
243
227
|
|
|
244
|
-
private isGround(expr: number) {
|
|
245
|
-
return this.manager.isGround(expr);
|
|
246
|
-
}
|
|
247
|
-
|
|
248
228
|
private isVar(expr: number) {
|
|
249
229
|
return this.manager.kinds[expr] === KIND_VAR;
|
|
250
230
|
}
|
|
251
231
|
|
|
252
|
-
// poly_rewriter::is_var_plus_ground.
|
|
253
232
|
private isVarPlusGround(expr: number) {
|
|
254
233
|
const manager = this.manager;
|
|
255
|
-
if (manager.getOp(expr) !== OP_ADD ||
|
|
234
|
+
if (manager.getOp(expr) !== OP_ADD || manager.isGroundApp(expr)) return undefined;
|
|
256
235
|
const args: number[] = [];
|
|
257
236
|
let variable: number | undefined;
|
|
258
237
|
let isInverted = false;
|
|
@@ -267,7 +246,7 @@ export class QuantifierAnalyzer {
|
|
|
267
246
|
isStopped = true;
|
|
268
247
|
}
|
|
269
248
|
const negated = this.manager.getTimesMinusOneArg(arg);
|
|
270
|
-
if (this.
|
|
249
|
+
if (this.manager.isGroundApp(arg)) args.push(arg);
|
|
271
250
|
else if (this.isVar(arg)) {
|
|
272
251
|
if (variable !== undefined) return undefined;
|
|
273
252
|
variable = arg;
|
|
@@ -282,31 +261,31 @@ export class QuantifierAnalyzer {
|
|
|
282
261
|
return { variable, term, isInverted };
|
|
283
262
|
}
|
|
284
263
|
|
|
285
|
-
private mkSub(first: number, second: number) {
|
|
286
|
-
return this.rewriter.mkSub(first, second);
|
|
287
|
-
}
|
|
288
|
-
|
|
289
264
|
private mkAdd(first: number, second: number) {
|
|
290
265
|
return this.rewriter.mkAdd([first, second]);
|
|
291
266
|
}
|
|
292
267
|
|
|
293
268
|
private isVarAndGround(lhs: number, rhs: number) {
|
|
294
|
-
if (this.isVar(lhs) && this.
|
|
269
|
+
if (this.isVar(lhs) && this.manager.isGroundApp(rhs))
|
|
295
270
|
return { variable: lhs, term: rhs, isInverted: false };
|
|
296
|
-
if (this.isVar(rhs) && this.
|
|
271
|
+
if (this.isVar(rhs) && this.manager.isGroundApp(lhs))
|
|
297
272
|
return { variable: rhs, term: lhs, isInverted: false };
|
|
298
273
|
const left = this.isVarPlusGround(lhs);
|
|
299
|
-
if (left !== undefined && this.
|
|
274
|
+
if (left !== undefined && this.manager.isGroundApp(rhs))
|
|
300
275
|
return {
|
|
301
276
|
variable: left.variable,
|
|
302
|
-
term: left.isInverted
|
|
277
|
+
term: left.isInverted
|
|
278
|
+
? this.rewriter.mkSub(left.term, rhs)
|
|
279
|
+
: this.rewriter.mkSub(rhs, left.term),
|
|
303
280
|
isInverted: left.isInverted,
|
|
304
281
|
};
|
|
305
282
|
const right = this.isVarPlusGround(rhs);
|
|
306
|
-
if (right !== undefined && this.
|
|
283
|
+
if (right !== undefined && this.manager.isGroundApp(lhs))
|
|
307
284
|
return {
|
|
308
285
|
variable: right.variable,
|
|
309
|
-
term: right.isInverted
|
|
286
|
+
term: right.isInverted
|
|
287
|
+
? this.rewriter.mkSub(right.term, lhs)
|
|
288
|
+
: this.rewriter.mkSub(lhs, right.term),
|
|
310
289
|
isInverted: right.isInverted,
|
|
311
290
|
};
|
|
312
291
|
return undefined;
|
|
@@ -352,12 +331,12 @@ export class QuantifierAnalyzer {
|
|
|
352
331
|
const one = manager.mkNumeralOfSort(Rational.one, manager.sorts[found.term]);
|
|
353
332
|
return {
|
|
354
333
|
variable: found.variable,
|
|
355
|
-
term: isLe ? this.mkAdd(found.term, one) : this.mkSub(found.term, one),
|
|
334
|
+
term: isLe ? this.mkAdd(found.term, one) : this.rewriter.mkSub(found.term, one),
|
|
356
335
|
};
|
|
357
336
|
}
|
|
358
337
|
|
|
359
338
|
private visitFormula(expr: number, polarity: Polarity) {
|
|
360
|
-
if (this.
|
|
339
|
+
if (this.manager.isGroundApp(expr)) return;
|
|
361
340
|
const cache = polarity === "pos" ? this.posCache : this.negCache;
|
|
362
341
|
if (cache.has(expr)) return;
|
|
363
342
|
this.ftodo.push([expr, polarity]);
|
|
@@ -365,7 +344,7 @@ export class QuantifierAnalyzer {
|
|
|
365
344
|
}
|
|
366
345
|
|
|
367
346
|
private visitTerm(expr: number) {
|
|
368
|
-
if (this.
|
|
347
|
+
if (this.manager.isGroundApp(expr) || this.posCache.has(expr)) return;
|
|
369
348
|
this.ttodo.push(expr);
|
|
370
349
|
this.posCache.add(expr);
|
|
371
350
|
}
|
|
@@ -446,12 +425,13 @@ export class QuantifierAnalyzer {
|
|
|
446
425
|
? this.isVarAndVar(manager.getArg(atom, 0), manager.getArg(atom, 1))
|
|
447
426
|
: undefined;
|
|
448
427
|
if (xEqY !== undefined) {
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
428
|
+
info.insertQInfo(
|
|
429
|
+
mkVarPair(
|
|
430
|
+
isNegated ? "x_neq_y" : "x_eq_y",
|
|
431
|
+
manager.values[xEqY[0]],
|
|
432
|
+
manager.values[xEqY[1]],
|
|
433
|
+
),
|
|
434
|
+
);
|
|
455
435
|
return;
|
|
456
436
|
}
|
|
457
437
|
const xLeY =
|
|
@@ -532,7 +512,6 @@ export class QuantifierAnalyzer {
|
|
|
532
512
|
}
|
|
533
513
|
}
|
|
534
514
|
|
|
535
|
-
// is_clause: a disjunction of literals.
|
|
536
515
|
private isLiteral(expr: number) {
|
|
537
516
|
const manager = this.manager;
|
|
538
517
|
const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
|
|
@@ -551,7 +530,7 @@ export class QuantifierAnalyzer {
|
|
|
551
530
|
for (const literal of literals) {
|
|
552
531
|
const isNegated = manager.isNot(literal);
|
|
553
532
|
const atom = isNegated ? manager.getArg(literal, 0) : literal;
|
|
554
|
-
if (!this.
|
|
533
|
+
if (!this.manager.isGroundApp(atom)) this.processLiteral(atom, isNegated);
|
|
555
534
|
}
|
|
556
535
|
} else this.visitFormula(body, "pos");
|
|
557
536
|
while (this.ftodo.length > 0 || this.ttodo.length > 0) {
|
|
@@ -1,19 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
// quantifier with only multi-patterns keeps one of them eager and sends the rest to a lazy matcher
|
|
4
|
-
// that runs in the final check. With MBQI, the model finder and the model checker turn candidate
|
|
5
|
-
// models into instances.
|
|
6
|
-
import {
|
|
7
|
-
CHECK_MODEL_RESTART,
|
|
8
|
-
CHECK_MODEL_SAT,
|
|
9
|
-
CHECK_MODEL_UNKNOWN,
|
|
10
|
-
FC_CONTINUE,
|
|
11
|
-
FC_DONE,
|
|
12
|
-
type Context,
|
|
13
|
-
} from "./context";
|
|
1
|
+
import { CHECK_MODEL_RESTART, CHECK_MODEL_SAT, CHECK_MODEL_UNKNOWN, type Context } from "./context";
|
|
2
|
+
import { FC_CONTINUE, FC_DONE } from "./theory";
|
|
14
3
|
import { Mam } from "./e-matching";
|
|
15
4
|
import type { Enode } from "./enode";
|
|
16
|
-
import { FingerprintSet } from "./fingerprints";
|
|
17
5
|
import { ModelChecker } from "./model-checker";
|
|
18
6
|
import { ModelFinder } from "./model-finder";
|
|
19
7
|
import type { ProtoModel } from "./proto-model";
|
|
@@ -22,8 +10,6 @@ import { QiQueue } from "./qi-queue";
|
|
|
22
10
|
const QI_MAX_EAGER_MULTIPATTERNS = 0;
|
|
23
11
|
const QI_MAX_LAZY_MULTIPATTERN_MATCHING = 2;
|
|
24
12
|
|
|
25
|
-
// Model-based quantifier instantiation: the finder completes candidate models, the checker refutes
|
|
26
|
-
// them with instances.
|
|
27
13
|
interface Mbqi {
|
|
28
14
|
finder: ModelFinder;
|
|
29
15
|
checker: ModelChecker;
|
|
@@ -35,23 +21,25 @@ export class DefaultQuantifierManager {
|
|
|
35
21
|
private qiQueue: QiQueue;
|
|
36
22
|
private mam: Mam;
|
|
37
23
|
private lazyMam: Mam;
|
|
38
|
-
private fingerprints: FingerprintSet;
|
|
39
24
|
private isActive = false;
|
|
40
25
|
private lazyMatchingIndex = 0;
|
|
41
26
|
private mbqi: Mbqi | null = null;
|
|
42
27
|
|
|
43
|
-
constructor(
|
|
44
|
-
private context: Context,
|
|
45
|
-
isMbqi: boolean,
|
|
46
|
-
) {
|
|
28
|
+
constructor(private context: Context) {
|
|
47
29
|
this.qiQueue = new QiQueue(context);
|
|
48
|
-
this.fingerprints = new FingerprintSet(context.manager);
|
|
49
30
|
const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
|
|
50
31
|
this.addInstance(quantifier, bindings, maxGeneration);
|
|
51
32
|
this.mam = new Mam(context, onMatch);
|
|
52
33
|
this.lazyMam = new Mam(context, onMatch);
|
|
53
|
-
|
|
54
|
-
|
|
34
|
+
this.updateParams();
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// As in Z3, smt.mbqi is read each time the model finder would run.
|
|
38
|
+
updateParams() {
|
|
39
|
+
const context = this.context;
|
|
40
|
+
if (!context.params.isMbqi || this.mbqi !== null) return;
|
|
41
|
+
const finder = new ModelFinder(context);
|
|
42
|
+
for (let level = 0; level < context.scopeLevel; level++) finder.pushScope();
|
|
55
43
|
this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
|
|
56
44
|
}
|
|
57
45
|
|
|
@@ -62,7 +50,7 @@ export class DefaultQuantifierManager {
|
|
|
62
50
|
add(quantifier: number, generation: number) {
|
|
63
51
|
this.quantifiers.push(quantifier);
|
|
64
52
|
this.generations.set(quantifier, generation);
|
|
65
|
-
this.mbqi?.finder.registerQuantifier(quantifier);
|
|
53
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.registerQuantifier(quantifier);
|
|
66
54
|
}
|
|
67
55
|
|
|
68
56
|
del(quantifier: number) {
|
|
@@ -96,7 +84,6 @@ export class DefaultQuantifierManager {
|
|
|
96
84
|
}
|
|
97
85
|
}
|
|
98
86
|
|
|
99
|
-
// is_shared: a ground term of a pattern, once a quantifier was asserted.
|
|
100
87
|
isShared(node: Enode) {
|
|
101
88
|
return this.isActive && (this.mam.isShared(node) || this.lazyMam.isShared(node));
|
|
102
89
|
}
|
|
@@ -116,7 +103,6 @@ export class DefaultQuantifierManager {
|
|
|
116
103
|
this.lazyMam.pushScope();
|
|
117
104
|
this.mbqi?.finder.pushScope();
|
|
118
105
|
this.qiQueue.push();
|
|
119
|
-
this.fingerprints.push();
|
|
120
106
|
}
|
|
121
107
|
|
|
122
108
|
pop(numScopes: number) {
|
|
@@ -124,7 +110,6 @@ export class DefaultQuantifierManager {
|
|
|
124
110
|
this.lazyMam.popScope(numScopes);
|
|
125
111
|
this.mbqi?.finder.popScope(numScopes);
|
|
126
112
|
this.qiQueue.pop(numScopes);
|
|
127
|
-
this.fingerprints.pop(numScopes);
|
|
128
113
|
}
|
|
129
114
|
|
|
130
115
|
canPropagate() {
|
|
@@ -138,7 +123,11 @@ export class DefaultQuantifierManager {
|
|
|
138
123
|
|
|
139
124
|
addInstance(quantifier: number, bindings: Enode[], maxGeneration: number) {
|
|
140
125
|
const generation = Math.max(maxGeneration, this.getGeneration(quantifier));
|
|
141
|
-
const roots = this.fingerprints.insert(
|
|
126
|
+
const roots = this.context.fingerprints.insert(
|
|
127
|
+
quantifier,
|
|
128
|
+
this.context.manager.ids[quantifier],
|
|
129
|
+
bindings,
|
|
130
|
+
);
|
|
142
131
|
if (roots !== null) this.qiQueue.insert(quantifier, roots, generation);
|
|
143
132
|
}
|
|
144
133
|
|
|
@@ -164,20 +153,21 @@ export class DefaultQuantifierManager {
|
|
|
164
153
|
}
|
|
165
154
|
|
|
166
155
|
restartEh() {
|
|
156
|
+
if (!this.context.params.isMbqi) return;
|
|
167
157
|
this.mbqi?.finder.restartEh();
|
|
168
158
|
this.mbqi?.checker.restartEh();
|
|
169
159
|
}
|
|
170
160
|
|
|
171
161
|
isModelBased() {
|
|
172
|
-
return this.
|
|
162
|
+
return this.context.params.isMbqi;
|
|
173
163
|
}
|
|
174
164
|
|
|
175
165
|
adjustModel(model: ProtoModel) {
|
|
176
|
-
this.mbqi?.finder.fixModel(model);
|
|
166
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.fixModel(model);
|
|
177
167
|
}
|
|
178
168
|
|
|
179
169
|
checkModel(model: ProtoModel, root2value: Map<Enode, number>) {
|
|
180
|
-
const checker = this.mbqi?.checker;
|
|
170
|
+
const checker = this.context.params.isMbqi ? this.mbqi?.checker : undefined;
|
|
181
171
|
if (this.quantifiers.length === 0) return CHECK_MODEL_SAT;
|
|
182
172
|
if (checker === undefined) return CHECK_MODEL_UNKNOWN;
|
|
183
173
|
if (checker.check(model, root2value)) return CHECK_MODEL_SAT;
|