tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.d618a2d79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +47 -44
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +44 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +474 -718
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +244 -238
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +31 -106
- package/src/exit-codes.ts +2 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +616 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +50 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -5
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +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 +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 +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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +15 -18
- package/src/sany/builtins.ts +1 -3
- 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 +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +206 -44
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +22 -47
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +54 -26
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_VAR, type AstManager } from "./ast";
|
|
3
|
-
import type { Context } from "./context";
|
|
4
2
|
import type { Enode } from "./enode";
|
|
5
3
|
|
|
6
4
|
export const OP_INIT = 0;
|
|
@@ -17,51 +15,66 @@ export const OP_CONTINUE = 10;
|
|
|
17
15
|
export const OP_GET_ENODE = 11;
|
|
18
16
|
export const OP_GET_CGR = 12;
|
|
19
17
|
export const OP_IS_CGR = 13;
|
|
18
|
+
export const OP_INITAC = 14;
|
|
20
19
|
|
|
21
20
|
const JOINT_NULL = 0;
|
|
22
21
|
export const JOINT_GROUND = 1;
|
|
23
22
|
export const JOINT_VAR = 2;
|
|
24
23
|
export const JOINT_NESTED = 3;
|
|
25
24
|
|
|
26
|
-
export interface Joint {
|
|
25
|
+
export interface Joint<E = Enode> {
|
|
27
26
|
kind: number;
|
|
28
|
-
enode:
|
|
27
|
+
enode: E | null;
|
|
29
28
|
reg: number;
|
|
30
29
|
decl: number;
|
|
31
30
|
argPos: number;
|
|
32
31
|
}
|
|
33
32
|
|
|
34
|
-
export interface Instruction {
|
|
33
|
+
export interface Instruction<E = Enode> {
|
|
35
34
|
op: number;
|
|
36
|
-
next: Instruction | null;
|
|
35
|
+
next: Instruction<E> | null;
|
|
37
36
|
numArgs: number;
|
|
38
37
|
reg: number;
|
|
39
38
|
reg2: number;
|
|
40
39
|
oreg: number;
|
|
41
40
|
label: number;
|
|
42
|
-
enode:
|
|
41
|
+
enode: E | null;
|
|
43
42
|
lblLow: number;
|
|
44
43
|
lblHigh: number;
|
|
45
|
-
alt: Instruction | null;
|
|
44
|
+
alt: Instruction<E> | null;
|
|
46
45
|
quantifier: number;
|
|
46
|
+
pattern: number;
|
|
47
47
|
regs: number[];
|
|
48
|
-
joints: Joint[];
|
|
48
|
+
joints: Joint<E>[];
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
export interface CodeTree {
|
|
51
|
+
export interface CodeTree<E = Enode> {
|
|
52
52
|
numArgs: number;
|
|
53
53
|
isFilteringCandidates: boolean;
|
|
54
54
|
numRegs: number;
|
|
55
55
|
numChoices: number;
|
|
56
|
-
root: Instruction
|
|
57
|
-
candidates:
|
|
56
|
+
root: Instruction<E>;
|
|
57
|
+
candidates: E[];
|
|
58
|
+
qhead: number;
|
|
58
59
|
candidateGcThreshold: number;
|
|
59
60
|
}
|
|
60
61
|
|
|
61
|
-
export interface LabelHasher {
|
|
62
|
+
export interface LabelHasher<E = Enode> {
|
|
62
63
|
getLabelHash(decl: number): number;
|
|
63
|
-
getGroundEnode(expr: number, quantifier: number):
|
|
64
|
-
getLblHash(node:
|
|
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
|
+
export interface CompilerContext {
|
|
76
|
+
readonly manager: AstManager;
|
|
77
|
+
pushTrail(undo: () => void): void;
|
|
65
78
|
}
|
|
66
79
|
|
|
67
80
|
const NOT_CHECKED = 0;
|
|
@@ -71,7 +84,7 @@ const CHECK_SINGLETON = 2;
|
|
|
71
84
|
const FIND_BEST_CHILD_THRESHOLD = 64;
|
|
72
85
|
const SIMPLE_SEQ_THRESHOLD = 4;
|
|
73
86
|
|
|
74
|
-
const mkInstruction = (op: number): Instruction => ({
|
|
87
|
+
const mkInstruction = <E>(op: number): Instruction<E> => ({
|
|
75
88
|
op,
|
|
76
89
|
next: null,
|
|
77
90
|
numArgs: 0,
|
|
@@ -84,11 +97,12 @@ const mkInstruction = (op: number): Instruction => ({
|
|
|
84
97
|
lblHigh: 0,
|
|
85
98
|
alt: null,
|
|
86
99
|
quantifier: -1,
|
|
100
|
+
pattern: -1,
|
|
87
101
|
regs: [],
|
|
88
102
|
joints: [],
|
|
89
103
|
});
|
|
90
104
|
|
|
91
|
-
const mkNullJoint = (): Joint => ({
|
|
105
|
+
const mkNullJoint = <E>(): Joint<E> => ({
|
|
92
106
|
kind: JOINT_NULL,
|
|
93
107
|
enode: null,
|
|
94
108
|
reg: 0,
|
|
@@ -105,65 +119,69 @@ const countBits = (word: number) => {
|
|
|
105
119
|
return count;
|
|
106
120
|
};
|
|
107
121
|
|
|
108
|
-
const setHash = (instr: Instruction
|
|
122
|
+
const setHash = <E>(instr: Instruction<E>, hash: number) => {
|
|
109
123
|
if (hash < 32) instr.lblLow |= 1 << hash;
|
|
110
124
|
else instr.lblHigh |= 1 << hash;
|
|
111
125
|
};
|
|
112
126
|
|
|
113
|
-
const mkFilter = (op: number, reg: number, low: number, high: number) => {
|
|
114
|
-
const instr = mkInstruction(op);
|
|
127
|
+
const mkFilter = <E>(op: number, reg: number, low: number, high: number) => {
|
|
128
|
+
const instr = mkInstruction<E>(op);
|
|
115
129
|
instr.reg = reg;
|
|
116
130
|
instr.lblLow = low;
|
|
117
131
|
instr.lblHigh = high;
|
|
118
132
|
return instr;
|
|
119
133
|
};
|
|
120
134
|
|
|
121
|
-
const mkSingletonFilter = (op: number, reg: number, hash: number) => {
|
|
122
|
-
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);
|
|
123
137
|
setHash(instr, hash);
|
|
124
138
|
return instr;
|
|
125
139
|
};
|
|
126
140
|
|
|
127
|
-
const mkCompare = (reg1: number, reg2: number) => {
|
|
128
|
-
const instr = mkInstruction(OP_COMPARE);
|
|
141
|
+
const mkCompare = <E>(reg1: number, reg2: number) => {
|
|
142
|
+
const instr = mkInstruction<E>(OP_COMPARE);
|
|
129
143
|
instr.reg = reg1;
|
|
130
144
|
instr.reg2 = reg2;
|
|
131
145
|
return instr;
|
|
132
146
|
};
|
|
133
147
|
|
|
134
|
-
const mkCheck = (reg: number, enode:
|
|
135
|
-
const instr = mkInstruction(OP_CHECK);
|
|
148
|
+
const mkCheck = <E>(reg: number, enode: E | null) => {
|
|
149
|
+
const instr = mkInstruction<E>(OP_CHECK);
|
|
136
150
|
instr.reg = reg;
|
|
137
151
|
instr.enode = enode;
|
|
138
152
|
return instr;
|
|
139
153
|
};
|
|
140
154
|
|
|
141
|
-
const mkChoose = (alt: Instruction | null) => {
|
|
142
|
-
const instr = mkInstruction(OP_CHOOSE);
|
|
155
|
+
const mkChoose = <E>(alt: Instruction<E> | null) => {
|
|
156
|
+
const instr = mkInstruction<E>(OP_CHOOSE);
|
|
143
157
|
instr.alt = alt;
|
|
144
158
|
return instr;
|
|
145
159
|
};
|
|
146
160
|
|
|
147
|
-
const mkInit = (numArgs: number) => {
|
|
148
|
-
const instr = mkInstruction(
|
|
161
|
+
const mkInit = <E>(op: number, numArgs: number) => {
|
|
162
|
+
const instr = mkInstruction<E>(op);
|
|
149
163
|
instr.numArgs = numArgs;
|
|
150
164
|
return instr;
|
|
151
165
|
};
|
|
152
166
|
|
|
153
|
-
|
|
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;
|
|
154
170
|
private registers: number[] = [];
|
|
155
171
|
private todo: number[] = [];
|
|
156
172
|
private aux: number[] = [];
|
|
157
173
|
private vars: number[] = [];
|
|
158
174
|
private quantifier = -1;
|
|
175
|
+
private pattern = -1;
|
|
159
176
|
private patterns: number[] = [];
|
|
160
|
-
private tree: CodeTree = {
|
|
177
|
+
private tree: CodeTree<E> = {
|
|
161
178
|
numArgs: 0,
|
|
162
179
|
isFilteringCandidates: false,
|
|
163
180
|
numRegs: 0,
|
|
164
181
|
numChoices: 0,
|
|
165
|
-
root: mkInit(0),
|
|
182
|
+
root: mkInit<E>(OP_INIT, 0),
|
|
166
183
|
candidates: [],
|
|
184
|
+
qhead: 0,
|
|
167
185
|
candidateGcThreshold: 0,
|
|
168
186
|
};
|
|
169
187
|
private numChoices = 0;
|
|
@@ -172,15 +190,17 @@ export class Compiler {
|
|
|
172
190
|
private matchedExprs = new Map<number, number>();
|
|
173
191
|
private marks: number[] = [];
|
|
174
192
|
private toReset: number[] = [];
|
|
175
|
-
private compatible: Instruction[] = [];
|
|
176
|
-
private incompatible: Instruction[] = [];
|
|
177
|
-
private seq: Instruction[] = [];
|
|
193
|
+
private compatible: Instruction<E>[] = [];
|
|
194
|
+
private incompatible: Instruction<E>[] = [];
|
|
195
|
+
private seq: Instruction<E>[] = [];
|
|
178
196
|
|
|
179
197
|
constructor(
|
|
180
|
-
private
|
|
181
|
-
private
|
|
182
|
-
private
|
|
183
|
-
) {
|
|
198
|
+
private context: CompilerContext,
|
|
199
|
+
private hasher: LabelHasher<E>,
|
|
200
|
+
private isAc: (decl: number) => boolean = () => false,
|
|
201
|
+
) {
|
|
202
|
+
this.manager = context.manager;
|
|
203
|
+
}
|
|
184
204
|
|
|
185
205
|
private getRegister(reg: number) {
|
|
186
206
|
return this.registers[reg] ?? -1;
|
|
@@ -198,10 +218,17 @@ export class Compiler {
|
|
|
198
218
|
return expr !== -1 && this.manager.kinds[expr] !== KIND_VAR;
|
|
199
219
|
}
|
|
200
220
|
|
|
201
|
-
private init(
|
|
221
|
+
private init(
|
|
222
|
+
tree: CodeTree<E>,
|
|
223
|
+
quantifier: number,
|
|
224
|
+
pattern: number,
|
|
225
|
+
patterns: number[],
|
|
226
|
+
firstIndex: number,
|
|
227
|
+
) {
|
|
202
228
|
const manager = this.manager;
|
|
203
229
|
this.tree = tree;
|
|
204
230
|
this.quantifier = quantifier;
|
|
231
|
+
this.pattern = pattern;
|
|
205
232
|
this.patterns = patterns;
|
|
206
233
|
this.numChoices = 0;
|
|
207
234
|
this.todo = [];
|
|
@@ -230,7 +257,7 @@ export class Compiler {
|
|
|
230
257
|
let numUnboundVars = 0;
|
|
231
258
|
const visit = (term: number) => {
|
|
232
259
|
size++;
|
|
233
|
-
if (manager.
|
|
260
|
+
if (manager.isGroundApp(term)) return;
|
|
234
261
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
235
262
|
const arg = manager.getArg(term, index);
|
|
236
263
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
@@ -259,7 +286,7 @@ export class Compiler {
|
|
|
259
286
|
else this.vars[varIndex] = reg;
|
|
260
287
|
continue;
|
|
261
288
|
}
|
|
262
|
-
if (manager.
|
|
289
|
+
if (manager.isGroundApp(pattern)) {
|
|
263
290
|
this.seq.push(mkCheck(reg, hasher.getGroundEnode(pattern, this.quantifier)));
|
|
264
291
|
this.setMark(reg, NOT_CHECKED);
|
|
265
292
|
continue;
|
|
@@ -303,7 +330,7 @@ export class Compiler {
|
|
|
303
330
|
const label = manager.decls[firstApp];
|
|
304
331
|
const numArgs = manager.getNumArgs(firstApp);
|
|
305
332
|
if (this.isAllArgsBoundVars(firstApp)) {
|
|
306
|
-
const instr = mkInstruction(OP_IS_CGR);
|
|
333
|
+
const instr = mkInstruction<E>(OP_IS_CGR);
|
|
307
334
|
instr.label = label;
|
|
308
335
|
instr.reg = firstAppReg;
|
|
309
336
|
instr.numArgs = numArgs;
|
|
@@ -316,7 +343,7 @@ export class Compiler {
|
|
|
316
343
|
this.registers[oreg + index] = manager.getArg(firstApp, index);
|
|
317
344
|
this.aux.push(oreg + index);
|
|
318
345
|
}
|
|
319
|
-
const instr = mkInstruction(OP_BIND);
|
|
346
|
+
const instr = mkInstruction<E>(OP_BIND);
|
|
320
347
|
instr.label = label;
|
|
321
348
|
instr.numArgs = numArgs;
|
|
322
349
|
instr.reg = firstAppReg;
|
|
@@ -336,7 +363,7 @@ export class Compiler {
|
|
|
336
363
|
let count = 0;
|
|
337
364
|
let hasUnboundVars = false;
|
|
338
365
|
const visit = (term: number) => {
|
|
339
|
-
if (manager.
|
|
366
|
+
if (manager.isGroundApp(term)) return;
|
|
340
367
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
341
368
|
const arg = manager.getArg(term, index);
|
|
342
369
|
if (manager.kinds[arg] !== KIND_VAR) visit(arg);
|
|
@@ -350,10 +377,10 @@ export class Compiler {
|
|
|
350
377
|
|
|
351
378
|
private genMpFilter(expr: number): number {
|
|
352
379
|
const manager = this.manager;
|
|
353
|
-
if (manager.
|
|
380
|
+
if (manager.isGroundApp(expr)) {
|
|
354
381
|
const oreg = this.tree.numRegs;
|
|
355
382
|
this.tree.numRegs += 1;
|
|
356
|
-
const instr = mkInstruction(OP_GET_ENODE);
|
|
383
|
+
const instr = mkInstruction<E>(OP_GET_ENODE);
|
|
357
384
|
instr.oreg = oreg;
|
|
358
385
|
instr.enode = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
359
386
|
this.seq.push(instr);
|
|
@@ -364,7 +391,7 @@ export class Compiler {
|
|
|
364
391
|
);
|
|
365
392
|
const oreg = this.tree.numRegs;
|
|
366
393
|
this.tree.numRegs += 1;
|
|
367
|
-
const instr = mkInstruction(OP_GET_CGR);
|
|
394
|
+
const instr = mkInstruction<E>(OP_GET_CGR);
|
|
368
395
|
instr.label = manager.decls[expr];
|
|
369
396
|
instr.numArgs = iregs.length;
|
|
370
397
|
instr.oreg = oreg;
|
|
@@ -413,32 +440,32 @@ export class Compiler {
|
|
|
413
440
|
this.todo.push(oreg + index);
|
|
414
441
|
if (
|
|
415
442
|
(manager.kinds[arg] === KIND_VAR && this.vars[manager.values[arg]] >= 0) ||
|
|
416
|
-
|
|
443
|
+
manager.isGroundApp(arg)
|
|
417
444
|
)
|
|
418
445
|
hasDepth1Joint = true;
|
|
419
446
|
}
|
|
420
|
-
const joints = manager.mapArgs(best, (arg): Joint => {
|
|
447
|
+
const joints = manager.mapArgs(best, (arg): Joint<E> => {
|
|
421
448
|
if (hasDepth1Joint) {
|
|
422
449
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
423
450
|
const reg = this.vars[manager.values[arg]];
|
|
424
|
-
return reg >= 0 ? { ...mkNullJoint(), kind: JOINT_VAR, reg } : mkNullJoint();
|
|
451
|
+
return reg >= 0 ? { ...mkNullJoint<E>(), kind: JOINT_VAR, reg } : mkNullJoint<E>();
|
|
425
452
|
}
|
|
426
|
-
if (manager.
|
|
453
|
+
if (manager.isGroundApp(arg))
|
|
427
454
|
return {
|
|
428
|
-
...mkNullJoint(),
|
|
455
|
+
...mkNullJoint<E>(),
|
|
429
456
|
kind: JOINT_GROUND,
|
|
430
457
|
enode: this.hasher.getGroundEnode(arg, this.quantifier),
|
|
431
458
|
};
|
|
432
|
-
return mkNullJoint();
|
|
459
|
+
return mkNullJoint<E>();
|
|
433
460
|
}
|
|
434
|
-
if (manager.kinds[arg] === KIND_VAR) return mkNullJoint();
|
|
461
|
+
if (manager.kinds[arg] === KIND_VAR) return mkNullJoint<E>();
|
|
435
462
|
let argPos = -1;
|
|
436
463
|
for (let index = 0; index < manager.getNumArgs(arg) && argPos === -1; index++) {
|
|
437
464
|
const innerArg = manager.getArg(arg, index);
|
|
438
465
|
if (manager.kinds[innerArg] === KIND_VAR && this.vars[manager.values[innerArg]] >= 0)
|
|
439
466
|
argPos = index;
|
|
440
467
|
}
|
|
441
|
-
if (argPos === -1) return mkNullJoint();
|
|
468
|
+
if (argPos === -1) return mkNullJoint<E>();
|
|
442
469
|
return {
|
|
443
470
|
kind: JOINT_NESTED,
|
|
444
471
|
enode: null,
|
|
@@ -447,7 +474,7 @@ export class Compiler {
|
|
|
447
474
|
argPos,
|
|
448
475
|
};
|
|
449
476
|
});
|
|
450
|
-
const instr = mkInstruction(OP_CONTINUE);
|
|
477
|
+
const instr = mkInstruction<E>(OP_CONTINUE);
|
|
451
478
|
instr.label = manager.decls[best];
|
|
452
479
|
instr.numArgs = manager.getNumArgs(best);
|
|
453
480
|
instr.oreg = oreg;
|
|
@@ -459,7 +486,7 @@ export class Compiler {
|
|
|
459
486
|
}
|
|
460
487
|
}
|
|
461
488
|
|
|
462
|
-
private linearise(head: Instruction
|
|
489
|
+
private linearise(head: Instruction<E>, firstIndex: number) {
|
|
463
490
|
this.seq = [];
|
|
464
491
|
this.matchedExprs.clear();
|
|
465
492
|
while (this.todo.length > 0) this.lineariseCore();
|
|
@@ -469,8 +496,9 @@ export class Compiler {
|
|
|
469
496
|
}
|
|
470
497
|
const numDecls = this.manager.getQuantifier(this.quantifier).sorts.length;
|
|
471
498
|
for (let index = 0; index < numDecls; index++) if (this.vars[index] === -1) return;
|
|
472
|
-
const instr = mkInstruction(OP_YIELD);
|
|
499
|
+
const instr = mkInstruction<E>(OP_YIELD);
|
|
473
500
|
instr.quantifier = this.quantifier;
|
|
501
|
+
instr.pattern = this.pattern;
|
|
474
502
|
instr.numArgs = numDecls;
|
|
475
503
|
instr.regs = this.vars.slice(0, numDecls);
|
|
476
504
|
this.seq.push(instr);
|
|
@@ -481,7 +509,7 @@ export class Compiler {
|
|
|
481
509
|
}
|
|
482
510
|
}
|
|
483
511
|
|
|
484
|
-
private setNext(instr: Instruction
|
|
512
|
+
private setNext(instr: Instruction<E>, next: Instruction<E> | null) {
|
|
485
513
|
if (!this.isTmpTree) {
|
|
486
514
|
const old = instr.next;
|
|
487
515
|
this.context.pushTrail(() => {
|
|
@@ -491,11 +519,11 @@ export class Compiler {
|
|
|
491
519
|
instr.next = next;
|
|
492
520
|
}
|
|
493
521
|
|
|
494
|
-
private findBestChild(firstChild: Instruction) {
|
|
522
|
+
private findBestChild(firstChild: Instruction<E>) {
|
|
495
523
|
let numTooSimple = 0;
|
|
496
|
-
let bestChild: Instruction | null = null;
|
|
524
|
+
let bestChild: Instruction<E> | null = null;
|
|
497
525
|
let maxCompatibility = 0;
|
|
498
|
-
for (let child: Instruction | null = firstChild; child !== null; child = child.alt) {
|
|
526
|
+
for (let child: Instruction<E> | null = firstChild; child !== null; child = child.alt) {
|
|
499
527
|
const measure = this.getCompatibilityMeasure(child);
|
|
500
528
|
if (measure.isSimple) {
|
|
501
529
|
numTooSimple++;
|
|
@@ -509,76 +537,76 @@ export class Compiler {
|
|
|
509
537
|
return bestChild;
|
|
510
538
|
}
|
|
511
539
|
|
|
512
|
-
private isBindCompatible(instr: Instruction) {
|
|
540
|
+
private isBindCompatible(instr: Instruction<E>) {
|
|
513
541
|
const manager = this.manager;
|
|
514
542
|
const expr = this.getRegister(instr.reg);
|
|
515
543
|
return (
|
|
516
544
|
this.isApp(expr) &&
|
|
517
|
-
!manager.
|
|
545
|
+
!manager.isGroundApp(expr) &&
|
|
518
546
|
manager.decls[expr] === instr.label &&
|
|
519
547
|
manager.getNumArgs(expr) === instr.numArgs
|
|
520
548
|
);
|
|
521
549
|
}
|
|
522
550
|
|
|
523
|
-
private isCompareCompatible(instr: Instruction) {
|
|
551
|
+
private isCompareCompatible(instr: Instruction<E>) {
|
|
524
552
|
const expr = this.getRegister(instr.reg);
|
|
525
553
|
return expr !== -1 && expr === this.getRegister(instr.reg2);
|
|
526
554
|
}
|
|
527
555
|
|
|
528
|
-
private isCheckCompatible(instr: Instruction) {
|
|
556
|
+
private isCheckCompatible(instr: Instruction<E>) {
|
|
529
557
|
const expr = this.getRegister(instr.reg);
|
|
530
|
-
if (!this.
|
|
558
|
+
if (!this.manager.isGroundApp(expr)) return false;
|
|
531
559
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
532
560
|
return instr.enode !== null && node !== null && instr.enode.root === node.root;
|
|
533
561
|
}
|
|
534
562
|
|
|
535
563
|
private getPatLblHash(reg: number) {
|
|
536
564
|
const expr = this.registers[reg];
|
|
537
|
-
if (this.manager.
|
|
565
|
+
if (this.manager.isGroundApp(expr)) {
|
|
538
566
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
539
567
|
return node === null ? -1 : this.hasher.getLblHash(node);
|
|
540
568
|
}
|
|
541
569
|
return this.hasher.getLabelHash(this.manager.decls[expr]);
|
|
542
570
|
}
|
|
543
571
|
|
|
544
|
-
private isCheckSemiCompatible(instr: Instruction) {
|
|
572
|
+
private isCheckSemiCompatible(instr: Instruction<E>) {
|
|
545
573
|
if (instr.enode !== null) this.hasher.getLblHash(instr.enode);
|
|
546
574
|
const expr = this.getRegister(instr.reg);
|
|
547
575
|
return (
|
|
548
576
|
expr !== -1 &&
|
|
549
577
|
this.getMark(instr.reg) === NOT_CHECKED &&
|
|
550
|
-
this.manager.
|
|
578
|
+
this.manager.isGroundApp(expr) &&
|
|
551
579
|
instr.enode !== null &&
|
|
552
580
|
this.getPatLblHash(instr.reg) === instr.enode.lblHash
|
|
553
581
|
);
|
|
554
582
|
}
|
|
555
583
|
|
|
556
|
-
private isFilterCompatible(instr: Instruction) {
|
|
584
|
+
private isFilterCompatible(instr: Instruction<E>) {
|
|
557
585
|
const expr = this.getRegister(instr.reg);
|
|
558
586
|
return (
|
|
559
587
|
this.isApp(expr) &&
|
|
560
|
-
!this.manager.
|
|
588
|
+
!this.manager.isGroundApp(expr) &&
|
|
561
589
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
562
590
|
);
|
|
563
591
|
}
|
|
564
592
|
|
|
565
|
-
private isCfilterCompatible(instr: Instruction) {
|
|
593
|
+
private isCfilterCompatible(instr: Instruction<E>) {
|
|
566
594
|
const expr = this.getRegister(instr.reg);
|
|
567
595
|
return (
|
|
568
596
|
expr !== -1 &&
|
|
569
|
-
this.manager.
|
|
597
|
+
this.manager.isGroundApp(expr) &&
|
|
570
598
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
571
599
|
);
|
|
572
600
|
}
|
|
573
601
|
|
|
574
|
-
private isFilterSemiCompatible(instr: Instruction) {
|
|
602
|
+
private isFilterSemiCompatible(instr: Instruction<E>) {
|
|
575
603
|
const expr = this.getRegister(instr.reg);
|
|
576
604
|
return (
|
|
577
|
-
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)
|
|
578
606
|
);
|
|
579
607
|
}
|
|
580
608
|
|
|
581
|
-
private getCompatibilityMeasure(child: Instruction) {
|
|
609
|
+
private getCompatibilityMeasure(child: Instruction<E>) {
|
|
582
610
|
const manager = this.manager;
|
|
583
611
|
this.toReset.length = 0;
|
|
584
612
|
let weight = 0;
|
|
@@ -627,7 +655,7 @@ export class Compiler {
|
|
|
627
655
|
if (index !== -1) this.todo.splice(index, 1);
|
|
628
656
|
}
|
|
629
657
|
|
|
630
|
-
private insertAt(start: Instruction
|
|
658
|
+
private insertAt(start: Instruction<E>, firstIndex: number) {
|
|
631
659
|
const manager = this.manager;
|
|
632
660
|
let head = start;
|
|
633
661
|
for (;;) {
|
|
@@ -657,7 +685,7 @@ export class Compiler {
|
|
|
657
685
|
this.setMark(curr.reg, NOT_CHECKED);
|
|
658
686
|
compatible.push(curr);
|
|
659
687
|
} else if (this.isCheckSemiCompatible(curr) && curr.enode !== null) {
|
|
660
|
-
const filter = mkFilter(OP_CFILTER, curr.reg, 0, 0);
|
|
688
|
+
const filter = mkFilter<E>(OP_CFILTER, curr.reg, 0, 0);
|
|
661
689
|
setHash(filter, this.hasher.getLblHash(curr.enode));
|
|
662
690
|
setHash(filter, this.getPatLblHash(curr.reg));
|
|
663
691
|
this.setMark(curr.reg, CHECK_SET);
|
|
@@ -704,7 +732,7 @@ export class Compiler {
|
|
|
704
732
|
setHash(filter, hash);
|
|
705
733
|
compatible.push(curr);
|
|
706
734
|
} else {
|
|
707
|
-
const filter = mkFilter(OP_FILTER, curr.reg, curr.lblLow, curr.lblHigh);
|
|
735
|
+
const filter = mkFilter<E>(OP_FILTER, curr.reg, curr.lblLow, curr.lblHigh);
|
|
708
736
|
setHash(filter, hash);
|
|
709
737
|
compatible.push(filter);
|
|
710
738
|
incompatible.push(curr);
|
|
@@ -731,7 +759,7 @@ export class Compiler {
|
|
|
731
759
|
continue;
|
|
732
760
|
}
|
|
733
761
|
const firstChildHead = curr;
|
|
734
|
-
const newChildHead2 = mkInstruction(OP_NOOP);
|
|
762
|
+
const newChildHead2 = mkInstruction<E>(OP_NOOP);
|
|
735
763
|
const newChildHead1 = mkChoose(newChildHead2);
|
|
736
764
|
this.numChoices++;
|
|
737
765
|
let tail = head;
|
|
@@ -757,30 +785,34 @@ export class Compiler {
|
|
|
757
785
|
patterns: number[],
|
|
758
786
|
firstIndex: number,
|
|
759
787
|
isFilteringCandidates: boolean,
|
|
788
|
+
pattern = -1,
|
|
760
789
|
) {
|
|
761
|
-
const
|
|
762
|
-
const numArgs = this.manager.getNumArgs(
|
|
763
|
-
const tree: CodeTree = {
|
|
790
|
+
const first = patterns[firstIndex];
|
|
791
|
+
const numArgs = this.manager.getNumArgs(first);
|
|
792
|
+
const tree: CodeTree<E> = {
|
|
764
793
|
numArgs,
|
|
765
794
|
isFilteringCandidates,
|
|
766
795
|
numRegs: numArgs + 1,
|
|
767
796
|
numChoices: 0,
|
|
768
|
-
root: mkInit(numArgs),
|
|
797
|
+
root: mkInit<E>(this.isAc(this.manager.decls[first]) ? OP_INITAC : OP_INIT, numArgs),
|
|
769
798
|
candidates: [],
|
|
799
|
+
qhead: 0,
|
|
770
800
|
candidateGcThreshold: 10000,
|
|
771
801
|
};
|
|
772
|
-
this.init(tree, quantifier, patterns, firstIndex);
|
|
802
|
+
this.init(tree, quantifier, pattern, patterns, firstIndex);
|
|
773
803
|
this.linearise(tree.root, firstIndex);
|
|
804
|
+
if (tree.root.op === OP_INITAC) this.numChoices++;
|
|
774
805
|
tree.numChoices = this.numChoices;
|
|
775
806
|
return tree;
|
|
776
807
|
}
|
|
777
808
|
|
|
778
809
|
insert(
|
|
779
|
-
tree: CodeTree
|
|
810
|
+
tree: CodeTree<E>,
|
|
780
811
|
quantifier: number,
|
|
781
812
|
patterns: number[],
|
|
782
813
|
firstIndex: number,
|
|
783
814
|
isTmpTree: boolean,
|
|
815
|
+
pattern = -1,
|
|
784
816
|
) {
|
|
785
817
|
if (tree.numArgs !== this.manager.getNumArgs(patterns[firstIndex])) return;
|
|
786
818
|
this.isTmpTree = isTmpTree;
|
|
@@ -790,7 +822,7 @@ export class Compiler {
|
|
|
790
822
|
tree.numRegs = numRegs;
|
|
791
823
|
});
|
|
792
824
|
}
|
|
793
|
-
this.init(tree, quantifier, patterns, firstIndex);
|
|
825
|
+
this.init(tree, quantifier, pattern, patterns, firstIndex);
|
|
794
826
|
this.numChoices = tree.numChoices;
|
|
795
827
|
this.insertAt(tree.root, firstIndex);
|
|
796
828
|
if (this.numChoices <= tree.numChoices) return;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { AstManager } from "./ast";
|
|
2
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
5
|
+
|
|
6
|
+
// dependent_expr_state_tactic pushes a scope of the state but not of the simplifier, so the
|
|
7
|
+
// rewriter never registers the kinds it shares and leaves every formula as it is.
|
|
8
|
+
export const runMaxBvSharing = (manager: AstManager) => (goal: Goal) => {
|
|
9
|
+
runSimplifier(goal, false, (state) => {
|
|
10
|
+
const rewriter = new MaxBvSharing(manager);
|
|
11
|
+
return {
|
|
12
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
13
|
+
release: () => rewriter.release(),
|
|
14
|
+
};
|
|
15
|
+
});
|
|
16
|
+
return [goal];
|
|
17
|
+
};
|