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

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

src/ast/pattern/expr_pattern_match.cpp

@@ -29,13 +29,13 @@ Notes:
 
 --*/
 
-#include"ast.h"
-#include"expr_pattern_match.h"
-#include"for_each_ast.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
+#include "ast/ast.h"
+#include "ast/pattern/expr_pattern_match.h"
+#include "ast/for_each_ast.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
 
 expr_pattern_match::expr_pattern_match(ast_manager & manager):
     m_manager(manager), m_precompiled(manager) {        

src/ast/pattern/expr_pattern_match.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef EXPR_PATTERN_MATCH_H_
 #define EXPR_PATTERN_MATCH_H_
 
-#include"ast.h"
-#include"map.h"
+#include "ast/ast.h"
+#include "util/map.h"
 
 class expr_pattern_match {
 

src/ast/pattern/pattern_inference.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"pattern_inference.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"warning.h"
-#include"arith_decl_plugin.h"
-#include"pull_quant.h"
-#include"well_sorted.h"
-#include"for_each_expr.h"
+#include "ast/pattern/pattern_inference.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "util/warning.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/well_sorted.h"
+#include "ast/for_each_expr.h"
 
 void smaller_pattern::save(expr * p1, expr * p2) {
     expr_pair e(p1, p2);
@@ -576,7 +576,7 @@ void pattern_inference::mk_patterns(unsigned num_bindings,
     m_candidates.reset();
 }
 
-#include"database.h" // defines g_pattern_database
+#include "smt/database.h"
 
 void pattern_inference::reduce1_quantifier(quantifier * q) {
     TRACE("pattern_inference", tout << "processing:\n" << mk_pp(q, m) << "\n";);

src/ast/pattern/pattern_inference.h

@@ -19,16 +19,16 @@ Revision History:
 #ifndef PATTERN_INFERENCE_H_
 #define PATTERN_INFERENCE_H_
 
-#include"ast.h"
-#include"simplifier.h"
-#include"pattern_inference_params.h"
-#include"vector.h"
-#include"uint_set.h"
-#include"nat_set.h"
-#include"obj_hashtable.h"
-#include"obj_pair_hashtable.h"
-#include"map.h"
-#include"expr_pattern_match.h"
+#include "ast/ast.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/pattern/pattern_inference_params.h"
+#include "util/vector.h"
+#include "util/uint_set.h"
+#include "util/nat_set.h"
+#include "util/obj_hashtable.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/map.h"
+#include "ast/pattern/expr_pattern_match.h"
 
 /**
    \brief A pattern p_1 is smaller than a pattern p_2 iff 

src/ast/pattern/pattern_inference_params.cpp

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

src/ast/pattern/pattern_inference_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef PATTERN_INFERENCE_PARAMS_H_
 #define PATTERN_INFERENCE_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum arith_pattern_inference_kind {
     AP_NO,           // do not infer patterns with arithmetic terms