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

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

src/ast/simplifier/arith_simplifier_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"arith_simplifier_params.h"
+#include "ast/simplifier/arith_simplifier_params.h"
 #include"arith_simplifier_params_helper.hpp"
 
 void arith_simplifier_params::updt_params(params_ref const & _p) {

src/ast/simplifier/arith_simplifier_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARITH_SIMPLIFIER_PARAMS_H_
 #define ARITH_SIMPLIFIER_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 struct arith_simplifier_params { 
     bool    m_arith_expand_eqs;

src/ast/simplifier/arith_simplifier_plugin.cpp

@@ -14,10 +14,10 @@ Author:
     Leonardo (leonardo) 2008-01-08
     
 --*/
-#include"arith_simplifier_plugin.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 arith_simplifier_plugin::~arith_simplifier_plugin() {
 }

src/ast/simplifier/arith_simplifier_plugin.h

@@ -17,10 +17,10 @@ Author:
 #ifndef ARITH_SIMPLIFIER_PLUGIN_H_
 #define ARITH_SIMPLIFIER_PLUGIN_H_
 
-#include"basic_simplifier_plugin.h"
-#include"poly_simplifier_plugin.h"
-#include"arith_decl_plugin.h"
-#include"arith_simplifier_params.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/poly_simplifier_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/arith_simplifier_params.h"
 
 /**
    \brief Simplifier for the arith family.

src/ast/simplifier/array_simplifier_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"array_simplifier_params.h"
+#include "ast/simplifier/array_simplifier_params.h"
 #include"array_simplifier_params_helper.hpp"
 
 void array_simplifier_params::updt_params(params_ref const & _p) {

src/ast/simplifier/array_simplifier_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARRAY_SIMPLIFIER_PARAMS_H_
 #define ARRAY_SIMPLIFIER_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 struct array_simplifier_params {
     bool            m_array_canonize_simplify;

src/ast/simplifier/array_simplifier_plugin.cpp

@@ -24,9 +24,9 @@ Notes TODO:
 
 --*/
 
