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

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

src/tactic/core/blast_term_ite_tactic.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"defined_names.h"
-#include"rewriter_def.h"
-#include"filter_model_converter.h"
-#include"cooperate.h"
-#include"scoped_proof.h"
+#include "tactic/tactical.h"
+#include "ast/normal_forms/defined_names.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "tactic/filter_model_converter.h"
+#include "util/cooperate.h"
+#include "ast/scoped_proof.h"
 
 
 

src/tactic/core/blast_term_ite_tactic.h

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

src/tactic/core/cofactor_elim_term_ite.cpp

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#include"cofactor_elim_term_ite.h"
-#include"mk_simplified_app.h"
-#include"rewriter_def.h"
-#include"cooperate.h"
-#include"for_each_expr.h"
-#include"ast_smt2_pp.h"
-#include"ast_ll_pp.h"
-#include"tactic.h"
+#include "tactic/core/cofactor_elim_term_ite.h"
+#include "ast/rewriter/mk_simplified_app.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/cooperate.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "tactic/tactic.h"
 
 struct cofactor_elim_term_ite::imp {
     ast_manager &      m;

src/tactic/core/cofactor_elim_term_ite.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef COFACTOR_ELIM_TERM_ITE_H_
 #define COFACTOR_ELIM_TERM_ITE_H_
 
-#include"ast.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "util/params.h"
 
 class cofactor_elim_term_ite {
     struct     imp;

src/tactic/core/cofactor_term_ite_tactic.cpp

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"cofactor_elim_term_ite.h"
+#include "tactic/tactical.h"
+#include "tactic/core/cofactor_elim_term_ite.h"
 
 /**
    \brief Wrapper for applying cofactor_elim_term_ite in an assertion set.

src/tactic/core/cofactor_term_ite_tactic.h

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

src/tactic/core/collect_occs.cpp

@@ -17,10 +17,10 @@ Notes:
 
 --*/
 
-#include "ast.h"
-#include "goal.h"
-#include "hashtable.h"
-#include "collect_occs.h"
+#include "ast/ast.h"
+#include "tactic/goal.h"
+#include "util/hashtable.h"
+#include "tactic/core/collect_occs.h"
 
 bool collect_occs::visit(expr * t) {
     if (m_visited.is_marked(t)) {

src/tactic/core/collect_statistics_tactic.cpp

@@ -20,17 +20,17 @@ Notes:
 #include<string>
 #include<map>
 
-#include"ast.h"
-#include"params.h"
-#include"arith_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"tactical.h"
-#include"stats.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "tactic/tactical.h"
+#include "util/stats.h"
 
-#include"collect_statistics_tactic.h"
+#include "tactic/core/collect_statistics_tactic.h"
 
 class collect_statistics_tactic : public tactic {
     ast_manager &        m;

src/tactic/core/collect_statistics_tactic.h

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

src/tactic/core/ctx_simplify_tactic.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"ctx_simplify_tactic.h"
-#include"mk_simplified_app.h"
-#include"cooperate.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "ast/rewriter/mk_simplified_app.h"
+#include "util/cooperate.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
 
 
 class ctx_propagate_assertions : public ctx_simplify_tactic::simplifier {

src/tactic/core/ctx_simplify_tactic.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef CTX_SIMPLIFY_TACTIC_H_
 #define CTX_SIMPLIFY_TACTIC_H_
 
-#include"tactical.h"
-#include"goal_num_occurs.h"
+#include "tactic/tactical.h"
+#include "tactic/goal_num_occurs.h"
 
 class ctx_simplify_tactic : public tactic {
 public:

src/tactic/core/der_tactic.cpp

@@ -14,8 +14,8 @@ Author:
     Leonardo de Moura (leonardo) 2012-10-20
 
 --*/
-#include"der.h"
-#include"tactical.h"
+#include "ast/rewriter/der.h"
+#include "tactic/tactical.h"
 
 class der_tactic : public tactic {
     struct imp {

src/tactic/core/distribute_forall_tactic.cpp

@@ -14,9 +14,9 @@ Author:
     Leonardo de Moura (leonardo) 2012-02-18.
 
 --*/
-#include"tactical.h"
-#include"rewriter_def.h"
-#include"var_subst.h"
+#include "tactic/tactical.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/var_subst.h"
 
 class distribute_forall_tactic : public tactic {
 

src/tactic/core/distribute_forall_tactic.h

@@ -17,7 +17,7 @@ Author:
 #ifndef DISTRIBUTE_FORALL_TACTIC_H_
 #define DISTRIBUTE_FORALL_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/tactic/core/elim_term_ite_tactic.cpp

@@ -17,11 +17,11 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"defined_names.h"
-#include"rewriter_def.h"
-#include"filter_model_converter.h"
-#include"cooperate.h"
+#include "tactic/tactical.h"
+#include "ast/normal_forms/defined_names.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "tactic/filter_model_converter.h"
+#include "util/cooperate.h"
 
 class elim_term_ite_tactic : public tactic {
 

src/tactic/core/elim_term_ite_tactic.h

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

src/tactic/core/elim_uncnstr_tactic.cpp

@@ -16,18 +16,18 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"extension_model_converter.h"
-#include"filter_model_converter.h"
-#include"rewriter_def.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"collect_occs.h"
-#include"cooperate.h"
-#include"ast_smt2_pp.h"
-#include"ast_ll_pp.h"
+#include "tactic/tactical.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "tactic/core/collect_occs.h"
+#include "util/cooperate.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_ll_pp.h"
 
 class elim_uncnstr_tactic : public tactic {
 

src/tactic/core/elim_uncnstr_tactic.h

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

src/tactic/core/nnf_tactic.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"nnf.h"
-#include"tactical.h"
-#include"filter_model_converter.h"
+#include "ast/normal_forms/nnf.h"
+#include "tactic/tactical.h"
+#include "tactic/filter_model_converter.h"
 
 class nnf_tactic : public tactic {
     params_ref    m_params;

src/tactic/core/nnf_tactic.h

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

src/tactic/core/occf_tactic.cpp

@@ -21,10 +21,10 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"occf_tactic.h"
-#include"filter_model_converter.h"
-#include"cooperate.h"
+#include "tactic/tactical.h"
+#include "tactic/core/occf_tactic.h"
+#include "tactic/filter_model_converter.h"
+#include "util/cooperate.h"
 
 class occf_tactic : public tactic {
     struct     imp {

src/tactic/core/occf_tactic.h

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

src/tactic/core/pb_preprocess_tactic.cpp

@@ -31,13 +31,13 @@ Notes:
 
 
 --*/
-#include "pb_preprocess_tactic.h"
-#include "tactical.h"
-#include "for_each_expr.h"
-#include "pb_decl_plugin.h"
-#include "th_rewriter.h"
-#include "expr_substitution.h"
-#include "ast_pp.h"
+#include "tactic/core/pb_preprocess_tactic.h"
+#include "tactic/tactical.h"
+#include "ast/for_each_expr.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/expr_substitution.h"
+#include "ast/ast_pp.h"
 
 class pb_preproc_model_converter : public model_converter {
     ast_manager& m;

src/tactic/core/pb_preprocess_tactic.h

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

src/tactic/core/propagate_values_tactic.cpp

@@ -17,12 +17,12 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"propagate_values_tactic.h"
-#include"th_rewriter.h"
-#include"ast_smt2_pp.h"
-#include"expr_substitution.h"
-#include"goal_shared_occs.h"
+#include "tactic/tactical.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/expr_substitution.h"
+#include "tactic/goal_shared_occs.h"
 
 class propagate_values_tactic : public tactic {
     struct     imp {

src/tactic/core/propagate_values_tactic.h

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

src/tactic/core/reduce_args_tactic.cpp

@@ -16,14 +16,14 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"cooperate.h"
-#include"ast_smt2_pp.h"
-#include"has_free_vars.h"
-#include"map.h"
-#include"rewriter_def.h"
-#include"extension_model_converter.h"
-#include"filter_model_converter.h"
+#include "tactic/tactical.h"
+#include "util/cooperate.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/has_free_vars.h"
+#include "util/map.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "tactic/extension_model_converter.h"
+#include "tactic/filter_model_converter.h"
 
 /**
    \brief Reduce the number of arguments in function applications.

src/tactic/core/reduce_args_tactic.h

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

src/tactic/core/simplify_tactic.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"simplify_tactic.h"
-#include"th_rewriter.h"
-#include"ast_pp.h"
+#include "tactic/core/simplify_tactic.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_pp.h"
 
 struct simplify_tactic::imp {
     ast_manager &   m_manager;

src/tactic/core/simplify_tactic.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef SIMPLIFY_TACTIC_H_
 #define SIMPLIFY_TACTIC_H_
 
-#include"tactic.h"
-#include"tactical.h"
+#include "tactic/tactic.h"
+#include "tactic/tactical.h"
 
 class simplify_tactic : public tactic {
     struct     imp;

src/tactic/core/solve_eqs_tactic.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"expr_replacer.h"
-#include"extension_model_converter.h"
-#include"occurs.h"
-#include"cooperate.h"
-#include"goal_shared_occs.h"
-#include"ast_pp.h"
+#include "tactic/tactical.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "tactic/extension_model_converter.h"
+#include "ast/occurs.h"
+#include "util/cooperate.h"
+#include "tactic/goal_shared_occs.h"
+#include "ast/ast_pp.h"
 
 class solve_eqs_tactic : public tactic {
     struct imp {

src/tactic/core/solve_eqs_tactic.h

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

src/tactic/core/split_clause_tactic.cpp

@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"split_clause_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/split_clause_tactic.h"
 
 class split_clause_tactic : public tactic {
     bool          m_largest_clause;

src/tactic/core/split_clause_tactic.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef SPLIT_CLAUSE_TACTIC_H_
 #define SPLIT_CLAUSE_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class tactic;
 
 tactic * mk_split_clause_tactic(params_ref const & p = params_ref());

src/tactic/core/symmetry_reduce_tactic.cpp

@@ -19,12 +19,12 @@ Notes:
     adaption of the algorithms proposed for veriT.
 
 --*/
-#include"tactical.h"
-#include"for_each_expr.h"
-#include"map.h"
-#include"expr_replacer.h"
-#include"rewriter_def.h"
-#include"ast_pp.h"
+#include "tactic/tactical.h"
+#include "ast/for_each_expr.h"
+#include "util/map.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
 
 class symmetry_reduce_tactic : public tactic {
     class imp;

src/tactic/core/symmetry_reduce_tactic.h

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

src/tactic/core/tseitin_cnf_tactic.cpp

@@ -49,12 +49,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"goal_shared_occs.h"
-#include"filter_model_converter.h"
-#include"bool_rewriter.h"
-#include"simplify_tactic.h"
-#include"cooperate.h"
+#include "tactic/tactical.h"
+#include "tactic/goal_shared_occs.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "tactic/core/simplify_tactic.h"
+#include "util/cooperate.h"
 
 static void swap_if_gt(expr * & n1, expr * & n2) {
     if (n1->get_id() > n2->get_id())

src/tactic/core/tseitin_cnf_tactic.h

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