tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +4 -11
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import {
|
|
2
|
+
FAMILY_USER,
|
|
3
|
+
KIND_APP,
|
|
4
|
+
KIND_VAR,
|
|
5
|
+
OP_EQ,
|
|
6
|
+
OP_NOT,
|
|
7
|
+
OP_OR,
|
|
8
|
+
type AstManager,
|
|
9
|
+
QUANTIFIER_FORALL,
|
|
10
|
+
} from "./ast";
|
|
11
|
+
import { isAppOf } from "./ast-util";
|
|
12
|
+
|
|
13
|
+
// The result comes with a reference, which the caller releases.
|
|
14
|
+
export const simplifyInjAxiom = (manager: AstManager, quantifier: number) => {
|
|
15
|
+
const data = manager.getQuantifier(quantifier);
|
|
16
|
+
const body = data.body;
|
|
17
|
+
if (
|
|
18
|
+
data.kind !== QUANTIFIER_FORALL ||
|
|
19
|
+
!isAppOf(manager, body, OP_OR) ||
|
|
20
|
+
manager.getNumArgs(body) !== 2
|
|
21
|
+
)
|
|
22
|
+
return undefined;
|
|
23
|
+
const isSwapped = isAppOf(manager, manager.getArg(body, 1), OP_NOT);
|
|
24
|
+
const negated = manager.getArg(body, isSwapped ? 1 : 0);
|
|
25
|
+
const varEq = manager.getArg(body, isSwapped ? 0 : 1);
|
|
26
|
+
if (!isAppOf(manager, negated, OP_NOT)) return undefined;
|
|
27
|
+
const appEq = manager.getArg(negated, 0);
|
|
28
|
+
if (!isAppOf(manager, appEq, OP_EQ) || !isAppOf(manager, varEq, OP_EQ)) return undefined;
|
|
29
|
+
const first = manager.getArg(appEq, 0);
|
|
30
|
+
const second = manager.getArg(appEq, 1);
|
|
31
|
+
const firstVar = manager.getArg(varEq, 0);
|
|
32
|
+
const secondVar = manager.getArg(varEq, 1);
|
|
33
|
+
const decl = manager.decls[first];
|
|
34
|
+
const numArgs = manager.kinds[first] === KIND_APP ? manager.getNumArgs(first) : 0;
|
|
35
|
+
if (
|
|
36
|
+
manager.kinds[first] !== KIND_APP ||
|
|
37
|
+
manager.kinds[second] !== KIND_APP ||
|
|
38
|
+
manager.decls[second] !== decl ||
|
|
39
|
+
manager.getNumArgs(second) !== numArgs ||
|
|
40
|
+
manager.funcDecls[decl].family !== FAMILY_USER ||
|
|
41
|
+
numArgs === 0 ||
|
|
42
|
+
manager.kinds[firstVar] !== KIND_VAR ||
|
|
43
|
+
manager.kinds[secondVar] !== KIND_VAR ||
|
|
44
|
+
firstVar === secondVar
|
|
45
|
+
)
|
|
46
|
+
return undefined;
|
|
47
|
+
let index = -1;
|
|
48
|
+
for (let argIndex = 0; argIndex < numArgs; argIndex++) {
|
|
49
|
+
const firstArg = manager.getArg(first, argIndex);
|
|
50
|
+
const secondArg = manager.getArg(second, argIndex);
|
|
51
|
+
if (manager.kinds[firstArg] !== KIND_VAR && !manager.isUninterpretedConst(firstArg))
|
|
52
|
+
return undefined;
|
|
53
|
+
if (
|
|
54
|
+
(firstArg === firstVar && secondArg === secondVar) ||
|
|
55
|
+
(firstArg === secondVar && secondArg === firstVar)
|
|
56
|
+
) {
|
|
57
|
+
if (index !== -1) return undefined;
|
|
58
|
+
index = argIndex;
|
|
59
|
+
} else if (firstArg !== secondArg || firstArg === firstVar || firstArg === secondVar)
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
if (index === -1 || !manager.isGround(quantifier)) return undefined;
|
|
63
|
+
return manager.withTemporaries(() => {
|
|
64
|
+
const domain = manager.funcDecls[decl].domain;
|
|
65
|
+
const sorts: number[] = [];
|
|
66
|
+
const names: number[] = [];
|
|
67
|
+
const args: number[] = [];
|
|
68
|
+
const invArgs: number[] = [];
|
|
69
|
+
let inverted = -1;
|
|
70
|
+
for (let argIndex = 0; argIndex < numArgs; argIndex++) {
|
|
71
|
+
const arg = manager.getArg(first, argIndex);
|
|
72
|
+
if (manager.kinds[arg] !== KIND_VAR) {
|
|
73
|
+
args.push(arg);
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
names.push(argIndex);
|
|
77
|
+
sorts.push(domain[argIndex]);
|
|
78
|
+
const variable = manager.mkVar(sorts.length - 1, domain[argIndex]);
|
|
79
|
+
args.push(variable);
|
|
80
|
+
if (argIndex === index) inverted = variable;
|
|
81
|
+
else invArgs.push(variable);
|
|
82
|
+
}
|
|
83
|
+
const app = manager.mkApp(decl, args, manager.sorts[first]);
|
|
84
|
+
invArgs.push(app);
|
|
85
|
+
const inverse = manager.mkFreshFuncDecl(
|
|
86
|
+
"inj",
|
|
87
|
+
invArgs.map((arg) => manager.sorts[arg]),
|
|
88
|
+
domain[index],
|
|
89
|
+
);
|
|
90
|
+
return manager.mkQuantifier({
|
|
91
|
+
kind: QUANTIFIER_FORALL,
|
|
92
|
+
sorts: sorts.reverse(),
|
|
93
|
+
names,
|
|
94
|
+
body: manager.mkEq(manager.mkApp(inverse, invArgs, domain[index]), inverted),
|
|
95
|
+
patterns: [manager.mkPattern([app])],
|
|
96
|
+
noPatterns: [],
|
|
97
|
+
weight: 0,
|
|
98
|
+
qid: "",
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
};
|
|
@@ -1,21 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
5
|
-
FAMILY_ARITH,
|
|
6
4
|
FAMILY_BASIC,
|
|
7
5
|
FAMILY_USER,
|
|
8
6
|
KIND_APP,
|
|
9
7
|
KIND_QUANTIFIER,
|
|
8
|
+
OP_ADD,
|
|
10
9
|
OP_AND,
|
|
10
|
+
OP_BADD,
|
|
11
|
+
OP_BAND,
|
|
12
|
+
OP_BMUL,
|
|
13
|
+
OP_BOR,
|
|
14
|
+
OP_BXNOR,
|
|
15
|
+
OP_BXOR,
|
|
11
16
|
OP_EQ,
|
|
12
17
|
OP_IMPLIES,
|
|
13
18
|
OP_ITE,
|
|
19
|
+
OP_MUL,
|
|
14
20
|
OP_NOT,
|
|
15
21
|
OP_OR,
|
|
16
22
|
OP_XOR,
|
|
17
23
|
SORT_BOOL,
|
|
18
|
-
isArithSort,
|
|
19
24
|
} from "./ast";
|
|
20
25
|
import { CaseSplitQueue } from "./case-split-queue";
|
|
21
26
|
import { CgTable, getCongruenceJustification, isCongruent } from "./cg-table";
|
|
@@ -38,6 +43,7 @@ import {
|
|
|
38
43
|
NO_ENODES,
|
|
39
44
|
UnitResolutionJustification,
|
|
40
45
|
} from "./enode";
|
|
46
|
+
import { isCommutativeDecl } from "./euf/egraph";
|
|
41
47
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
42
48
|
import {
|
|
43
49
|
BoolVar,
|
|
@@ -55,8 +61,9 @@ import type { DefaultQuantifierManager } from "./quantifier-manager";
|
|
|
55
61
|
import { RelevancyPropagator } from "./relevancy";
|
|
56
62
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
57
63
|
import { sortNumbers } from "./sort";
|
|
58
|
-
import type {
|
|
64
|
+
import type { Theory } from "./theory";
|
|
59
65
|
import { setAt, shrink } from "./array";
|
|
66
|
+
import { DEFAULT_CONFIG, IA_RANDOM, IA_RANDOM_WHEN_SEARCHING } from "./smt-setup";
|
|
60
67
|
import { StickyGenerations } from "./sticky-generations";
|
|
61
68
|
|
|
62
69
|
const DEEP_EXPR_THRESHOLD = 1024;
|
|
@@ -85,6 +92,26 @@ export const BV_THEORY = 1 << 31;
|
|
|
85
92
|
export const UNDO_ADD_EQ = 8;
|
|
86
93
|
export const UNDO_TH_VAR = 9;
|
|
87
94
|
|
|
95
|
+
// func_decl_info::is_flat_associative of a commutative declaration. cg_table::mk_table_for gives
|
|
96
|
+
// such a declaration the n-ary table, not the binary commutative one.
|
|
97
|
+
const isFlatAssociativeDecl = (manager: AstManager, decl: number) => {
|
|
98
|
+
switch (manager.funcDecls[decl].op) {
|
|
99
|
+
case OP_AND:
|
|
100
|
+
case OP_OR:
|
|
101
|
+
case OP_ADD:
|
|
102
|
+
case OP_MUL:
|
|
103
|
+
case OP_BADD:
|
|
104
|
+
case OP_BMUL:
|
|
105
|
+
case OP_BAND:
|
|
106
|
+
case OP_BOR:
|
|
107
|
+
case OP_BXOR:
|
|
108
|
+
case OP_BXNOR:
|
|
109
|
+
return true;
|
|
110
|
+
default:
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
};
|
|
114
|
+
|
|
88
115
|
interface NewEq {
|
|
89
116
|
lhs: Enode;
|
|
90
117
|
rhs: Enode;
|
|
@@ -104,12 +131,13 @@ export abstract class Internalizer {
|
|
|
104
131
|
readonly caseSplitQueue: CaseSplitQueue;
|
|
105
132
|
readonly cgTable = new CgTable();
|
|
106
133
|
private stickyGenerations = new StickyGenerations();
|
|
107
|
-
abstract
|
|
134
|
+
abstract getTheory(family: number): Theory | undefined;
|
|
108
135
|
abstract readonly qmanager: DefaultQuantifierManager;
|
|
109
136
|
|
|
110
137
|
numBoolVars = 0;
|
|
111
138
|
boolVar2Expr: number[] = [];
|
|
112
139
|
private boolVarData = new Int32Array(2048);
|
|
140
|
+
private boolVarTheories: number[] = [];
|
|
113
141
|
justifications: BJustification[] = [];
|
|
114
142
|
activity: number[] = [];
|
|
115
143
|
protected assignment: number[] = [];
|
|
@@ -146,6 +174,7 @@ export abstract class Internalizer {
|
|
|
146
174
|
protected cachedGeneration = new Map<number, number>();
|
|
147
175
|
private randomSeed = 0;
|
|
148
176
|
isSearching = false;
|
|
177
|
+
config = DEFAULT_CONFIG;
|
|
149
178
|
|
|
150
179
|
constructor(
|
|
151
180
|
readonly manager: AstManager,
|
|
@@ -305,12 +334,18 @@ export abstract class Internalizer {
|
|
|
305
334
|
}
|
|
306
335
|
|
|
307
336
|
findCongruent(decl: number, args: Enode[]) {
|
|
308
|
-
return this.cgTable.findFor(
|
|
337
|
+
return this.cgTable.findFor(
|
|
338
|
+
decl,
|
|
339
|
+
args,
|
|
340
|
+
args.length === 2 &&
|
|
341
|
+
isCommutativeDecl(this.manager, decl) &&
|
|
342
|
+
!isFlatAssociativeDecl(this.manager, decl),
|
|
343
|
+
);
|
|
309
344
|
}
|
|
310
345
|
|
|
311
|
-
isDiseq(first: Enode, second: Enode) {
|
|
346
|
+
isDiseq(first: Enode, second: Enode, isCheckingValues = true) {
|
|
312
347
|
const manager = this.manager;
|
|
313
|
-
if (manager.areDistinct(first.root.owner, second.root.owner)) return true;
|
|
348
|
+
if (isCheckingValues && manager.areDistinct(first.root.owner, second.root.owner)) return true;
|
|
314
349
|
const tmp = this.isDiseqTmp;
|
|
315
350
|
if (tmp === -1 || manager.sorts[manager.getArg(tmp, 0)] !== manager.sorts[first.owner]) {
|
|
316
351
|
if (tmp !== -1) manager.decRef(tmp);
|
|
@@ -350,8 +385,8 @@ export abstract class Internalizer {
|
|
|
350
385
|
if (arg === manager.trueExpr) return L_FALSE;
|
|
351
386
|
return L_UNDEF;
|
|
352
387
|
}
|
|
353
|
-
if (this.isBInternalized(expr)) return this.getAssignmentOfExpr(expr);
|
|
354
388
|
if (expr === manager.falseExpr) return L_FALSE;
|
|
389
|
+
if (this.isBInternalized(expr)) return this.getAssignmentOfExpr(expr);
|
|
355
390
|
if (expr === manager.trueExpr) return L_TRUE;
|
|
356
391
|
return L_UNDEF;
|
|
357
392
|
}
|
|
@@ -444,7 +479,12 @@ export abstract class Internalizer {
|
|
|
444
479
|
this.boolVarData[2 * boolVar] = 0;
|
|
445
480
|
this.boolVarData[2 * boolVar + 1] = this.scopeLevel;
|
|
446
481
|
this.justifications[boolVar] = null;
|
|
447
|
-
|
|
482
|
+
const initialActivity = this.config.randomInitialActivity;
|
|
483
|
+
this.activity[boolVar] =
|
|
484
|
+
initialActivity === IA_RANDOM ||
|
|
485
|
+
(initialActivity === IA_RANDOM_WHEN_SEARCHING && this.isSearching)
|
|
486
|
+
? -((this.getRandomValue() % 1000) / 1000)
|
|
487
|
+
: 0;
|
|
448
488
|
this.assignment[literal] = L_UNDEF;
|
|
449
489
|
this.assignment[literal + 1] = L_UNDEF;
|
|
450
490
|
this.resetWatches(literal);
|
|
@@ -510,7 +550,12 @@ export abstract class Internalizer {
|
|
|
510
550
|
return this.hasBoolVarFlag(boolVar, BV_EQ | BV_ENODE | BV_THEORY | BV_QUANTIFIER);
|
|
511
551
|
}
|
|
512
552
|
|
|
513
|
-
|
|
553
|
+
getBoolVarTheory(boolVar: BoolVar) {
|
|
554
|
+
return this.hasBoolVarFlag(boolVar, BV_THEORY) ? this.boolVarTheories[boolVar] : -1;
|
|
555
|
+
}
|
|
556
|
+
|
|
557
|
+
setVarTheory(boolVar: BoolVar, thId: number) {
|
|
558
|
+
setAt(this.boolVarTheories, boolVar, thId);
|
|
514
559
|
if (this.scopeLevel > this.getInternLevel(boolVar)) {
|
|
515
560
|
this.trailInts.push(boolVar);
|
|
516
561
|
this.trailKinds.push(UNDO_VAR_THEORY);
|
|
@@ -518,6 +563,12 @@ export abstract class Internalizer {
|
|
|
518
563
|
this.setBoolVarFlag(boolVar, BV_THEORY, true);
|
|
519
564
|
}
|
|
520
565
|
|
|
566
|
+
forcePhase(literal: Literal) {
|
|
567
|
+
const boolVar = getVar(literal);
|
|
568
|
+
this.setBoolVarFlag(boolVar, BV_PHASE_AVAILABLE, true);
|
|
569
|
+
this.setBoolVarFlag(boolVar, BV_PHASE, !isNegated(literal));
|
|
570
|
+
}
|
|
571
|
+
|
|
521
572
|
setTrueFirstFlag(boolVar: BoolVar) {
|
|
522
573
|
this.trailInts.push(boolVar);
|
|
523
574
|
this.trailKinds.push(UNDO_TRUE_FIRST);
|
|
@@ -535,15 +586,19 @@ export abstract class Internalizer {
|
|
|
535
586
|
const moreArgs: Enode[] = numArgs > 2 ? [] : NO_ENODES;
|
|
536
587
|
for (let index = 2; index < numArgs; index++) moreArgs.push(this.getArgEnode(expr, index));
|
|
537
588
|
const isEq = !isSuppressingArgs && manager.getOp(expr) === OP_EQ;
|
|
589
|
+
const decl = manager.decls[expr];
|
|
590
|
+
const isCommutative = isEq || (numArgs === 2 && isCommutativeDecl(manager, decl));
|
|
538
591
|
const node = new Enode(
|
|
539
592
|
expr,
|
|
540
|
-
|
|
593
|
+
decl,
|
|
541
594
|
numArgs,
|
|
542
595
|
numArgs > 0 ? this.getArgEnode(expr, 0) : null,
|
|
543
596
|
numArgs > 1 ? this.getArgEnode(expr, 1) : null,
|
|
544
597
|
moreArgs,
|
|
545
598
|
generation,
|
|
546
599
|
isEq,
|
|
600
|
+
isCommutative,
|
|
601
|
+
isEq || (isCommutative && !isFlatAssociativeDecl(manager, decl)),
|
|
547
602
|
manager.sorts[expr] === SORT_BOOL,
|
|
548
603
|
isMergeTf,
|
|
549
604
|
isCgcEnabled,
|
|
@@ -647,18 +702,20 @@ export abstract class Internalizer {
|
|
|
647
702
|
return family === FAMILY_BASIC || family === FAMILY_USER;
|
|
648
703
|
}
|
|
649
704
|
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
this.isEInternalized(expr) ||
|
|
653
|
-
this.manager.depths[expr] <= DEEP_EXPR_THRESHOLD ||
|
|
654
|
-
!this.shouldInternalizeRec(expr)
|
|
655
|
-
)
|
|
656
|
-
return;
|
|
705
|
+
// Internalizes bottom up in topological order, so the recursion of internalizeRec stays shallow.
|
|
706
|
+
private internalizeDeep(exprs: readonly number[]) {
|
|
657
707
|
const manager = this.manager;
|
|
708
|
+
const isDeep = (expr: number) =>
|
|
709
|
+
!this.isEInternalized(expr) &&
|
|
710
|
+
manager.depths[expr] > DEEP_EXPR_THRESHOLD &&
|
|
711
|
+
this.shouldInternalizeRec(expr);
|
|
712
|
+
if (!exprs.some(isDeep)) return;
|
|
658
713
|
const colors = new Map<number, number>();
|
|
659
714
|
const getColor = (current: number, isGate: boolean) =>
|
|
660
715
|
colors.get(current * 2 + (isGate ? 1 : 0)) ?? WHITE;
|
|
661
|
-
const todo: [number, boolean][] =
|
|
716
|
+
const todo: [number, boolean][] = exprs
|
|
717
|
+
.filter(isDeep)
|
|
718
|
+
.map((innerExpr): [number, boolean] => [innerExpr, true]);
|
|
662
719
|
const sorted: [number, boolean][] = [];
|
|
663
720
|
const visitChild = (child: number, isGate: boolean) => {
|
|
664
721
|
if (getColor(child, isGate) === WHITE) todo.push([child, isGate]);
|
|
@@ -689,7 +746,7 @@ export abstract class Internalizer {
|
|
|
689
746
|
visitChildren(top[0]);
|
|
690
747
|
} else {
|
|
691
748
|
colors.set(top[0] * 2 + (top[1] ? 1 : 0), BLACK);
|
|
692
|
-
if (top[0]
|
|
749
|
+
if (!exprs.includes(top[0]) && !manager.isNot(top[0]) && this.shouldInternalizeRec(top[0]))
|
|
693
750
|
sorted.push(top);
|
|
694
751
|
}
|
|
695
752
|
}
|
|
@@ -699,7 +756,7 @@ export abstract class Internalizer {
|
|
|
699
756
|
internalizeAssertion(expr: number, generation: number) {
|
|
700
757
|
const savedGeneration = this.generation;
|
|
701
758
|
this.generation = generation;
|
|
702
|
-
this.internalizeDeep(expr);
|
|
759
|
+
this.internalizeDeep([expr]);
|
|
703
760
|
const manager = this.manager;
|
|
704
761
|
if (this.isGate(expr)) {
|
|
705
762
|
switch (manager.getOp(expr)) {
|
|
@@ -763,13 +820,19 @@ export abstract class Internalizer {
|
|
|
763
820
|
internalize(expr: number, isGateContext: boolean, generation = this.generation) {
|
|
764
821
|
const savedGeneration = this.generation;
|
|
765
822
|
this.generation = generation;
|
|
766
|
-
this.internalizeDeep(expr);
|
|
823
|
+
this.internalizeDeep([expr]);
|
|
767
824
|
this.internalizeRec(expr, isGateContext);
|
|
768
825
|
this.generation = savedGeneration;
|
|
769
826
|
}
|
|
770
827
|
|
|
828
|
+
internalizeAll(exprs: readonly number[], isGateContext: boolean) {
|
|
829
|
+
this.internalizeDeep(exprs);
|
|
830
|
+
for (const expr of exprs) this.internalizeRec(expr, isGateContext);
|
|
831
|
+
}
|
|
832
|
+
|
|
771
833
|
private internalizeRec(expr: number, isGateContext: boolean) {
|
|
772
834
|
const manager = this.manager;
|
|
835
|
+
if (manager.isLambda(expr)) throw new SmtUnsupportedError("lambdas in the array theory");
|
|
773
836
|
if (manager.sorts[expr] === SORT_BOOL) this.internalizeFormula(expr, isGateContext);
|
|
774
837
|
else this.internalizeTerm(expr);
|
|
775
838
|
}
|
|
@@ -808,13 +871,16 @@ export abstract class Internalizer {
|
|
|
808
871
|
this.internalizeFormulaCore(expr, isGateContext);
|
|
809
872
|
const boolVar = this.getBoolVar(expr);
|
|
810
873
|
this.setBoolVarFlag(boolVar, BV_EQ, true);
|
|
811
|
-
const
|
|
812
|
-
|
|
874
|
+
const manager = this.manager;
|
|
875
|
+
this.getTheory(manager.getSortFamily(manager.sorts[manager.getArg(expr, 0)]))?.internalizeEqEh(
|
|
876
|
+
expr,
|
|
877
|
+
boolVar,
|
|
878
|
+
);
|
|
813
879
|
}
|
|
814
880
|
|
|
815
881
|
private internalizeTheoryAtom(expr: number, isGateContext: boolean) {
|
|
816
|
-
|
|
817
|
-
|
|
882
|
+
const theory = this.getTheory(this.manager.getFamily(expr));
|
|
883
|
+
if (theory === undefined || !theory.internalizeAtom(expr, isGateContext)) return false;
|
|
818
884
|
const boolVar = this.getBoolVar(expr);
|
|
819
885
|
if (!isGateContext) {
|
|
820
886
|
const node = this.exprToEnode[expr];
|
|
@@ -939,21 +1005,28 @@ export abstract class Internalizer {
|
|
|
939
1005
|
const existing = this.exprToEnode[expr];
|
|
940
1006
|
if (existing !== undefined) {
|
|
941
1007
|
this.updateGeneration(existing);
|
|
942
|
-
|
|
943
|
-
|
|
1008
|
+
const theory = this.getTheory(manager.getFamily(expr));
|
|
1009
|
+
if (theory !== undefined && !theory.isAttachedToVar(existing)) theory.internalizeTerm(expr);
|
|
944
1010
|
return;
|
|
945
1011
|
}
|
|
946
1012
|
if (manager.getOp(expr) === OP_ITE) {
|
|
947
1013
|
this.internalizeIteTerm(expr);
|
|
948
1014
|
return;
|
|
949
1015
|
}
|
|
950
|
-
if (manager.getFamily(expr)
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
1016
|
+
if (!this.getTheory(manager.getFamily(expr))?.internalizeTerm(expr)) {
|
|
1017
|
+
for (let index = 0; index < manager.getNumArgs(expr); index++) {
|
|
1018
|
+
const arg = manager.getArg(expr, index);
|
|
1019
|
+
this.internalizeRec(arg, false);
|
|
1020
|
+
}
|
|
1021
|
+
if (this.exprToEnode[expr] === undefined) this.mkEnode(expr, false, false, true);
|
|
954
1022
|
}
|
|
955
|
-
|
|
956
|
-
this.
|
|
1023
|
+
const node = this.exprToEnode[expr];
|
|
1024
|
+
if (node !== undefined) this.applySortCnstr(expr, node);
|
|
1025
|
+
}
|
|
1026
|
+
|
|
1027
|
+
private applySortCnstr(expr: number, node: Enode) {
|
|
1028
|
+
const sort = this.manager.sorts[expr];
|
|
1029
|
+
this.getTheory(this.manager.getSortFamily(sort))?.applySortCnstr(node, sort);
|
|
957
1030
|
}
|
|
958
1031
|
|
|
959
1032
|
mkEqAtom(lhs: number, rhs: number) {
|