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

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

src/cmd_context/basic_cmds.cpp

@@ -15,20 +15,20 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
+#include "cmd_context/cmd_context.h"
 #include"version.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"ast_pp.h"
-#include"model_smt2_pp.h"
-#include"array_decl_plugin.h"
-#include"pp.h"
-#include"cmd_util.h"
-#include"simplify_cmd.h"
-#include"eval_cmd.h"
-#include"gparams.h"
-#include"env_params.h"
-#include"well_sorted.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_pp.h"
+#include "model/model_smt2_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/pp.h"
+#include "cmd_context/cmd_util.h"
+#include "cmd_context/simplify_cmd.h"
+#include "cmd_context/eval_cmd.h"
+#include "util/gparams.h"
+#include "util/env_params.h"
+#include "ast/well_sorted.h"
 #include"pp_params.hpp"
 
 class help_cmd : public cmd {

src/cmd_context/check_logic.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"check_logic.h"
-#include"arith_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"pb_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"ast_pp.h"
-#include"for_each_expr.h"
+#include "cmd_context/check_logic.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/for_each_expr.h"
 #include<sstream>
 
 struct check_logic::imp {

src/cmd_context/check_logic.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef CHECK_LOGIC_H_
 #define CHECK_LOGIC_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class check_logic {
     struct imp;

src/cmd_context/cmd_context.cpp

@@ -17,36 +17,36 @@ Notes:
 --*/
 
 #include<signal.h>
-#include"tptr.h"
-#include"cmd_context.h"
-#include"func_decl_dependencies.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"pb_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"ast_pp.h"
-#include"var_subst.h"
-#include"pp.h"
-#include"ast_smt2_pp.h"
-#include"basic_cmds.h"
-#include"cancel_eh.h"
-#include"scoped_ctrl_c.h"
-#include"dec_ref_util.h"
-#include"decl_collector.h"
-#include"well_sorted.h"
-#include"model_evaluator.h"
-#include"for_each_expr.h"
-#include"scoped_timer.h"
-#include"interpolant_cmds.h"
-#include"model_smt2_pp.h"
-#include"model_v2_pp.h"
+#include "util/tptr.h"
+#include "cmd_context/cmd_context.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "cmd_context/basic_cmds.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/dec_ref_util.h"
+#include "ast/decl_collector.h"
+#include "ast/well_sorted.h"
+#include "model/model_evaluator.h"
+#include "ast/for_each_expr.h"
+#include "util/scoped_timer.h"
+#include "cmd_context/interpolant_cmds.h"
+#include "model/model_smt2_pp.h"
+#include "model/model_v2_pp.h"
 #include"model_params.hpp"
-#include"th_rewriter.h"
-#include"tactic_exception.h"
-#include"smt_logics.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "tactic/tactic_exception.h"
+#include "solver/smt_logics.h"
 
 func_decls::func_decls(ast_manager & m, func_decl * f):
     m_decls(TAG(func_decl*, f, 0)) {

src/cmd_context/cmd_context.h

@@ -23,21 +23,21 @@ Notes:
 
 #include<sstream>
 #include<vector>
-#include"ast.h"
-#include"ast_printer.h"
-#include"pdecl.h"
-#include"dictionary.h"
-#include"solver.h"
-#include"datatype_decl_plugin.h"
-#include"stopwatch.h"
-#include"cmd_context_types.h"
-#include"event_handler.h"
-#include"sexpr.h"
-#include"tactic_manager.h"
-#include"check_logic.h"
-#include"progress_callback.h"
-#include"scoped_ptr_vector.h"
-#include"context_params.h"
+#include "ast/ast.h"
+#include "ast/ast_printer.h"
+#include "cmd_context/pdecl.h"
+#include "util/dictionary.h"
+#include "solver/solver.h"
+#include "ast/datatype_decl_plugin.h"
+#include "util/stopwatch.h"
+#include "util/cmd_context_types.h"
+#include "util/event_handler.h"
+#include "util/sexpr.h"
+#include "cmd_context/tactic_manager.h"
+#include "cmd_context/check_logic.h"
+#include "solver/progress_callback.h"
+#include "util/scoped_ptr_vector.h"
+#include "cmd_context/context_params.h"
 
 
 class func_decls {

src/cmd_context/cmd_context_to_goal.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
-#include"goal.h"
+#include "cmd_context/cmd_context.h"
+#include "tactic/goal.h"
 
 /**
    \brief Assert expressions from ctx into t.

src/cmd_context/cmd_util.cpp

@@ -15,7 +15,7 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
+#include "cmd_context/cmd_context.h"
 
 ast * get_ast_ref(cmd_context & ctx, symbol const & v) {
     object_ref * r = ctx.find_object_ref(v);

src/cmd_context/context_params.cpp

@@ -17,11 +17,11 @@ Author:
 Notes:
 
 --*/
-#include"context_params.h"
-#include"gparams.h"
-#include"params.h"
-#include"ast.h"
-#include"solver.h"
+#include "cmd_context/context_params.h"
+#include "util/gparams.h"
+#include "util/params.h"
+#include "ast/ast.h"
+#include "solver/solver.h"
 
 context_params::context_params() {
     m_unsat_core     = false;

src/cmd_context/context_params.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef CONTEXT_PARAMS_H_
 #define CONTEXT_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 
 class context_params {

src/cmd_context/echo_tactic.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"tactic.h"
-#include"probe.h"
-#include"cmd_context.h"
+#include "tactic/tactic.h"
+#include "tactic/probe.h"
+#include "cmd_context/cmd_context.h"
 
 class echo_tactic : public skip_tactic {
     cmd_context & m_ctx;

src/cmd_context/eval_cmd.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
-#include"model_evaluator.h"
-#include"parametric_cmd.h"
-#include"scoped_timer.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
+#include "cmd_context/cmd_context.h"
+#include "model/model_evaluator.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/scoped_timer.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
 
 class eval_cmd : public parametric_cmd {
     expr *                   m_target;

src/cmd_context/extra_cmds/dbg_cmds.cpp

@@ -16,20 +16,20 @@ Notes:
 
 --*/
 #include<iomanip>
-#include"cmd_context.h"
-#include"cmd_util.h"
-#include"rewriter.h"
-#include"shared_occs.h"
-#include"for_each_expr.h"
-#include"rewriter.h"
-#include"bool_rewriter.h"
-#include"ast_lt.h"
-#include"simplify_cmd.h"
-#include"ast_smt2_pp.h"
-#include"bound_manager.h"
-#include"used_vars.h"
-#include"var_subst.h"
-#include"gparams.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/cmd_util.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/shared_occs.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/ast_lt.h"
+#include "cmd_context/simplify_cmd.h"
+#include "ast/ast_smt2_pp.h"
+#include "tactic/arith/bound_manager.h"
+#include "ast/used_vars.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/gparams.h"
 
 #ifndef _EXTERNAL_RELEASE
 

src/cmd_context/extra_cmds/polynomial_cmds.cpp

@@ -16,19 +16,19 @@ Notes:
 
 --*/
 #include<sstream>
-#include"cmd_context.h"
-#include"cmd_util.h"
-#include"scoped_timer.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"ast_smt2_pp.h"
-#include"expr2polynomial.h"
-#include"parametric_cmd.h"
-#include"mpq.h"
-#include"algebraic_numbers.h"
-#include"polynomial_var2value.h"
-#include"expr2var.h"
-#include"pp.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/cmd_util.h"
+#include "util/scoped_timer.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/expr2polynomial.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/mpq.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "math/polynomial/polynomial_var2value.h"
+#include "ast/expr2var.h"
+#include "ast/pp.h"
 #include"pp_params.hpp"
 
 static void to_poly(cmd_context & ctx, expr * t) {

src/cmd_context/extra_cmds/subpaving_cmds.cpp

@@ -16,12 +16,12 @@ Notes:
 
 --*/
 #include<sstream>
-#include"cmd_context.h"
-#include"cmd_util.h"
-#include"expr2subpaving.h"
-#include"th_rewriter.h"
-#include"ast_smt2_pp.h"
-#include"expr2var.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/cmd_util.h"
+#include "math/subpaving/tactic/expr2subpaving.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/expr2var.h"
 
 static void to_subpaving(cmd_context & ctx, expr * t) {
     ast_manager & m = ctx.m();

src/cmd_context/interpolant_cmds.cpp

@@ -16,23 +16,23 @@
 
   --*/
 #include<sstream>
-#include"cmd_context.h"
-#include"cmd_util.h"
-#include"scoped_timer.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"ast_pp.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"parametric_cmd.h"
-#include"mpq.h"
-#include"expr2var.h"
-#include"pp.h"
-#include"iz3interp.h"
-#include"iz3checker.h"
-#include"iz3profiling.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/cmd_util.h"
+#include "util/scoped_timer.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/mpq.h"
+#include "ast/expr2var.h"
+#include "ast/pp.h"
+#include "interp/iz3interp.h"
+#include "interp/iz3checker.h"
+#include "interp/iz3profiling.h"
 #include"interp_params.hpp"
-#include"scoped_proof.h"
+#include "ast/scoped_proof.h"
 
 static void show_interpolant_and_maybe_check(cmd_context & ctx,
                                              ptr_vector<ast> &cnsts,

src/cmd_context/parametric_cmd.cpp

@@ -16,8 +16,8 @@ Notes:
 
 --*/
 #include<sstream>
-#include"cmd_context.h"
-#include"parametric_cmd.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/parametric_cmd.h"
 
 char const * parametric_cmd::get_descr(cmd_context & ctx) const { 
     if (m_descr == 0) {

src/cmd_context/parametric_cmd.h

@@ -18,10 +18,10 @@ Notes:
 #ifndef PARAMETRIC_CMD_H_
 #define PARAMETRIC_CMD_H_
 
-#include"params.h"
-#include"symbol.h"
-#include"string_buffer.h"
-#include"cmd_context_types.h"
+#include "util/params.h"
+#include "util/symbol.h"
+#include "util/string_buffer.h"
+#include "util/cmd_context_types.h"
 
 class parametric_cmd : public cmd {
 public:

src/cmd_context/pdecl.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"pdecl.h"
-#include"datatype_decl_plugin.h"
+#include "cmd_context/pdecl.h"
+#include "ast/datatype_decl_plugin.h"
 using namespace format_ns;
 
 class psort_inst_cache {

src/cmd_context/pdecl.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef PDECL_H_
 #define PDECL_H_
 
-#include"ast.h"
-#include"obj_hashtable.h" 
-#include"dictionary.h"
-#include"format.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/dictionary.h"
+#include "ast/format.h"
 
 class pdecl_manager;
 

src/cmd_context/simplify_cmd.cpp

@@ -15,16 +15,16 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
-#include"th_rewriter.h"
-#include"shared_occs.h"
-#include"ast_smt_pp.h"
-#include"for_each_expr.h"
-#include"parametric_cmd.h"
-#include"scoped_timer.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"seq_rewriter.h"
+#include "cmd_context/cmd_context.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/shared_occs.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/for_each_expr.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/scoped_timer.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "ast/rewriter/seq_rewriter.h"
 #include<iomanip>
 
 class simplify_cmd : public parametric_cmd {

src/cmd_context/tactic_cmds.cpp

@@ -16,21 +16,21 @@ Notes:
 
 --*/
 #include<sstream>
-#include"tactic_cmds.h"
-#include"cmd_context.h"
-#include"cmd_util.h"
-#include"parametric_cmd.h"
-#include"scoped_timer.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"model_smt2_pp.h"
-#include"ast_smt2_pp.h"
-#include"tactic.h"
-#include"tactical.h"
-#include"probe.h"
-#include"check_sat_result.h"
-#include"cmd_context_to_goal.h"
-#include"echo_tactic.h"
+#include "cmd_context/tactic_cmds.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/cmd_util.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/scoped_timer.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "model/model_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "tactic/tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/probe.h"
+#include "solver/check_sat_result.h"
+#include "cmd_context/cmd_context_to_goal.h"
+#include "cmd_context/echo_tactic.h"
 
 tactic_cmd::~tactic_cmd() {
     dealloc(m_factory);

src/cmd_context/tactic_cmds.h

@@ -18,9 +18,9 @@ Notes:
 #ifndef TACTIC_CMDS_H_
 #define TACTIC_CMDS_H_
 
-#include"ast.h"
-#include"cmd_context_types.h"
-#include"ref.h"
+#include "ast/ast.h"
+#include "util/cmd_context_types.h"
+#include "util/ref.h"
 
 class tactic;
 class probe;

src/cmd_context/tactic_manager.cpp

@@ -16,7 +16,7 @@ Author:
 Notes:
 
 --*/
-#include"tactic_manager.h"
+#include "cmd_context/tactic_manager.h"
 
 tactic_manager::~tactic_manager() {
     finalize_tactic_cmds();

src/cmd_context/tactic_manager.h

@@ -18,8 +18,8 @@ Notes:
 #ifndef TACTIC_MANAGER_H_
 #define TACTIC_MANAGER_H_
 
-#include"tactic_cmds.h"
-#include"dictionary.h"
+#include "cmd_context/tactic_cmds.h"
+#include "util/dictionary.h"
 
 class tactic_manager {
 protected: