tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- 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 +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- 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 +268 -71
- 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 +8 -1
- 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/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- 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 +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- 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 +1 -3
- 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 +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- 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 +0 -2
- 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 +3 -5
- 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 +0 -2
- 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 +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- 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 +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -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 +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- 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 +26 -7
- 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 +158 -82
- 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 +144 -108
- 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 +50 -19
- 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 +138 -97
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- 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 +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- 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 +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- 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 +12 -13
- package/src/prover/zenon/parse.ts +0 -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 +0 -2
- 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 +1 -3
- 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/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_kernel.cpp, src/smt/smt_context.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../errors";
|
|
4
2
|
import { type AstManager } from "./ast";
|
|
5
3
|
import type { SmtSetup } from "./smt-setup";
|
|
@@ -10,7 +8,7 @@ import type { KernelParams } from "./solver";
|
|
|
10
8
|
export class SmtKernel {
|
|
11
9
|
readonly context: Context;
|
|
12
10
|
private asserted: AssertedFormulas;
|
|
13
|
-
|
|
11
|
+
isSetUp = false;
|
|
14
12
|
private setup: SmtSetup | undefined;
|
|
15
13
|
|
|
16
14
|
constructor(manager: AstManager, params: KernelParams) {
|
|
@@ -23,10 +21,16 @@ export class SmtKernel {
|
|
|
23
21
|
this.setup = params.setup;
|
|
24
22
|
}
|
|
25
23
|
|
|
24
|
+
// As in Z3, a kernel not yet set up reads auto_config again.
|
|
25
|
+
updateParams(params: KernelParams) {
|
|
26
|
+
if (!this.isSetUp) this.setup = params.setup;
|
|
27
|
+
this.context.updateParams(params);
|
|
28
|
+
this.asserted.updateParams(this.context.config);
|
|
29
|
+
}
|
|
30
|
+
|
|
26
31
|
private setupContext(isUsingStaticFeatures: boolean) {
|
|
27
32
|
if (this.isSetUp) return;
|
|
28
|
-
this.isSetUp =
|
|
29
|
-
this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
33
|
+
this.isSetUp = this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
30
34
|
}
|
|
31
35
|
|
|
32
36
|
// context::copy sets up and internalizes a copy as soon as it makes it.
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// for the legacy ones the setups for difference logic pick, and one array solver, which is
|
|
5
|
-
// theory_array_full.
|
|
1
|
+
// Of the parameters a setup picks, the port takes those in SmtConfig and the MBQI that setup_AUFLIA
|
|
2
|
+
// and setup_AUFLIRA turn on. The port has one arithmetic solver, so it stands in for the legacy
|
|
3
|
+
// ones the setups for difference logic pick, and one array solver, which is theory_array_full.
|
|
6
4
|
import {
|
|
7
5
|
type AstManager,
|
|
8
6
|
FAMILY_ARITH,
|
|
@@ -16,6 +14,7 @@ import {
|
|
|
16
14
|
FAMILY_RECFUN,
|
|
17
15
|
FAMILY_SEQ,
|
|
18
16
|
} from "./ast";
|
|
17
|
+
import { SmtDefaultError } from "../../../errors";
|
|
19
18
|
import { collectStaticFeatures, isDense, type StaticFeatures } from "./static-features";
|
|
20
19
|
|
|
21
20
|
const AUFLIA_LOGICS = new Set([
|
|
@@ -103,6 +102,8 @@ export interface SmtConfig {
|
|
|
103
102
|
isNnfCnf: boolean;
|
|
104
103
|
isEq2Ineq: boolean;
|
|
105
104
|
isFindingMacros: boolean;
|
|
105
|
+
isEliminatingTermIte: boolean;
|
|
106
|
+
isArithPropagatingEqs: boolean;
|
|
106
107
|
}
|
|
107
108
|
|
|
108
109
|
const UNKNOWN_THEORIES = [
|
|
@@ -130,10 +131,14 @@ export const DEFAULT_CONFIG: SmtConfig = {
|
|
|
130
131
|
isNnfCnf: true,
|
|
131
132
|
isEq2Ineq: false,
|
|
132
133
|
isFindingMacros: false,
|
|
134
|
+
isEliminatingTermIte: false,
|
|
135
|
+
isArithPropagatingEqs: true,
|
|
133
136
|
};
|
|
134
137
|
|
|
135
|
-
|
|
138
|
+
// setup_unknown(), which closes with setup_relevancy.
|
|
139
|
+
const setupUnknown = (config: SmtConfig, features: StaticFeatures) => {
|
|
136
140
|
config.theories.push(...UNKNOWN_THEORIES);
|
|
141
|
+
if (features.hasBv && features.numQuantifiers === 0) config.relevancyLevel = 0;
|
|
137
142
|
};
|
|
138
143
|
|
|
139
144
|
const setupQfUf = (config: SmtConfig) => {
|
|
@@ -144,15 +149,23 @@ const setupQfUf = (config: SmtConfig) => {
|
|
|
144
149
|
config.randomInitialActivity = IA_RANDOM;
|
|
145
150
|
};
|
|
146
151
|
|
|
152
|
+
const setupQfUfByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
153
|
+
if (isArith(features))
|
|
154
|
+
throw new SmtDefaultError(
|
|
155
|
+
"Benchmark constrains arithmetic, but specified logic does not support it.",
|
|
156
|
+
);
|
|
157
|
+
setupQfUf(config);
|
|
158
|
+
};
|
|
159
|
+
|
|
147
160
|
const setupQfDt = (config: SmtConfig) => {
|
|
148
161
|
setupQfUf(config);
|
|
149
162
|
config.theories.push(FAMILY_DATATYPE, FAMILY_RECFUN);
|
|
150
163
|
};
|
|
151
164
|
|
|
152
|
-
// The parameters smt_params::setup_QF_IDL, setup_QF_RDL and setup_QF_LIA share.
|
|
153
165
|
const setupDiffLogicParams = (config: SmtConfig) => {
|
|
154
166
|
config.relevancyLevel = 0;
|
|
155
167
|
config.isEq2Ineq = true;
|
|
168
|
+
config.isArithPropagatingEqs = false;
|
|
156
169
|
config.isNnfCnf = false;
|
|
157
170
|
};
|
|
158
171
|
|
|
@@ -161,13 +174,25 @@ const setupQfLia = (config: SmtConfig) => {
|
|
|
161
174
|
config.theories.push(FAMILY_ARITH);
|
|
162
175
|
};
|
|
163
176
|
|
|
177
|
+
const checkNoUninterpretedFunctions = (features: StaticFeatures) => {
|
|
178
|
+
if (features.numUninterpretedFunctions !== 0)
|
|
179
|
+
throw new SmtDefaultError(
|
|
180
|
+
"Benchmark contains uninterpreted function symbols, but specified logic does not support them.",
|
|
181
|
+
);
|
|
182
|
+
};
|
|
183
|
+
|
|
164
184
|
const setupQfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
185
|
+
checkNoUninterpretedFunctions(features);
|
|
165
186
|
setupDiffLogicParams(config);
|
|
166
187
|
if (features.maxIteTreeDepth > 50) {
|
|
167
188
|
config.isEq2Ineq = false;
|
|
189
|
+
config.isArithPropagatingEqs = true;
|
|
168
190
|
config.relevancyLevel = 2;
|
|
169
|
-
} else if (features.numClauses === features.numUnits)
|
|
170
|
-
|
|
191
|
+
} else if (features.numClauses === features.numUnits) {
|
|
192
|
+
config.relevancyLevel = 2;
|
|
193
|
+
config.isEliminatingTermIte = true;
|
|
194
|
+
} else {
|
|
195
|
+
config.isEliminatingTermIte = true;
|
|
171
196
|
config.isRestartAdaptive = false;
|
|
172
197
|
config.restartStrategy = RS_GEOMETRIC;
|
|
173
198
|
config.restartFactor = 1.5;
|
|
@@ -177,11 +202,13 @@ const setupQfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
177
202
|
|
|
178
203
|
const setupQfLra = (config: SmtConfig) => {
|
|
179
204
|
setupDiffLogicParams(config);
|
|
205
|
+
config.isEliminatingTermIte = true;
|
|
180
206
|
config.phaseSelection = PS_THEORY;
|
|
181
207
|
config.theories.push(FAMILY_ARITH);
|
|
182
208
|
};
|
|
183
209
|
|
|
184
210
|
const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
211
|
+
checkNoUninterpretedFunctions(features);
|
|
185
212
|
setupQfLra(config);
|
|
186
213
|
if (features.arithKSum.num > 2000000n && features.arithKSum.den > 500n) config.relevancyLevel = 2;
|
|
187
214
|
if (features.isCnf) return;
|
|
@@ -190,6 +217,13 @@ const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
190
217
|
};
|
|
191
218
|
|
|
192
219
|
const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
220
|
+
if (!isInDiffLogic(features))
|
|
221
|
+
throw new SmtDefaultError("Benchmark is not in QF_RDL (real difference logic).");
|
|
222
|
+
if (features.hasInt)
|
|
223
|
+
throw new SmtDefaultError(
|
|
224
|
+
"Benchmark has integer variables but it is marked as QF_RDL (real difference logic).",
|
|
225
|
+
);
|
|
226
|
+
checkNoUninterpretedFunctions(features);
|
|
193
227
|
setupDiffLogicParams(config);
|
|
194
228
|
if (isDense(features)) {
|
|
195
229
|
config.restartStrategy = RS_GEOMETRIC;
|
|
@@ -200,6 +234,13 @@ const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
200
234
|
};
|
|
201
235
|
|
|
202
236
|
const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => {
|
|
237
|
+
if (!isInDiffLogic(features))
|
|
238
|
+
throw new SmtDefaultError("Benchmark is not in QF_IDL (integer difference logic).");
|
|
239
|
+
if (features.hasReal)
|
|
240
|
+
throw new SmtDefaultError(
|
|
241
|
+
"Benchmark has real variables but it is marked as QF_IDL (integer difference logic).",
|
|
242
|
+
);
|
|
243
|
+
checkNoUninterpretedFunctions(features);
|
|
203
244
|
setupDiffLogicParams(config);
|
|
204
245
|
if (features.numUninterpretedConstants > 5000) config.relevancyLevel = 2;
|
|
205
246
|
else if (features.isCnf && !isDense(features)) config.phaseSelection = PS_CACHING_CONSERVATIVE2;
|
|
@@ -216,7 +257,9 @@ const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup
|
|
|
216
257
|
};
|
|
217
258
|
|
|
218
259
|
const setupQfUfIdl = (config: SmtConfig) => {
|
|
219
|
-
|
|
260
|
+
config.relevancyLevel = 0;
|
|
261
|
+
config.isNnfCnf = false;
|
|
262
|
+
config.isEq2Ineq = true;
|
|
220
263
|
config.restartStrategy = RS_GEOMETRIC;
|
|
221
264
|
config.restartFactor = 1.5;
|
|
222
265
|
config.isRestartAdaptive = false;
|
|
@@ -224,10 +267,15 @@ const setupQfUfIdl = (config: SmtConfig) => {
|
|
|
224
267
|
};
|
|
225
268
|
|
|
226
269
|
const setupQfUfIdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
270
|
+
if (features.hasReal)
|
|
271
|
+
throw new SmtDefaultError(
|
|
272
|
+
"Benchmark has real variables but it is marked as QF_UFIDL (uninterpreted functions and difference logic).",
|
|
273
|
+
);
|
|
227
274
|
config.relevancyLevel = 0;
|
|
228
275
|
config.isNnfCnf = false;
|
|
229
276
|
if (features.numUninterpretedFunctions === 0) {
|
|
230
277
|
config.isEq2Ineq = true;
|
|
278
|
+
config.isArithPropagatingEqs = false;
|
|
231
279
|
if (isDense(features)) {
|
|
232
280
|
config.restartStrategy = RS_GEOMETRIC;
|
|
233
281
|
config.theories.push(FAMILY_ARITH);
|
|
@@ -253,6 +301,10 @@ const setupQfBv = (config: SmtConfig) => {
|
|
|
253
301
|
};
|
|
254
302
|
|
|
255
303
|
const setupQfUfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
304
|
+
if (features.hasReal)
|
|
305
|
+
throw new SmtDefaultError(
|
|
306
|
+
"Benchmark has real variables but it is marked as QF_UFLIA (uninterpreted functions and linear integer arithmetic).",
|
|
307
|
+
);
|
|
256
308
|
setupQfUfLia(config);
|
|
257
309
|
if (features.hasBv) setupQfBv(config);
|
|
258
310
|
};
|
|
@@ -311,6 +363,14 @@ const setupAufLia = (config: SmtConfig) => {
|
|
|
311
363
|
config.theories.push(FAMILY_ARITH, FAMILY_ARRAY);
|
|
312
364
|
};
|
|
313
365
|
|
|
366
|
+
const setupAufLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
367
|
+
if (features.hasReal)
|
|
368
|
+
throw new SmtDefaultError(
|
|
369
|
+
"Benchmark has real variables but it is marked as AUFLIA (arrays, uninterpreted functions and linear integer arithmetic).",
|
|
370
|
+
);
|
|
371
|
+
setupAufLia(config);
|
|
372
|
+
};
|
|
373
|
+
|
|
314
374
|
const setupAufLira = (config: SmtConfig) => {
|
|
315
375
|
config.phaseSelection = PS_ALWAYS_FALSE;
|
|
316
376
|
config.isFindingMacros = true;
|
|
@@ -319,6 +379,8 @@ const setupAufLira = (config: SmtConfig) => {
|
|
|
319
379
|
|
|
320
380
|
const setupLra = (config: SmtConfig) => {
|
|
321
381
|
config.relevancyLevel = 0;
|
|
382
|
+
config.isArithPropagatingEqs = false;
|
|
383
|
+
config.isEliminatingTermIte = true;
|
|
322
384
|
config.theories.push(FAMILY_ARITH);
|
|
323
385
|
};
|
|
324
386
|
|
|
@@ -364,8 +426,6 @@ const DEFAULT_SETUPS = new Map<string, (config: SmtConfig) => void>([
|
|
|
364
426
|
["QF_FP", setupQfFp],
|
|
365
427
|
["QF_FPBV", setupQfFp],
|
|
366
428
|
["QF_BVFP", setupQfFp],
|
|
367
|
-
["QF_S", setupUnknown],
|
|
368
|
-
["QF_SLIA", setupUnknown],
|
|
369
429
|
["QF_DT", setupQfDt],
|
|
370
430
|
["QF_FF", setupFf],
|
|
371
431
|
["QF_FFA", setupFf],
|
|
@@ -409,10 +469,10 @@ const setupUnknownByFeatures = (config: SmtConfig, features: StaticFeatures, set
|
|
|
409
469
|
else if (numTheories === 1 && isDiffLogic(features)) {
|
|
410
470
|
if (features.hasReal && !features.hasInt) setupQfRdlByFeatures(config, features);
|
|
411
471
|
else if (!features.hasReal && features.hasInt) setupQfIdlByFeatures(config, features, setup);
|
|
412
|
-
else setupUnknown(config);
|
|
472
|
+
else setupUnknown(config, features);
|
|
413
473
|
} else if (isTwoWithUf && isDiffLogic(features)) {
|
|
414
474
|
if (!features.hasReal && features.hasInt) setupQfUfIdlByFeatures(config, features);
|
|
415
|
-
else setupUnknown(config);
|
|
475
|
+
else setupUnknown(config, features);
|
|
416
476
|
} else if (numTheories === 1 && isArith(features)) {
|
|
417
477
|
if ((features.hasInt && features.hasReal) || !isLinear) config.theories.push(FAMILY_ARITH);
|
|
418
478
|
else if (features.hasReal) setupQfLraByFeatures(config, features);
|
|
@@ -420,7 +480,7 @@ const setupUnknownByFeatures = (config: SmtConfig, features: StaticFeatures, set
|
|
|
420
480
|
} else if (isTwoWithUf && isArith(features)) {
|
|
421
481
|
if (!features.hasReal && isLinear) setupQfUfLiaByFeatures(config, features);
|
|
422
482
|
else if (!features.hasInt && isLinear) setupQfUfLia(config);
|
|
423
|
-
else setupUnknown(config);
|
|
483
|
+
else setupUnknown(config, features);
|
|
424
484
|
} else if (numTheories === 1 && features.hasBv) setupQfBv(config);
|
|
425
485
|
else if (numTheories === 1 && features.hasFpa) setupQfFp(config);
|
|
426
486
|
else if (numTheories === 2 && features.hasFpa && features.hasBv) setupQfFp(config);
|
|
@@ -429,14 +489,14 @@ const setupUnknownByFeatures = (config: SmtConfig, features: StaticFeatures, set
|
|
|
429
489
|
setupQfAufBv(config);
|
|
430
490
|
else if (isTwoWithUf && features.hasArrays && features.hasInt)
|
|
431
491
|
setupQfAufLiaByFeatures(config, features);
|
|
432
|
-
else setupUnknown(config);
|
|
492
|
+
else setupUnknown(config, features);
|
|
433
493
|
};
|
|
434
494
|
|
|
435
495
|
const AUTO_SETUPS = new Map<
|
|
436
496
|
string,
|
|
437
497
|
(config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => void
|
|
438
498
|
>([
|
|
439
|
-
["QF_UF",
|
|
499
|
+
["QF_UF", setupQfUfByFeatures],
|
|
440
500
|
["QF_RDL", setupQfRdlByFeatures],
|
|
441
501
|
["QF_IDL", setupQfIdlByFeatures],
|
|
442
502
|
["QF_UFIDL", setupQfUfIdlByFeatures],
|
|
@@ -449,7 +509,7 @@ const AUTO_SETUPS = new Map<
|
|
|
449
509
|
["QF_AUFLIA", setupQfAufLiaByFeatures],
|
|
450
510
|
["QF_S", setupUnknown],
|
|
451
511
|
["QF_SLIA", setupUnknown],
|
|
452
|
-
["AUFLIA",
|
|
512
|
+
["AUFLIA", setupAufLiaByFeatures],
|
|
453
513
|
["AUFLIRA", setupAufLira],
|
|
454
514
|
["AUFNIRA", setupAufLira],
|
|
455
515
|
["AUFLIA+", setupAufLia],
|
|
@@ -477,8 +537,14 @@ export const getSmtConfig = (
|
|
|
477
537
|
) => {
|
|
478
538
|
const config: SmtConfig = { ...base, theories: [] };
|
|
479
539
|
const logic = setup?.logic ?? "";
|
|
480
|
-
|
|
481
|
-
|
|
540
|
+
const defaultSetup = isUsingStaticFeatures ? undefined : DEFAULT_SETUPS.get(logic);
|
|
541
|
+
if (
|
|
542
|
+
setup === undefined ||
|
|
543
|
+
!setup.isAutoConfig ||
|
|
544
|
+
(!isUsingStaticFeatures && defaultSetup === undefined)
|
|
545
|
+
)
|
|
546
|
+
setupUnknown(config, collectStaticFeatures(manager, formulas));
|
|
547
|
+
else if (defaultSetup !== undefined) defaultSetup(config);
|
|
482
548
|
// setup_auto_config skips the static features of the logics whose setups ignore them.
|
|
483
549
|
else if (logic === "QF_BV") setupQfBv(config);
|
|
484
550
|
else if (logic === "QF_AUFBV" || logic === "QF_ABV" || logic === "QF_UFBV") setupQfAufBv(config);
|