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

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

src/muz/transforms/dl_mk_array_blast.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include "dl_mk_array_blast.h"
-#include "ast_util.h"
-#include "scoped_proof.h"
+#include "muz/transforms/dl_mk_array_blast.h"
+#include "ast/ast_util.h"
+#include "ast/scoped_proof.h"
 
 
 namespace datalog {

src/muz/transforms/dl_mk_array_blast.h

@@ -19,13 +19,13 @@ Revision History:
 #ifndef DL_MK_ARRAY_BLAST_H_
 #define DL_MK_ARRAY_BLAST_H_
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
-#include"dl_mk_interp_tail_simplifier.h"
-#include "equiv_proof_converter.h"
-#include "array_decl_plugin.h"
-#include "expr_safe_replace.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "tactic/equiv_proof_converter.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_backwards.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include"dl_mk_backwards.h"
-#include"dl_context.h"
+#include "muz/transforms/dl_mk_backwards.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_backwards.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_MK_BACKWARDS_H_
 #define DL_MK_BACKWARDS_H_
 
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_bit_blast.cpp

@@ -17,16 +17,16 @@ Revision History:
 
 --*/
 
-#include "dl_mk_bit_blast.h"
-#include "bit_blaster_rewriter.h"
-#include "rewriter_def.h"
-#include "ast_pp.h"
-#include "expr_safe_replace.h"
-#include "filter_model_converter.h"
-#include "dl_mk_interp_tail_simplifier.h"
+#include "muz/transforms/dl_mk_bit_blast.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "tactic/filter_model_converter.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
 #include "fixedpoint_params.hpp"
-#include "scoped_proof.h"
-#include "model_v2_pp.h"
+#include "ast/scoped_proof.h"
+#include "model/model_v2_pp.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_bit_blast.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_MK_BIT_BLAST_H_
 #define DL_MK_BIT_BLAST_H_
 
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_coalesce.cpp

@@ -26,8 +26,8 @@ Notes:
 
  
 --*/
-#include "dl_mk_coalesce.h"
-#include "bool_rewriter.h"
+#include "muz/transforms/dl_mk_coalesce.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_coalesce.h

@@ -20,11 +20,11 @@ Revision History:
 #ifndef DL_MK_COALESCE_H_
 #define DL_MK_COALESCE_H_
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"uint_set.h"
-#include"dl_rule_transformer.h"
-#include"dl_mk_rule_inliner.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/uint_set.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_coi_filter.cpp

@@ -17,11 +17,11 @@ Author:
 
 --*/
 
-#include "dl_mk_coi_filter.h"
-#include "dataflow.h"
-#include "reachability.h"
-#include "ast_pp.h"
-#include "extension_model_converter.h"
+#include "muz/transforms/dl_mk_coi_filter.h"
+#include "muz/dataflow/dataflow.h"
+#include "muz/dataflow/reachability.h"
+#include "ast/ast_pp.h"
+#include "tactic/extension_model_converter.h"
 
 namespace datalog {
     rule_set * mk_coi_filter::operator()(rule_set const & source) {

src/muz/transforms/dl_mk_coi_filter.h

@@ -20,8 +20,8 @@ Author:
 #ifndef DL_MK_COI_FILTER_H_
 #define DL_MK_COI_FILTER_H_
 
-#include "dl_rule_transformer.h"
-#include "dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_different.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_MK_DIFFERENT_SYMBOLIC_H_
 #define DL_MK_DIFFERENT_SYMBOLIC_H_
 
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_filter_rules.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include"dl_mk_filter_rules.h"
-#include"dl_context.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
+#include "muz/transforms/dl_mk_filter_rules.h"
+#include "muz/base/dl_context.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_filter_rules.h

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

src/muz/transforms/dl_mk_interp_tail_simplifier.cpp

@@ -19,13 +19,13 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include"bool_rewriter.h"
-#include"rewriter.h"
-#include"rewriter_def.h"
-#include"dl_mk_rule_inliner.h"
-#include"dl_mk_interp_tail_simplifier.h"
-#include"ast_util.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "ast/ast_util.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_interp_tail_simplifier.h

@@ -20,11 +20,11 @@ Revision History:
 #ifndef DL_MK_INTERP_TAIL_SIMPLIFIER_H_
 #define DL_MK_INTERP_TAIL_SIMPLIFIER_H_
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
-#include "unifier.h"
-#include "substitution.h"
-#include "arith_decl_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/substitution/unifier.h"
+#include "ast/substitution/substitution.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_karr_invariants.cpp

@@ -32,13 +32,13 @@ Revision History:
            
 --*/
 
-#include"expr_safe_replace.h"
-#include"bool_rewriter.h"
-#include"for_each_expr.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/for_each_expr.h"
 
-#include"dl_mk_karr_invariants.h"
-#include"dl_mk_backwards.h"
-#include"dl_mk_loop_counter.h"
+#include "muz/transforms/dl_mk_karr_invariants.h"
+#include "muz/transforms/dl_mk_backwards.h"
+#include "muz/transforms/dl_mk_loop_counter.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_karr_invariants.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef DL_MK_KARR_INVARIANTS_H_
 #define DL_MK_KARR_INVARIANTS_H_
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
-#include"arith_decl_plugin.h"
-#include"hilbert_basis.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/arith_decl_plugin.h"
+#include "math/hilbert/hilbert_basis.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_loop_counter.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include"dl_mk_loop_counter.h"
-#include"dl_context.h"
+#include "muz/transforms/dl_mk_loop_counter.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_loop_counter.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DL_MK_LOOP_COUNTER_H_
 #define DL_MK_LOOP_COUNTER_H_
 
-#include"dl_rule_transformer.h"
-#include"arith_decl_plugin.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_magic_sets.cpp

@@ -19,8 +19,8 @@ Revision History:
 
 #include<utility>
 #include<sstream>
-#include"ast_pp.h"
-#include"dl_mk_magic_sets.h"
+#include "ast/ast_pp.h"
+#include "muz/transforms/dl_mk_magic_sets.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_magic_sets.h

@@ -21,12 +21,12 @@ Revision History:
 
 #include<utility>
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_magic_symbolic.cpp

@@ -52,8 +52,8 @@ Revision History:
 
 --*/
 
-#include"dl_mk_magic_symbolic.h"
-#include"dl_context.h"
+#include "muz/transforms/dl_mk_magic_symbolic.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_magic_symbolic.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_MK_MAGIC_SYMBOLIC_H_
 #define DL_MK_MAGIC_SYMBOLIC_H_
 
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_quantifier_abstraction.cpp

@@ -19,10 +19,10 @@ Revision History:
 
 --*/
 
-#include "dl_mk_quantifier_abstraction.h"
-#include "dl_context.h"
-#include "expr_safe_replace.h"
-#include "expr_abstract.h"
+#include "muz/transforms/dl_mk_quantifier_abstraction.h"
+#include "muz/base/dl_context.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/expr_abstract.h"
 #include"fixedpoint_params.hpp"
 
 

src/muz/transforms/dl_mk_quantifier_abstraction.h

@@ -26,8 +26,8 @@ Revision History:
 #define DL_MK_QUANTIFIER_ABSTRACTION_H_
 
 
-#include"dl_rule_transformer.h"
-#include"array_decl_plugin.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/array_decl_plugin.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_quantifier_instantiation.cpp

@@ -23,9 +23,9 @@ Revision History:
 
 --*/
 
-#include "dl_mk_quantifier_instantiation.h"
-#include "dl_context.h"
-#include "pattern_inference.h"
+#include "muz/transforms/dl_mk_quantifier_instantiation.h"
+#include "muz/base/dl_context.h"
+#include "ast/pattern/pattern_inference.h"
 
 
 namespace datalog {

src/muz/transforms/dl_mk_quantifier_instantiation.h

@@ -26,9 +26,9 @@ Revision History:
 #define DL_MK_QUANTIFIER_INSTANTIATION_H_
 
 
-#include "dl_rule_transformer.h"
-#include "expr_safe_replace.h"
-#include "union_find.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "util/union_find.h"
 
 
 namespace datalog {

src/muz/transforms/dl_mk_rule_inliner.cpp

@@ -48,10 +48,10 @@ Subsumption transformation (remove rule):
 
 
 #include <sstream>
-#include "ast_pp.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "dl_mk_rule_inliner.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
 #include "fixedpoint_params.hpp"
 
 namespace datalog {

src/muz/transforms/dl_mk_rule_inliner.h

@@ -20,12 +20,12 @@ Revision History:
 #ifndef DL_MK_RULE_INLINER_H_
 #define DL_MK_RULE_INLINER_H_
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
-#include "dl_mk_interp_tail_simplifier.h"
-#include "unifier.h"
-#include "substitution.h"
-#include "substitution_tree.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "ast/substitution/unifier.h"
+#include "ast/substitution/substitution.h"
+#include "ast/substitution/substitution_tree.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_scale.cpp

@@ -16,8 +16,8 @@ Revision History:
 
 --*/
 
-#include"dl_mk_scale.h"
-#include"dl_context.h"
+#include "muz/transforms/dl_mk_scale.h"
+#include "muz/base/dl_context.h"
 #include"fixedpoint_params.hpp"
 
 namespace datalog {

src/muz/transforms/dl_mk_scale.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef DL_MK_SCALE_H_
 #define DL_MK_SCALE_H_
 
-#include"dl_rule_transformer.h"
-#include"arith_decl_plugin.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_separate_negated_tails.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include "dl_mk_separate_negated_tails.h"
-#include "dl_context.h"
+#include "muz/transforms/dl_mk_separate_negated_tails.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_separate_negated_tails.h

@@ -32,8 +32,8 @@ Revision History:
 #ifndef DL_MK_SEPARAT_NEGATED_TAILS_H_
 #define DL_MK_SEPARAT_NEGATED_TAILS_H_
 
-#include "dl_rule_transformer.h"
-#include "dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_slice.cpp

@@ -50,12 +50,12 @@ Revision History:
 
 --*/
 
-#include "dl_mk_slice.h"
-#include "ast_pp.h"
-#include "ast_util.h"
-#include "expr_functors.h"
-#include "dl_mk_rule_inliner.h"
-#include "model_smt2_pp.h"
+#include "muz/transforms/dl_mk_slice.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "ast/expr_functors.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "model/model_smt2_pp.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_slice.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DL_MK_SLICE_H_
 #define DL_MK_SLICE_H_
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"uint_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/uint_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_subsumption_checker.cpp

@@ -20,10 +20,10 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include"dl_mk_subsumption_checker.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/transforms/dl_mk_subsumption_checker.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_subsumption_checker.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef DL_MK_SUBSUMPTION_CHECKER_H_
 #define DL_MK_SUBSUMPTION_CHECKER_H_
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
-#include "dl_rule_subsumption_index.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/base/dl_rule_subsumption_index.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_unbound_compressor.cpp

@@ -19,7 +19,7 @@ Revision History:
 
 #include<utility>
 #include<sstream>
-#include"dl_mk_unbound_compressor.h"
+#include "muz/transforms/dl_mk_unbound_compressor.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_unbound_compressor.h

@@ -21,12 +21,12 @@ Revision History:
 
 #include<utility>
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_unfold.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "dl_mk_unfold.h"
+#include "muz/transforms/dl_mk_unfold.h"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_unfold.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef DL_MK_UNFOLD_H_
 #define DL_MK_UNFOLD_H_
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"uint_set.h"
-#include"dl_rule_transformer.h"
-#include"dl_mk_rule_inliner.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/uint_set.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
 
 namespace datalog {
 

src/muz/transforms/dl_transforms.cpp

@@ -19,20 +19,20 @@ Revision History:
 
 --*/
 
-#include"dl_transforms.h"
-#include"dl_rule_transformer.h"
-#include"dl_mk_coi_filter.h"
-#include"dl_mk_filter_rules.h"
-#include"dl_mk_interp_tail_simplifier.h"
-#include"dl_mk_rule_inliner.h"
-#include"dl_mk_bit_blast.h"
-#include"dl_mk_array_blast.h"
-#include"dl_mk_karr_invariants.h"
-#include"dl_mk_magic_symbolic.h"
-#include"dl_mk_quantifier_abstraction.h"
-#include"dl_mk_quantifier_instantiation.h"
-#include"dl_mk_subsumption_checker.h"
-#include"dl_mk_scale.h"
+#include "muz/transforms/dl_transforms.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_coi_filter.h"
+#include "muz/transforms/dl_mk_filter_rules.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "muz/transforms/dl_mk_bit_blast.h"
+#include "muz/transforms/dl_mk_array_blast.h"
+#include "muz/transforms/dl_mk_karr_invariants.h"
+#include "muz/transforms/dl_mk_magic_symbolic.h"
+#include "muz/transforms/dl_mk_quantifier_abstraction.h"
+#include "muz/transforms/dl_mk_quantifier_instantiation.h"
+#include "muz/transforms/dl_mk_subsumption_checker.h"
+#include "muz/transforms/dl_mk_scale.h"
 #include"fixedpoint_params.hpp"
 
 namespace datalog {

src/muz/transforms/dl_transforms.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef DL_TRANSFORMS_H_
 #define DL_TRANSFORMS_H_
 
-#include "dl_context.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
     void apply_default_transformation(context& ctx);