-#include "array_simplifier_plugin.h"
-#include "ast_ll_pp.h"
-#include "ast_pp.h"
+#include "ast/simplifier/array_simplifier_plugin.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
 
 
 array_simplifier_plugin::array_simplifier_plugin(

src/ast/simplifier/array_simplifier_plugin.h

@@ -19,15 +19,15 @@ Revision History:
 #ifndef ARRAY_SIMPLIFIER_PLUGIN_H_
 #define ARRAY_SIMPLIFIER_PLUGIN_H_
 
-#include"ast.h"
-#include"map.h"
-#include"array_decl_plugin.h"
-#include"simplifier_plugin.h"
-#include"basic_simplifier_plugin.h"
-#include"array_simplifier_params.h"
-#include"simplifier.h"
-#include"obj_hashtable.h"
-#include"lbool.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/simplifier/simplifier_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/array_simplifier_params.h"
+#include "ast/simplifier/simplifier.h"
+#include "util/obj_hashtable.h"
+#include "util/lbool.h"
 
 class array_simplifier_plugin : public simplifier_plugin {
 

src/ast/simplifier/base_simplifier.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef BASE_SIMPLIFIER_H_
 #define BASE_SIMPLIFIER_H_
 
-#include"expr_map.h"
-#include"ast_pp.h"
+#include "ast/expr_map.h"
+#include "ast/ast_pp.h"
 
 /**
    \brief Implements basic functionality used by expression simplifiers.

src/ast/simplifier/basic_simplifier_plugin.cpp

@@ -14,9 +14,9 @@ Author:
     Leonardo (leonardo) 2008-01-07
     
 --*/
-#include"basic_simplifier_plugin.h"
-#include"ast_ll_pp.h"
-#include"bool_rewriter.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 basic_simplifier_plugin::basic_simplifier_plugin(ast_manager & m):
     simplifier_plugin(symbol("basic"), m), 

src/ast/simplifier/basic_simplifier_plugin.h

@@ -17,7 +17,7 @@ Author:
 #ifndef BASIC_SIMPLIFIER_PLUGIN_H_
 #define BASIC_SIMPLIFIER_PLUGIN_H_
 
-#include"simplifier_plugin.h"
+#include "ast/simplifier/simplifier_plugin.h"
 
 class bool_rewriter;
 

src/ast/simplifier/bit2int.cpp

@@ -19,10 +19,10 @@ Revision History:
 
 --*/
 
-#include "bit2int.h"
-#include "ast_pp.h"
-#include "ast_ll_pp.h"
-#include "for_each_ast.h"
+#include "ast/simplifier/bit2int.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/for_each_ast.h"
 
 #define CHECK(_x_) if (!(_x_)) { UNREACHABLE(); }
 

src/ast/simplifier/bit2int.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef BIT2INT_H_
 #define BIT2INT_H_
 
-#include"bv_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"act_cache.h"
-#include"basic_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/act_cache.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
 
 
 class bit2int {

src/ast/simplifier/bv_elim.cpp

@@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "bv_elim.h"
-#include "bv_decl_plugin.h"
-#include "var_subst.h"
+#include "ast/simplifier/bv_elim.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/var_subst.h"
 #include <sstream>
 
 void bv_elim::elim(quantifier* q, quantifier_ref& r) {

src/ast/simplifier/bv_elim.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef BV_ELIM_H_
 #define BV_ELIM_H_
 
-#include "ast.h"
-#include "simplifier.h"
+#include "ast/ast.h"
+#include "ast/simplifier/simplifier.h"
 
 class bv_elim {
     ast_manager& m_manager;

src/ast/simplifier/bv_simplifier_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"bv_simplifier_params.h"
+#include "ast/simplifier/bv_simplifier_params.h"
 #include"bv_simplifier_params_helper.hpp"
 #include"bv_rewriter_params.hpp"
 

src/ast/simplifier/bv_simplifier_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef BV_SIMPLIFIER_PARAMS_H_
 #define BV_SIMPLIFIER_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 struct bv_simplifier_params {
     bool  m_hi_div0; //!< if true, uses the hardware interpretation for div0, mod0, ... if false, div0, mod0, ... are considered uninterpreted.

src/ast/simplifier/bv_simplifier_plugin.cpp

@@ -15,12 +15,12 @@ Author:
     Nikolaj Bjorner (nbjorner) 2008-01-05
     
 --*/
-#include"bv_simplifier_plugin.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"arith_decl_plugin.h"
-#include"obj_hashtable.h"
-#include"ast_util.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/obj_hashtable.h"
+#include "ast/ast_util.h"
 
 bv_simplifier_plugin::~bv_simplifier_plugin() {
     flush_caches();

src/ast/simplifier/bv_simplifier_plugin.h

@@ -17,12 +17,12 @@ Author:
 #ifndef BV_SIMPLIFIER_PLUGIN_H_
 #define BV_SIMPLIFIER_PLUGIN_H_
 
-#include"basic_simplifier_plugin.h"
-#include"poly_simplifier_plugin.h"
-#include"bv_decl_plugin.h"
-#include"map.h"
-#include"bv_simplifier_params.h"
-#include"arith_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/poly_simplifier_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/map.h"
+#include "ast/simplifier/bv_simplifier_params.h"
+#include "ast/arith_decl_plugin.h"
 
 /**
    \brief Simplifier for the bv family.

src/ast/simplifier/datatype_simplifier_plugin.cpp

@@ -15,7 +15,7 @@ Author:
     
 --*/
 
-#include"datatype_simplifier_plugin.h"
+#include "ast/simplifier/datatype_simplifier_plugin.h"
 
 datatype_simplifier_plugin::datatype_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b):
     simplifier_plugin(symbol("datatype"), m),

src/ast/simplifier/datatype_simplifier_plugin.h

@@ -17,8 +17,8 @@ Author:
 #ifndef DATATYPE_SIMPLIFIER_PLUGIN_H_
 #define DATATYPE_SIMPLIFIER_PLUGIN_H_
 
-#include"basic_simplifier_plugin.h"
-#include"datatype_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/datatype_decl_plugin.h"
 
 /**
    \brief Simplifier for the arith family.

src/ast/simplifier/elim_bounds.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"elim_bounds.h"
-#include"used_vars.h"
-#include"obj_hashtable.h"
-#include"var_subst.h"
-#include"ast_pp.h"
+#include "ast/simplifier/elim_bounds.h"
+#include "ast/used_vars.h"
+#include "util/obj_hashtable.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
 
 elim_bounds::elim_bounds(ast_manager & m):
     m_manager(m),

src/ast/simplifier/elim_bounds.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef ELIM_BOUNDS_H_
 #define ELIM_BOUNDS_H_
 
-#include"ast.h"
-#include"arith_decl_plugin.h"
-#include"simplifier.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/simplifier.h"
 
 /**
    \brief Functor for eliminating irrelevant bounds in quantified formulas.

src/ast/simplifier/fpa_simplifier_plugin.cpp

@@ -14,7 +14,7 @@ Author:
     Christoph (cwinter) 2015-01-14
 
 --*/
-#include"fpa_simplifier_plugin.h"
+#include "ast/simplifier/fpa_simplifier_plugin.h"
 
 fpa_simplifier_plugin::fpa_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b) :
 simplifier_plugin(symbol("fpa"), m),

src/ast/simplifier/fpa_simplifier_plugin.h

@@ -17,9 +17,9 @@ Author:
 #ifndef FPA_SIMPLIFIER_PLUGIN_H_
 #define FPA_SIMPLIFIER_PLUGIN_H_
 
-#include"basic_simplifier_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"fpa_rewriter.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/rewriter/fpa_rewriter.h"
 
 class fpa_simplifier_plugin : public simplifier_plugin {
     fpa_util     m_util;

src/ast/simplifier/inj_axiom.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"inj_axiom.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"has_free_vars.h"
-#include"well_sorted.h"
+#include "ast/simplifier/inj_axiom.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/has_free_vars.h"
+#include "ast/well_sorted.h"
 
 /**
    \brief Little HACK for simplifying injectivity axioms

src/ast/simplifier/inj_axiom.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef INJ_AXIOM_H_
 #define INJ_AXIOM_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 bool simplify_inj_axiom(ast_manager & m, quantifier * q, expr_ref & result);
 

src/ast/simplifier/maximise_ac_sharing.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include"maximise_ac_sharing.h"
-#include"ast_pp.h"
-#include"basic_simplifier_plugin.h"
+#include "ast/simplifier/maximise_ac_sharing.h"
+#include "ast/ast_pp.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 maximise_ac_sharing::ac_plugin::ac_plugin(symbol const & fname, ast_manager & m, maximise_ac_sharing & owner):
     simplifier_plugin(fname, m),

src/ast/simplifier/maximise_ac_sharing.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef MAXIMISE_AC_SHARING_H_
 #define MAXIMISE_AC_SHARING_H_
 
-#include"simplifier.h"
-#include"hashtable.h"
-#include"bv_decl_plugin.h"
-#include"region.h"
+#include "ast/simplifier/simplifier.h"
+#include "util/hashtable.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/region.h"
 
 /**
    \brief Functor used to maximise the amount of shared terms in an expression.

src/ast/simplifier/poly_simplifier_plugin.cpp

@@ -14,11 +14,11 @@ Author:
     Leonardo (leonardo) 2008-01-08
     
 --*/
-#include"poly_simplifier_plugin.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"ast_smt2_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/simplifier/poly_simplifier_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_ll_pp.h"
 
 poly_simplifier_plugin::poly_simplifier_plugin(symbol const & fname, ast_manager & m, decl_kind add, decl_kind mul, decl_kind uminus, decl_kind sub,
                                                decl_kind num):

src/ast/simplifier/poly_simplifier_plugin.h

@@ -17,7 +17,7 @@ Author:
 #ifndef POLY_SIMPLIFIER_PLUGIN_H_
 #define POLY_SIMPLIFIER_PLUGIN_H_
 
-#include "simplifier_plugin.h"
+#include "ast/simplifier/simplifier_plugin.h"
 
 /**
    \brief Abstract class that provides simplification functions for polynomials.

src/ast/simplifier/pull_ite_tree.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"pull_ite_tree.h"
-#include"recurse_expr_def.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
+#include "ast/simplifier/pull_ite_tree.h"
+#include "ast/recurse_expr_def.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
 
 pull_ite_tree::pull_ite_tree(ast_manager & m, simplifier & s):
     m_manager(m),

src/ast/simplifier/pull_ite_tree.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef PULL_ITE_TREE_H_
 #define PULL_ITE_TREE_H_
 
-#include"ast.h"
-#include"simplifier.h"
-#include"recurse_expr.h"
-#include"obj_hashtable.h"
-#include"expr_map.h"
+#include "ast/ast.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/recurse_expr.h"
+#include "util/obj_hashtable.h"
+#include "ast/expr_map.h"
 
 /**
    \brief Functor for applying the following transformation

src/ast/simplifier/push_app_ite.cpp

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#include"push_app_ite.h"
-#include"ast_pp.h"
+#include "ast/simplifier/push_app_ite.h"
+#include "ast/ast_pp.h"
 
 push_app_ite::push_app_ite(simplifier & s, bool conservative):
     simplifier(s.get_manager()),

src/ast/simplifier/push_app_ite.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef PUSH_APP_ITE_H_
 #define PUSH_APP_ITE_H_
 
-#include"ast.h"
-#include"simplifier.h"
+#include "ast/ast.h"
+#include "ast/simplifier/simplifier.h"
 
 /**
    \brief Functor for applying the following transformation:

src/ast/simplifier/seq_simplifier_plugin.cpp

@@ -14,7 +14,7 @@ Author:
     Nikolaj Bjorner (nbjorner) 2016-02-05
 
 --*/
-#include"seq_simplifier_plugin.h"
+#include "ast/simplifier/seq_simplifier_plugin.h"
 
 seq_simplifier_plugin::seq_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b) :
 simplifier_plugin(symbol("seq"), m),

src/ast/simplifier/seq_simplifier_plugin.h

@@ -17,9 +17,9 @@ Author:
 #ifndef SEQ_SIMPLIFIER_PLUGIN_H_
 #define SEQ_SIMPLIFIER_PLUGIN_H_
 
-#include"basic_simplifier_plugin.h"
-#include"seq_decl_plugin.h"
-#include"seq_rewriter.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/rewriter/seq_rewriter.h"
 
 class seq_simplifier_plugin : public simplifier_plugin {
     seq_util     m_util;

src/ast/simplifier/simplifier.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"simplifier.h"
-#include"var_subst.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"well_sorted.h"
-#include"ast_smt_pp.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/well_sorted.h"
+#include "ast/ast_smt_pp.h"
 
 simplifier::simplifier(ast_manager & m):
     base_simplifier(m),

src/ast/simplifier/simplifier.h

@@ -19,11 +19,11 @@ Notes:
 #ifndef SIMPLIFIER_H_
 #define SIMPLIFIER_H_
 
-#include"base_simplifier.h"
-#include"simplifier_plugin.h"
-#include"plugin_manager.h"
-#include"ast_util.h"
-#include"obj_hashtable.h"
+#include "ast/simplifier/base_simplifier.h"
+#include "ast/simplifier/simplifier_plugin.h"
+#include "util/plugin_manager.h"
+#include "ast/ast_util.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief Local simplifier.

src/ast/simplifier/simplifier_plugin.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"simplifier_plugin.h"
+#include "ast/simplifier/simplifier_plugin.h"
 
 /**
    \brief Copy every args[i] mult[i] times to new_args.

src/ast/simplifier/simplifier_plugin.h

@@ -18,7 +18,7 @@ Author:
 #ifndef SIMPLIFIER_PLUGIN_H_
 #define SIMPLIFIER_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class simplifier;