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

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

src/smt/proto_model/array_factory.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include"array_factory.h"
-#include"array_decl_plugin.h"
-#include"proto_model.h"
-#include"func_interp.h"
-#include"ast_pp.h"
+#include "smt/proto_model/array_factory.h"
+#include "ast/array_decl_plugin.h"
+#include "smt/proto_model/proto_model.h"
+#include "model/func_interp.h"
+#include "ast/ast_pp.h"
 
 func_decl * mk_aux_decl_for_array_sort(ast_manager & m, sort * s) {
     ptr_buffer<sort> domain;

src/smt/proto_model/array_factory.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARRAY_FACTORY_H_
 #define ARRAY_FACTORY_H_
 
-#include"struct_factory.h"
+#include "smt/proto_model/struct_factory.h"
 
 class func_interp;
 

src/smt/proto_model/datatype_factory.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"datatype_factory.h"
-#include"proto_model.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"expr_functors.h"
+#include "smt/proto_model/datatype_factory.h"
+#include "smt/proto_model/proto_model.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/expr_functors.h"
 
 datatype_factory::datatype_factory(ast_manager & m, proto_model & md):
     struct_factory(m, m.mk_family_id("datatype"), md),

src/smt/proto_model/datatype_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DATATYPE_FACTORY_H_
 #define DATATYPE_FACTORY_H_
 
-#include"struct_factory.h"
-#include"datatype_decl_plugin.h"
+#include "smt/proto_model/struct_factory.h"
+#include "ast/datatype_decl_plugin.h"
 
 class datatype_factory : public struct_factory {
     datatype_util         m_util;

src/smt/proto_model/numeral_factory.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"numeral_factory.h"
-#include"ast_pp.h"
+#include "smt/proto_model/numeral_factory.h"
+#include "ast/ast_pp.h"
 
 app * arith_factory::mk_value_core(rational const & val, sort * s) {
     return m_util.mk_numeral(val, s);

src/smt/proto_model/numeral_factory.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef NUMERAL_FACTORY_H_
 #define NUMERAL_FACTORY_H_
 
-#include"value_factory.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
+#include "smt/proto_model/value_factory.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 class numeral_factory : public simple_factory<rational> {
 public:

src/smt/proto_model/proto_model.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"proto_model.h"
+#include "smt/proto_model/proto_model.h"
 #include"model_params.hpp"
-#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_v2_pp.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_v2_pp.h"
 
 proto_model::proto_model(ast_manager & m, params_ref const & p):
     model_core(m),
@@ -441,8 +441,8 @@ model * proto_model::mk_model() {
 
 #if 0
 
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 // Auxiliary function for computing fi(args[0], ..., args[fi.get_arity() - 1]).
 // The result is stored in result.

src/smt/proto_model/proto_model.h

@@ -28,15 +28,15 @@ Revision History:
 #ifndef PROTO_MODEL_H_
 #define PROTO_MODEL_H_
 
-#include"model_core.h"
-#include"model_evaluator.h"
-#include"value_factory.h"
-#include"plugin_manager.h"
-#include"arith_decl_plugin.h"
-#include"func_decl_dependencies.h"
-#include"model.h"
-#include"params.h"
-#include"th_rewriter.h"
+#include "model/model_core.h"
+#include "model/model_evaluator.h"
+#include "smt/proto_model/value_factory.h"
+#include "util/plugin_manager.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/func_decl_dependencies.h"
+#include "model/model.h"
+#include "util/params.h"
+#include "ast/rewriter/th_rewriter.h"
 
 class proto_model : public model_core {
     plugin_manager<value_factory> m_factories;

src/smt/proto_model/struct_factory.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"struct_factory.h"
-#include"proto_model.h"
+#include "smt/proto_model/struct_factory.h"
+#include "smt/proto_model/proto_model.h"
 
 struct_factory::value_set * struct_factory::get_value_set(sort * s) {
     value_set * set = 0;

src/smt/proto_model/struct_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef STRUCT_FACTORY_H_
 #define STRUCT_FACTORY_H_
 
-#include"value_factory.h"
-#include"obj_hashtable.h"
+#include "smt/proto_model/value_factory.h"
+#include "util/obj_hashtable.h"
 
 class proto_model;
 

src/smt/proto_model/value_factory.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"value_factory.h"
+#include "smt/proto_model/value_factory.h"
 
 value_factory::value_factory(ast_manager & m, family_id fid):
     m_manager(m), 

src/smt/proto_model/value_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef VALUE_FACTORY_H_
 #define VALUE_FACTORY_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief Auxiliary object used during model construction.