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
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt. The code trees of Z3's matching
|
|
2
|
-
// abstract machine and the compiler that builds them: each pattern becomes a sequence of
|
|
3
|
-
// instructions, and the patterns that start with the same label share the instructions they have
|
|
4
|
-
// in common, so a term is matched against all of them at once and the matches come in Z3's order.
|
|
5
1
|
import { KIND_VAR, type AstManager } from "./ast";
|
|
6
|
-
import type { Context } from "./context";
|
|
7
2
|
import type { Enode } from "./enode";
|
|
8
3
|
|
|
9
4
|
export const OP_INIT = 0;
|
|
@@ -20,73 +15,76 @@ export const OP_CONTINUE = 10;
|
|
|
20
15
|
export const OP_GET_ENODE = 11;
|
|
21
16
|
export const OP_GET_CGR = 12;
|
|
22
17
|
export const OP_IS_CGR = 13;
|
|
18
|
+
export const OP_INITAC = 14;
|
|
23
19
|
|
|
24
20
|
const JOINT_NULL = 0;
|
|
25
21
|
export const JOINT_GROUND = 1;
|
|
26
22
|
export const JOINT_VAR = 2;
|
|
27
23
|
export const JOINT_NESTED = 3;
|
|
28
24
|
|
|
29
|
-
|
|
30
|
-
// joint (f ... (g ... X ...) ...), with g, the position of X in it, and X's register.
|
|
31
|
-
export interface Joint {
|
|
25
|
+
export interface Joint<E = Enode> {
|
|
32
26
|
kind: number;
|
|
33
|
-
enode:
|
|
27
|
+
enode: E | null;
|
|
34
28
|
reg: number;
|
|
35
29
|
decl: number;
|
|
36
30
|
argPos: number;
|
|
37
31
|
}
|
|
38
32
|
|
|
39
|
-
|
|
40
|
-
// defaults. reg is the register of CHECK, COMPARE (m_reg1), the filters, and the input register of
|
|
41
|
-
// BIND and IS_CGR. regs holds the input registers of GET_CGR and IS_CGR and the bindings of YIELD.
|
|
42
|
-
export interface Instruction {
|
|
33
|
+
export interface Instruction<E = Enode> {
|
|
43
34
|
op: number;
|
|
44
|
-
next: Instruction | null;
|
|
35
|
+
next: Instruction<E> | null;
|
|
45
36
|
numArgs: number;
|
|
46
37
|
reg: number;
|
|
47
38
|
reg2: number;
|
|
48
39
|
oreg: number;
|
|
49
40
|
label: number;
|
|
50
|
-
enode:
|
|
41
|
+
enode: E | null;
|
|
51
42
|
lblLow: number;
|
|
52
43
|
lblHigh: number;
|
|
53
|
-
alt: Instruction | null;
|
|
44
|
+
alt: Instruction<E> | null;
|
|
54
45
|
quantifier: number;
|
|
46
|
+
pattern: number;
|
|
55
47
|
regs: number[];
|
|
56
|
-
joints: Joint[];
|
|
48
|
+
joints: Joint<E>[];
|
|
57
49
|
}
|
|
58
50
|
|
|
59
|
-
export interface CodeTree {
|
|
60
|
-
rootLabel: number;
|
|
51
|
+
export interface CodeTree<E = Enode> {
|
|
61
52
|
numArgs: number;
|
|
62
53
|
isFilteringCandidates: boolean;
|
|
63
54
|
numRegs: number;
|
|
64
55
|
numChoices: number;
|
|
65
|
-
root: Instruction
|
|
66
|
-
candidates:
|
|
67
|
-
|
|
56
|
+
root: Instruction<E>;
|
|
57
|
+
candidates: E[];
|
|
58
|
+
qhead: number;
|
|
68
59
|
candidateGcThreshold: number;
|
|
69
60
|
}
|
|
70
61
|
|
|
71
|
-
|
|
72
|
-
export interface LabelHasher {
|
|
73
|
-
// label_hasher.
|
|
62
|
+
export interface LabelHasher<E = Enode> {
|
|
74
63
|
getLabelHash(decl: number): number;
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
64
|
+
getGroundEnode(expr: number, quantifier: number): E | null;
|
|
65
|
+
getLblHash(node: E): number;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
// The part of an enode that compiling a pattern reads.
|
|
69
|
+
export interface MamEnode<E> {
|
|
70
|
+
readonly root: E;
|
|
71
|
+
lblHash: number;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
// The context that undoes a compiler's updates of shared code trees.
|
|
75
|
+
interface CompilerContext {
|
|
76
|
+
readonly manager: AstManager;
|
|
77
|
+
pushTrail(undo: () => void): void;
|
|
79
78
|
}
|
|
80
79
|
|
|
81
80
|
const NOT_CHECKED = 0;
|
|
82
81
|
const CHECK_SET = 1;
|
|
83
82
|
const CHECK_SINGLETON = 2;
|
|
84
83
|
|
|
85
|
-
// FIND_BEST_CHILD_THRESHOLD and SIMPLE_SEQ_THRESHOLD.
|
|
86
84
|
const FIND_BEST_CHILD_THRESHOLD = 64;
|
|
87
85
|
const SIMPLE_SEQ_THRESHOLD = 4;
|
|
88
86
|
|
|
89
|
-
const mkInstruction = (op: number): Instruction => ({
|
|
87
|
+
const mkInstruction = <E>(op: number): Instruction<E> => ({
|
|
90
88
|
op,
|
|
91
89
|
next: null,
|
|
92
90
|
numArgs: 0,
|
|
@@ -99,11 +97,19 @@ const mkInstruction = (op: number): Instruction => ({
|
|
|
99
97
|
lblHigh: 0,
|
|
100
98
|
alt: null,
|
|
101
99
|
quantifier: -1,
|
|
100
|
+
pattern: -1,
|
|
102
101
|
regs: [],
|
|
103
102
|
joints: [],
|
|
104
103
|
});
|
|
105
104
|
|
|
106
|
-
|
|
105
|
+
const mkNullJoint = <E>(): Joint<E> => ({
|
|
106
|
+
kind: JOINT_NULL,
|
|
107
|
+
enode: null,
|
|
108
|
+
reg: 0,
|
|
109
|
+
decl: -1,
|
|
110
|
+
argPos: 0,
|
|
111
|
+
});
|
|
112
|
+
|
|
107
113
|
export const hasHash = (low: number, high: number, hash: number) =>
|
|
108
114
|
((hash < 32 ? low : high) & (1 << hash)) !== 0;
|
|
109
115
|
|
|
@@ -113,70 +119,69 @@ const countBits = (word: number) => {
|
|
|
113
119
|
return count;
|
|
114
120
|
};
|
|
115
121
|
|
|
116
|
-
const setHash = (instr: Instruction
|
|
122
|
+
const setHash = <E>(instr: Instruction<E>, hash: number) => {
|
|
117
123
|
if (hash < 32) instr.lblLow |= 1 << hash;
|
|
118
124
|
else instr.lblHigh |= 1 << hash;
|
|
119
125
|
};
|
|
120
126
|
|
|
121
|
-
const mkFilter = (op: number, reg: number, low: number, high: number) => {
|
|
122
|
-
const instr = mkInstruction(op);
|
|
127
|
+
const mkFilter = <E>(op: number, reg: number, low: number, high: number) => {
|
|
128
|
+
const instr = mkInstruction<E>(op);
|
|
123
129
|
instr.reg = reg;
|
|
124
130
|
instr.lblLow = low;
|
|
125
131
|
instr.lblHigh = high;
|
|
126
132
|
return instr;
|
|
127
133
|
};
|
|
128
134
|
|
|
129
|
-
const mkSingletonFilter = (op: number, reg: number, hash: number) => {
|
|
130
|
-
const instr = mkFilter(op, reg, 0, 0);
|
|
135
|
+
const mkSingletonFilter = <E>(op: number, reg: number, hash: number) => {
|
|
136
|
+
const instr = mkFilter<E>(op, reg, 0, 0);
|
|
131
137
|
setHash(instr, hash);
|
|
132
138
|
return instr;
|
|
133
139
|
};
|
|
134
140
|
|
|
135
|
-
const mkCompare = (reg1: number, reg2: number) => {
|
|
136
|
-
const instr = mkInstruction(OP_COMPARE);
|
|
141
|
+
const mkCompare = <E>(reg1: number, reg2: number) => {
|
|
142
|
+
const instr = mkInstruction<E>(OP_COMPARE);
|
|
137
143
|
instr.reg = reg1;
|
|
138
144
|
instr.reg2 = reg2;
|
|
139
145
|
return instr;
|
|
140
146
|
};
|
|
141
147
|
|
|
142
|
-
const mkCheck = (reg: number, enode:
|
|
143
|
-
const instr = mkInstruction(OP_CHECK);
|
|
148
|
+
const mkCheck = <E>(reg: number, enode: E | null) => {
|
|
149
|
+
const instr = mkInstruction<E>(OP_CHECK);
|
|
144
150
|
instr.reg = reg;
|
|
145
151
|
instr.enode = enode;
|
|
146
152
|
return instr;
|
|
147
153
|
};
|
|
148
154
|
|
|
149
|
-
const mkChoose = (alt: Instruction | null) => {
|
|
150
|
-
const instr = mkInstruction(OP_CHOOSE);
|
|
155
|
+
const mkChoose = <E>(alt: Instruction<E> | null) => {
|
|
156
|
+
const instr = mkInstruction<E>(OP_CHOOSE);
|
|
151
157
|
instr.alt = alt;
|
|
152
158
|
return instr;
|
|
153
159
|
};
|
|
154
160
|
|
|
155
|
-
const mkInit = (numArgs: number) => {
|
|
156
|
-
const instr = mkInstruction(
|
|
161
|
+
const mkInit = <E>(op: number, numArgs: number) => {
|
|
162
|
+
const instr = mkInstruction<E>(op);
|
|
157
163
|
instr.numArgs = numArgs;
|
|
158
164
|
return instr;
|
|
159
165
|
};
|
|
160
166
|
|
|
161
|
-
//
|
|
162
|
-
export class Compiler {
|
|
163
|
-
|
|
167
|
+
// isAc marks the associative-commutative labels that euf's matcher starts with OP_INITAC.
|
|
168
|
+
export class Compiler<E extends MamEnode<E> = Enode> {
|
|
169
|
+
private manager: AstManager;
|
|
164
170
|
private registers: number[] = [];
|
|
165
|
-
// m_todo: the registers whose patterns are still to be processed.
|
|
166
171
|
private todo: number[] = [];
|
|
167
172
|
private aux: number[] = [];
|
|
168
|
-
// The register of each variable by de Bruijn index, -1 while it is unbound.
|
|
169
173
|
private vars: number[] = [];
|
|
170
174
|
private quantifier = -1;
|
|
175
|
+
private pattern = -1;
|
|
171
176
|
private patterns: number[] = [];
|
|
172
|
-
private tree: CodeTree = {
|
|
173
|
-
rootLabel: -1,
|
|
177
|
+
private tree: CodeTree<E> = {
|
|
174
178
|
numArgs: 0,
|
|
175
179
|
isFilteringCandidates: false,
|
|
176
180
|
numRegs: 0,
|
|
177
181
|
numChoices: 0,
|
|
178
|
-
root: mkInit(0),
|
|
182
|
+
root: mkInit<E>(OP_INIT, 0),
|
|
179
183
|
candidates: [],
|
|
184
|
+
qhead: 0,
|
|
180
185
|
candidateGcThreshold: 0,
|
|
181
186
|
};
|
|
182
187
|
private numChoices = 0;
|
|
@@ -185,15 +190,17 @@ export class Compiler {
|
|
|
185
190
|
private matchedExprs = new Map<number, number>();
|
|
186
191
|
private marks: number[] = [];
|
|
187
192
|
private toReset: number[] = [];
|
|
188
|
-
private compatible: Instruction[] = [];
|
|
189
|
-
private incompatible: Instruction[] = [];
|
|
190
|
-
private seq: Instruction[] = [];
|
|
193
|
+
private compatible: Instruction<E>[] = [];
|
|
194
|
+
private incompatible: Instruction<E>[] = [];
|
|
195
|
+
private seq: Instruction<E>[] = [];
|
|
191
196
|
|
|
192
197
|
constructor(
|
|
193
|
-
private
|
|
194
|
-
private
|
|
195
|
-
private
|
|
196
|
-
) {
|
|
198
|
+
private context: CompilerContext,
|
|
199
|
+
private hasher: LabelHasher<E>,
|
|
200
|
+
private isAc: (decl: number) => boolean = () => false,
|
|
201
|
+
) {
|
|
202
|
+
this.manager = context.manager;
|
|
203
|
+
}
|
|
197
204
|
|
|
198
205
|
private getRegister(reg: number) {
|
|
199
206
|
return this.registers[reg] ?? -1;
|
|
@@ -211,10 +218,17 @@ export class Compiler {
|
|
|
211
218
|
return expr !== -1 && this.manager.kinds[expr] !== KIND_VAR;
|
|
212
219
|
}
|
|
213
220
|
|
|
214
|
-
private init(
|
|
221
|
+
private init(
|
|
222
|
+
tree: CodeTree<E>,
|
|
223
|
+
quantifier: number,
|
|
224
|
+
pattern: number,
|
|
225
|
+
patterns: number[],
|
|
226
|
+
firstIndex: number,
|
|
227
|
+
) {
|
|
215
228
|
const manager = this.manager;
|
|
216
229
|
this.tree = tree;
|
|
217
230
|
this.quantifier = quantifier;
|
|
231
|
+
this.pattern = pattern;
|
|
218
232
|
this.patterns = patterns;
|
|
219
233
|
this.numChoices = 0;
|
|
220
234
|
this.todo = [];
|
|
@@ -229,7 +243,6 @@ export class Compiler {
|
|
|
229
243
|
this.vars.fill(-1, 0, numDecls);
|
|
230
244
|
}
|
|
231
245
|
|
|
232
|
-
// all_args_are_bound_vars.
|
|
233
246
|
private isAllArgsBoundVars(expr: number) {
|
|
234
247
|
const manager = this.manager;
|
|
235
248
|
return manager.everyArg(
|
|
@@ -238,14 +251,13 @@ export class Compiler {
|
|
|
238
251
|
);
|
|
239
252
|
}
|
|
240
253
|
|
|
241
|
-
// get_stats: the size of a pattern and its number of unbound variables.
|
|
242
254
|
private getStats(expr: number) {
|
|
243
255
|
const manager = this.manager;
|
|
244
256
|
let size = 0;
|
|
245
257
|
let numUnboundVars = 0;
|
|
246
258
|
const visit = (term: number) => {
|
|
247
259
|
size++;
|
|
248
|
-
if (manager.
|
|
260
|
+
if (manager.isGroundApp(term)) return;
|
|
249
261
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
250
262
|
const arg = manager.getArg(term, index);
|
|
251
263
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
@@ -258,8 +270,6 @@ export class Compiler {
|
|
|
258
270
|
return { size, numUnboundVars };
|
|
259
271
|
}
|
|
260
272
|
|
|
261
|
-
// linearise_core: the registers in m_todo that do not need a BIND are processed first, then a
|
|
262
|
-
// single BIND or IS_CGR is produced, and the registers left and the new ones become m_todo.
|
|
263
273
|
private lineariseCore() {
|
|
264
274
|
const manager = this.manager;
|
|
265
275
|
const hasher = this.hasher;
|
|
@@ -276,7 +286,7 @@ export class Compiler {
|
|
|
276
286
|
else this.vars[varIndex] = reg;
|
|
277
287
|
continue;
|
|
278
288
|
}
|
|
279
|
-
if (manager.
|
|
289
|
+
if (manager.isGroundApp(pattern)) {
|
|
280
290
|
this.seq.push(mkCheck(reg, hasher.getGroundEnode(pattern, this.quantifier)));
|
|
281
291
|
this.setMark(reg, NOT_CHECKED);
|
|
282
292
|
continue;
|
|
@@ -320,7 +330,7 @@ export class Compiler {
|
|
|
320
330
|
const label = manager.decls[firstApp];
|
|
321
331
|
const numArgs = manager.getNumArgs(firstApp);
|
|
322
332
|
if (this.isAllArgsBoundVars(firstApp)) {
|
|
323
|
-
const instr = mkInstruction(OP_IS_CGR);
|
|
333
|
+
const instr = mkInstruction<E>(OP_IS_CGR);
|
|
324
334
|
instr.label = label;
|
|
325
335
|
instr.reg = firstAppReg;
|
|
326
336
|
instr.numArgs = numArgs;
|
|
@@ -333,7 +343,7 @@ export class Compiler {
|
|
|
333
343
|
this.registers[oreg + index] = manager.getArg(firstApp, index);
|
|
334
344
|
this.aux.push(oreg + index);
|
|
335
345
|
}
|
|
336
|
-
const instr = mkInstruction(OP_BIND);
|
|
346
|
+
const instr = mkInstruction<E>(OP_BIND);
|
|
337
347
|
instr.label = label;
|
|
338
348
|
instr.numArgs = numArgs;
|
|
339
349
|
instr.reg = firstAppReg;
|
|
@@ -348,13 +358,12 @@ export class Compiler {
|
|
|
348
358
|
this.aux = todo;
|
|
349
359
|
}
|
|
350
360
|
|
|
351
|
-
// get_num_bound_vars: the number of bound variables in a pattern, and whether it has unbound ones.
|
|
352
361
|
private getNumBoundVars(expr: number) {
|
|
353
362
|
const manager = this.manager;
|
|
354
363
|
let count = 0;
|
|
355
364
|
let hasUnboundVars = false;
|
|
356
365
|
const visit = (term: number) => {
|
|
357
|
-
if (manager.
|
|
366
|
+
if (manager.isGroundApp(term)) return;
|
|
358
367
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
359
368
|
const arg = manager.getArg(term, index);
|
|
360
369
|
if (manager.kinds[arg] !== KIND_VAR) visit(arg);
|
|
@@ -366,14 +375,12 @@ export class Compiler {
|
|
|
366
375
|
return { count, hasUnboundVars };
|
|
367
376
|
}
|
|
368
377
|
|
|
369
|
-
// gen_mp_filter: compiles a pattern whose variables are all bound, and returns the register that
|
|
370
|
-
// gets the enode congruent to it.
|
|
371
378
|
private genMpFilter(expr: number): number {
|
|
372
379
|
const manager = this.manager;
|
|
373
|
-
if (manager.
|
|
380
|
+
if (manager.isGroundApp(expr)) {
|
|
374
381
|
const oreg = this.tree.numRegs;
|
|
375
382
|
this.tree.numRegs += 1;
|
|
376
|
-
const instr = mkInstruction(OP_GET_ENODE);
|
|
383
|
+
const instr = mkInstruction<E>(OP_GET_ENODE);
|
|
377
384
|
instr.oreg = oreg;
|
|
378
385
|
instr.enode = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
379
386
|
this.seq.push(instr);
|
|
@@ -384,7 +391,7 @@ export class Compiler {
|
|
|
384
391
|
);
|
|
385
392
|
const oreg = this.tree.numRegs;
|
|
386
393
|
this.tree.numRegs += 1;
|
|
387
|
-
const instr = mkInstruction(OP_GET_CGR);
|
|
394
|
+
const instr = mkInstruction<E>(OP_GET_CGR);
|
|
388
395
|
instr.label = manager.decls[expr];
|
|
389
396
|
instr.numArgs = iregs.length;
|
|
390
397
|
instr.oreg = oreg;
|
|
@@ -394,8 +401,6 @@ export class Compiler {
|
|
|
394
401
|
return oreg;
|
|
395
402
|
}
|
|
396
403
|
|
|
397
|
-
// linearise_multi_pattern: the other patterns of a multi-pattern, the one with the most bound
|
|
398
|
-
// variables first.
|
|
399
404
|
private lineariseMultiPattern() {
|
|
400
405
|
const manager = this.manager;
|
|
401
406
|
const patterns = this.patterns;
|
|
@@ -435,39 +440,32 @@ export class Compiler {
|
|
|
435
440
|
this.todo.push(oreg + index);
|
|
436
441
|
if (
|
|
437
442
|
(manager.kinds[arg] === KIND_VAR && this.vars[manager.values[arg]] >= 0) ||
|
|
438
|
-
|
|
443
|
+
manager.isGroundApp(arg)
|
|
439
444
|
)
|
|
440
445
|
hasDepth1Joint = true;
|
|
441
446
|
}
|
|
442
|
-
const
|
|
443
|
-
kind: JOINT_NULL,
|
|
444
|
-
enode: null,
|
|
445
|
-
reg: 0,
|
|
446
|
-
decl: -1,
|
|
447
|
-
argPos: 0,
|
|
448
|
-
});
|
|
449
|
-
const joints = manager.mapArgs(best, (arg): Joint => {
|
|
447
|
+
const joints = manager.mapArgs(best, (arg): Joint<E> => {
|
|
450
448
|
if (hasDepth1Joint) {
|
|
451
449
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
452
450
|
const reg = this.vars[manager.values[arg]];
|
|
453
|
-
return reg >= 0 ? { ...
|
|
451
|
+
return reg >= 0 ? { ...mkNullJoint<E>(), kind: JOINT_VAR, reg } : mkNullJoint<E>();
|
|
454
452
|
}
|
|
455
|
-
if (manager.
|
|
453
|
+
if (manager.isGroundApp(arg))
|
|
456
454
|
return {
|
|
457
|
-
...
|
|
455
|
+
...mkNullJoint<E>(),
|
|
458
456
|
kind: JOINT_GROUND,
|
|
459
457
|
enode: this.hasher.getGroundEnode(arg, this.quantifier),
|
|
460
458
|
};
|
|
461
|
-
return
|
|
459
|
+
return mkNullJoint<E>();
|
|
462
460
|
}
|
|
463
|
-
if (manager.kinds[arg] === KIND_VAR) return
|
|
461
|
+
if (manager.kinds[arg] === KIND_VAR) return mkNullJoint<E>();
|
|
464
462
|
let argPos = -1;
|
|
465
463
|
for (let index = 0; index < manager.getNumArgs(arg) && argPos === -1; index++) {
|
|
466
464
|
const innerArg = manager.getArg(arg, index);
|
|
467
465
|
if (manager.kinds[innerArg] === KIND_VAR && this.vars[manager.values[innerArg]] >= 0)
|
|
468
466
|
argPos = index;
|
|
469
467
|
}
|
|
470
|
-
if (argPos === -1) return
|
|
468
|
+
if (argPos === -1) return mkNullJoint<E>();
|
|
471
469
|
return {
|
|
472
470
|
kind: JOINT_NESTED,
|
|
473
471
|
enode: null,
|
|
@@ -476,7 +474,7 @@ export class Compiler {
|
|
|
476
474
|
argPos,
|
|
477
475
|
};
|
|
478
476
|
});
|
|
479
|
-
const instr = mkInstruction(OP_CONTINUE);
|
|
477
|
+
const instr = mkInstruction<E>(OP_CONTINUE);
|
|
480
478
|
instr.label = manager.decls[best];
|
|
481
479
|
instr.numArgs = manager.getNumArgs(best);
|
|
482
480
|
instr.oreg = oreg;
|
|
@@ -488,8 +486,7 @@ export class Compiler {
|
|
|
488
486
|
}
|
|
489
487
|
}
|
|
490
488
|
|
|
491
|
-
|
|
492
|
-
private linearise(head: Instruction, firstIndex: number) {
|
|
489
|
+
private linearise(head: Instruction<E>, firstIndex: number) {
|
|
493
490
|
this.seq = [];
|
|
494
491
|
this.matchedExprs.clear();
|
|
495
492
|
while (this.todo.length > 0) this.lineariseCore();
|
|
@@ -499,8 +496,9 @@ export class Compiler {
|
|
|
499
496
|
}
|
|
500
497
|
const numDecls = this.manager.getQuantifier(this.quantifier).sorts.length;
|
|
501
498
|
for (let index = 0; index < numDecls; index++) if (this.vars[index] === -1) return;
|
|
502
|
-
const instr = mkInstruction(OP_YIELD);
|
|
499
|
+
const instr = mkInstruction<E>(OP_YIELD);
|
|
503
500
|
instr.quantifier = this.quantifier;
|
|
501
|
+
instr.pattern = this.pattern;
|
|
504
502
|
instr.numArgs = numDecls;
|
|
505
503
|
instr.regs = this.vars.slice(0, numDecls);
|
|
506
504
|
this.seq.push(instr);
|
|
@@ -511,7 +509,7 @@ export class Compiler {
|
|
|
511
509
|
}
|
|
512
510
|
}
|
|
513
511
|
|
|
514
|
-
private setNext(instr: Instruction
|
|
512
|
+
private setNext(instr: Instruction<E>, next: Instruction<E> | null) {
|
|
515
513
|
if (!this.isTmpTree) {
|
|
516
514
|
const old = instr.next;
|
|
517
515
|
this.context.pushTrail(() => {
|
|
@@ -521,11 +519,11 @@ export class Compiler {
|
|
|
521
519
|
instr.next = next;
|
|
522
520
|
}
|
|
523
521
|
|
|
524
|
-
private findBestChild(firstChild: Instruction) {
|
|
522
|
+
private findBestChild(firstChild: Instruction<E>) {
|
|
525
523
|
let numTooSimple = 0;
|
|
526
|
-
let bestChild: Instruction | null = null;
|
|
524
|
+
let bestChild: Instruction<E> | null = null;
|
|
527
525
|
let maxCompatibility = 0;
|
|
528
|
-
for (let child: Instruction | null = firstChild; child !== null; child = child.alt) {
|
|
526
|
+
for (let child: Instruction<E> | null = firstChild; child !== null; child = child.alt) {
|
|
529
527
|
const measure = this.getCompatibilityMeasure(child);
|
|
530
528
|
if (measure.isSimple) {
|
|
531
529
|
numTooSimple++;
|
|
@@ -539,79 +537,76 @@ export class Compiler {
|
|
|
539
537
|
return bestChild;
|
|
540
538
|
}
|
|
541
539
|
|
|
542
|
-
private isBindCompatible(instr: Instruction) {
|
|
540
|
+
private isBindCompatible(instr: Instruction<E>) {
|
|
543
541
|
const manager = this.manager;
|
|
544
542
|
const expr = this.getRegister(instr.reg);
|
|
545
543
|
return (
|
|
546
544
|
this.isApp(expr) &&
|
|
547
|
-
!manager.
|
|
545
|
+
!manager.isGroundApp(expr) &&
|
|
548
546
|
manager.decls[expr] === instr.label &&
|
|
549
547
|
manager.getNumArgs(expr) === instr.numArgs
|
|
550
548
|
);
|
|
551
549
|
}
|
|
552
550
|
|
|
553
|
-
private isCompareCompatible(instr: Instruction) {
|
|
551
|
+
private isCompareCompatible(instr: Instruction<E>) {
|
|
554
552
|
const expr = this.getRegister(instr.reg);
|
|
555
553
|
return expr !== -1 && expr === this.getRegister(instr.reg2);
|
|
556
554
|
}
|
|
557
555
|
|
|
558
|
-
private isCheckCompatible(instr: Instruction) {
|
|
556
|
+
private isCheckCompatible(instr: Instruction<E>) {
|
|
559
557
|
const expr = this.getRegister(instr.reg);
|
|
560
|
-
if (!this.
|
|
558
|
+
if (!this.manager.isGroundApp(expr)) return false;
|
|
561
559
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
562
560
|
return instr.enode !== null && node !== null && instr.enode.root === node.root;
|
|
563
561
|
}
|
|
564
562
|
|
|
565
|
-
// get_pat_lbl_hash: a ground pattern is a constant, hashed by its enode.
|
|
566
563
|
private getPatLblHash(reg: number) {
|
|
567
564
|
const expr = this.registers[reg];
|
|
568
|
-
if (this.manager.
|
|
565
|
+
if (this.manager.isGroundApp(expr)) {
|
|
569
566
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
570
567
|
return node === null ? -1 : this.hasher.getLblHash(node);
|
|
571
568
|
}
|
|
572
569
|
return this.hasher.getLabelHash(this.manager.decls[expr]);
|
|
573
570
|
}
|
|
574
571
|
|
|
575
|
-
private isCheckSemiCompatible(instr: Instruction) {
|
|
572
|
+
private isCheckSemiCompatible(instr: Instruction<E>) {
|
|
576
573
|
if (instr.enode !== null) this.hasher.getLblHash(instr.enode);
|
|
577
574
|
const expr = this.getRegister(instr.reg);
|
|
578
575
|
return (
|
|
579
576
|
expr !== -1 &&
|
|
580
577
|
this.getMark(instr.reg) === NOT_CHECKED &&
|
|
581
|
-
this.manager.
|
|
578
|
+
this.manager.isGroundApp(expr) &&
|
|
582
579
|
instr.enode !== null &&
|
|
583
580
|
this.getPatLblHash(instr.reg) === instr.enode.lblHash
|
|
584
581
|
);
|
|
585
582
|
}
|
|
586
583
|
|
|
587
|
-
private isFilterCompatible(instr: Instruction) {
|
|
584
|
+
private isFilterCompatible(instr: Instruction<E>) {
|
|
588
585
|
const expr = this.getRegister(instr.reg);
|
|
589
586
|
return (
|
|
590
587
|
this.isApp(expr) &&
|
|
591
|
-
!this.manager.
|
|
588
|
+
!this.manager.isGroundApp(expr) &&
|
|
592
589
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
593
590
|
);
|
|
594
591
|
}
|
|
595
592
|
|
|
596
|
-
private isCfilterCompatible(instr: Instruction) {
|
|
593
|
+
private isCfilterCompatible(instr: Instruction<E>) {
|
|
597
594
|
const expr = this.getRegister(instr.reg);
|
|
598
595
|
return (
|
|
599
596
|
expr !== -1 &&
|
|
600
|
-
this.manager.
|
|
597
|
+
this.manager.isGroundApp(expr) &&
|
|
601
598
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
602
599
|
);
|
|
603
600
|
}
|
|
604
601
|
|
|
605
|
-
private isFilterSemiCompatible(instr: Instruction) {
|
|
602
|
+
private isFilterSemiCompatible(instr: Instruction<E>) {
|
|
606
603
|
const expr = this.getRegister(instr.reg);
|
|
607
604
|
return (
|
|
608
|
-
this.getMark(instr.reg) === NOT_CHECKED && this.isApp(expr) && !this.manager.
|
|
605
|
+
this.getMark(instr.reg) === NOT_CHECKED && this.isApp(expr) && !this.manager.isGroundApp(expr)
|
|
609
606
|
);
|
|
610
607
|
}
|
|
611
608
|
|
|
612
|
-
|
|
613
|
-
// patterns in the registers, and whether the branch is too simple to look at.
|
|
614
|
-
private getCompatibilityMeasure(child: Instruction) {
|
|
609
|
+
private getCompatibilityMeasure(child: Instruction<E>) {
|
|
615
610
|
const manager = this.manager;
|
|
616
611
|
this.toReset.length = 0;
|
|
617
612
|
let weight = 0;
|
|
@@ -660,9 +655,7 @@ export class Compiler {
|
|
|
660
655
|
if (index !== -1) this.todo.splice(index, 1);
|
|
661
656
|
}
|
|
662
657
|
|
|
663
|
-
|
|
664
|
-
// with a CHOOSE where they stop.
|
|
665
|
-
private insertAt(start: Instruction, firstIndex: number) {
|
|
658
|
+
private insertAt(start: Instruction<E>, firstIndex: number) {
|
|
666
659
|
const manager = this.manager;
|
|
667
660
|
let head = start;
|
|
668
661
|
for (;;) {
|
|
@@ -692,7 +685,7 @@ export class Compiler {
|
|
|
692
685
|
this.setMark(curr.reg, NOT_CHECKED);
|
|
693
686
|
compatible.push(curr);
|
|
694
687
|
} else if (this.isCheckSemiCompatible(curr) && curr.enode !== null) {
|
|
695
|
-
const filter = mkFilter(OP_CFILTER, curr.reg, 0, 0);
|
|
688
|
+
const filter = mkFilter<E>(OP_CFILTER, curr.reg, 0, 0);
|
|
696
689
|
setHash(filter, this.hasher.getLblHash(curr.enode));
|
|
697
690
|
setHash(filter, this.getPatLblHash(curr.reg));
|
|
698
691
|
this.setMark(curr.reg, CHECK_SET);
|
|
@@ -729,7 +722,6 @@ export class Compiler {
|
|
|
729
722
|
const hash = this.getPatLblHash(curr.reg);
|
|
730
723
|
this.setMark(curr.reg, CHECK_SET);
|
|
731
724
|
if (countBits(curr.lblLow) + countBits(curr.lblHigh) > 1) {
|
|
732
|
-
// insert_new_lbl_hash.
|
|
733
725
|
const filter = curr;
|
|
734
726
|
const low = filter.lblLow;
|
|
735
727
|
const high = filter.lblHigh;
|
|
@@ -740,7 +732,7 @@ export class Compiler {
|
|
|
740
732
|
setHash(filter, hash);
|
|
741
733
|
compatible.push(curr);
|
|
742
734
|
} else {
|
|
743
|
-
const filter = mkFilter(OP_FILTER, curr.reg, curr.lblLow, curr.lblHigh);
|
|
735
|
+
const filter = mkFilter<E>(OP_FILTER, curr.reg, curr.lblLow, curr.lblHigh);
|
|
744
736
|
setHash(filter, hash);
|
|
745
737
|
compatible.push(filter);
|
|
746
738
|
incompatible.push(curr);
|
|
@@ -757,7 +749,6 @@ export class Compiler {
|
|
|
757
749
|
if (curr === null) return;
|
|
758
750
|
const bestChild = this.findBestChild(curr);
|
|
759
751
|
if (bestChild === null) {
|
|
760
|
-
// head -> ... -> last -> new_child: CHOOSE(first_child) -> linearise.
|
|
761
752
|
const newChild = mkChoose(curr);
|
|
762
753
|
this.numChoices++;
|
|
763
754
|
this.setNext(last, newChild);
|
|
@@ -767,10 +758,8 @@ export class Compiler {
|
|
|
767
758
|
head = bestChild;
|
|
768
759
|
continue;
|
|
769
760
|
}
|
|
770
|
-
// head -> compatible -> new_child_head1: CHOOSE(new_child_head2) -> incompatible -> curr, and
|
|
771
|
-
// new_child_head2: NOOP -> linearise.
|
|
772
761
|
const firstChildHead = curr;
|
|
773
|
-
const newChildHead2 = mkInstruction(OP_NOOP);
|
|
762
|
+
const newChildHead2 = mkInstruction<E>(OP_NOOP);
|
|
774
763
|
const newChildHead1 = mkChoose(newChildHead2);
|
|
775
764
|
this.numChoices++;
|
|
776
765
|
let tail = head;
|
|
@@ -791,38 +780,39 @@ export class Compiler {
|
|
|
791
780
|
}
|
|
792
781
|
}
|
|
793
782
|
|
|
794
|
-
// mk_tree: a new code tree for a quantifier, which starts with the pattern at firstIndex.
|
|
795
783
|
mkTree(
|
|
796
784
|
quantifier: number,
|
|
797
785
|
patterns: number[],
|
|
798
786
|
firstIndex: number,
|
|
799
787
|
isFilteringCandidates: boolean,
|
|
788
|
+
pattern = -1,
|
|
800
789
|
) {
|
|
801
|
-
const
|
|
802
|
-
const numArgs = this.manager.getNumArgs(
|
|
803
|
-
const tree: CodeTree = {
|
|
804
|
-
rootLabel: this.manager.decls[pattern],
|
|
790
|
+
const first = patterns[firstIndex];
|
|
791
|
+
const numArgs = this.manager.getNumArgs(first);
|
|
792
|
+
const tree: CodeTree<E> = {
|
|
805
793
|
numArgs,
|
|
806
794
|
isFilteringCandidates,
|
|
807
795
|
numRegs: numArgs + 1,
|
|
808
796
|
numChoices: 0,
|
|
809
|
-
root: mkInit(numArgs),
|
|
797
|
+
root: mkInit<E>(this.isAc(this.manager.decls[first]) ? OP_INITAC : OP_INIT, numArgs),
|
|
810
798
|
candidates: [],
|
|
799
|
+
qhead: 0,
|
|
811
800
|
candidateGcThreshold: 10000,
|
|
812
801
|
};
|
|
813
|
-
this.init(tree, quantifier, patterns, firstIndex);
|
|
802
|
+
this.init(tree, quantifier, pattern, patterns, firstIndex);
|
|
814
803
|
this.linearise(tree.root, firstIndex);
|
|
804
|
+
if (tree.root.op === OP_INITAC) this.numChoices++;
|
|
815
805
|
tree.numChoices = this.numChoices;
|
|
816
806
|
return tree;
|
|
817
807
|
}
|
|
818
808
|
|
|
819
|
-
// insert: adds a pattern to a code tree. A temporary tree records no trail.
|
|
820
809
|
insert(
|
|
821
|
-
tree: CodeTree
|
|
810
|
+
tree: CodeTree<E>,
|
|
822
811
|
quantifier: number,
|
|
823
812
|
patterns: number[],
|
|
824
813
|
firstIndex: number,
|
|
825
814
|
isTmpTree: boolean,
|
|
815
|
+
pattern = -1,
|
|
826
816
|
) {
|
|
827
817
|
if (tree.numArgs !== this.manager.getNumArgs(patterns[firstIndex])) return;
|
|
828
818
|
this.isTmpTree = isTmpTree;
|
|
@@ -832,7 +822,7 @@ export class Compiler {
|
|
|
832
822
|
tree.numRegs = numRegs;
|
|
833
823
|
});
|
|
834
824
|
}
|
|
835
|
-
this.init(tree, quantifier, patterns, firstIndex);
|
|
825
|
+
this.init(tree, quantifier, pattern, patterns, firstIndex);
|
|
836
826
|
this.numChoices = tree.numChoices;
|
|
837
827
|
this.insertAt(tree.root, firstIndex);
|
|
838
828
|
if (this.numChoices <= tree.numChoices) return;
|