remove old_simplify dependencies

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/smt/params/CMakeLists.txt

@@ -13,7 +13,6 @@ z3_add_component(smt_params
     ast
     bit_blaster
     pattern
-    simplifier
   PYG_FILES
     smt_params_helper.pyg
 )

src/smt/params/preprocessor_params.cpp

@@ -30,8 +30,6 @@ void preprocessor_params::updt_local_params(params_ref const & _p) {
 
 void preprocessor_params::updt_params(params_ref const & p) {
     pattern_inference_params::updt_params(p);
-    bv_simplifier_params::updt_params(p);
-    arith_simplifier_params::updt_params(p);
     updt_local_params(p);
 }
 
@@ -40,8 +38,6 @@ void preprocessor_params::updt_params(params_ref const & p) {
 void preprocessor_params::display(std::ostream & out) const {
     pattern_inference_params::display(out);
     bit_blaster_params::display(out);
-    bv_simplifier_params::display(out);
-    arith_simplifier_params::display(out);
 
     DISPLAY_PARAM(m_lift_ite);
     DISPLAY_PARAM(m_ng_lift_ite);

src/smt/params/preprocessor_params.h

@@ -21,8 +21,6 @@ Revision History:
 
 #include "ast/pattern/pattern_inference_params.h"
 #include "ast/rewriter/bit_blaster/bit_blaster_params.h"
-#include "ast/simplifier/bv_simplifier_params.h"
-#include "ast/simplifier/arith_simplifier_params.h"
 
 enum lift_ite_kind {
     LI_NONE,
@@ -31,9 +29,7 @@ enum lift_ite_kind {
 };
 
 struct preprocessor_params : public pattern_inference_params, 
-                             public bit_blaster_params,
-                             public bv_simplifier_params,
-                             public arith_simplifier_params {
+                             public bit_blaster_params {
     lift_ite_kind   m_lift_ite;
     lift_ite_kind   m_ng_lift_ite;  // lift ite for non ground terms
     bool            m_pull_cheap_ite_trees;

src/smt/params/theory_arith_params.cpp

@@ -42,6 +42,8 @@ void theory_arith_params::updt_params(params_ref const & _p) {
 #define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
 
 void theory_arith_params::display(std::ostream & out) const {
+    DISPLAY_PARAM(m_arith_expand_eqs);
+    DISPLAY_PARAM(m_arith_process_all_eqs);
     DISPLAY_PARAM(m_arith_mode);
     DISPLAY_PARAM(m_arith_auto_config_simplex); //!< force simplex solver in auto_config
     DISPLAY_PARAM(m_arith_blands_rule_threshold);

src/smt/params/theory_arith_params.h

@@ -49,6 +49,8 @@ enum arith_pivot_strategy {
 };
 
 struct theory_arith_params {
+    bool                    m_arith_expand_eqs;
+    bool                    m_arith_process_all_eqs;
     arith_solver_id         m_arith_mode;
     bool                    m_arith_auto_config_simplex; //!< force simplex solver in auto_config
     unsigned                m_arith_blands_rule_threshold;
@@ -108,6 +110,8 @@ struct theory_arith_params {
 
 
     theory_arith_params(params_ref const & p = params_ref()):
+        m_arith_expand_eqs(false),
+        m_arith_process_all_eqs(false),
         m_arith_mode(AS_ARITH),
         m_arith_auto_config_simplex(false),
         m_arith_blands_rule_threshold(1000),

src/smt/params/theory_array_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_ARRAY_PARAMS_H_
 #define THEORY_ARRAY_PARAMS_H_
 
-#include "ast/simplifier/array_simplifier_params.h"
+#include "util/params.h"
 
 enum array_solver_id {
     AR_NO_ARRAY,
@@ -28,7 +28,9 @@ enum array_solver_id {
     AR_FULL
 };
 
-struct theory_array_params : public array_simplifier_params {
+struct theory_array_params {
+    bool            m_array_canonize_simplify;
+    bool            m_array_simplify; // temporary hack for disabling array simplifier plugin.
     array_solver_id m_array_mode;
     bool            m_array_weak;
     bool            m_array_extensional;
@@ -40,6 +42,8 @@ struct theory_array_params : public array_simplifier_params {
     unsigned        m_array_lazy_ieq_delay;
 
     theory_array_params():
+        m_array_canonize_simplify(false),
+        m_array_simplify(true),
         m_array_mode(AR_FULL),
         m_array_weak(false),
         m_array_extensional(true),

src/smt/params/theory_bv_params.cpp

@@ -18,9 +18,12 @@ Revision History:
 --*/
 #include "smt/params/theory_bv_params.h"
 #include "smt/params/smt_params_helper.hpp"
+#include "ast/rewriter/bv_rewriter_params.hpp"
 
 void theory_bv_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);
+    bv_rewriter_params rp(_p);
+    m_hi_div0 = rp.hi_div0();
     m_bv_reflect = p.bv_reflect();
     m_bv_enable_int2bv2int = p.bv_enable_int2bv(); 
 }
@@ -29,9 +32,10 @@ void theory_bv_params::updt_params(params_ref const & _p) {
 
 void theory_bv_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_bv_mode);
+    DISPLAY_PARAM(m_hi_div0);
     DISPLAY_PARAM(m_bv_reflect);
     DISPLAY_PARAM(m_bv_lazy_le);
     DISPLAY_PARAM(m_bv_cc);
     DISPLAY_PARAM(m_bv_blast_max_size);
     DISPLAY_PARAM(m_bv_enable_int2bv2int);
-}
+}

src/smt/params/theory_bv_params.h

@@ -28,6 +28,7 @@ enum bv_solver_id {
 
 struct theory_bv_params {
     bv_solver_id m_bv_mode;
+    bool  m_hi_div0; //!< if true, uses the hardware interpretation for div0, mod0, ... if false, div0, mod0, ... are considered uninterpreted.
     bool         m_bv_reflect;
     bool         m_bv_lazy_le;
     bool         m_bv_cc;
@@ -35,6 +36,7 @@ struct theory_bv_params {
     bool         m_bv_enable_int2bv2int;
     theory_bv_params(params_ref const & p = params_ref()):
         m_bv_mode(BS_BLASTER),
+        m_hi_div0(false),
         m_bv_reflect(true),
         m_bv_lazy_le(false),
         m_bv_cc(false),