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

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

src/ackermannization/ackermannize_bv_model_converter.cpp

@@ -14,8 +14,8 @@
 
  Revision History:
 --*/
-#include"ackr_model_converter.h"
-#include"ackermannize_bv_model_converter.h"
+#include "ackermannization/ackr_model_converter.h"
+#include "ackermannization/ackermannize_bv_model_converter.h"
 
 model_converter * mk_ackermannize_bv_model_converter(ast_manager & m, const ackr_info_ref& info) {
  return mk_ackr_model_converter(m, info);

src/ackermannization/ackermannize_bv_model_converter.h

@@ -17,8 +17,8 @@
 #ifndef ACKERMANNIZE_BV_MODEL_CONVERTER_H_
 #define ACKERMANNIZE_BV_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_ackermannize_bv_model_converter(ast_manager & m, const ackr_info_ref& info);
 

src/ackermannization/ackermannize_bv_tactic.cpp

@@ -13,12 +13,12 @@ Mikolas Janota
 
 Revision History:
 --*/
-#include"ackermannize_bv_tactic.h"
-#include"tactical.h"
-#include"lackr.h"
-#include"model_smt2_pp.h"
+#include "ackermannization/ackermannize_bv_tactic.h"
+#include "tactic/tactical.h"
+#include "ackermannization/lackr.h"
+#include "model/model_smt2_pp.h"
 #include"ackermannize_bv_tactic_params.hpp"
-#include"ackermannize_bv_model_converter.h"
+#include "ackermannization/ackermannize_bv_model_converter.h"
 
 
 class ackermannize_bv_tactic : public tactic {

src/ackermannization/ackermannize_bv_tactic.h

@@ -16,7 +16,7 @@ Revision History:
 
 #ifndef _ACKERMANNIZE_TACTIC_H_
 #define _ACKERMANNIZE_TACTIC_H_
-#include"tactical.h"
+#include "tactic/tactical.h"
 
 tactic * mk_ackermannize_bv_tactic(ast_manager & m, params_ref const & p);
 

src/ackermannization/ackr_bound_probe.cpp

@@ -14,9 +14,9 @@
 
  Revision History:
 --*/
-#include"ackr_helper.h"
-#include"ackr_bound_probe.h"
-#include"ast_smt2_pp.h"
+#include "ackermannization/ackr_helper.h"
+#include "ackermannization/ackr_bound_probe.h"
+#include "ast/ast_smt2_pp.h"
 
 /*
   For each function f, calculate the number of its occurrences o_f and compute "o_f choose 2".

src/ackermannization/ackr_bound_probe.h

@@ -18,7 +18,7 @@
 #ifndef ACKR_BOUND_PROBE_H_
 #define ACKR_BOUND_PROBE_H_
 
-#include"probe.h"
+#include "tactic/probe.h"
 
 probe * mk_ackr_bound_probe();
 

src/ackermannization/ackr_helper.cpp

@@ -14,7 +14,7 @@
 
  Revision History:
 --*/
-#include"ackr_helper.h"
+#include "ackermannization/ackr_helper.h"
 
 double ackr_helper::calculate_lemma_bound(ackr_helper::fun2terms_map& occurrences) {
     fun2terms_map::iterator it = occurrences.begin();

src/ackermannization/ackr_helper.h

@@ -17,7 +17,7 @@
 #ifndef ACKR_HELPER_H_
 #define ACKR_HELPER_H_
 
-#include"bv_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 class ackr_helper {
     public:

src/ackermannization/ackr_info.h

@@ -16,11 +16,11 @@ Revision History:
 #ifndef ACKR_INFO_H_
 #define ACKR_INFO_H_
 
-#include"obj_hashtable.h"
-#include"ast.h"
-#include"ref.h"
-#include"expr_replacer.h"
-#include"ast_translation.h"
+#include "util/obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/ref.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/ast_translation.h"
 
 /** \brief
    Information about how a formula is being converted into

src/ackermannization/ackr_model_converter.cpp

@@ -13,10 +13,10 @@ Mikolas Janota
 
 Revision History:
 --*/
-#include"ackr_model_converter.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
+#include "ackermannization/ackr_model_converter.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
 
 
 class ackr_model_converter : public model_converter {

src/ackermannization/ackr_model_converter.h

@@ -16,8 +16,8 @@ Revision History:
 #ifndef ACKR_MODEL_CONVERTER_H_
 #define ACKR_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model);
 model_converter * mk_ackr_model_converter(ast_manager & m, const ackr_info_ref& info);

src/ackermannization/lackr.cpp

@@ -15,13 +15,13 @@
  Revision History:
 --*/
 
-#include"lackr.h"
+#include "ackermannization/lackr.h"
 #include"ackermannization_params.hpp"
-#include"tactic.h"
-#include"lackr_model_constructor.h"
-#include"ackr_info.h"
-#include"for_each_expr.h"
-#include"model_smt2_pp.h"
+#include "tactic/tactic.h"
+#include "ackermannization/lackr_model_constructor.h"
+#include "ackermannization/ackr_info.h"
+#include "ast/for_each_expr.h"
+#include "model/model_smt2_pp.h"
 
 lackr::lackr(ast_manager& m, params_ref p, lackr_stats& st, expr_ref_vector& formulas,
     solver * uffree_solver)

src/ackermannization/lackr.h

@@ -17,17 +17,17 @@
 #ifndef LACKR_H_
 #define LACKR_H_
 
-#include"ackr_info.h"
-#include"ackr_helper.h"
-#include"th_rewriter.h"
-#include"cooperate.h"
-#include"bv_decl_plugin.h"
-#include"lbool.h"
-#include"model.h"
-#include"solver.h"
-#include"util.h"
-#include"tactic_exception.h"
-#include"goal.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/ackr_helper.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "util/cooperate.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/lbool.h"
+#include "model/model.h"
+#include "solver/solver.h"
+#include "util/util.h"
+#include "tactic/tactic_exception.h"
+#include "tactic/goal.h"
 
 struct lackr_stats {
     lackr_stats() : m_it(0), m_ackrs_sz(0) {}

src/ackermannization/lackr_model_constructor.cpp

@@ -14,13 +14,13 @@
 
  Revision History:
 --*/
-#include"lackr_model_constructor.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
-#include"for_each_expr.h"
-#include"bv_rewriter.h"
-#include"bool_rewriter.h"
+#include "ackermannization/lackr_model_constructor.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/bv_rewriter.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 struct lackr_model_constructor::imp {
     public:

src/ackermannization/lackr_model_constructor.h

@@ -18,10 +18,10 @@
 #ifndef LACKR_MODEL_CONSTRUCTOR_H_
 #define LACKR_MODEL_CONSTRUCTOR_H_
 
-#include"ast.h"
-#include"ackr_info.h"
-#include"ackr_helper.h"
-#include"model.h"
+#include "ast/ast.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/ackr_helper.h"
+#include "model/model.h"
 
 class lackr_model_constructor {
     public:

src/ackermannization/lackr_model_converter_lazy.cpp

@@ -14,11 +14,11 @@
 
  Revision History:
 --*/
-#include"lackr_model_converter_lazy.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
-#include"lackr_model_constructor.h"
+#include "ackermannization/lackr_model_converter_lazy.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/lackr_model_constructor.h"
 
 class lackr_model_converter_lazy : public model_converter {
 public:

src/ackermannization/lackr_model_converter_lazy.h

@@ -17,8 +17,8 @@
 #ifndef LACKR_MODEL_CONVERTER_LAZY_H_
 #define LACKR_MODEL_CONVERTER_LAZY_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_lackr_model_converter_lazy(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model);