shuffle dependencies

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

scripts/mk_project.py

@@ -23,12 +23,13 @@ def init_project_def():
     add_lib('realclosure', ['interval'], 'math/realclosure')
     add_lib('subpaving', ['interval'], 'math/subpaving')
     add_lib('ast', ['util', 'polynomial'])
+    add_lib('params', ['ast', 'util'])
     add_lib('euf', ['ast','util'], 'ast/euf')
     add_lib('grobner', ['ast', 'dd', 'simplex'], 'math/grobner')    
     add_lib('sat', ['util','dd', 'grobner'])    
     add_lib('nlsat', ['polynomial', 'sat'])
     add_lib('lp', ['util','nlsat','grobner', 'interval'], 'math/lp')
-    add_lib('rewriter', ['ast', 'polynomial', 'automata'], 'ast/rewriter')
+    add_lib('rewriter', ['ast', 'polynomial', 'automata','params'], 'ast/rewriter')
     add_lib('macros', ['rewriter'], 'ast/macros')
     add_lib('normal_forms', ['rewriter'], 'ast/normal_forms')
     add_lib('model', ['rewriter'])
@@ -37,14 +38,14 @@ def init_project_def():
     add_lib('parser_util', ['ast'], 'parsers/util')
     add_lib('proofs', ['rewriter', 'util'], 'ast/proofs')
     add_lib('solver', ['model', 'tactic', 'proofs'])
-    add_lib('cmd_context', ['solver', 'rewriter'])
+    add_lib('cmd_context', ['solver', 'rewriter', 'params'])
     add_lib('smt2parser', ['cmd_context', 'parser_util'], 'parsers/smt2')
     add_lib('aig_tactic', ['tactic'], 'tactic/aig')
     add_lib('ackermannization', ['model', 'rewriter', 'ast', 'solver', 'tactic'], 'ackermannization')
     add_lib('fpa', ['ast', 'util', 'rewriter', 'model'], 'ast/fpa')
-    add_lib('bit_blaster', ['rewriter', 'rewriter'], 'ast/rewriter/bit_blaster')
+    add_lib('bit_blaster', ['rewriter', 'params'], 'ast/rewriter/bit_blaster')
     add_lib('pattern', ['normal_forms', 'smt2parser', 'rewriter'], 'ast/pattern')
-    add_lib('smt_params', ['ast', 'rewriter', 'pattern', 'bit_blaster'], 'smt/params')
+    add_lib('smt_params', ['ast', 'params'], 'smt/params')
     add_lib('core_tactics', ['tactic', 'macros', 'normal_forms', 'rewriter', 'pattern'], 'tactic/core')
     add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith')
 

src/CMakeLists.txt

@@ -44,6 +44,7 @@ add_subdirectory(math/interval)
 add_subdirectory(math/realclosure)
 add_subdirectory(math/subpaving)
 add_subdirectory(ast)
+add_subdirectory(params)
 add_subdirectory(ast/rewriter)
 add_subdirectory(ast/normal_forms)
 add_subdirectory(model)

src/api/api_config_params.cpp

@@ -24,7 +24,7 @@ Revision History:
 #include "util/symbol.h"
 #include "util/gparams.h"
 #include "util/env_params.h"
