move parameters from ast/rewriter to params

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

src/ast/rewriter/CMakeLists.txt

@@ -41,11 +41,4 @@ z3_add_component(rewriter
     params
     automata
     polynomial
-  PYG_FILES
-    array_rewriter_params.pyg
-    bool_rewriter_params.pyg
-    fpa_rewriter_params.pyg
-    poly_rewriter_params.pyg
-    rewriter_params.pyg
-    seq_rewriter_params.pyg
 )

src/ast/rewriter/array_rewriter.cpp

@@ -17,12 +17,12 @@ Notes:
 
 --*/
 #include "ast/rewriter/array_rewriter.h"
-#include "ast/rewriter/array_rewriter_params.hpp"
 #include "ast/ast_lt.h"
 #include "ast/ast_util.h"
 #include "ast/ast_pp.h"
 #include "ast/ast_ll_pp.h"
 #include "ast/rewriter/var_subst.h"
+#include "params/array_rewriter_params.hpp"
 
 void array_rewriter::updt_params(params_ref const & _p) {
     array_rewriter_params p(_p);

src/ast/rewriter/array_rewriter_params.pyg

@@ -1,7 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='array_rewriter_params',
-                  export=True,
-                  params=(("expand_select_store", BOOL, False, "replace a (select (store ...) ...) term by an if-then-else term"),
-                          ("expand_nested_stores", BOOL, False, "replace nested stores by a lambda expression"),
-                          ("expand_store_eq", BOOL, False, "reduce (store ...) = (store ...) with a common base into selects"),
-                          ("sort_store", BOOL, False, "sort nested stores when the indices are known to be different")))

src/ast/rewriter/bool_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/bool_rewriter.h"
-#include "ast/rewriter/bool_rewriter_params.hpp"
+#include "params/bool_rewriter_params.hpp"
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/ast_lt.h"
 #include <algorithm>

src/ast/rewriter/bool_rewriter_params.pyg

@@ -1,12 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='bool_rewriter_params',
-                  export=True,
-                  params=(("ite_extra_rules", BOOL, False, "extra ite simplifications, these additional simplifications may reduce size locally but increase globally"),
-                          ("flat", BOOL, True, "create nary applications for and,or,+,*,bvadd,bvmul,bvand,bvor,bvxor"),
-                          ("elim_and", BOOL, False, "conjunctions are rewritten using negation and disjunctions"),
-                          ('elim_ite', BOOL, True,  "eliminate ite in favor of and/or"),
-                          ("local_ctx", BOOL, False, "perform local (i.e., cheap) context simplifications"),
-                          ("local_ctx_limit", UINT, UINT_MAX, "limit for applying local context simplifier"),
-                          ("blast_distinct", BOOL, False, "expand a distinct predicate into a quadratic number of disequalities"), 
-                          ("blast_distinct_threshold", UINT, UINT_MAX, "when blast_distinct is true, only distinct expressions with less than this number of arguments are blasted")  
-                          ))

src/ast/rewriter/fpa_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/fpa_rewriter.h"
-#include "ast/rewriter/fpa_rewriter_params.hpp"
+#include "params/fpa_rewriter_params.hpp"
 #include "ast/ast_smt2_pp.h"
 
 fpa_rewriter::fpa_rewriter(ast_manager & m, params_ref const & p) :

src/ast/rewriter/fpa_rewriter_params.pyg

@@ -1,5 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='fpa_rewriter_params',
-                  export=True,
-                  params=(("hi_fp_unspecified", BOOL, False, "use the 'hardware interpretation' for unspecified values in fp.to_ubv, fp.to_sbv, fp.to_real, and fp.to_ieee_bv"),
-))

src/ast/rewriter/poly_rewriter_def.h

@@ -19,7 +19,7 @@ Notes:
 
 #include "util/container_util.h"
 #include "ast/rewriter/poly_rewriter.h"
-#include "ast/rewriter/poly_rewriter_params.hpp"
+#include "params/poly_rewriter_params.hpp"
 #include "params/arith_rewriter_params.hpp"
 #include "ast/ast_lt.h"
 #include "ast/ast_ll_pp.h"

src/ast/rewriter/poly_rewriter_params.pyg

@@ -1,8 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='poly_rewriter_params',
-                  export=True,
-                  params=(("som", BOOL, False, "put polynomials in sum-of-monomials form"),
-                          ("som_blowup", UINT, 10, "maximum increase of monomials generated when putting a polynomial in sum-of-monomials normal form"),
-                          ("hoist_mul", BOOL, False, "hoist multiplication over summation to minimize number of multiplications"),
-                          ("hoist_ite", BOOL, False, "hoist shared summands under ite expressions"),
-                          ("flat", BOOL, True, "create nary applications for and,or,+,*,bvadd,bvmul,bvand,bvor,bvxor")))

src/ast/rewriter/rewriter_params.pyg

@@ -1,14 +0,0 @@
-def_module_params('rewriter',
-                  description='new formula simplification module used in the tactic framework, and new solvers',
-                  export=True,
-                  params=(max_memory_param(),
-                          max_steps_param(),
-                          ("flat", BOOL, True, "create nary applications for and,or,+,*,bvadd,bvmul,bvand,bvor,bvxor"),
-                          ("push_ite_arith", BOOL, False, "push if-then-else over arithmetic terms."),
-                          ("push_ite_bv", BOOL, False, "push if-then-else over bit-vector terms."),
-                          ("pull_cheap_ite", BOOL, False, "pull if-then-else terms when cheap."),
-                          ("bv_ineq_consistency_test_max", UINT, 0, "max size of conjunctions on which to perform consistency test based on inequalities on bitvectors."),
-                          ("cache_all", BOOL, False, "cache all intermediate results."),
-                          ("rewrite_patterns", BOOL, False, "rewrite patterns."),
-                          ("ignore_patterns_on_ground_qbody", BOOL, True, "ignores patterns on quantifiers that don't mention their bound variables.")))
-

src/ast/rewriter/seq_rewriter.cpp

@@ -27,7 +27,7 @@ Author:
 #include "ast/well_sorted.h"
 #include "ast/rewriter/var_subst.h"
 #include "ast/rewriter/expr_safe_replace.h"
-#include "ast/rewriter/seq_rewriter_params.hpp"
+#include "params/seq_rewriter_params.hpp"
 #include "math/automata/automaton.h"
 #include "math/automata/symbolic_automata_def.h"
 

src/ast/rewriter/seq_rewriter_params.pyg

@@ -1,4 +0,0 @@
-def_module_params(module_name='rewriter',
-                  class_name='seq_rewriter_params',
-                  export=True,
-                  params=(("coalesce_chars", BOOL, True, "coalesce characters into strings"),))

src/ast/rewriter/th_rewriter.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
+#include "params/rewriter_params.hpp"
 #include "ast/rewriter/th_rewriter.h"
-#include "ast/rewriter/rewriter_params.hpp"
 #include "ast/rewriter/bool_rewriter.h"
 #include "ast/rewriter/arith_rewriter.h"
 #include "ast/rewriter/bv_rewriter.h"