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

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

src/shell/datalog_frontend.cpp

@@ -20,22 +20,22 @@ Revision History:
 #include<iostream>
 #include<time.h>
 #include<signal.h>
-#include"stopwatch.h"
+#include "util/stopwatch.h"
 #ifdef _CYGWIN
 #undef min
 #undef max
 #endif
-#include"smt_params.h"
-#include"arith_decl_plugin.h"
-#include"dl_compiler.h"
-#include"dl_mk_filter_rules.h"
-#include"dl_finite_product_relation.h"
-#include"dl_context.h"
-#include"rel_context.h"
-#include"dl_register_engine.h"
-#include"datalog_parser.h"
-#include"datalog_frontend.h"
-#include"timeout.h"
+#include "smt/params/smt_params.h"
+#include "ast/arith_decl_plugin.h"
+#include "muz/rel/dl_compiler.h"
+#include "muz/transforms/dl_mk_filter_rules.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/rel_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/fp/datalog_parser.h"
+#include "shell/datalog_frontend.h"
+#include "util/timeout.h"
 
 static stopwatch g_overall_time;
 static stopwatch g_piece_timer;

src/shell/dimacs_frontend.cpp

@@ -19,11 +19,11 @@ Revision History:
 #include<iostream>
 #include<time.h>
 #include<signal.h>
-#include"timeout.h"
-#include"rlimit.h"
-#include"dimacs.h"
-#include"sat_solver.h"
-#include"gparams.h"
+#include "util/timeout.h"
+#include "util/rlimit.h"
+#include "sat/dimacs.h"
+#include "sat/sat_solver.h"
+#include "util/gparams.h"
 
 extern bool          g_display_statistics;
 static sat::solver * g_solver = 0;

src/shell/lp_frontend.cpp

@@ -10,11 +10,11 @@ Author:
 #include "lp_params.hpp"
 #include "util/lp/lp_settings.h"
 #include "util/lp/mps_reader.h"
-#include "timeout.h"
-#include "cancel_eh.h"
-#include "scoped_timer.h"
-#include "rlimit.h"
-#include "gparams.h"
+#include "util/timeout.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "util/rlimit.h"
+#include "util/gparams.h"
 #include <signal.h>
 
 static lean::lp_solver<double, double>* g_solver = 0;

src/shell/main.cpp

@@ -18,24 +18,24 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"memory_manager.h"
-#include"trace.h"
-#include"debug.h"
-#include"util.h"
-#include"pp.h"
-#include"smtlib_frontend.h"
-#include"z3_log_frontend.h"
-#include"warning.h"
+#include "util/memory_manager.h"
+#include "util/trace.h"
+#include "util/debug.h"
+#include "util/util.h"
+#include "ast/pp.h"
+#include "shell/smtlib_frontend.h"
+#include "shell/z3_log_frontend.h"
+#include "util/warning.h"
 #include"version.h"
-#include"dimacs_frontend.h"
-#include"datalog_frontend.h"
-#include"opt_frontend.h"
-#include"timeout.h"
-#include"z3_exception.h"
-#include"error_codes.h"
-#include"gparams.h"
-#include"env_params.h"
-#include "lp_frontend.h"
+#include "shell/dimacs_frontend.h"
+#include "shell/datalog_frontend.h"
+#include "shell/opt_frontend.h"
+#include "util/timeout.h"
+#include "util/z3_exception.h"
+#include "util/error_codes.h"
+#include "util/gparams.h"
+#include "util/env_params.h"
+#include "shell/lp_frontend.h"
 
 typedef enum { IN_UNSPECIFIED, IN_SMTLIB, IN_SMTLIB_2, IN_DATALOG, IN_DIMACS, IN_WCNF, IN_OPB, IN_Z3_LOG, IN_MPS } input_kind;
 

src/shell/opt_frontend.cpp

@@ -7,12 +7,12 @@ Copyright (c) 2015 Microsoft Corporation
 #include<fstream>
 #include<signal.h>
 #include<time.h>
-#include"opt_context.h"
-#include"ast_util.h"
-#include"arith_decl_plugin.h"
-#include"gparams.h"
-#include"timeout.h"
-#include"reg_decl_plugins.h"
+#include "opt/opt_context.h"
+#include "ast/ast_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/gparams.h"
+#include "util/timeout.h"
+#include "ast/reg_decl_plugins.h"
 
 extern bool g_display_statistics;
 static bool g_first_interrupt = true;

src/shell/smtlib_frontend.cpp

@@ -21,17 +21,17 @@ Revision History:
 #include<iostream>
 #include<time.h>
 #include<signal.h>
-#include"smtlib_solver.h"
-#include"timeout.h"
-#include"smt2parser.h"
-#include"dl_cmds.h"
-#include"dbg_cmds.h"
-#include"opt_cmds.h"
-#include"polynomial_cmds.h"
-#include"subpaving_cmds.h"
-#include"smt2_extra_cmds.h"
-#include"smt_strategic_solver.h"
-#include"smt_solver.h"
+#include "parsers/smt/smtlib_solver.h"
+#include "util/timeout.h"
+#include "parsers/smt2/smt2parser.h"
+#include "muz/fp/dl_cmds.h"
+#include "cmd_context/extra_cmds/dbg_cmds.h"
+#include "opt/opt_cmds.h"
+#include "cmd_context/extra_cmds/polynomial_cmds.h"
+#include "cmd_context/extra_cmds/subpaving_cmds.h"
+#include "smt/smt2_extra_cmds.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "smt/smt_solver.h"
 
 extern bool g_display_statistics;
 static clock_t             g_start_time;

src/shell/z3_log_frontend.cpp

@@ -20,9 +20,9 @@ Revision History:
 #include<iostream>
 #include<fstream>
 #include<time.h>
-#include"util.h"
-#include"error_codes.h"
-#include"z3_replayer.h"
+#include "util/util.h"
+#include "util/error_codes.h"
+#include "api/z3_replayer.h"
 
 static void solve(char const * stream_name, std::istream & in) {
     clock_t start_time = clock();