smtfd solver that uses lazy iteration around fd to produce theory lemmas

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Z3Prover · Sep 7, 2019 · c476c4a · c476c4a
1 parent e881c4a
commit c476c4a
Show file tree

Hide file tree

Showing 4 changed files with 1,029 additions and 0 deletions.
diff --git a/src/ast/rewriter/bv_rewriter.cpp b/src/ast/rewriter/bv_rewriter.cpp
@@ -2244,6 +2244,10 @@ br_status bv_rewriter::mk_bv_mul(unsigned num_args, expr * const * args, expr_re
 br_status bv_rewriter::mk_bit2bool(expr * n, int idx, expr_ref & result) {
     rational v, bit;
     unsigned sz = 0;
+    if (m_util.is_mkbv(n)) {
+        result = to_app(n)->get_arg(idx);
+        return BR_DONE;
+    }
     if (!is_numeral(n, v, sz)) 
         return BR_FAILED;
     if (idx < 0 || idx >= static_cast<int>(sz)) 

diff --git a/src/tactic/fd_solver/CMakeLists.txt b/src/tactic/fd_solver/CMakeLists.txt
@@ -4,8 +4,10 @@ z3_add_component(fd_solver
     enum2bv_solver.cpp
     fd_solver.cpp
     pb2bv_solver.cpp
+    smtfd_solver.cpp
   COMPONENT_DEPENDENCIES
     sat_solver
   TACTIC_HEADERS
     fd_solver.h
+    smtfd_solver.h
 )