shuffle dependencies

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

src/ast/rewriter/arith_rewriter.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
+#include "params/arith_rewriter_params.hpp"
 #include "ast/rewriter/arith_rewriter.h"
-#include "ast/rewriter/arith_rewriter_params.hpp"
 #include "ast/rewriter/poly_rewriter_def.h"
 #include "math/polynomial/algebraic_numbers.h"
 #include "ast/ast_pp.h"

src/ast/rewriter/arith_rewriter_params.pyg

@@ -1,16 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='arith_rewriter_params',
-                  export=True,
-                  params=(("algebraic_number_evaluator", BOOL, True, "simplify/evaluate expressions containing (algebraic) irrational numbers."),
-                          ("mul_to_power", BOOL, False, "collpase (* t ... t) into (^ t k), it is ignored if expand_power is true."),
-                          ("expand_power", BOOL, False, "expand (^ t k) into (* t ... t) if  1 < k <= max_degree."),
-                          ("expand_tan", BOOL, False, "replace (tan x) with (/ (sin x) (cos x))."),
-                          ("max_degree", UINT, 64, "max degree of algebraic numbers (and power operators) processed by simplifier."),
-                          ("sort_sums", BOOL, False, "sort the arguments of + application."),
-                          ("gcd_rounding", BOOL, False, "use gcd rounding on integer arithmetic atoms."),
-                          ("arith_lhs", BOOL, False, "all monomials are moved to the left-hand-side, and the right-hand-side is just a constant."),
-                          ("arith_ineq_lhs", BOOL, False, "rewrite inequalities so that right-hand-side is a constant."),
-                          ("elim_to_real", BOOL, False, "eliminate to_real from arithmetic predicates that contain only integers."),
-                          ("push_to_real", BOOL, True, "distribute to_real over * and +."),
-                          ("eq2ineq", BOOL, False, "expand equalities into two inequalities"),
-                          ("elim_rem", BOOL, False, "replace (rem x y) with (ite (>= y 0) (mod x y) (- (mod x y))).")))

src/ast/rewriter/bit_blaster/CMakeLists.txt

@@ -4,4 +4,5 @@ z3_add_component(bit_blaster
     bit_blaster_rewriter.cpp
   COMPONENT_DEPENDENCIES
     rewriter
+    params
 )

src/ast/rewriter/bit_blaster/bit_blaster.h

@@ -18,11 +18,11 @@ Revision History:
 --*/
 #pragma once
 
-#include "ast/rewriter/bool_rewriter.h"
-#include "ast/rewriter/bit_blaster/bit_blaster_params.h"
-#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h"
-#include "ast/bv_decl_plugin.h"
 #include "util/rational.h"
+#include "ast/bv_decl_plugin.h"
+#include "params/bit_blaster_params.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h"
 
 class bit_blaster_cfg {
 public:

src/ast/rewriter/bit_blaster/bit_blaster_params.h

@@ -1,41 +0,0 @@
-/*++
-Copyright (c) 2006 Microsoft Corporation
-
-Module Name:
-
-    bit_blaster_params.h
-
-Abstract:
-
-    <abstract>
-
-Author:
-
-    Leonardo de Moura (leonardo) 2008-10-02.
-
-Revision History:
-
---*/
-#pragma once
-
-struct bit_blaster_params {
-    bool  m_bb_ext_gates;
-    bool  m_bb_quantifiers;
-    bit_blaster_params() :
-        m_bb_ext_gates(false),
-        m_bb_quantifiers(false) {
-    }
-#if 0
-    void register_params(ini_params & p) {
-        p.register_bool_param("bb_ext_gates", m_bb_ext_gates, "use extended gates during bit-blasting");
-        p.register_bool_param("bb_quantifiers", m_bb_quantifiers, "convert bit-vectors to Booleans in quantifiers");
-    }
-#endif
-
-    void display(std::ostream & out) const {
-        out << "m_bb_ext_gates=" << m_bb_ext_gates << std::endl;
-        out << "m_bb_quantifiers=" << m_bb_quantifiers << std::endl;
-    }
-};
-
-

src/ast/rewriter/bv_rewriter_params.pyg

@@ -1,16 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='bv_rewriter_params',
-                  export=True,
-                  params=(("split_concat_eq", BOOL, False, "split equalities of the form (= (concat t1 t2) t3)"),
-                          ("bit2bool", BOOL, True, "try to convert bit-vector terms of size 1 into Boolean terms"),
-                          ("blast_eq_value", BOOL, False, "blast (some) Bit-vector equalities into bits"),
-                          ("elim_sign_ext", BOOL, True, "expand sign-ext operator using concat and extract"),
-                          ("hi_div0", BOOL, True, "use the 'hardware interpretation' for division by zero (for bit-vector terms)"),
-                          ("mul2concat", BOOL, False, "replace multiplication by a power of two into a concatenation"),
-                          ("bvnot2arith", BOOL, False, "replace (bvnot x) with (bvsub -1 x)"),
-                          ("bv_sort_ac", BOOL, False, "sort the arguments of all AC operators"),
-                          ("bv_extract_prop", BOOL, False, "attempt to partially propagate extraction inwards"),
-                          ("bv_not_simpl", BOOL, False, "apply simplifications for bvnot"),
-                          ("bv_ite2id", BOOL, False, "rewrite ite that can be simplified to identity"),
-                          ("bv_le_extra", BOOL, False, "additional bu_(u/s)le simplifications")
-                          ))