make include paths uniformly use path relative to src. #534

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

src/tactic/bv/bit_blaster_model_converter.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"model.h"
-#include"model_pp.h"
-#include"model_converter.h"
-#include"bv_decl_plugin.h"
-#include"ast_smt2_pp.h"
+#include "model/model.h"
+#include "model/model_pp.h"
+#include "tactic/model_converter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
 
 /**
    If TO_BOOL == true, then bit-vectors of size n were blasted into n-tuples of Booleans.

src/tactic/bv/bit_blaster_model_converter.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef BIT_BLASTER_MODEL_CONVERTER_H_
 #define BIT_BLASTER_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
+#include "tactic/model_converter.h"
 
 model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits);
 model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits);

src/tactic/bv/bit_blaster_tactic.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"bit_blaster_model_converter.h"
-#include"bit_blaster_rewriter.h"
-#include"ast_pp.h"
-#include"model_pp.h"
-#include"rewriter_types.h"
+#include "tactic/tactical.h"
+#include "tactic/bv/bit_blaster_model_converter.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h"
+#include "ast/ast_pp.h"
+#include "model/model_pp.h"
+#include "ast/rewriter/rewriter_types.h"
 
 class bit_blaster_tactic : public tactic {
 

src/tactic/bv/bit_blaster_tactic.h

@@ -19,8 +19,8 @@ Copyright (c) 2011 Microsoft Corporation
 #ifndef BIT_BLASTER_TACTIC_H_
 #define BIT_BLASTER_TACTIC_H_
  
- #include"params.h"
- #include"bit_blaster_rewriter.h"
+#include "util/params.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h"
  class ast_manager;
  class tactic;
  

src/tactic/bv/bv1_blaster_tactic.cpp

@@ -22,13 +22,13 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"bit_blaster_model_converter.h"
-#include"bv_decl_plugin.h"
-#include"rewriter_def.h"
-#include"for_each_expr.h"
-#include"cooperate.h"
-#include"bv_rewriter.h"
+#include "tactic/tactical.h"
+#include "tactic/bv/bit_blaster_model_converter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/for_each_expr.h"
+#include "util/cooperate.h"
+#include "ast/rewriter/bv_rewriter.h"
 
 class bv1_blaster_tactic : public tactic {
 

src/tactic/bv/bv1_blaster_tactic.h

@@ -25,7 +25,7 @@ Notes:
 #ifndef BV1_BLASTER_TACTIC_H_
 #define BV1_BLASTER_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/tactic/bv/bv_bound_chk_tactic.cpp

@@ -14,14 +14,14 @@
 
  Revision History:
 --*/
-#include"bv_bound_chk_tactic.h"
-#include"ast.h"
-#include"rewriter.h"
-#include"rewriter_def.h"
-#include"bv_bounds.h"
+#include "tactic/bv/bv_bound_chk_tactic.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/bv_bounds.h"
 #include"rewriter_params.hpp"
