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

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

src/tactic/ufbv/macro_finder_tactic.cpp

@@ -16,15 +16,15 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
-#include"arith_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"macro_manager.h"
-#include"macro_finder.h"
-#include"extension_model_converter.h"
-#include"macro_finder_tactic.h"
+#include "tactic/tactical.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/macros/macro_finder.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/ufbv/macro_finder_tactic.h"
 
 class macro_finder_tactic : public tactic {    
 

src/tactic/ufbv/macro_finder_tactic.h

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

src/tactic/ufbv/quasi_macros_tactic.cpp

@@ -16,16 +16,16 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
-#include"arith_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"macro_manager.h"
-#include"macro_finder.h"
-#include"extension_model_converter.h"
-#include"quasi_macros.h"
-#include"quasi_macros_tactic.h"
+#include "tactic/tactical.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/macros/macro_finder.h"
+#include "tactic/extension_model_converter.h"
+#include "ast/macros/quasi_macros.h"
+#include "tactic/ufbv/quasi_macros_tactic.h"
 
 class quasi_macros_tactic : public tactic {
 

src/tactic/ufbv/quasi_macros_tactic.h

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

src/tactic/ufbv/ufbv_rewriter.cpp

@@ -20,11 +20,11 @@ Revision History:
 
 --*/
 
-#include"ast_pp.h"
-#include"ufbv_rewriter.h"
-#include"for_each_expr.h"
-#include"var_subst.h"
-#include"uint_set.h"
+#include "ast/ast_pp.h"
+#include "tactic/ufbv/ufbv_rewriter.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/uint_set.h"
 
 ufbv_rewriter::ufbv_rewriter(ast_manager & m, basic_simplifier_plugin & p):
     m_manager(m),

src/tactic/ufbv/ufbv_rewriter.h

@@ -21,12 +21,12 @@ Revision History:
 #ifndef UFBV_REWRITER_H_
 #define UFBV_REWRITER_H_
 
-#include"ast.h"
-#include"substitution.h"
-#include"obj_hashtable.h"
-#include"obj_pair_hashtable.h"
-#include"array_map.h"
-#include"basic_simplifier_plugin.h"
+#include "ast/ast.h"
+#include "ast/substitution/substitution.h"
+#include "util/obj_hashtable.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/array_map.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 /**
    \brief Apply demodulators as a preprocessing technique.

src/tactic/ufbv/ufbv_rewriter_tactic.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
-#include"ufbv_rewriter.h"
-#include"ufbv_rewriter_tactic.h"
+#include "tactic/tactical.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "tactic/ufbv/ufbv_rewriter.h"
+#include "tactic/ufbv/ufbv_rewriter_tactic.h"
 
 class ufbv_rewriter_tactic : public tactic {
 

src/tactic/ufbv/ufbv_rewriter_tactic.h

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

src/tactic/ufbv/ufbv_tactic.cpp

@@ -16,19 +16,19 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"distribute_forall_tactic.h"
-#include"der_tactic.h"
-#include"reduce_args_tactic.h"
-#include"smt_tactic.h"
-#include"nnf_tactic.h"
-#include"macro_finder_tactic.h"
-#include"ufbv_rewriter_tactic.h"
-#include"quasi_macros_tactic.h"
-#include"ufbv_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/distribute_forall_tactic.h"
+#include "tactic/core/der_tactic.h"
+#include "tactic/core/reduce_args_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/core/nnf_tactic.h"
+#include "tactic/ufbv/macro_finder_tactic.h"
+#include "tactic/ufbv/ufbv_rewriter_tactic.h"
+#include "tactic/ufbv/quasi_macros_tactic.h"
+#include "tactic/ufbv/ufbv_tactic.h"
 
 
 static tactic * mk_der_fp_tactic(ast_manager & m, params_ref const & p) {

src/tactic/ufbv/ufbv_tactic.h

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