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

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

src/model/func_interp.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"func_interp.h"
-#include"var_subst.h"
-#include"obj_hashtable.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
+#include "model/func_interp.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/obj_hashtable.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 func_entry::func_entry(ast_manager & m, unsigned arity, expr * const * args, expr * result):
     m_args_are_values(true),

src/model/func_interp.h

@@ -30,8 +30,8 @@ Revision History:
 #ifndef FUNC_INTERP_H_
 #define FUNC_INTERP_H_
 
-#include"ast.h"
-#include"ast_translation.h"
+#include "ast/ast.h"
+#include "ast/ast_translation.h"
 
 class func_interp;
 

src/model/model.cpp

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#include"model.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"var_subst.h"
-#include"array_decl_plugin.h"
-#include"well_sorted.h"
-#include"used_symbols.h"
-#include"model_evaluator.h"
+#include "model/model.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/well_sorted.h"
+#include "ast/used_symbols.h"
+#include "model/model_evaluator.h"
 
 model::model(ast_manager & m):
     model_core(m) {

src/model/model.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef MODEL_H_
 #define MODEL_H_
 
-#include"model_core.h"
-#include"ref.h"
-#include"ast_translation.h"
+#include "model/model_core.h"
+#include "util/ref.h"
+#include "ast/ast_translation.h"
 
 class model : public model_core {
 protected:

src/model/model2expr.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include "model2expr.h"
-#include "for_each_ast.h"
-#include "bool_rewriter.h"
-#include "var_subst.h"
+#include "model/model2expr.h"
+#include "ast/for_each_ast.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/var_subst.h"
 
 struct for_each_symbol_proc {
     symbol_set& m_symbols;

src/model/model2expr.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef MODEL2EXPR_H_
 #define MODEL2EXPR_H_
 
-#include"model.h"
+#include "model/model.h"
 
 void model2expr(model& m, expr_ref& result);
 

src/model/model_core.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"model_core.h"
+#include "model/model_core.h"
 
 model_core::~model_core() {
     decl2expr::iterator it1  = m_interp.begin();

src/model/model_core.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef MODEL_CORE_H_
 #define MODEL_CORE_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"func_interp.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "model/func_interp.h"
 
 class model_core {
 protected:

src/model/model_evaluator.cpp

@@ -16,23 +16,23 @@ Author:
 Revision History:
 
 --*/
-#include"model.h"
+#include "model/model.h"
 #include"model_evaluator_params.hpp"
-#include"rewriter_types.h"
-#include"model_evaluator.h"
-#include"bool_rewriter.h"
-#include"arith_rewriter.h"
-#include"bv_rewriter.h"
-#include"pb_rewriter.h"
-#include"seq_rewriter.h"
-#include"datatype_rewriter.h"
-#include"array_rewriter.h"
-#include"fpa_rewriter.h"
-#include"rewriter_def.h"
-#include"cooperate.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"model_smt2_pp.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "model/model_evaluator.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/rewriter/bv_rewriter.h"
+#include "ast/rewriter/pb_rewriter.h"
+#include "ast/rewriter/seq_rewriter.h"
+#include "ast/rewriter/datatype_rewriter.h"
+#include "ast/rewriter/array_rewriter.h"
+#include "ast/rewriter/fpa_rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/cooperate.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "model/model_smt2_pp.h"
 
 
 struct evaluator_cfg : public default_rewriter_cfg {

src/model/model_evaluator.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef MODEL_EVALUATOR_H_
 #define MODEL_EVALUATOR_H_
 
-#include"ast.h"
-#include"rewriter_types.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/params.h"
 class model;
 
 typedef rewriter_exception model_evaluator_exception;

src/model/model_implicant.cpp

@@ -22,23 +22,23 @@ Notes:
 --*/
 
 #include <sstream>
-#include "array_decl_plugin.h"
-#include "ast_pp.h"
-#include "bool_rewriter.h"
-#include "for_each_expr.h"
-#include "model.h"
-#include "ref_vector.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "util.h"
-#include "model_implicant.h"
-#include "arith_decl_plugin.h"
-#include "expr_replacer.h"
-#include "model_smt2_pp.h"
-#include "poly_rewriter.h"
-#include "poly_rewriter_def.h"
-#include "arith_rewriter.h"
-#include "scoped_proof.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/for_each_expr.h"
+#include "model/model.h"
+#include "util/ref_vector.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/util.h"
+#include "model/model_implicant.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "model/model_smt2_pp.h"
+#include "ast/rewriter/poly_rewriter.h"
+#include "ast/rewriter/poly_rewriter_def.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/scoped_proof.h"
 
 
 

src/model/model_implicant.h

@@ -20,14 +20,14 @@ Revision History:
 #ifndef MODEL_IMPLICANT_H_
 #define MODEL_IMPLICANT_H_
 
-#include "ast.h"
-#include "ast_pp.h"
-#include "obj_hashtable.h"
-#include "ref_vector.h"
-#include "trace.h"
-#include "vector.h"
-#include "arith_decl_plugin.h"
-#include "array_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "util/obj_hashtable.h"
+#include "util/ref_vector.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
 
 class model;
 class model_core;

src/model/model_pp.cpp

@@ -17,12 +17,12 @@ Revision History:
 
 
 --*/
-#include"model_pp.h"
-#include"model_core.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
-#include"used_symbols.h"
-#include"pp.h"
+#include "model/model_pp.h"
+#include "model/model_core.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/used_symbols.h"
+#include "ast/pp.h"
 
 static void display_uninterp_sorts(std::ostream & out, model_core const & md) {
     ast_manager & m = md.get_manager();

src/model/model_smt2_pp.cpp

@@ -18,10 +18,10 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"model_smt2_pp.h"
-#include"ast_smt2_pp.h"
-#include"func_decl_dependencies.h"
-#include"pp.h"
+#include "model/model_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/pp.h"
 using namespace format_ns;
 
 static void pp_indent(std::ostream & out, unsigned indent) {

src/model/model_smt2_pp.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef MODEL_SMT2_PP_H_
 #define MODEL_SMT2_PP_H_
 
-#include"ast_printer.h"
-#include"model_core.h"
+#include "ast/ast_printer.h"
+#include "model/model_core.h"
 
 void model_smt2_pp(std::ostream & out, ast_printer_context & ctx, model_core const & m, unsigned indent);
 void model_smt2_pp(std::ostream & out, ast_manager & m, model_core const & md, unsigned indent);

src/model/model_v2_pp.cpp

@@ -15,9 +15,9 @@ Author:
 
 Revision History:
 --*/
-#include"model_v2_pp.h"
-#include"model_core.h"
-#include"ast_pp.h"
+#include "model/model_v2_pp.h"
+#include "model/model_core.h"
+#include "ast/ast_pp.h"
 
 static void display_function(std::ostream & out, model_core const & md, func_decl * f, bool partial) {
     ast_manager & m = md.get_manager();