-#include "cmd_context/context_params.h"
+#include "params/context_params.h"
 
 extern "C" {
     void Z3_API Z3_global_param_set(Z3_string param_id, Z3_string param_value) {

src/api/api_context.h

@@ -36,7 +36,7 @@ Revision History:
 #include "smt/smt_kernel.h"
 #include "smt/smt_solver.h"
 #include "cmd_context/tactic_manager.h"
-#include "cmd_context/context_params.h"
+#include "params/context_params.h"
 #include "cmd_context/cmd_context.h"
 #include "solver/solver.h"
 #include "api/z3.h"

src/ast/pattern/CMakeLists.txt

@@ -23,7 +23,6 @@ z3_add_component(pattern
   SOURCES
     expr_pattern_match.cpp
     pattern_inference.cpp
-    pattern_inference_params.cpp
     # Let CMake know this target depends on this generated
     # header file
     ${CMAKE_CURRENT_BINARY_DIR}/database.h
@@ -31,6 +30,4 @@ z3_add_component(pattern
     normal_forms
     rewriter
     smt2parser
-  PYG_FILES
-    pattern_inference_params_helper.pyg
 )

src/ast/pattern/pattern_inference.h

@@ -20,7 +20,7 @@ Revision History:
 
 #include "ast/ast.h"
 #include "ast/rewriter/rewriter.h"
-#include "ast/pattern/pattern_inference_params.h"
+#include "params/pattern_inference_params.h"
 #include "util/vector.h"
 #include "util/uint_set.h"
 #include "util/nat_set.h"

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/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/cmd_context/CMakeLists.txt

@@ -5,7 +5,6 @@ z3_add_component(cmd_context
     cmd_context.cpp
     cmd_context_to_goal.cpp
     cmd_util.cpp
-    context_params.cpp
     echo_tactic.cpp
     eval_cmd.cpp
     parametric_cmd.cpp
@@ -16,6 +15,5 @@ z3_add_component(cmd_context
   COMPONENT_DEPENDENCIES
     rewriter
     solver
-  EXTRA_REGISTER_MODULE_HEADERS
-    context_params.h
+    params
 )

src/cmd_context/cmd_context.h

@@ -39,7 +39,7 @@ Notes:
 #include "cmd_context/pdecl.h"
 #include "cmd_context/tactic_manager.h"
 #include "cmd_context/check_logic.h"
-#include "cmd_context/context_params.h"
+#include "params/context_params.h"
 
 
 class func_decls {

src/params/context_params.cpp

@@ -17,11 +17,10 @@ Author:
 Notes:
 
 --*/
-#include "cmd_context/context_params.h"
 #include "util/gparams.h"
 #include "util/params.h"
 #include "ast/ast.h"
-#include "solver/solver.h"
+#include "params/context_params.h"
 
 context_params::context_params() {
     updt_params();

src/params/pattern_inference_params.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include "ast/pattern/pattern_inference_params.h"
-#include "ast/pattern/pattern_inference_params_helper.hpp"
+#include "params/pattern_inference_params.h"
+#include "params/pattern_inference_params_helper.hpp"
 
 void pattern_inference_params::updt_params(params_ref const & _p) {
     pattern_inference_params_helper p(_p);
@@ -44,4 +44,4 @@ void pattern_inference_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_pi_nopat_weight);
     DISPLAY_PARAM(m_pi_avoid_skolems);
     DISPLAY_PARAM(m_pi_warnings);
-}
+}

src/smt/params/CMakeLists.txt

@@ -11,7 +11,7 @@ z3_add_component(smt_params
     theory_seq_params.cpp
     theory_str_params.cpp
   COMPONENT_DEPENDENCIES
-    pattern
+    params
   PYG_FILES
     smt_params_helper.pyg
 )

src/smt/params/preprocessor_params.h

@@ -18,8 +18,8 @@ Revision History:
 --*/
 #pragma once
 
-#include "ast/pattern/pattern_inference_params.h"
-#include "ast/rewriter/bit_blaster/bit_blaster_params.h"
+#include "params/pattern_inference_params.h"
+#include "params/bit_blaster_params.h"
 
 enum lift_ite_kind {
     LI_NONE,

src/smt/params/smt_params.h

@@ -28,7 +28,7 @@ Revision History:
 #include "smt/params/theory_pb_params.h"
 #include "smt/params/theory_datatype_params.h"
 #include "smt/params/preprocessor_params.h"
-#include "cmd_context/context_params.h"
+#include "params/context_params.h"
 
 enum phase_selection {
     PS_ALWAYS_FALSE,

src/smt/params/theory_arith_params.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include "smt/params/theory_arith_params.h"
 #include "smt/params/smt_params_helper.hpp"
-#include "ast/rewriter/arith_rewriter_params.hpp"
+#include "params/arith_rewriter_params.hpp"
 
 void theory_arith_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/theory_bv_params.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include "smt/params/theory_bv_params.h"
 #include "smt/params/smt_params_helper.hpp"
-#include "ast/rewriter/bv_rewriter_params.hpp"
+#include "params/bv_rewriter_params.hpp"
 
 void theory_bv_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);