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

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

src/muz/base/bind_variables.cpp

@@ -18,7 +18,7 @@ Notes:
 
 --*/
 
-#include "bind_variables.h"
+#include "muz/base/bind_variables.h"
 
 bind_variables::bind_variables(ast_manager & m):
     m(m),

src/muz/base/bind_variables.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef BIND_VARIABLES_H_
 #define BIND_VARIABLES_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class bind_variables {
     typedef obj_map<app, var*> var2bound;

src/muz/base/dl_boogie_proof.cpp

@@ -51,11 +51,11 @@ Example from Boogie:
 ")
 */
 
-#include "dl_boogie_proof.h"
-#include "model_pp.h"
-#include "proof_utils.h"
-#include "ast_pp.h"
-#include "ast_util.h"
+#include "muz/base/dl_boogie_proof.h"
+#include "model/model_pp.h"
+#include "muz/base/proof_utils.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
 
 namespace datalog {
     

src/muz/base/dl_boogie_proof.h

@@ -48,8 +48,8 @@ define-fun) when Boogie supports this.
 
 */
 
-#include "ast.h"
-#include "model.h"
+#include "ast/ast.h"
+#include "model/model.h"
 
 namespace datalog {
     class boogie_proof {

src/muz/base/dl_context.cpp

@@ -19,16 +19,16 @@ Revision History:
 
 #include<sstream>
 #include<limits>
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"dl_context.h"
-#include"for_each_expr.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"datatype_decl_plugin.h"
-#include"scoped_proof.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/base/dl_context.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/scoped_proof.h"
 #include"fixedpoint_params.hpp"
-#include"ast_pp_util.h"
+#include "ast/ast_pp_util.h"
 
 
 namespace datalog {

src/muz/base/dl_context.h

@@ -23,26 +23,26 @@ Revision History:
 #undef min
 #undef max
 #endif
-#include"arith_decl_plugin.h"
-#include"map.h"
-#include"th_rewriter.h"
-#include"str_hashtable.h"
-#include"var_subst.h"
-#include"dl_costs.h"
-#include"dl_decl_plugin.h"
-#include"dl_rule_set.h"
-#include"lbool.h"
-#include"statistics.h"
-#include"params.h"
-#include"trail.h"
-#include"model_converter.h"
-#include"model2expr.h"
-#include"smt_params.h"
-#include"dl_rule_transformer.h"
-#include"expr_functors.h"
-#include"dl_engine_base.h"
-#include"bind_variables.h"
-#include"rule_properties.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/map.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "util/str_hashtable.h"
+#include "ast/rewriter/var_subst.h"
+#include "muz/base/dl_costs.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "util/params.h"
+#include "util/trail.h"
+#include "tactic/model_converter.h"
+#include "model/model2expr.h"
+#include "smt/params/smt_params.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/expr_functors.h"
+#include "muz/base/dl_engine_base.h"
+#include "muz/base/bind_variables.h"
+#include "muz/base/rule_properties.h"
 
 struct fixedpoint_params;
 

src/muz/base/dl_costs.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "stopwatch.h"
-#include "dl_context.h"
-#include "dl_rule.h"
-#include "dl_costs.h"
+#include "util/debug.h"
+#include "util/stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_costs.h"
 
 namespace datalog {
 

src/muz/base/dl_costs.h

@@ -22,7 +22,7 @@ Revision History:
 
 #include<iosfwd>
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class stopwatch;
 

src/muz/base/dl_engine_base.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_ENGINE_BASE_H_
 #define DL_ENGINE_BASE_H_
 
-#include "model.h"
+#include "model/model.h"
 
 namespace datalog {
     enum DL_ENGINE {

src/muz/base/dl_rule.cpp

@@ -24,26 +24,26 @@ Revision History:
 #include<algorithm>
 #include<sstream>
 
-#include"ast_pp.h"
-#include"dl_context.h"
-#include"map.h"
-#include"recurse_expr_def.h"
-#include"dl_rule.h"
-#include"qe.h"
-#include"for_each_expr.h"
-#include"used_vars.h"
-#include"var_subst.h"
-#include"rewriter_def.h"
-#include"th_rewriter.h"
-#include"ast_smt2_pp.h"
-#include"used_symbols.h"
-#include"quant_hoist.h"
-#include"expr_replacer.h"
-#include"bool_rewriter.h"
-#include"expr_safe_replace.h"
-#include"filter_model_converter.h"
-#include"scoped_proof.h"
-#include"datatype_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "util/map.h"
+#include "ast/recurse_expr_def.h"
+#include "muz/base/dl_rule.h"
+#include "qe/qe.h"
+#include "ast/for_each_expr.h"
+#include "ast/used_vars.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/used_symbols.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/scoped_proof.h"
+#include "ast/datatype_decl_plugin.h"
 
 namespace datalog {
 

src/muz/base/dl_rule.h

@@ -20,19 +20,19 @@ Revision History:
 #ifndef DL_RULE_H_
 #define DL_RULE_H_
 
-#include"ast.h"
-#include"dl_costs.h"
-#include"dl_util.h"
-#include"used_vars.h"
-#include"proof_converter.h"
-#include"model_converter.h"
-#include"ast_counter.h"
-#include"rewriter.h"
-#include"hnf.h"
-#include"qe_lite.h"
-#include"var_subst.h"
-#include"datatype_decl_plugin.h"
-#include"label_rewriter.h"
+#include "ast/ast.h"
+#include "muz/base/dl_costs.h"
+#include "muz/base/dl_util.h"
+#include "ast/used_vars.h"
+#include "tactic/proof_converter.h"
+#include "tactic/model_converter.h"
+#include "ast/rewriter/ast_counter.h"
+#include "ast/rewriter/rewriter.h"
+#include "muz/base/hnf.h"
+#include "qe/qe_lite.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/rewriter/label_rewriter.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_set.cpp

@@ -19,9 +19,9 @@ Revision History:
 
 #include<algorithm>
 #include<functional>
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_set.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DL_RULE_SET_H_
 #define DL_RULE_SET_H_
 
-#include"obj_hashtable.h"
-#include"dl_rule.h"
+#include "util/obj_hashtable.h"
+#include "muz/base/dl_rule.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_subsumption_index.cpp

@@ -20,9 +20,9 @@ Revision History:
 
 
 #include <sstream>
-#include "ast_pp.h"
+#include "ast/ast_pp.h"
 
-#include "dl_rule_subsumption_index.h"
+#include "muz/base/dl_rule_subsumption_index.h"
 
 namespace datalog {
   

src/muz/base/dl_rule_subsumption_index.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef DL_RULE_SUBSUMPTION_INDEX_H_
 #define DL_RULE_SUBSUMPTION_INDEX_H_
 
-#include "dl_context.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_transformer.cpp

@@ -20,9 +20,9 @@ Revision History:
 #include <algorithm>
 #include<typeinfo>
 
-#include"dl_context.h"
-#include"dl_rule_transformer.h"
-#include"stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "util/stopwatch.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_transformer.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DL_RULE_TRANSFORMER_H_
 #define DL_RULE_TRANSFORMER_H_
 
-#include"map.h"
-#include"vector.h"
-#include"dl_rule.h"
-#include"dl_rule_set.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_set.h"
 
 namespace datalog {
 

src/muz/base/dl_util.cpp

@@ -23,14 +23,14 @@ Revision History:
 #ifdef _WINDOWS
 #include <windows.h>
 #endif
-#include"ast_pp.h"
-#include"bool_rewriter.h"
-#include"for_each_expr.h"
-#include"scoped_proof.h"
-#include"dl_context.h"
-#include"dl_rule.h"
-#include"dl_util.h"
-#include"stopwatch.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/for_each_expr.h"
+#include "ast/scoped_proof.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_util.h"
+#include "util/stopwatch.h"
 
 namespace datalog {
 

src/muz/base/dl_util.h

@@ -20,17 +20,17 @@ Revision History:
 #define DL_UTIL_H_
 
 #include<vector>
-#include"ast.h"
-#include"hashtable.h"
-#include"obj_hashtable.h"
-#include"uint_set.h"
-#include"horn_subsume_model_converter.h"
-#include"replace_proof_converter.h"
-#include"substitution.h"
-#include"ast_counter.h"
-#include"statistics.h"
-#include"stopwatch.h"
-#include"lbool.h"
+#include "ast/ast.h"
+#include "util/hashtable.h"
+#include "util/obj_hashtable.h"
+#include "util/uint_set.h"
+#include "tactic/horn_subsume_model_converter.h"
+#include "tactic/replace_proof_converter.h"
+#include "ast/substitution/substitution.h"
+#include "ast/rewriter/ast_counter.h"
+#include "util/statistics.h"
+#include "util/stopwatch.h"
+#include "util/lbool.h"
 
 namespace datalog {
 

src/muz/base/hnf.cpp

@@ -43,20 +43,20 @@ Notes:
      
                 
 --*/
-#include"hnf.h"
-#include"warning.h"
-#include"used_vars.h"
-#include"well_sorted.h"
-#include"var_subst.h"
-#include"name_exprs.h"
-#include"act_cache.h"
-#include"cooperate.h"
-#include"ast_pp.h"
-#include"quant_hoist.h"
-#include"ast_util.h"
-#include"dl_util.h"
-#include"for_each_ast.h"
-#include"for_each_expr.h"
+#include "muz/base/hnf.h"
+#include "util/warning.h"
+#include "ast/used_vars.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/act_cache.h"
+#include "util/cooperate.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/ast_util.h"
+#include "muz/base/dl_util.h"
+#include "ast/for_each_ast.h"
+#include "ast/for_each_expr.h"
 
 class hnf::imp {
 

src/muz/base/hnf.h

@@ -25,10 +25,10 @@ Copyright (c) 2015 Microsoft Corporation
 #ifndef HNF_H_
 #define HNF_H_
  
-#include"ast.h"
-#include"params.h"
-#include"defined_names.h"
-#include"proof_converter.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/normal_forms/defined_names.h"
+#include "tactic/proof_converter.h"
  
 class hnf {
     class imp;

src/muz/base/proof_utils.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "dl_util.h"
-#include "proof_utils.h"
-#include "ast_smt2_pp.h"
-#include "var_subst.h"
+#include "muz/base/dl_util.h"
+#include "muz/base/proof_utils.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/rewriter/var_subst.h"
 
 class reduce_hypotheses {
     typedef obj_hashtable<expr> expr_set;

src/muz/base/rule_properties.cpp

@@ -18,11 +18,11 @@ Notes:
 
 --*/
 
-#include"expr_functors.h"
-#include"rule_properties.h"
-#include"dl_rule_set.h"
-#include"for_each_expr.h"
-#include"dl_context.h"
+#include "ast/expr_functors.h"
+#include "muz/base/rule_properties.h"
+#include "muz/base/dl_rule_set.h"
+#include "ast/for_each_expr.h"
+#include "muz/base/dl_context.h"
 
 using namespace datalog;
 rule_properties::rule_properties(ast_manager & m, rule_manager& rm, context& ctx, i_expr_pred& p): 

src/muz/base/rule_properties.h

@@ -21,10 +21,10 @@ Notes:
 #ifndef RULE_PROPERTIES_H_
 #define RULE_PROPERTIES_H_
 
-#include"ast.h"
-#include"datatype_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"dl_rule.h"
+#include "ast/ast.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/base/dl_rule.h"
 
 namespace datalog {
     class rule_properties {