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

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

src/ast/macros/macro_finder.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include"macro_finder.h"
-#include"occurs.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/macros/macro_finder.h"
+#include "ast/occurs.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 bool macro_finder::is_macro(expr * n, app_ref & head, expr_ref & def) {
     if (!is_quantifier(n) || !to_quantifier(n)->is_forall())

src/ast/macros/macro_finder.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MACRO_FINDER_H_
 #define MACRO_FINDER_H_
 
-#include"macro_manager.h"
-#include"arith_simplifier_plugin.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
 
 
 bool is_macro_head(expr * n, unsigned num_decls);

src/ast/macros/macro_manager.cpp

@@ -19,11 +19,11 @@ Revision History:
     Leonardo de Moura (leonardo) 2010-12-15: Moved dependency management to func_decl_dependencies.h
 
 --*/
-#include"macro_manager.h"
-#include"for_each_expr.h"
-#include"var_subst.h"
-#include"ast_pp.h"
-#include"recurse_expr_def.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/recurse_expr_def.h"
 
 macro_manager::macro_manager(ast_manager & m, simplifier & s):
     m_manager(m),

src/ast/macros/macro_manager.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef MACRO_MANAGER_H_
 #define MACRO_MANAGER_H_
 
-#include"ast_util.h"
-#include"obj_hashtable.h"
-#include"simplifier.h"
-#include"recurse_expr.h"
-#include"func_decl_dependencies.h"
-#include"macro_util.h"
+#include "ast/ast_util.h"
+#include "util/obj_hashtable.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/recurse_expr.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/macros/macro_util.h"
 
 /**
    \brief Macros are universally quantified formulas of the form:

src/ast/macros/macro_util.cpp

@@ -17,17 +17,17 @@ Author:
 Revision History:
 
 --*/
-#include"macro_util.h"
-#include"occurs.h"
-#include"ast_util.h"
-#include"arith_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"var_subst.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"for_each_expr.h"
-#include"well_sorted.h"
-#include"bool_rewriter.h"
+#include "ast/macros/macro_util.h"
+#include "ast/occurs.h"
+#include "ast/ast_util.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/for_each_expr.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 macro_util::macro_util(ast_manager & m, simplifier & s):
     m_manager(m),

src/ast/macros/macro_util.h

@@ -20,9 +20,9 @@ Revision History:
 #ifndef MACRO_UTIL_H_
 #define MACRO_UTIL_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"simplifier.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "ast/simplifier/simplifier.h"
 
 class poly_simplifier_plugin;
 class arith_simplifier_plugin;

src/ast/macros/quasi_macros.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"quasi_macros.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
-#include"uint_set.h"
-#include"var_subst.h"
+#include "ast/macros/quasi_macros.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
+#include "util/uint_set.h"
+#include "ast/rewriter/var_subst.h"
 
 quasi_macros::quasi_macros(ast_manager & m, macro_manager & mm, simplifier & s) :
   m_manager(m),

src/ast/macros/quasi_macros.h

@@ -20,9 +20,9 @@ Revision History:
 #define QUASI_MACROS_H_
 
 #include<sstream>
-#include"macro_manager.h"
-#include"basic_simplifier_plugin.h"
-#include"simplifier.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/simplifier.h"
 
 /**
    \brief Finds quasi macros and applies them.