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

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

src/ast/normal_forms/defined_names.cpp

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#include"defined_names.h"
-#include"obj_hashtable.h"
-#include"used_vars.h"
-#include"var_subst.h"
-#include"ast_smt2_pp.h"
-#include"ast_pp.h"
+#include "ast/normal_forms/defined_names.h"
+#include "util/obj_hashtable.h"
+#include "ast/used_vars.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_pp.h"
 
 struct defined_names::impl {
     typedef obj_map<expr, app *>   expr2name;

src/ast/normal_forms/defined_names.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef DEFINED_NAMES_H_
 #define DEFINED_NAMES_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 /**
    \brief Mapping from expressions to skolem functions that are used to name them.

src/ast/normal_forms/name_exprs.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"name_exprs.h"
-#include"rewriter_def.h"
-#include"ast_smt2_pp.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_smt2_pp.h"
 
 class name_exprs_core : public name_exprs {
     struct cfg : public default_rewriter_cfg {

src/ast/normal_forms/name_exprs.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef NAME_EXPRS_H_
 #define NAME_EXPRS_H_
 
-#include"ast.h"
-#include"defined_names.h"
+#include "ast/ast.h"
+#include "ast/normal_forms/defined_names.h"
 
 class expr_predicate {
 public:

src/ast/normal_forms/nnf.cpp

@@ -17,18 +17,18 @@ Notes:
     Major revision on 2011-10-06
 
 --*/
-#include"nnf.h"
+#include "ast/normal_forms/nnf.h"
 #include"nnf_params.hpp"
-#include"warning.h"
-#include"used_vars.h"
-#include"well_sorted.h"
-#include"var_subst.h"
+#include "util/warning.h"
+#include "ast/used_vars.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
 
-#include"name_exprs.h"
-#include"act_cache.h"
-#include"cooperate.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/act_cache.h"
+#include "util/cooperate.h"
 
-#include"ast_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 /**
    \brief NNF translation mode.  The cheapest mode is NNF_SKOLEM, and

src/ast/normal_forms/nnf.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef NNF_H_
 #define NNF_H_
 
-#include"ast.h"
-#include"params.h"
-#include"defined_names.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/normal_forms/defined_names.h"
 
 class nnf {
     struct imp;

src/ast/normal_forms/pull_quant.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"pull_quant.h"
-#include"var_subst.h"
-#include"rewriter_def.h"
-#include"ast_pp.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
 
 struct pull_quant::imp {
     

src/ast/normal_forms/pull_quant.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef PULL_QUANT_H_
 #define PULL_QUANT_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 /**
    \brief Pull nested quantifiers in a formula.