-#include"bool_rewriter.h"
-#include"cooperate.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "util/cooperate.h"
 
 struct bv_bound_chk_stats {
     unsigned            m_unsats;

src/tactic/bv/bv_bound_chk_tactic.h

@@ -17,9 +17,9 @@
 #ifndef BV_BOUND_CHK_TACTIC_H_
 #define BV_BOUND_CHK_TACTIC_H_
 
-#include"tactical.h"
-#include"params.h"
-#include"ast.h"
+#include "tactic/tactical.h"
+#include "util/params.h"
+#include "ast/ast.h"
 
 tactic* mk_bv_bound_chk_tactic(ast_manager & m, params_ref const & p = params_ref());
 

src/tactic/bv/bv_bounds_tactic.cpp

@@ -16,10 +16,10 @@ Author:
 
 --*/
 
-#include "bv_bounds_tactic.h"
-#include "ctx_simplify_tactic.h"
-#include "bv_decl_plugin.h"
-#include "ast_pp.h"
+#include "tactic/bv/bv_bounds_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_pp.h"
 #include <climits>
 
 static uint64 uMaxInt(unsigned sz) {

src/tactic/bv/bv_bounds_tactic.h

@@ -17,7 +17,7 @@ Author:
 --*/
 #ifndef BV_BOUNDS_TACTIC_H_
 #define BV_BOUNDS_TACTIC_H_
-#include "tactic.h"
+#include "tactic/tactic.h"
 
 tactic * mk_bv_bounds_tactic(ast_manager & m, params_ref const & p = params_ref());
 

src/tactic/bv/bv_size_reduction_tactic.cpp

@@ -21,12 +21,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"bv_decl_plugin.h"
-#include"expr_replacer.h"
-#include"extension_model_converter.h"
-#include"filter_model_converter.h"
-#include"ast_smt2_pp.h"
+#include "tactic/tactical.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/ast_smt2_pp.h"
 
 class bv_size_reduction_tactic : public tactic {
     struct imp;

src/tactic/bv/bv_size_reduction_tactic.h

@@ -24,7 +24,7 @@ Notes:
 #ifndef BV_SIZE_REDUCTION_TACTIC_H_
 #define BV_SIZE_REDUCTION_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/tactic/bv/bvarray2uf_rewriter.cpp

@@ -18,14 +18,14 @@ Notes:
 
 --*/
 
-#include"cooperate.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"params.h"
-#include"ast_pp.h"
-#include"bvarray2uf_rewriter.h"
-#include"rewriter_def.h"
-#include"ref_util.h"
+#include "util/cooperate.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "util/params.h"
+#include "ast/ast_pp.h"
+#include "tactic/bv/bvarray2uf_rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/ref_util.h"
 
 // [1] C. M. Wintersteiger, Y. Hamadi, and L. de Moura: Efficiently Solving
 //     Quantified Bit-Vector Formulas, in Formal Methods in System Design,

src/tactic/bv/bvarray2uf_rewriter.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef BVARRAY2UF_REWRITER_H_
 #define BVARRAY2UF_REWRITER_H_
 
-#include"rewriter.h"
-#include"extension_model_converter.h"
-#include"filter_model_converter.h"
+#include "ast/rewriter/rewriter.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/filter_model_converter.h"
 
 class bvarray2uf_rewriter_cfg : public default_rewriter_cfg {
     ast_manager       & m_manager;

src/tactic/bv/bvarray2uf_tactic.cpp

@@ -17,15 +17,15 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"bv_decl_plugin.h"
-#include"expr_replacer.h"
-#include"extension_model_converter.h"
-#include"filter_model_converter.h"
-#include"ast_smt2_pp.h"
+#include "tactic/tactical.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/ast_smt2_pp.h"
 
-#include"bvarray2uf_tactic.h"
-#include"bvarray2uf_rewriter.h"
+#include "tactic/bv/bvarray2uf_tactic.h"
+#include "tactic/bv/bvarray2uf_rewriter.h"
 
 class bvarray2uf_tactic : public tactic {
 

src/tactic/bv/bvarray2uf_tactic.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef BV_ARRAY2UF_TACTIC_H_
 #define BV_ARRAY2UF_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/tactic/bv/dt2bv_tactic.cpp

@@ -19,18 +19,18 @@ Revision History:
 
 --*/
 
-#include "dt2bv_tactic.h"
-#include "tactical.h"
-#include "filter_model_converter.h"
-#include "datatype_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "rewriter_def.h"
-#include "filter_model_converter.h"
-#include "extension_model_converter.h"
-#include "var_subst.h"
-#include "ast_util.h"
-#include "enum2bv_rewriter.h"
-#include "ast_pp.h"
+#include "tactic/bv/dt2bv_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "tactic/filter_model_converter.h"
+#include "tactic/extension_model_converter.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/enum2bv_rewriter.h"
+#include "ast/ast_pp.h"
 
 
 class dt2bv_tactic : public tactic {

src/tactic/bv/dt2bv_tactic.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DT2BV_TACTIC_H_
 #define DT2BV_TACTIC_H_
 
-#include"params.h"
-#include"obj_hashtable.h"
+#include "util/params.h"
+#include "util/obj_hashtable.h"
 class ast_manager;
 class tactic;
 

src/tactic/bv/elim_small_bv_tactic.cpp

@@ -16,19 +16,19 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"rewriter_def.h"
-#include"filter_model_converter.h"
-#include"cooperate.h"
-#include"bv_decl_plugin.h"
-#include"used_vars.h"
-#include"well_sorted.h"
-#include"var_subst.h"
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
+#include "tactic/tactical.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "tactic/filter_model_converter.h"
+#include "util/cooperate.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/used_vars.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
 
-#include"elim_small_bv_tactic.h"
+#include "tactic/bv/elim_small_bv_tactic.h"
 
 class elim_small_bv_tactic : public tactic {
 

src/tactic/bv/elim_small_bv_tactic.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ELIM_SMALL_BV_H_
 #define ELIM_SMALL_BV_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/tactic/bv/max_bv_sharing_tactic.cpp

@@ -19,12 +19,12 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"bv_decl_plugin.h"
-#include"rewriter_def.h"
-#include"obj_pair_hashtable.h"
-#include"ast_lt.h"
-#include"cooperate.h"
+#include "tactic/tactical.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/obj_pair_hashtable.h"
+#include "ast/ast_lt.h"
+#include "util/cooperate.h"
 
 class max_bv_sharing_tactic : public tactic {
     

src/tactic/bv/max_bv_sharing_tactic.h

@@ -22,7 +22,7 @@ Revision History:
 #ifndef MAX_BV_SHARING_TACTIC_H_
 #define MAX_BV_SHARING_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;