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

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

src/interp/iz3base.cpp

@@ -25,12 +25,12 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3base.h"
+#include "interp/iz3base.h"
 #include <stdio.h>
 #include <fstream>
 #include <iostream>
 #include <ostream>
-#include "solver.h"
+#include "solver/solver.h"
 #include "../smt/smt_solver.h"
 
 

src/interp/iz3base.h

@@ -21,8 +21,8 @@
 #ifndef IZ3BASE_H
 #define IZ3BASE_H
 
-#include "iz3mgr.h"
-#include "iz3scopes.h"
+#include "interp/iz3mgr.h"
+#include "interp/iz3scopes.h"
 
 namespace hash_space {
     template <>

src/interp/iz3checker.cpp

@@ -24,8 +24,8 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3base.h"
-#include "iz3checker.h"
+#include "interp/iz3base.h"
+#include "interp/iz3checker.h"
 
 #include <algorithm>
 #include <stdio.h>

src/interp/iz3checker.h

@@ -20,8 +20,8 @@
 #ifndef IZ3_CHECKER_H
 #define IZ3_CHECKER_H
 
-#include "iz3mgr.h"
-#include "solver.h"
+#include "interp/iz3mgr.h"
+#include "solver/solver.h"
 
 bool iz3check(ast_manager &_m_manager,
 	      solver *s,

src/interp/iz3exception.h

@@ -17,8 +17,8 @@ Notes:
 #ifndef _IZ3EXCEPTION_H_
 #define _IZ3EXCEPTION_H_
 
-#include "z3_exception.h"
-#include "error_codes.h"
+#include "util/z3_exception.h"
+#include "util/error_codes.h"
 
 class iz3_exception: public default_exception {
 public:

src/interp/iz3hash.h

@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 #include <iterator>
-#include "hash.h"
+#include "util/hash.h"
 
 #define stl_ext hash_space
 

src/interp/iz3interp.cpp

@@ -33,13 +33,13 @@
 #include <set>
 #include <iostream>
 
-#include "iz3profiling.h"
-#include "iz3translate.h"
-#include "iz3proof.h"
-#include "iz3hash.h"
-#include "iz3interp.h"
+#include "interp/iz3profiling.h"
+#include "interp/iz3translate.h"
+#include "interp/iz3proof.h"
+#include "interp/iz3hash.h"
+#include "interp/iz3interp.h"
 
-#include"scoped_proof.h"
+#include "ast/scoped_proof.h"
 
 
 using namespace stl_ext;

src/interp/iz3interp.h

@@ -20,9 +20,9 @@
 #ifndef IZ3_INTERP_H
 #define IZ3_INTERP_H
 
-#include "iz3hash.h"
-#include "iz3exception.h"
-#include "solver.h"
+#include "interp/iz3hash.h"
+#include "interp/iz3exception.h"
+#include "solver/solver.h"
 
 class iz3base;
 

src/interp/iz3mgr.cpp

@@ -27,15 +27,15 @@
 #pragma warning(disable:4800)
 #endif
 
-#include "iz3mgr.h"
+#include "interp/iz3mgr.h"
 
 #include <stdio.h>
 #include <fstream>
 #include <iostream>
 #include <ostream>
 
-#include "expr_abstract.h"
-#include "params.h"
+#include "ast/expr_abstract.h"
+#include "util/params.h"
 
 
 using namespace stl_ext;

src/interp/iz3mgr.h

@@ -25,26 +25,26 @@
 #include <vector>
 #include <functional>
 
-#include "iz3hash.h"
-#include "iz3exception.h"
+#include "interp/iz3hash.h"
+#include "interp/iz3exception.h"
 
-#include"well_sorted.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"ast_translation.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"th_rewriter.h"
-#include"var_subst.h"
-#include"expr_substitution.h"
-#include"pp.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "ast/well_sorted.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/expr_substitution.h"
+#include "ast/pp.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 
 /* A wrapper around an ast manager, providing convenience methods. */
 

src/interp/iz3pp.cpp

@@ -26,14 +26,14 @@
 #include <set>
 #include <iostream>
 
-#include "iz3mgr.h"
-#include "iz3pp.h"
-#include "func_decl_dependencies.h"
-#include"for_each_expr.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"expr_functors.h"
-#include"expr_abstract.h"
+#include "interp/iz3mgr.h"
+#include "interp/iz3pp.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/expr_functors.h"
+#include "ast/expr_abstract.h"
 
 
 using namespace stl_ext;

src/interp/iz3pp.h

@@ -20,7 +20,7 @@
 #ifndef IZ3_PP_H
 #define IZ3_PP_H
 
-#include "iz3mgr.h"
+#include "interp/iz3mgr.h"
 
 /** Exception thrown in case of mal-formed tree interpoloation
     specification */

src/interp/iz3profiling.cpp

@@ -24,14 +24,14 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3profiling.h"
+#include "interp/iz3profiling.h"
 
 #include <map>
 #include <iostream>
 #include <string>
 #include <string.h>
 #include <stdlib.h>
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 
 
 // FIXME fill in these stubs

src/interp/iz3proof.cpp

@@ -25,8 +25,8 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3proof.h"
-#include "iz3profiling.h"
+#include "interp/iz3proof.h"
+#include "interp/iz3profiling.h"
 
 #include<algorithm>
 #include <iterator>

src/interp/iz3proof.h

@@ -22,8 +22,8 @@
 
 #include <set>
 
-#include "iz3base.h"
-#include "iz3secondary.h"
+#include "interp/iz3base.h"
+#include "interp/iz3secondary.h"
 
 // #define CHECK_PROOFS
 

src/interp/iz3proof_itp.cpp

@@ -24,7 +24,7 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3proof_itp.h"
+#include "interp/iz3proof_itp.h"
 
 using namespace stl_ext;
 

src/interp/iz3proof_itp.h

@@ -22,8 +22,8 @@
 
 #include <set>
 
-#include "iz3base.h"
-#include "iz3secondary.h"
+#include "interp/iz3base.h"
+#include "interp/iz3secondary.h"
 
 // #define CHECK_PROOFS
 

src/interp/iz3scopes.cpp

@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include "iz3scopes.h"
+#include "interp/iz3scopes.h"
 
 
 /** computes the least common ancestor of two nodes in the tree, or SHRT_MAX if none */

src/interp/iz3scopes.h

@@ -23,7 +23,7 @@
 
 #include <vector>
 #include <limits.h>
-#include "iz3hash.h"
+#include "interp/iz3hash.h"
 
 class scopes {
 

src/interp/iz3secondary.h

@@ -23,7 +23,7 @@
 
 /** Interface class for secondary provers. */
 
-#include "iz3base.h"
+#include "interp/iz3base.h"
 #include <vector>
 
 class iz3secondary : public iz3mgr {

src/interp/iz3translate.cpp

@@ -24,11 +24,11 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "iz3translate.h"
-#include "iz3proof.h"
-#include "iz3profiling.h"
-#include "iz3interp.h"
-#include "iz3proof_itp.h"
+#include "interp/iz3translate.h"
+#include "interp/iz3proof.h"
+#include "interp/iz3profiling.h"
+#include "interp/iz3interp.h"
+#include "interp/iz3proof_itp.h"
 
 #include <assert.h>
 #include <algorithm>

src/interp/iz3translate.h

@@ -22,8 +22,8 @@
 #ifndef IZ3TRANSLATION_H
 #define IZ3TRANSLATION_H
 
-#include "iz3proof.h"
-#include "iz3secondary.h"
+#include "interp/iz3proof.h"
+#include "interp/iz3secondary.h"
 
 // This is a interface class for translation from Z3 proof terms to
 // an interpolatable proof

src/interp/iz3translate_direct.cpp

@@ -28,10 +28,10 @@
 #pragma warning(disable:4390)
 #endif
 
-#include "iz3translate.h"
-#include "iz3proof.h"
-#include "iz3profiling.h"
-#include "iz3interp.h"
+#include "interp/iz3translate.h"
+#include "interp/iz3proof.h"
+#include "interp/iz3profiling.h"
+#include "interp/iz3interp.h"
 
 #include <assert.h>
 #include <algorithm>