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

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

src/parsers/smt/smtlib.cpp

@@ -5,9 +5,9 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include"smtlib.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
+#include "parsers/smt/smtlib.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 #ifdef _WINDOWS
 #ifdef ARRAYSIZE

src/parsers/smt/smtlib.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef SMTLIB_H_
 #define SMTLIB_H_
 
-#include "ast.h"
-#include "symbol_table.h"
-#include "map.h"
-#include "arith_decl_plugin.h"
+#include "ast/ast.h"
+#include "util/symbol_table.h"
+#include "util/map.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace smtlib {    
 

src/parsers/smt/smtlib_solver.cpp

@@ -17,17 +17,17 @@ Revision History:
 
 --*/
 
-#include"smtparser.h"
-#include"smtlib_solver.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"well_sorted.h"
-#include"model.h"
-#include"model_v2_pp.h"
-#include"solver.h"
-#include"smt_strategic_solver.h"
-#include"cmd_context.h"
+#include "parsers/smt/smtparser.h"
+#include "parsers/smt/smtlib_solver.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/well_sorted.h"
+#include "model/model.h"
+#include "model/model_v2_pp.h"
+#include "solver/solver.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "cmd_context/cmd_context.h"
 #include"model_params.hpp"
 #include"parser_params.hpp"
 

src/parsers/smt/smtlib_solver.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SMTLIB_SOLVER_H_
 #define SMTLIB_SOLVER_H_
 
-#include"smtparser.h"
-#include"context_params.h"
-#include"lbool.h"
+#include "parsers/smt/smtparser.h"
+#include "cmd_context/context_params.h"
+#include "util/lbool.h"
 
 class cmd_context;
 

src/parsers/smt/smtparser.cpp

@@ -21,23 +21,23 @@ Revision History:
 #include<fstream>
 #include<sstream>
 #include<signal.h>
-#include"region.h"
-#include"scanner.h"
-#include"symbol.h"
-#include"vector.h"
-#include"symbol_table.h"
-#include"smtlib.h"
-#include"smtparser.h"
-#include"ast_pp.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"warning.h"
-#include"error_codes.h"
-#include"pattern_validation.h"
-#include"var_subst.h"
-#include"well_sorted.h"
-#include"str_hashtable.h"
-#include"stopwatch.h"
+#include "util/region.h"
+#include "parsers/util/scanner.h"
+#include "util/symbol.h"
+#include "util/vector.h"
+#include "util/symbol_table.h"
+#include "parsers/smt/smtlib.h"
+#include "parsers/smt/smtparser.h"
+#include "ast/ast_pp.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "util/warning.h"
+#include "util/error_codes.h"
+#include "parsers/util/pattern_validation.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/well_sorted.h"
+#include "util/str_hashtable.h"
+#include "util/stopwatch.h"
 
 class id_param_info {
     symbol    m_string;

src/parsers/smt/smtparser.h

@@ -20,9 +20,9 @@ Revision History:
 #define SMT_PARSER_H_
 
 #include<iostream>
-#include"ast.h"
-#include"vector.h"
-#include"smtlib.h"
+#include "ast/ast.h"
+#include "util/vector.h"
+#include "parsers/smt/smtlib.h"
 
 namespace smtlib {
     class parser {

src/parsers/smt2/smt2parser.cpp

@@ -16,19 +16,19 @@ Author:
 Revision History:
 
 --*/
-#include"smt2parser.h"
-#include"smt2scanner.h"
-#include"stack.h"
-#include"datatype_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"ast_pp.h"
-#include"well_sorted.h"
-#include"pattern_validation.h"
-#include"rewriter.h"
-#include"has_free_vars.h"
-#include"ast_smt2_pp.h"
+#include "parsers/smt2/smt2parser.h"
+#include "parsers/smt2/smt2scanner.h"
+#include "util/stack.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/well_sorted.h"
+#include "parsers/util/pattern_validation.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/has_free_vars.h"
+#include "ast/ast_smt2_pp.h"
 #include"parser_params.hpp"
 #include<sstream>
 

src/parsers/smt2/smt2parser.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef SMT2_PARSER_H_
 #define SMT2_PARSER_H_
 
-#include"cmd_context.h"
+#include "cmd_context/cmd_context.h"
 
 bool parse_smt2_commands(cmd_context & ctx, std::istream & is, bool interactive = false, params_ref const & p = params_ref(), char const * filename = 0);
 

src/parsers/smt2/smt2scanner.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"smt2scanner.h"
+#include "parsers/smt2/smt2scanner.h"
 #include"parser_params.hpp"
 
 namespace smt2 {

src/parsers/smt2/smt2scanner.h

@@ -20,10 +20,10 @@ Revision History:
 #define SMT2SCANNER_H_
 
 #include<iostream>
-#include"symbol.h"
-#include"vector.h"
-#include"rational.h"
-#include"cmd_context.h"
+#include "util/symbol.h"
+#include "util/vector.h"
+#include "util/rational.h"
+#include "cmd_context/cmd_context.h"
 
 namespace smt2 {
 

src/parsers/util/cost_parser.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"cost_parser.h"
+#include "parsers/util/cost_parser.h"
 
 cost_parser::cost_parser(ast_manager & m):
     simple_parser(m),

src/parsers/util/cost_parser.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef COST_PARSER_H_
 #define COST_PARSER_H_
 
-#include"simple_parser.h"
-#include"arith_decl_plugin.h"
+#include "parsers/util/simple_parser.h"
+#include "ast/arith_decl_plugin.h"
 
 class cost_parser : public simple_parser {
     arith_util     m_util;

src/parsers/util/pattern_validation.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include"pattern_validation.h"
-#include"for_each_expr.h"
-#include"warning.h"
+#include "parsers/util/pattern_validation.h"
+#include "ast/for_each_expr.h"
+#include "util/warning.h"
 
-#include"ast_pp.h"
+#include "ast/ast_pp.h"
 
 struct pattern_validation_functor {
     uint_set & m_found_vars;

src/parsers/util/pattern_validation.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef PATTERN_VALIDATION_H_
 #define PATTERN_VALIDATION_H_
 
-#include"ast.h"
-#include"uint_set.h"
-#include"vector.h"
+#include "ast/ast.h"
+#include "util/uint_set.h"
+#include "util/vector.h"
 
 class pattern_validator {
     family_id          m_bfid;

src/parsers/util/scanner.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"scanner.h"
+#include "parsers/util/scanner.h"
 
 inline char scanner::read_char() {
     if (m_is_interactive) {

src/parsers/util/scanner.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef SCANNER_H_
 #define SCANNER_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class scanner {
 public:

src/parsers/util/simple_parser.cpp

@@ -18,9 +18,9 @@ Revision History:
 --*/
 #include<fstream>
 #include<sstream>
-#include"simple_parser.h"
-#include"warning.h"
-#include"scanner.h"
+#include "parsers/util/simple_parser.h"
+#include "util/warning.h"
+#include "parsers/util/scanner.h"
 
 simple_parser::simple_parser(ast_manager & m):
     m_manager(m),

src/parsers/util/simple_parser.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SIMPLE_PARSER_H_
 #define SIMPLE_PARSER_H_
 
-#include"ast.h"
-#include"map.h"
+#include "ast/ast.h"
+#include "util/map.h"
 
 class scanner;