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

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

src/smt/params/dyn_ack_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"dyn_ack_params.h"
+#include "smt/params/dyn_ack_params.h"
 #include"smt_params_helper.hpp"
 
 void dyn_ack_params::updt_params(params_ref const & _p) {

src/smt/params/dyn_ack_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DYN_ACK_PARAMS_H_
 #define DYN_ACK_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum dyn_ack_strategy {
     DACK_DISABLED,

src/smt/params/preprocessor_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"preprocessor_params.h"
+#include "smt/params/preprocessor_params.h"
 #include"smt_params_helper.hpp"
 
 void preprocessor_params::updt_local_params(params_ref const & _p) {

src/smt/params/preprocessor_params.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef PREPROCESSOR_PARAMS_H_
 #define PREPROCESSOR_PARAMS_H_
 
-#include"pattern_inference_params.h"
-#include"bit_blaster_params.h"
-#include"bv_simplifier_params.h"
-#include"arith_simplifier_params.h"
+#include "ast/pattern/pattern_inference_params.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_params.h"
+#include "ast/simplifier/bv_simplifier_params.h"
+#include "ast/simplifier/arith_simplifier_params.h"
 
 enum lift_ite_kind {
     LI_NONE,

src/smt/params/qi_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"qi_params.h"
+#include "smt/params/qi_params.h"
 #include"smt_params_helper.hpp"
 
 void qi_params::updt_params(params_ref const & _p) {

src/smt/params/qi_params.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef QI_PARAMS_H_
 #define QI_PARAMS_H_
 
-#include"util.h"
-#include"params.h"
+#include "util/util.h"
+#include "util/params.h"
 
 enum quick_checker_mode {
     MC_NO,     // do not use (cheap) model checking based instantiation

src/smt/params/smt_params.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_params.h"
+#include "smt/params/smt_params.h"
 #include"smt_params_helper.hpp"
 #include"model_params.hpp"
-#include"gparams.h"
+#include "util/gparams.h"
 
 void smt_params::updt_local_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/smt_params.h

@@ -19,17 +19,17 @@ Revision History:
 #ifndef SMT_PARAMS_H_
 #define SMT_PARAMS_H_
 
-#include"ast.h"
-#include"dyn_ack_params.h"
-#include"qi_params.h"
-#include"theory_arith_params.h"
-#include"theory_array_params.h"
-#include"theory_bv_params.h"
-#include"theory_str_params.h"
-#include"theory_pb_params.h"
-#include"theory_datatype_params.h"
-#include"preprocessor_params.h"
-#include"context_params.h"
+#include "ast/ast.h"
+#include "smt/params/dyn_ack_params.h"
+#include "smt/params/qi_params.h"
+#include "smt/params/theory_arith_params.h"
+#include "smt/params/theory_array_params.h"
+#include "smt/params/theory_bv_params.h"
+#include "smt/params/theory_str_params.h"
+#include "smt/params/theory_pb_params.h"
+#include "smt/params/theory_datatype_params.h"
+#include "smt/params/preprocessor_params.h"
+#include "cmd_context/context_params.h"
 
 enum phase_selection { 
     PS_ALWAYS_FALSE,

src/smt/params/theory_arith_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_arith_params.h"
+#include "smt/params/theory_arith_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_arith_params::updt_params(params_ref const & _p) {

src/smt/params/theory_arith_params.h

@@ -20,7 +20,7 @@ Revision History:
 #define THEORY_ARITH_PARAMS_H_
 
 #include<limits.h>
-#include"params.h"
+#include "util/params.h"
 
 enum arith_solver_id {
     AS_NO_ARITH,

src/smt/params/theory_array_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_array_params.h"
+#include "smt/params/theory_array_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_array_params::updt_params(params_ref const & _p) {

src/smt/params/theory_array_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_ARRAY_PARAMS_H_
 #define THEORY_ARRAY_PARAMS_H_
 
-#include"array_simplifier_params.h"
+#include "ast/simplifier/array_simplifier_params.h"
 
 enum array_solver_id {
     AR_NO_ARRAY,

src/smt/params/theory_bv_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_bv_params.h"
+#include "smt/params/theory_bv_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_bv_params::updt_params(params_ref const & _p) {

src/smt/params/theory_bv_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_BV_PARAMS_H_
 #define THEORY_BV_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum bv_solver_id {
     BS_NO_BV,

src/smt/params/theory_pb_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_pb_params.h"
+#include "smt/params/theory_pb_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_pb_params::updt_params(params_ref const & _p) {

src/smt/params/theory_pb_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_PB_PARAMS_H_
 #define THEORY_PB_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 
 struct theory_pb_params {

src/smt/params/theory_str_params.cpp

@@ -15,7 +15,7 @@ Revision History:
 
 --*/
 
-#include"theory_str_params.h"
+#include "smt/params/theory_str_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_str_params::updt_params(params_ref const & _p) {

src/smt/params/theory_str_params.h

@@ -18,7 +18,7 @@ Revision History:
 #ifndef THEORY_STR_PARAMS_H
 #define THEORY_STR_PARAMS_H
 
-#include"params.h"
+#include "util/params.h"
 
 struct theory_str_params {
     /*