tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- 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 +338 -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 +110 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- 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 +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -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 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -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 +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -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 +814 -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 +8 -23
- 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 +261 -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 +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +43 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -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 +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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
|
@@ -1,31 +1,19 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/rewriter.h, rewriter.cpp, rewriter_def.h), MIT license, see
|
|
2
|
-
// z3-license.txt. The main loop of Z3's rewriters, ported step for step with Z3's references: the
|
|
3
|
-
// result stack, the caches and m_r hold their expressions, so that expressions are created and
|
|
4
|
-
// deleted in Z3's order. A configuration overrides the hooks of default_rewriter_cfg.
|
|
5
1
|
import { ActCache } from "./act-cache";
|
|
6
2
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, OP_ITE, type AstManager } from "./ast";
|
|
7
3
|
import { grow, shrink } from "./array";
|
|
8
4
|
|
|
9
|
-
// A result that the main loop rewrites again to depth levels, like Z3's BR_REWRITE1 (depth 1) to
|
|
10
|
-
// BR_REWRITE_FULL (depth Infinity).
|
|
11
5
|
export interface Rewrite {
|
|
12
6
|
expr: number;
|
|
13
7
|
depth: number;
|
|
14
8
|
}
|
|
15
9
|
|
|
16
|
-
// The depth to rewrite a Rewrite's result to. A frame keeps its depth in two bits, where 3 is
|
|
17
|
-
// RW_UNBOUNDED_DEPTH, so BR_REWRITE3 rewrites the result without a bound.
|
|
18
10
|
export const getRewriteDepth = (rewrite: Rewrite) =>
|
|
19
11
|
rewrite.depth >= 3 ? Infinity : rewrite.depth;
|
|
20
12
|
|
|
21
|
-
// rewriter_tpl's frame states.
|
|
22
13
|
const PROCESS_CHILDREN = 0;
|
|
23
14
|
const REWRITE_BUILTIN = 1;
|
|
24
15
|
const EXPAND_DEF = 2;
|
|
25
16
|
|
|
26
|
-
// A rewrite still to finish: its expression, state, next child, the depth left to rewrite, where
|
|
27
|
-
// its children's results start on the result stack, whether to cache its result, and whether a
|
|
28
|
-
// child changed.
|
|
29
17
|
interface Frame {
|
|
30
18
|
curr: number;
|
|
31
19
|
state: number;
|
|
@@ -41,10 +29,7 @@ interface Scope {
|
|
|
41
29
|
numQvars: number;
|
|
42
30
|
}
|
|
43
31
|
|
|
44
|
-
// rewriter_core: the frames, the result stack and one cache per quantifier scope.
|
|
45
32
|
class RewriterCore {
|
|
46
|
-
// m_frame_stack: the first numFrames frames are open. Like the svector, the stack keeps the frames
|
|
47
|
-
// past them, which pushFrame writes over.
|
|
48
33
|
protected frames: Frame[] = [];
|
|
49
34
|
protected numFrames = 0;
|
|
50
35
|
protected resultStack: number[] = [];
|
|
@@ -61,7 +46,6 @@ class RewriterCore {
|
|
|
61
46
|
return this.caches[this.scopes.length];
|
|
62
47
|
}
|
|
63
48
|
|
|
64
|
-
// must_cache: the result of a shared application with arguments or quantifier.
|
|
65
49
|
protected isCaching(expr: number) {
|
|
66
50
|
const manager = this.manager;
|
|
67
51
|
return (
|
|
@@ -113,7 +97,6 @@ class RewriterCore {
|
|
|
113
97
|
this.numFrames++;
|
|
114
98
|
}
|
|
115
99
|
|
|
116
|
-
// begin_scope: each quantifier level gets its own cache, which starts empty.
|
|
117
100
|
protected beginScope() {
|
|
118
101
|
this.scopes.push({ root: this.root, numQvars: this.numQvars });
|
|
119
102
|
if (this.scopes.length === this.caches.length)
|
|
@@ -129,7 +112,6 @@ class RewriterCore {
|
|
|
129
112
|
this.numQvars = scope.numQvars;
|
|
130
113
|
}
|
|
131
114
|
|
|
132
|
-
// rewriter_core::reset: releases the outermost cache and the result stack.
|
|
133
115
|
protected resetCore() {
|
|
134
116
|
this.caches[0].reset();
|
|
135
117
|
this.numFrames = 0;
|
|
@@ -139,12 +121,10 @@ class RewriterCore {
|
|
|
139
121
|
this.scopes = [];
|
|
140
122
|
}
|
|
141
123
|
|
|
142
|
-
// del_cache_stack: releases every cache, the outermost first.
|
|
143
124
|
protected releaseCaches() {
|
|
144
125
|
for (const cache of this.caches) cache.reset();
|
|
145
126
|
}
|
|
146
127
|
|
|
147
|
-
// rewriter_core::cleanup.
|
|
148
128
|
protected cleanupCore() {
|
|
149
129
|
this.releaseCaches();
|
|
150
130
|
this.shrinkResults(0);
|
|
@@ -157,7 +137,6 @@ class RewriterCore {
|
|
|
157
137
|
}
|
|
158
138
|
}
|
|
159
139
|
|
|
160
|
-
// var_shifter_core: rebuilds an expression with its free variables renamed by processVar.
|
|
161
140
|
abstract class VarShifterCore extends RewriterCore {
|
|
162
141
|
protected abstract processVar(variable: number): void;
|
|
163
142
|
|
|
@@ -207,7 +186,7 @@ abstract class VarShifterCore extends RewriterCore {
|
|
|
207
186
|
this.numQvars += data.sorts.length;
|
|
208
187
|
this.root = data.body;
|
|
209
188
|
}
|
|
210
|
-
const children = [data.body, ...data.patterns];
|
|
189
|
+
const children = [data.body, ...data.patterns, ...data.noPatterns];
|
|
211
190
|
while (frame.childIndex < children.length) {
|
|
212
191
|
const child = children[frame.childIndex];
|
|
213
192
|
frame.childIndex++;
|
|
@@ -217,7 +196,11 @@ abstract class VarShifterCore extends RewriterCore {
|
|
|
217
196
|
? manager.mkQuantifier({
|
|
218
197
|
...data,
|
|
219
198
|
body: this.resultStack[frame.spos],
|
|
220
|
-
patterns: this.resultStack.slice(frame.spos + 1),
|
|
199
|
+
patterns: this.resultStack.slice(frame.spos + 1, frame.spos + 1 + data.patterns.length),
|
|
200
|
+
noPatterns: this.resultStack.slice(
|
|
201
|
+
frame.spos + 1 + data.patterns.length,
|
|
202
|
+
frame.spos + children.length,
|
|
203
|
+
),
|
|
221
204
|
})
|
|
222
205
|
: expr;
|
|
223
206
|
this.finish(expr, frame, result);
|
|
@@ -232,7 +215,6 @@ abstract class VarShifterCore extends RewriterCore {
|
|
|
232
215
|
this.setNewChildFlag(expr, result);
|
|
233
216
|
}
|
|
234
217
|
|
|
235
|
-
// main_loop: the result comes with a reference, which the caller releases.
|
|
236
218
|
protected mainLoop(expr: number) {
|
|
237
219
|
this.root = expr;
|
|
238
220
|
if (!this.visit(expr))
|
|
@@ -269,13 +251,11 @@ abstract class VarShifterCore extends RewriterCore {
|
|
|
269
251
|
}
|
|
270
252
|
}
|
|
271
253
|
|
|
272
|
-
// var_shifter: a free variable with index at least bound moves up by shift1, any other by shift2.
|
|
273
254
|
export class VarShifter extends VarShifterCore {
|
|
274
255
|
private bound = 0;
|
|
275
256
|
private shift1 = 0;
|
|
276
257
|
private shift2 = 0;
|
|
277
258
|
|
|
278
|
-
// Returns the result with a reference, which the caller releases.
|
|
279
259
|
shift(expr: number, bound: number, shift1: number, shift2: number) {
|
|
280
260
|
if (this.manager.isGroundApp(expr)) {
|
|
281
261
|
this.manager.incRef(expr);
|
|
@@ -301,11 +281,9 @@ export class VarShifter extends VarShifterCore {
|
|
|
301
281
|
}
|
|
302
282
|
}
|
|
303
283
|
|
|
304
|
-
// inv_var_shifter: the free variables move down by shift.
|
|
305
284
|
export class InvVarShifter extends VarShifterCore {
|
|
306
285
|
private amount = 0;
|
|
307
286
|
|
|
308
|
-
// Returns the result with a reference, which the caller releases.
|
|
309
287
|
shift(expr: number, amount: number) {
|
|
310
288
|
if (this.manager.isGroundApp(expr) || amount === 0) {
|
|
311
289
|
this.manager.incRef(expr);
|
|
@@ -328,14 +306,10 @@ export class InvVarShifter extends VarShifterCore {
|
|
|
328
306
|
}
|
|
329
307
|
}
|
|
330
308
|
|
|
331
|
-
// The bindings of rewriter_tpl's substitution.
|
|
332
309
|
class SubstCore extends RewriterCore {
|
|
333
|
-
// m_bindings and m_shifts: the binding of each variable of the substitution, innermost last, and
|
|
334
|
-
// the number of bindings when it was bound.
|
|
335
310
|
protected bindings: number[] = [];
|
|
336
311
|
protected shifts: number[] = [];
|
|
337
312
|
|
|
338
|
-
// set_inv_bindings: (:var i) becomes bindings[n - 1 - i], and -1 keeps it.
|
|
339
313
|
setInvBindings(bindings: number[]) {
|
|
340
314
|
shrink(this.bindings, 0);
|
|
341
315
|
shrink(this.shifts, 0);
|
|
@@ -345,7 +319,6 @@ class SubstCore extends RewriterCore {
|
|
|
345
319
|
}
|
|
346
320
|
}
|
|
347
321
|
|
|
348
|
-
// set_bindings: (:var i) becomes bindings[i].
|
|
349
322
|
setBindings(bindings: number[]) {
|
|
350
323
|
shrink(this.bindings, 0);
|
|
351
324
|
shrink(this.shifts, 0);
|
|
@@ -360,23 +333,19 @@ class SubstCore extends RewriterCore {
|
|
|
360
333
|
}
|
|
361
334
|
}
|
|
362
335
|
|
|
363
|
-
//
|
|
364
|
-
// rather than the base of the configurations, so that V8 sees one shape of it and keeps its property
|
|
365
|
-
// accesses and calls monomorphic.
|
|
336
|
+
// HACK: a class apart from the configurations' base, so that V8 sees one shape of it.
|
|
366
337
|
class RewriterEngine extends SubstCore {
|
|
367
|
-
// m_r: the last result, which Z3 holds until it assigns the next one.
|
|
368
338
|
private lastResult = -1;
|
|
369
339
|
private newArgs: number[] = [];
|
|
370
340
|
private shifter: VarShifter;
|
|
371
341
|
private invShifter: InvVarShifter;
|
|
372
|
-
// m_blocked: the constants that a nested rewriter does not expand.
|
|
373
342
|
blocked = new Set<number>();
|
|
374
|
-
// Whether the config overrides getSubst and getMacro. Otherwise nothing is substituted or expanded
|
|
375
|
-
// and the call is skipped.
|
|
376
343
|
private isSubstituting: boolean;
|
|
377
344
|
private isExpandingMacros: boolean;
|
|
378
|
-
|
|
379
|
-
|
|
345
|
+
private isCheckingSteps: boolean;
|
|
346
|
+
private isPreVisiting: boolean;
|
|
347
|
+
private isReducingVars: boolean;
|
|
348
|
+
// HACK: the hooks are read once, since a call through config at each site goes megamorphic in V8.
|
|
380
349
|
private reduceAppHook: RewriterTpl["reduceApp"];
|
|
381
350
|
private isFlatAssocHook: RewriterTpl["isFlatAssoc"];
|
|
382
351
|
private getMacroHook: RewriterTpl["getMacro"];
|
|
@@ -389,6 +358,9 @@ class RewriterEngine extends SubstCore {
|
|
|
389
358
|
super(manager);
|
|
390
359
|
this.isSubstituting = config.getSubst !== RewriterTpl.prototype.getSubst;
|
|
391
360
|
this.isExpandingMacros = config.getMacro !== RewriterTpl.prototype.getMacro;
|
|
361
|
+
this.isCheckingSteps = config.checkMaxSteps !== RewriterTpl.prototype.checkMaxSteps;
|
|
362
|
+
this.isPreVisiting = config.preVisit !== RewriterTpl.prototype.preVisit;
|
|
363
|
+
this.isReducingVars = config.reduceVar !== RewriterTpl.prototype.reduceVar;
|
|
392
364
|
this.reduceAppHook = config.reduceApp;
|
|
393
365
|
this.isFlatAssocHook = config.isFlatAssoc;
|
|
394
366
|
this.getMacroHook = config.getMacro;
|
|
@@ -397,7 +369,6 @@ class RewriterEngine extends SubstCore {
|
|
|
397
369
|
this.invShifter = new InvVarShifter(manager);
|
|
398
370
|
}
|
|
399
371
|
|
|
400
|
-
// reset: releases the outermost cache and the bindings.
|
|
401
372
|
reset() {
|
|
402
373
|
this.resetCore();
|
|
403
374
|
shrink(this.bindings, 0);
|
|
@@ -406,7 +377,6 @@ class RewriterEngine extends SubstCore {
|
|
|
406
377
|
this.invShifter.reset();
|
|
407
378
|
}
|
|
408
379
|
|
|
409
|
-
// cleanup: releases every cache.
|
|
410
380
|
cleanup() {
|
|
411
381
|
this.cleanupCore();
|
|
412
382
|
this.bindings = [];
|
|
@@ -415,15 +385,13 @@ class RewriterEngine extends SubstCore {
|
|
|
415
385
|
this.shifts = [];
|
|
416
386
|
}
|
|
417
387
|
|
|
418
|
-
// ~rewriter_tpl: the shifters' caches go first, the inverse shifter's before the other's, then
|
|
419
|
-
// the rewriter's.
|
|
420
388
|
release() {
|
|
389
|
+
this.setLastResult(-1);
|
|
421
390
|
this.invShifter.release();
|
|
422
391
|
this.shifter.release();
|
|
423
392
|
this.releaseCaches();
|
|
424
393
|
}
|
|
425
394
|
|
|
426
|
-
// operator(): the result comes with a reference, which the caller releases.
|
|
427
395
|
rewrite(expr: number): number {
|
|
428
396
|
const manager = this.manager;
|
|
429
397
|
return manager.withoutTemporaries(() => {
|
|
@@ -435,12 +403,11 @@ class RewriterEngine extends SubstCore {
|
|
|
435
403
|
}
|
|
436
404
|
this.root = expr;
|
|
437
405
|
this.numQvars = 0;
|
|
438
|
-
// main_loop and each step of resume_core count a step of the resource limit, and throw
|
|
439
|
-
// SmtCanceledError when it cancels the rewrite.
|
|
440
406
|
manager.limit.checkpoint();
|
|
441
407
|
if (!this.visit(expr, Infinity))
|
|
442
408
|
while (this.numFrames > 0) {
|
|
443
409
|
manager.limit.checkpoint();
|
|
410
|
+
if (this.isCheckingSteps) this.config.checkMaxSteps();
|
|
444
411
|
const frame = this.frames[this.numFrames - 1];
|
|
445
412
|
const curr = frame.curr;
|
|
446
413
|
if (frame.childIndex === 0 && frame.state === PROCESS_CHILDREN && frame.isCaching) {
|
|
@@ -456,7 +423,6 @@ class RewriterEngine extends SubstCore {
|
|
|
456
423
|
if (kind === KIND_APP) this.processApp(curr, frame);
|
|
457
424
|
else if (kind === KIND_QUANTIFIER) this.processQuantifier(curr, frame);
|
|
458
425
|
else {
|
|
459
|
-
// A definition that is a variable gets a frame of its own.
|
|
460
426
|
this.numFrames--;
|
|
461
427
|
this.processVar(curr);
|
|
462
428
|
}
|
|
@@ -467,13 +433,6 @@ class RewriterEngine extends SubstCore {
|
|
|
467
433
|
});
|
|
468
434
|
}
|
|
469
435
|
|
|
470
|
-
// operator() with bindings: resets the rewriter and substitutes bindings[n - 1 - i] for (:var i).
|
|
471
|
-
rewriteWithBindings(expr: number, bindings: number[]) {
|
|
472
|
-
this.reset();
|
|
473
|
-
this.setInvBindings(bindings);
|
|
474
|
-
return this.rewrite(expr);
|
|
475
|
-
}
|
|
476
|
-
|
|
477
436
|
setLastResult(expr: number) {
|
|
478
437
|
if (expr !== -1) this.manager.incRef(expr);
|
|
479
438
|
if (this.lastResult !== -1) this.manager.decRef(this.lastResult);
|
|
@@ -484,8 +443,6 @@ class RewriterEngine extends SubstCore {
|
|
|
484
443
|
if (isCaching) this.cache.insert(expr, 0, result);
|
|
485
444
|
}
|
|
486
445
|
|
|
487
|
-
// visit: whether expr is rewritten and its result is on the result stack. Otherwise it pushes a
|
|
488
|
-
// frame for expr.
|
|
489
446
|
private visit(expr: number, maxDepth: number) {
|
|
490
447
|
const manager = this.manager;
|
|
491
448
|
const replacement = this.isSubstituting ? this.getSubstHook.call(this.config, expr) : undefined;
|
|
@@ -507,6 +464,10 @@ class RewriterEngine extends SubstCore {
|
|
|
507
464
|
return true;
|
|
508
465
|
}
|
|
509
466
|
}
|
|
467
|
+
if (this.isPreVisiting && !this.config.preVisit(expr)) {
|
|
468
|
+
this.pushResult(expr);
|
|
469
|
+
return true;
|
|
470
|
+
}
|
|
510
471
|
const kind = manager.kinds[expr];
|
|
511
472
|
if (kind === KIND_VAR) {
|
|
512
473
|
this.processVar(expr);
|
|
@@ -520,9 +481,6 @@ class RewriterEngine extends SubstCore {
|
|
|
520
481
|
return false;
|
|
521
482
|
}
|
|
522
483
|
|
|
523
|
-
// process_const: a constant is reduced, and a constant it rewrites to is reduced again. It
|
|
524
|
-
// returns false when the constant rewrites to a term with arguments, which m_r holds. The constant
|
|
525
|
-
// being reduced is held, like Z3's t.
|
|
526
484
|
private processConst(expr: number) {
|
|
527
485
|
const manager = this.manager;
|
|
528
486
|
let current = expr;
|
|
@@ -563,9 +521,6 @@ class RewriterEngine extends SubstCore {
|
|
|
563
521
|
}
|
|
564
522
|
}
|
|
565
523
|
|
|
566
|
-
// A constant that rewrites to a term with arguments: a rewriter with the same configuration
|
|
567
|
-
// rewrites the term, with the constant blocked so that it is not expanded again. m_r keeps the
|
|
568
|
-
// result.
|
|
569
524
|
private rewriteConstResult(expr: number) {
|
|
570
525
|
const manager = this.manager;
|
|
571
526
|
if (!this.blocked.has(expr)) {
|
|
@@ -581,10 +536,15 @@ class RewriterEngine extends SubstCore {
|
|
|
581
536
|
this.pushResult(this.lastResult);
|
|
582
537
|
}
|
|
583
538
|
|
|
584
|
-
// process_var: a bound variable becomes its binding, shifted over the quantifiers entered since
|
|
585
|
-
// it was bound.
|
|
586
539
|
private processVar(variable: number) {
|
|
587
540
|
const manager = this.manager;
|
|
541
|
+
const reduced = this.isReducingVars ? this.config.reduceVar(variable) : -1;
|
|
542
|
+
if (reduced !== -1) {
|
|
543
|
+
this.pushResult(reduced);
|
|
544
|
+
manager.decRef(reduced);
|
|
545
|
+
this.setNewChildFlag(variable, -1);
|
|
546
|
+
return;
|
|
547
|
+
}
|
|
588
548
|
const index = manager.values[variable];
|
|
589
549
|
const position = this.bindings.length - index - 1;
|
|
590
550
|
const binding = index < this.bindings.length ? this.bindings[position] : -1;
|
|
@@ -618,7 +578,6 @@ class RewriterEngine extends SubstCore {
|
|
|
618
578
|
return;
|
|
619
579
|
}
|
|
620
580
|
const numArgs = manager.getNumArgs(expr);
|
|
621
|
-
// visit pushes a child at depth 0 as it is when the config substitutes nothing.
|
|
622
581
|
if (frame.maxDepth === 0 && !this.isSubstituting && manager.getOp(expr) !== OP_ITE)
|
|
623
582
|
for (; frame.childIndex < numArgs; frame.childIndex++)
|
|
624
583
|
this.pushResult(manager.getArg(expr, frame.childIndex));
|
|
@@ -645,8 +604,6 @@ class RewriterEngine extends SubstCore {
|
|
|
645
604
|
return;
|
|
646
605
|
}
|
|
647
606
|
}
|
|
648
|
-
// new_args: Z3 passes the results on the stack itself. Nothing rewrites with this engine before
|
|
649
|
-
// the arguments are used, so one buffer holds them.
|
|
650
607
|
const newArgs = this.newArgs;
|
|
651
608
|
const resultStack = this.resultStack;
|
|
652
609
|
shrink(newArgs, 0);
|
|
@@ -654,7 +611,6 @@ class RewriterEngine extends SubstCore {
|
|
|
654
611
|
newArgs.push(resultStack[index]);
|
|
655
612
|
const reduced = this.reduceAppHook.call(this.config, decl, newArgs, manager.sorts[expr]);
|
|
656
613
|
if (typeof reduced !== "number") {
|
|
657
|
-
// BR_REWRITE: the result replaces the arguments and is rewritten to the depth it asks for.
|
|
658
614
|
this.setLastResult(reduced.expr);
|
|
659
615
|
manager.decRef(reduced.expr);
|
|
660
616
|
this.shrinkResults(frame.spos);
|
|
@@ -668,7 +624,6 @@ class RewriterEngine extends SubstCore {
|
|
|
668
624
|
const definition =
|
|
669
625
|
reduced === -1 && this.isExpandingMacros ? this.getMacroHook.call(this.config, decl) : -1;
|
|
670
626
|
if (definition !== -1 && (!manager.isGroundApp(definition) || this.config.isReducingMacro())) {
|
|
671
|
-
// The definition is rewritten with the arguments bound to its variables.
|
|
672
627
|
frame.state = EXPAND_DEF;
|
|
673
628
|
const size = this.bindings.length;
|
|
674
629
|
for (let index = newArgs.length - 1; index >= 0; index--) {
|
|
@@ -700,7 +655,6 @@ class RewriterEngine extends SubstCore {
|
|
|
700
655
|
this.setLastResult(-1);
|
|
701
656
|
}
|
|
702
657
|
|
|
703
|
-
// REWRITE_BUILTIN: the result of the rewritten term replaces the term on the result stack.
|
|
704
658
|
private finishRewriteBuiltin(expr: number, frame: Frame) {
|
|
705
659
|
const result = this.resultStack[this.resultStack.length - 1];
|
|
706
660
|
this.setLastResult(result);
|
|
@@ -712,8 +666,6 @@ class RewriterEngine extends SubstCore {
|
|
|
712
666
|
this.setNewChildFlag(expr, -1);
|
|
713
667
|
}
|
|
714
668
|
|
|
715
|
-
// EXPAND_DEF: the rewritten definition, with its variables moved back down, replaces the term.
|
|
716
|
-
// m_r keeps it until the next result.
|
|
717
669
|
private finishExpandDef(expr: number, frame: Frame) {
|
|
718
670
|
const manager = this.manager;
|
|
719
671
|
const numArgs = manager.getNumArgs(expr);
|
|
@@ -736,7 +688,6 @@ class RewriterEngine extends SubstCore {
|
|
|
736
688
|
this.setNewChildFlag(expr, -1);
|
|
737
689
|
}
|
|
738
690
|
|
|
739
|
-
// constant_fold: an ite whose condition rewrote to true or false becomes the chosen branch.
|
|
740
691
|
private isConstantFolded(expr: number, frame: Frame) {
|
|
741
692
|
const manager = this.manager;
|
|
742
693
|
if (frame.childIndex !== 1 || manager.getOp(expr) !== OP_ITE) return false;
|
|
@@ -770,20 +721,24 @@ class RewriterEngine extends SubstCore {
|
|
|
770
721
|
this.numQvars += numDecls;
|
|
771
722
|
}
|
|
772
723
|
const isRewritingPatterns = this.config.isRewritingPatterns();
|
|
773
|
-
const children = isRewritingPatterns
|
|
724
|
+
const children = isRewritingPatterns
|
|
725
|
+
? [data.body, ...data.patterns, ...data.noPatterns]
|
|
726
|
+
: [data.body];
|
|
774
727
|
while (frame.childIndex < children.length) {
|
|
775
728
|
const child = children[frame.childIndex];
|
|
776
729
|
frame.childIndex++;
|
|
777
730
|
if (!this.visit(child, frame.maxDepth)) return;
|
|
778
731
|
}
|
|
779
732
|
const body = this.resultStack[frame.spos];
|
|
780
|
-
|
|
781
|
-
|
|
733
|
+
const patterns = isRewritingPatterns
|
|
734
|
+
? this.resultStack.slice(frame.spos + 1, frame.spos + 1 + data.patterns.length)
|
|
735
|
+
: data.patterns;
|
|
782
736
|
for (const pattern of patterns) manager.incRef(pattern);
|
|
783
737
|
const reduced = this.config.reduceQuantifier(expr, body, patterns);
|
|
738
|
+
const noPatterns = isRewritingPatterns ? [] : data.noPatterns;
|
|
784
739
|
if (reduced === -1)
|
|
785
740
|
this.setLastResult(
|
|
786
|
-
frame.hasNewChild ? manager.mkQuantifier({ ...data, body, patterns }) : expr,
|
|
741
|
+
frame.hasNewChild ? manager.mkQuantifier({ ...data, body, patterns, noPatterns }) : expr,
|
|
787
742
|
);
|
|
788
743
|
else {
|
|
789
744
|
this.setLastResult(reduced);
|
|
@@ -803,9 +758,6 @@ class RewriterEngine extends SubstCore {
|
|
|
803
758
|
}
|
|
804
759
|
}
|
|
805
760
|
|
|
806
|
-
// rewriter_tpl with default_rewriter_cfg. A configuration overrides the hooks. The results of
|
|
807
|
-
// reduceApp and reduceQuantifier come with a reference, and -1 is Z3's BR_FAILED or false. A
|
|
808
|
-
// Rewrite from reduceApp is rewritten again.
|
|
809
761
|
export class RewriterTpl {
|
|
810
762
|
readonly engine: RewriterEngine;
|
|
811
763
|
|
|
@@ -825,16 +777,21 @@ export class RewriterTpl {
|
|
|
825
777
|
return undefined;
|
|
826
778
|
}
|
|
827
779
|
|
|
780
|
+
preVisit(_expr: number) {
|
|
781
|
+
return true;
|
|
782
|
+
}
|
|
783
|
+
|
|
828
784
|
reduceApp(_decl: number, _args: number[], _sort: number): number | Rewrite {
|
|
829
785
|
return -1;
|
|
830
786
|
}
|
|
831
787
|
|
|
832
|
-
//
|
|
788
|
+
// check_max_steps: Z3 asks the config at each step, which may count a step of the resource limit.
|
|
789
|
+
checkMaxSteps() {}
|
|
790
|
+
|
|
833
791
|
getMacro(_decl: number) {
|
|
834
792
|
return -1;
|
|
835
793
|
}
|
|
836
794
|
|
|
837
|
-
// reduce_macro: whether a ground definition is rewritten rather than taken as it is.
|
|
838
795
|
isReducingMacro() {
|
|
839
796
|
return false;
|
|
840
797
|
}
|
|
@@ -843,21 +800,12 @@ export class RewriterTpl {
|
|
|
843
800
|
return -1;
|
|
844
801
|
}
|
|
845
802
|
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
return new RewriterTpl(this.manager);
|
|
849
|
-
}
|
|
850
|
-
|
|
851
|
-
setInvBindings(bindings: number[]) {
|
|
852
|
-
this.engine.setInvBindings(bindings);
|
|
853
|
-
}
|
|
854
|
-
|
|
855
|
-
setBindings(bindings: number[]) {
|
|
856
|
-
this.engine.setBindings(bindings);
|
|
803
|
+
reduceVar(_variable: number) {
|
|
804
|
+
return -1;
|
|
857
805
|
}
|
|
858
806
|
|
|
859
|
-
|
|
860
|
-
this.
|
|
807
|
+
mkNested(): RewriterTpl {
|
|
808
|
+
return new RewriterTpl(this.manager);
|
|
861
809
|
}
|
|
862
810
|
|
|
863
811
|
reset() {
|
|
@@ -876,30 +824,18 @@ export class RewriterTpl {
|
|
|
876
824
|
return this.engine.rewrite(expr);
|
|
877
825
|
}
|
|
878
826
|
|
|
879
|
-
rewriteWithBindings(expr: number, bindings: number[]) {
|
|
880
|
-
return this.engine.rewriteWithBindings(expr, bindings);
|
|
881
|
-
}
|
|
882
|
-
|
|
883
827
|
protected setLastResult(expr: number) {
|
|
884
828
|
this.engine.setLastResult(expr);
|
|
885
829
|
}
|
|
886
830
|
}
|
|
887
831
|
|
|
888
|
-
// The flags of a BetaReducer frame: whether to cache its result, whether a child changed, and
|
|
889
|
-
// whether it waits for the branch that an ite folded to, REWRITE_BUILTIN.
|
|
890
832
|
const FRAME_CACHING = 1;
|
|
891
833
|
const FRAME_NEW_CHILD = 2;
|
|
892
834
|
const FRAME_FOLDED = 4;
|
|
893
835
|
|
|
894
|
-
// beta_reducer: rewriter_tpl with beta_reducer_cfg, which substitutes bindings for variables and
|
|
895
|
-
// rewrites nothing else. Its main loop is RewriterEngine's with the config's hooks folded in:
|
|
896
|
-
// pre_visit skips a ground term, and nothing reduces, expands or rewrites to a depth. So a frame
|
|
897
|
-
// needs no depth and only the ite folding's state, and its fields are typed arrays.
|
|
898
836
|
export class BetaReducer extends SubstCore {
|
|
899
|
-
// m_r: the last result, which Z3 holds until it assigns the next one.
|
|
900
837
|
private lastResult = -1;
|
|
901
838
|
private shifter: VarShifter;
|
|
902
|
-
// Whether the shifter's cache has entries, which reset releases.
|
|
903
839
|
private isShifted = false;
|
|
904
840
|
private frameExprs = new Int32Array(16);
|
|
905
841
|
private frameChildIndexes = new Int32Array(16);
|
|
@@ -911,8 +847,6 @@ export class BetaReducer extends SubstCore {
|
|
|
911
847
|
this.shifter = new VarShifter(manager);
|
|
912
848
|
}
|
|
913
849
|
|
|
914
|
-
// reset: releases the outermost cache and the bindings. The inverse shifter of rewriter_tpl only
|
|
915
|
-
// shifts an expanded definition, so it is always empty and left out.
|
|
916
850
|
reset() {
|
|
917
851
|
this.resetCore();
|
|
918
852
|
shrink(this.bindings, 0);
|
|
@@ -922,13 +856,12 @@ export class BetaReducer extends SubstCore {
|
|
|
922
856
|
this.isShifted = false;
|
|
923
857
|
}
|
|
924
858
|
|
|
925
|
-
// ~rewriter_tpl: the shifter's cache goes first, then the rewriter's.
|
|
926
859
|
release() {
|
|
860
|
+
this.setLastResult(-1);
|
|
927
861
|
this.shifter.release();
|
|
928
862
|
this.releaseCaches();
|
|
929
863
|
}
|
|
930
864
|
|
|
931
|
-
// operator(): the result comes with a reference, which the caller releases.
|
|
932
865
|
rewrite(expr: number): number {
|
|
933
866
|
const manager = this.manager;
|
|
934
867
|
return manager.withoutTemporaries(() => {
|
|
@@ -940,8 +873,6 @@ export class BetaReducer extends SubstCore {
|
|
|
940
873
|
}
|
|
941
874
|
this.root = expr;
|
|
942
875
|
this.numQvars = 0;
|
|
943
|
-
// main_loop and each step of resume_core count a step of the resource limit, and throw
|
|
944
|
-
// SmtCanceledError when it cancels the rewrite.
|
|
945
876
|
manager.limit.checkpoint();
|
|
946
877
|
if (!this.visit(expr))
|
|
947
878
|
while (this.numFrames > 0) {
|
|
@@ -969,7 +900,6 @@ export class BetaReducer extends SubstCore {
|
|
|
969
900
|
});
|
|
970
901
|
}
|
|
971
902
|
|
|
972
|
-
// operator() with bindings: resets the rewriter and substitutes bindings[n - 1 - i] for (:var i).
|
|
973
903
|
rewriteWithBindings(expr: number, bindings: number[]) {
|
|
974
904
|
this.reset();
|
|
975
905
|
this.setInvBindings(bindings);
|
|
@@ -1002,9 +932,6 @@ export class BetaReducer extends SubstCore {
|
|
|
1002
932
|
this.numFrames++;
|
|
1003
933
|
}
|
|
1004
934
|
|
|
1005
|
-
// visit: whether expr is rewritten and its result is on the result stack. Otherwise it opens a
|
|
1006
|
-
// frame for expr. pre_visit's test for a ground term comes before the cache's, which holds no
|
|
1007
|
-
// ground term.
|
|
1008
935
|
private visit(expr: number) {
|
|
1009
936
|
const manager = this.manager;
|
|
1010
937
|
if (manager.isGroundApp(expr)) {
|
|
@@ -1028,8 +955,6 @@ export class BetaReducer extends SubstCore {
|
|
|
1028
955
|
return false;
|
|
1029
956
|
}
|
|
1030
957
|
|
|
1031
|
-
// process_var: a bound variable becomes its binding, shifted over the quantifiers entered since
|
|
1032
|
-
// it was bound.
|
|
1033
958
|
private processVar(variable: number) {
|
|
1034
959
|
const manager = this.manager;
|
|
1035
960
|
const index = manager.values[variable];
|
|
@@ -1083,7 +1008,6 @@ export class BetaReducer extends SubstCore {
|
|
|
1083
1008
|
this.setLastResult(-1);
|
|
1084
1009
|
}
|
|
1085
1010
|
|
|
1086
|
-
// REWRITE_BUILTIN: the result of the folded branch replaces the ite on the result stack.
|
|
1087
1011
|
private finishFolded(expr: number, top: number) {
|
|
1088
1012
|
const result = this.resultStack[this.resultStack.length - 1];
|
|
1089
1013
|
this.setLastResult(result);
|
|
@@ -1095,7 +1019,6 @@ export class BetaReducer extends SubstCore {
|
|
|
1095
1019
|
this.markNewChild(expr, -1);
|
|
1096
1020
|
}
|
|
1097
1021
|
|
|
1098
|
-
// constant_fold: an ite whose condition rewrote to true or false becomes the chosen branch.
|
|
1099
1022
|
private isConstantFolded(expr: number, top: number) {
|
|
1100
1023
|
const manager = this.manager;
|
|
1101
1024
|
if (manager.getOp(expr) !== OP_ITE) return false;
|
|
@@ -1129,19 +1052,19 @@ export class BetaReducer extends SubstCore {
|
|
|
1129
1052
|
}
|
|
1130
1053
|
this.numQvars += numDecls;
|
|
1131
1054
|
}
|
|
1132
|
-
|
|
1055
|
+
const children = [data.body, ...data.patterns, ...data.noPatterns];
|
|
1056
|
+
while (this.frameChildIndexes[top] < children.length) {
|
|
1133
1057
|
const childIndex = this.frameChildIndexes[top];
|
|
1134
1058
|
this.frameChildIndexes[top] = childIndex + 1;
|
|
1135
|
-
if (!this.visit(
|
|
1059
|
+
if (!this.visit(children[childIndex])) return;
|
|
1136
1060
|
}
|
|
1137
1061
|
const spos = this.frameStarts[top];
|
|
1138
1062
|
const body = this.resultStack[spos];
|
|
1139
|
-
|
|
1140
|
-
const patterns = this.resultStack.slice(spos + 1);
|
|
1063
|
+
const patterns = this.resultStack.slice(spos + 1, spos + 1 + data.patterns.length);
|
|
1141
1064
|
for (const pattern of patterns) manager.incRef(pattern);
|
|
1142
1065
|
this.setLastResult(
|
|
1143
1066
|
this.frameFlags[top] & FRAME_NEW_CHILD
|
|
1144
|
-
? manager.mkQuantifier({ ...data, body, patterns })
|
|
1067
|
+
? manager.mkQuantifier({ ...data, body, patterns, noPatterns: [] })
|
|
1145
1068
|
: expr,
|
|
1146
1069
|
);
|
|
1147
1070
|
const result = this.lastResult;
|