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

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

scripts/update_include.py

@@ -0,0 +1,63 @@
+# Copyright (c) 2017 Microsoft Corporation
+
+import os
+import re
+
+is_include = re.compile("#include \"(.*)\"")
+is_include2 = re.compile("#include\"(.*)\"")
+
+
+def fix_include(file, paths):
+    print(file)
+    tmp = "%s.tmp" % file
+    ins = open(file)
+    ous = open(tmp,'w')
+    line = ins.readline()
+    found = False
+    while line:
+        m = is_include.search(line)
+        if m and m.group(1) in paths:
+            ous.write("#include \"")
+            ous.write(paths[m.group(1)])
+            ous.write("\"\n")
+            found = True
+            line = ins.readline()
+            continue
+        m = is_include2.search(line)
+        if m and m.group(1) in paths:
+            ous.write("#include \"")
+            ous.write(paths[m.group(1)])
+            ous.write("\"\n")
+            found = True
+            line = ins.readline()
+            continue
+        ous.write(line)            
+        line = ins.readline()
+    ins.close()
+    ous.close()
+    if found:
+        os.system("move %s %s" % (tmp, file))
+    else:
+        os.system("del %s" % tmp)
+
+def find_paths(dir):
+    paths = {}
+    for root, dirs, files in os.walk(dir):
+        root1 = root.replace("\\","/")[4:]
+        for f in files:
+            if f.endswith('.h'):
+                path = "%s/%s" % (root1, f)
+                paths[f] = path
+    return paths
+
+paths = find_paths('src')
+
+def fixup(dir):
+    for root, dirs, files in os.walk(dir):
+        for f in files:
+            if f.endswith('.h') or f.endswith('.cpp'):
+                path = "%s\\%s" % (root, f)
+                fix_include(path, paths)
+
+
+fixup('src')

src/ackermannization/ackermannize_bv_model_converter.cpp

@@ -14,8 +14,8 @@
 
  Revision History:
 --*/
-#include"ackr_model_converter.h"
-#include"ackermannize_bv_model_converter.h"
+#include "ackermannization/ackr_model_converter.h"
+#include "ackermannization/ackermannize_bv_model_converter.h"
 
 model_converter * mk_ackermannize_bv_model_converter(ast_manager & m, const ackr_info_ref& info) {
  return mk_ackr_model_converter(m, info);

src/ackermannization/ackermannize_bv_model_converter.h

@@ -17,8 +17,8 @@
 #ifndef ACKERMANNIZE_BV_MODEL_CONVERTER_H_
 #define ACKERMANNIZE_BV_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_ackermannize_bv_model_converter(ast_manager & m, const ackr_info_ref& info);
 

src/ackermannization/ackermannize_bv_tactic.cpp

@@ -13,12 +13,12 @@ Mikolas Janota
 
 Revision History:
 --*/
-#include"ackermannize_bv_tactic.h"
-#include"tactical.h"
-#include"lackr.h"
-#include"model_smt2_pp.h"
+#include "ackermannization/ackermannize_bv_tactic.h"
+#include "tactic/tactical.h"
+#include "ackermannization/lackr.h"
+#include "model/model_smt2_pp.h"
 #include"ackermannize_bv_tactic_params.hpp"
-#include"ackermannize_bv_model_converter.h"
+#include "ackermannization/ackermannize_bv_model_converter.h"
 
 
 class ackermannize_bv_tactic : public tactic {

src/ackermannization/ackermannize_bv_tactic.h

@@ -16,7 +16,7 @@ Revision History:
 
 #ifndef _ACKERMANNIZE_TACTIC_H_
 #define _ACKERMANNIZE_TACTIC_H_
-#include"tactical.h"
+#include "tactic/tactical.h"
 
 tactic * mk_ackermannize_bv_tactic(ast_manager & m, params_ref const & p);
 

src/ackermannization/ackr_bound_probe.cpp

@@ -14,9 +14,9 @@
 
  Revision History:
 --*/
-#include"ackr_helper.h"
-#include"ackr_bound_probe.h"
-#include"ast_smt2_pp.h"
+#include "ackermannization/ackr_helper.h"
+#include "ackermannization/ackr_bound_probe.h"
+#include "ast/ast_smt2_pp.h"
 
 /*
   For each function f, calculate the number of its occurrences o_f and compute "o_f choose 2".

src/ackermannization/ackr_bound_probe.h

@@ -18,7 +18,7 @@
 #ifndef ACKR_BOUND_PROBE_H_
 #define ACKR_BOUND_PROBE_H_
 
-#include"probe.h"
+#include "tactic/probe.h"
 
 probe * mk_ackr_bound_probe();
 

src/ackermannization/ackr_helper.cpp

@@ -14,7 +14,7 @@
 
  Revision History:
 --*/
-#include"ackr_helper.h"
+#include "ackermannization/ackr_helper.h"
 
 double ackr_helper::calculate_lemma_bound(ackr_helper::fun2terms_map& occurrences) {
     fun2terms_map::iterator it = occurrences.begin();

src/ackermannization/ackr_helper.h

@@ -17,7 +17,7 @@
 #ifndef ACKR_HELPER_H_
 #define ACKR_HELPER_H_
 
-#include"bv_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 class ackr_helper {
     public:

src/ackermannization/ackr_info.h

@@ -16,11 +16,11 @@ Revision History:
 #ifndef ACKR_INFO_H_
 #define ACKR_INFO_H_
 
-#include"obj_hashtable.h"
-#include"ast.h"
-#include"ref.h"
-#include"expr_replacer.h"
-#include"ast_translation.h"
+#include "util/obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/ref.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/ast_translation.h"
 
 /** \brief
    Information about how a formula is being converted into

src/ackermannization/ackr_model_converter.cpp

@@ -13,10 +13,10 @@ Mikolas Janota
 
 Revision History:
 --*/
-#include"ackr_model_converter.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
+#include "ackermannization/ackr_model_converter.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
 
 
 class ackr_model_converter : public model_converter {

src/ackermannization/ackr_model_converter.h

@@ -16,8 +16,8 @@ Revision History:
 #ifndef ACKR_MODEL_CONVERTER_H_
 #define ACKR_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model);
 model_converter * mk_ackr_model_converter(ast_manager & m, const ackr_info_ref& info);

src/ackermannization/lackr.cpp

@@ -15,13 +15,13 @@
  Revision History:
 --*/
 
-#include"lackr.h"
+#include "ackermannization/lackr.h"
 #include"ackermannization_params.hpp"
-#include"tactic.h"
-#include"lackr_model_constructor.h"
-#include"ackr_info.h"
-#include"for_each_expr.h"
-#include"model_smt2_pp.h"
+#include "tactic/tactic.h"
+#include "ackermannization/lackr_model_constructor.h"
+#include "ackermannization/ackr_info.h"
+#include "ast/for_each_expr.h"
+#include "model/model_smt2_pp.h"
 
 lackr::lackr(ast_manager& m, params_ref p, lackr_stats& st, expr_ref_vector& formulas,
     solver * uffree_solver)

src/ackermannization/lackr.h

@@ -17,17 +17,17 @@
 #ifndef LACKR_H_
 #define LACKR_H_
 
-#include"ackr_info.h"
-#include"ackr_helper.h"
-#include"th_rewriter.h"
-#include"cooperate.h"
-#include"bv_decl_plugin.h"
-#include"lbool.h"
-#include"model.h"
-#include"solver.h"
-#include"util.h"
-#include"tactic_exception.h"
-#include"goal.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/ackr_helper.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "util/cooperate.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/lbool.h"
+#include "model/model.h"
+#include "solver/solver.h"
+#include "util/util.h"
+#include "tactic/tactic_exception.h"
+#include "tactic/goal.h"
 
 struct lackr_stats {
     lackr_stats() : m_it(0), m_ackrs_sz(0) {}

src/ackermannization/lackr_model_constructor.cpp

@@ -14,13 +14,13 @@
 
  Revision History:
 --*/
-#include"lackr_model_constructor.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
-#include"for_each_expr.h"
-#include"bv_rewriter.h"
-#include"bool_rewriter.h"
+#include "ackermannization/lackr_model_constructor.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/bv_rewriter.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 struct lackr_model_constructor::imp {
     public:

src/ackermannization/lackr_model_constructor.h

@@ -18,10 +18,10 @@
 #ifndef LACKR_MODEL_CONSTRUCTOR_H_
 #define LACKR_MODEL_CONSTRUCTOR_H_
 
-#include"ast.h"
-#include"ackr_info.h"
-#include"ackr_helper.h"
-#include"model.h"
+#include "ast/ast.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/ackr_helper.h"
+#include "model/model.h"
 
 class lackr_model_constructor {
     public:

src/ackermannization/lackr_model_converter_lazy.cpp

@@ -14,11 +14,11 @@
 
  Revision History:
 --*/
-#include"lackr_model_converter_lazy.h"
-#include"model_evaluator.h"
-#include"ast_smt2_pp.h"
-#include"ackr_info.h"
-#include"lackr_model_constructor.h"
+#include "ackermannization/lackr_model_converter_lazy.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_smt2_pp.h"
+#include "ackermannization/ackr_info.h"
+#include "ackermannization/lackr_model_constructor.h"
 
 class lackr_model_converter_lazy : public model_converter {
 public:

src/ackermannization/lackr_model_converter_lazy.h

@@ -17,8 +17,8 @@
 #ifndef LACKR_MODEL_CONVERTER_LAZY_H_
 #define LACKR_MODEL_CONVERTER_LAZY_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_lackr_model_converter_lazy(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model);
 

src/api/api_algebraic.cpp

@@ -17,14 +17,14 @@ Author:
 Notes:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_vector.h"
-#include"algebraic_numbers.h"
-#include"expr2polynomial.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_ast_vector.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/expr2polynomial.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 
 
 #define CHECK_IS_ALGEBRAIC(ARG, RET) {          \

src/api/api_arith.cpp

@@ -15,12 +15,12 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"algebraic_numbers.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "math/polynomial/algebraic_numbers.h"
 
 #define MK_ARITH_OP(NAME, OP) MK_NARY(NAME, mk_c(c)->get_arith_fid(), OP, SKIP)
 #define MK_BINARY_ARITH_OP(NAME, OP) MK_BINARY(NAME, mk_c(c)->get_arith_fid(), OP, SKIP)

src/api/api_array.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"array_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/array_decl_plugin.h"
 
 extern "C" {
 

src/api/api_ast.cpp

@@ -17,26 +17,26 @@ Revision History:
 --*/
 #include<iostream>
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.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"pb_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_safe_replace.h"
-#include"pp.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_util.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/pb_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/rewriter/expr_safe_replace.h"
+#include "ast/pp.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 #include"pp_params.hpp"
 
 extern bool is_numeral_sort(Z3_context c, Z3_sort ty);

src/api/api_ast_map.cpp

@@ -16,13 +16,13 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_map.h"
-#include"api_ast_vector.h"
-#include"ast_smt2_pp.h"
-#include"dec_ref_util.h"
+#include "api/api_context.h"
+#include "api/api_ast_map.h"
+#include "api/api_ast_vector.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/dec_ref_util.h"
 
 Z3_ast_map_ref::~Z3_ast_map_ref() {
     dec_ref_key_values(m, m_map);

src/api/api_ast_map.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_AST_MAP_H_
 #define API_AST_MAP_H_
 
-#include"api_util.h"
-#include"obj_hashtable.h"
+#include "api/api_util.h"
+#include "util/obj_hashtable.h"
 
 struct Z3_ast_map_ref : public api::object {
     ast_manager &            m;

src/api/api_ast_vector.cpp

@@ -16,12 +16,12 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_vector.h"
-#include"ast_translation.h"
-#include"ast_smt2_pp.h"
+#include "api/api_context.h"
+#include "api/api_ast_vector.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_smt2_pp.h"
 
 extern "C" {
 

src/api/api_ast_vector.h

@@ -18,7 +18,7 @@ Revision History:
 #ifndef API_AST_VECTOR_H_
 #define API_AST_VECTOR_H_
 
-#include"api_util.h"
+#include "api/api_util.h"
 
 namespace api {
     class context;

src/api/api_bv.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"bv_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/bv_decl_plugin.h"
 
 extern "C" {
 

src/api/api_config_params.cpp

@@ -15,16 +15,16 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
-#include"api_context.h"
-#include"pp.h"
+#include "api/z3.h"
+#include "api/api_context.h"
+#include "ast/pp.h"
 #include"api_log_macros.h"
-#include"api_util.h"
-#include"cmd_context.h"
-#include"symbol.h"
-#include"gparams.h"
-#include"env_params.h"
-#include"context_params.h"
+#include "api/api_util.h"
+#include "cmd_context/cmd_context.h"
+#include "util/symbol.h"
+#include "util/gparams.h"
+#include "util/env_params.h"
+#include "cmd_context/context_params.h"
 
 extern "C" {
     void Z3_API Z3_global_param_set(Z3_string param_id, Z3_string param_value) {

src/api/api_context.cpp

@@ -18,15 +18,15 @@ Revision History:
 
 --*/
 #include<typeinfo>
-#include"api_context.h"
-#include"smtparser.h"
+#include "api/api_context.h"
+#include "parsers/smt/smtparser.h"
 #include"version.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 #include"api_log_macros.h"
-#include"api_util.h"
-#include"reg_decl_plugins.h"
-#include"realclosure.h"
+#include "api/api_util.h"
+#include "ast/reg_decl_plugins.h"
+#include "math/realclosure/realclosure.h"
 
 // The install_tactics procedure is automatically generated
 void install_tactics(tactic_manager & ctx);

src/api/api_context.h

@@ -20,22 +20,22 @@ Revision History:
 #ifndef API_CONTEXT_H_
 #define API_CONTEXT_H_
 
-#include"z3.h"
-#include"ast.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"smt_kernel.h"
-#include"smt_params.h"
-#include"event_handler.h"
-#include"tactic_manager.h"
-#include"context_params.h"
-#include"api_polynomial.h"
-#include"hashtable.h"
+#include "api/z3.h"
+#include "ast/ast.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "smt/smt_kernel.h"
+#include "smt/params/smt_params.h"
+#include "util/event_handler.h"
+#include "cmd_context/tactic_manager.h"
+#include "cmd_context/context_params.h"
+#include "api/api_polynomial.h"
+#include "util/hashtable.h"
 
 namespace smtlib {
     class parser;

src/api/api_datalog.cpp

@@ -15,24 +15,24 @@ Author:
 Revision History:
 
 --*/
-#include"api_datalog.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"ast_pp.h"
-#include"api_ast_vector.h"
+#include "api/api_datalog.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/ast_pp.h"
+#include "api/api_ast_vector.h"
 #include"api_log_macros.h"
-#include"api_stats.h"
-#include"datalog_parser.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"dl_cmds.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
-#include"dl_context.h"
-#include"dl_register_engine.h"
-#include"dl_external_relation.h"
-#include"dl_decl_plugin.h"
-#include"rel_context.h"
+#include "api/api_stats.h"
+#include "muz/fp/datalog_parser.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "muz/fp/dl_cmds.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/rel/dl_external_relation.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/rel/rel_context.h"
 
 namespace api {
 

src/api/api_datalog.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef API_DATALOG_H_
 #define API_DATALOG_H_
 
-#include"z3.h"
-#include"ast.h"
-#include"smt_params.h"
-#include"smt_kernel.h"
-#include"api_util.h"
+#include "api/z3.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "smt/smt_kernel.h"
+#include "api/api_util.h"
 
 typedef void (*reduce_app_callback_fptr)(void*, func_decl*, unsigned, expr*const*, expr**);
 typedef void (*reduce_assign_callback_fptr)(void*, func_decl*, unsigned, expr*const*, unsigned, expr*const*);

src/api/api_datatype.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"datatype_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/datatype_decl_plugin.h"
 
 extern "C" {
 

src/api/api_fpa.cpp

@@ -17,10 +17,10 @@ Notes:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"fpa_decl_plugin.h"
+#include "api/api_context.h"
+#include "ast/fpa_decl_plugin.h"
 
 bool is_fp_sort(Z3_context c, Z3_sort s) {
     return mk_c(c)->fpautil().is_float(to_sort(s));

src/api/api_goal.cpp

@@ -16,11 +16,11 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_goal.h"
-#include"ast_translation.h"
+#include "api/api_context.h"
+#include "api/api_goal.h"
+#include "ast/ast_translation.h"
 
 extern "C" {
 

src/api/api_goal.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_GOAL_H_
 #define API_GOAL_H_
 
-#include"api_util.h"
-#include"goal.h"
+#include "api/api_util.h"
+#include "tactic/goal.h"
 
 struct Z3_goal_ref : public api::object {
     goal_ref m_goal;

src/api/api_interp.cpp

@@ -17,27 +17,27 @@
   --*/
 #include<sstream>
 #include<vector>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_solver.h"
-#include"api_model.h"
-#include"api_stats.h"
-#include"api_ast_vector.h"
-#include"tactic2solver.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt_strategic_solver.h"
-#include"smt_solver.h"
-#include"smt_implied_equalities.h"
-#include"iz3interp.h"
-#include"iz3profiling.h"
-#include"iz3hash.h"
-#include"iz3pp.h"
-#include"iz3checker.h"
-#include"scoped_proof.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_solver.h"
+#include "api/api_model.h"
+#include "api/api_stats.h"
+#include "api/api_ast_vector.h"
+#include "solver/tactic2solver.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "smt/smt_solver.h"
+#include "smt/smt_implied_equalities.h"
+#include "interp/iz3interp.h"
+#include "interp/iz3profiling.h"
+#include "interp/iz3hash.h"
+#include "interp/iz3pp.h"
+#include "interp/iz3checker.h"
+#include "ast/scoped_proof.h"
 
 using namespace stl_ext;
 

src/api/api_log.cpp

@@ -16,9 +16,9 @@ Revision History:
 
 --*/
 #include<fstream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"util.h"
+#include "util/util.h"
 #include"version.h"
 
 std::ostream * g_z3_log = 0;

src/api/api_model.cpp

@@ -16,15 +16,15 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_model.h"
-#include"api_ast_vector.h"
-#include"array_decl_plugin.h"
-#include"model.h"
-#include"model_v2_pp.h"
-#include"model_smt2_pp.h"
+#include "api/api_context.h"
+#include "api/api_model.h"
+#include "api/api_ast_vector.h"
+#include "ast/array_decl_plugin.h"
+#include "model/model.h"
+#include "model/model_v2_pp.h"
+#include "model/model_smt2_pp.h"
 #include"model_params.hpp"
 #include"model_evaluator_params.hpp"
 

src/api/api_model.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_MODEL_H_
 #define API_MODEL_H_
 
-#include"api_util.h"
-#include"model.h"
+#include "api/api_util.h"
+#include "model/model.h"
 
 struct Z3_model_ref : public api::object {
     model_ref  m_model;

src/api/api_numeral.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"algebraic_numbers.h"
-#include"fpa_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/fpa_decl_plugin.h"
 
 bool is_numeral_sort(Z3_context c, Z3_sort ty) {
     sort * _ty = to_sort(ty);

src/api/api_opt.cpp

@@ -16,18 +16,18 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_stats.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"api_model.h"
-#include"opt_context.h"
-#include"opt_cmds.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt2parser.h"
-#include"api_ast_vector.h"
+#include "api/api_stats.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "api/api_model.h"
+#include "opt/opt_context.h"
+#include "opt/opt_cmds.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "parsers/smt2/smt2parser.h"
+#include "api/api_ast_vector.h"
 
 extern "C" {
 

src/api/api_params.cpp

@@ -18,11 +18,11 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"params.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "util/params.h"
 
 extern "C" {
     

src/api/api_parsers.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
-#include"smtparser.h"
-#include"solver_na2as.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "parsers/smt/smtparser.h"
+#include "solver/solver_na2as.h"
 
 extern "C" {
 

src/api/api_pb.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"pb_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/pb_decl_plugin.h"
 
 extern "C" {
 

src/api/api_polynomial.cpp

@@ -16,15 +16,15 @@ Author:
 Notes:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_polynomial.h"
-#include"api_ast_vector.h"
-#include"expr2polynomial.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"expr2var.h"
+#include "api/api_context.h"
+#include "api/api_polynomial.h"
+#include "api/api_ast_vector.h"
+#include "ast/expr2polynomial.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "ast/expr2var.h"
 
 namespace api {
 

src/api/api_polynomial.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef API_POLYNOMIAL_H_
 #define API_POLYNOMIAL_H_
 
-#include"polynomial.h"
+#include "math/polynomial/polynomial.h"
 
 namespace api {
     

src/api/api_quant.cpp

@@ -15,12 +15,12 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"pattern_validation.h"
-#include"expr_abstract.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "parsers/util/pattern_validation.h"
+#include "ast/expr_abstract.h"
 
 extern "C" {
 

src/api/api_rcf.cpp

@@ -20,10 +20,10 @@ Notes:
     
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"realclosure.h"
+#include "api/api_context.h"
+#include "math/realclosure/realclosure.h"
 
 static rcmanager & rcfm(Z3_context c) {
     return mk_c(c)->rcfm();

src/api/api_seq.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"ast_pp.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/ast_pp.h"
 
 extern "C" {
 

src/api/api_solver.cpp

@@ -17,22 +17,22 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_solver.h"
-#include"api_model.h"
-#include"api_stats.h"
-#include"api_ast_vector.h"
-#include"tactic2solver.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt_strategic_solver.h"
-#include"smt_solver.h"
-#include"smt_implied_equalities.h"
-#include"smt_logics.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_solver.h"
+#include "api/api_model.h"
+#include "api/api_stats.h"
+#include "api/api_ast_vector.h"
+#include "solver/tactic2solver.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "smt/smt_solver.h"
+#include "smt/smt_implied_equalities.h"
+#include "solver/smt_logics.h"
 
 extern "C" {
 

src/api/api_solver.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_SOLVER_H_
 #define API_SOLVER_H_
 
-#include"api_util.h"
-#include"solver.h"
+#include "api/api_util.h"
+#include "solver/solver.h"
 
 struct Z3_solver_ref : public api::object {
     scoped_ptr<solver_factory> m_solver_factory;

src/api/api_stats.cpp

@@ -16,10 +16,10 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_stats.h"
+#include "api/api_context.h"
+#include "api/api_stats.h"
 
 extern "C" {
 

src/api/api_stats.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_STATS_H_
 #define API_STATS_H_
 
-#include"api_util.h"
-#include"statistics.h"
+#include "api/api_util.h"
+#include "util/statistics.h"
 
 struct Z3_stats_ref : public api::object {
     statistics m_stats;

src/api/api_tactic.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_model.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_model.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 
 Z3_apply_result_ref::Z3_apply_result_ref(api::context& c, ast_manager & m): api::object(c), m_core(m) {
 }

src/api/api_tactic.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_TACTIC_H_
 #define API_TACTIC_H_
 
-#include"api_goal.h"
-#include"tactical.h"
+#include "api/api_goal.h"
+#include "tactic/tactical.h"
 
 namespace api {
     class context;

src/api/api_util.h

@@ -18,9 +18,9 @@ Revision History:
 #ifndef API_UTIL_H_
 #define API_UTIL_H_
 
-#include"params.h"
-#include"lbool.h"
-#include"ast.h"
+#include "util/params.h"
+#include "util/lbool.h"
+#include "ast/ast.h"
 
 #define Z3_TRY try {
 #define Z3_CATCH_CORE(CODE) } catch (z3_exception & ex) { mk_c(c)->handle_exception(ex); CODE }

src/api/z3.h

@@ -22,16 +22,16 @@ Notes:
 #define Z3_H_
 
 #include<stdio.h>
-#include"z3_macros.h"
-#include"z3_api.h"
-#include"z3_ast_containers.h"
-#include"z3_algebraic.h"
-#include"z3_polynomial.h"
-#include"z3_rcf.h"
-#include"z3_fixedpoint.h"
-#include"z3_optimization.h"
-#include"z3_interp.h"
-#include"z3_fpa.h"
+#include "api/z3_macros.h"
+#include "api/z3_api.h"
+#include "api/z3_ast_containers.h"
+#include "api/z3_algebraic.h"
+#include "api/z3_polynomial.h"
+#include "api/z3_rcf.h"
+#include "api/z3_fixedpoint.h"
+#include "api/z3_optimization.h"
+#include "api/z3_interp.h"
+#include "api/z3_fpa.h"
 
 #endif
 

src/api/z3_logger.h

@@ -17,7 +17,7 @@ Notes:
     
 --*/
 #include<iostream>
-#include"symbol.h"
+#include "util/symbol.h"
 struct ll_escaped { char const * m_str; ll_escaped(char const * str):m_str(str) {} };
 static std::ostream & operator<<(std::ostream & out, ll_escaped const & d);
 

src/api/z3_private.h

@@ -19,8 +19,8 @@ Notes:
 --*/
 
 #include<iostream>
-#include"rational.h"
-#include"z3_macros.h"
+#include "util/rational.h"
+#include "api/z3_macros.h"
 
 #ifndef Z3_PRIVATE_H_
 #define Z3_PRIVATE_H_

src/api/z3_replayer.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"vector.h"
-#include"map.h"
-#include"z3_replayer.h"
-#include"stream_buffer.h"
-#include"symbol.h"
-#include"trace.h"
+#include "util/vector.h"
+#include "util/map.h"
+#include "api/z3_replayer.h"
+#include "util/stream_buffer.h"
+#include "util/symbol.h"
+#include "util/trace.h"
 #include<sstream>
 #include<vector>
 

src/api/z3_replayer.h

@@ -20,8 +20,8 @@ Notes:
 #define Z3_REPLAYER_H_
 
 #include<iostream>
-#include"z3.h"
-#include"z3_exception.h"
+#include "api/z3.h"
+#include "util/z3_exception.h"
 
 class z3_replayer;
 

src/api/z3_v1.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef Z3_V1_H_
 #define Z3_V1_H_
 
-#include"z3.h"
+#include "api/z3.h"
 
 // Backwards compatibility
 #define Z3_type_ast            Z3_sort

src/ast/act_cache.cpp

@@ -17,7 +17,7 @@ Author:
 Notes:
 
 --*/
-#include"act_cache.h"
+#include "ast/act_cache.h"
 
 #define MIN_MAX_UNUSED   1024
 #define INITIAL_CAPACITY 128

src/ast/act_cache.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef ACT_CACHE_H_
 #define ACT_CACHE_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"chashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/chashtable.h"
 
 class act_cache {
     ast_manager &        m_manager;

src/ast/arith_decl_plugin.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"arith_decl_plugin.h"
-#include"warning.h"
-#include"algebraic_numbers.h"
-#include"id_gen.h"
-#include"ast_smt2_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/warning.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/id_gen.h"
+#include "ast/ast_smt2_pp.h"
 
 struct arith_decl_plugin::algebraic_numbers_wrapper {
     unsynch_mpq_manager           m_qmanager;

src/ast/arith_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARITH_DECL_PLUGIN_H_
 #define ARITH_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 class sexpr;
 
 namespace algebraic_numbers {

src/ast/array_decl_plugin.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"array_decl_plugin.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 array_decl_plugin::array_decl_plugin():
     m_store_sym("store"),

src/ast/array_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARRAY_DECL_PLUGIN_H_
 #define ARRAY_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 
 inline sort* get_array_range(sort const * s) {

src/ast/ast.cpp

@@ -18,14 +18,14 @@ Revision History:
 --*/
 #include<sstream>
 #include<cstring>
-#include"ast.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"buffer.h"
-#include"warning.h"
-#include"string_buffer.h"
-#include"ast_util.h"
-#include"ast_smt2_pp.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "util/buffer.h"
+#include "util/warning.h"
+#include "util/string_buffer.h"
+#include "ast/ast_util.h"
+#include "ast/ast_smt2_pp.h"
 
 // -----------------------------------
 //

src/ast/ast.h

@@ -19,32 +19,32 @@ Revision History:
 #ifndef AST_H_
 #define AST_H_
 
-#include"vector.h"
-#include"hashtable.h"
-#include"buffer.h"
-#include"symbol.h"
-#include"rational.h"
-#include"hash.h"
-#include"optional.h"
-#include"trace.h"
-#include"bit_vector.h"
-#include"symbol_table.h"
-#include"tptr.h"
-#include"memory_manager.h"
-#include"small_object_allocator.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
-#include"ref_buffer.h"
-#include"obj_mark.h"
-#include"obj_hashtable.h"
-#include"id_gen.h"
-#include"map.h"
-#include"parray.h"
-#include"dictionary.h"
-#include"chashtable.h"
-#include"z3_exception.h"
-#include"dependency.h"
-#include"rlimit.h"
+#include "util/vector.h"
+#include "util/hashtable.h"
+#include "util/buffer.h"
+#include "util/symbol.h"
+#include "util/rational.h"
+#include "util/hash.h"
+#include "util/optional.h"
+#include "util/trace.h"
+#include "util/bit_vector.h"
+#include "util/symbol_table.h"
+#include "util/tptr.h"
+#include "util/memory_manager.h"
+#include "util/small_object_allocator.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
+#include "util/ref_buffer.h"
+#include "util/obj_mark.h"
+#include "util/obj_hashtable.h"
+#include "util/id_gen.h"
+#include "util/map.h"
+#include "util/parray.h"
+#include "util/dictionary.h"
+#include "util/chashtable.h"
+#include "util/z3_exception.h"
+#include "util/dependency.h"
+#include "util/rlimit.h"
 
 #define RECYCLE_FREE_AST_INDICES
 

src/ast/ast_ll_pp.cpp

@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 #include<iostream>
-#include"for_each_ast.h"
-#include"arith_decl_plugin.h"
+#include "ast/for_each_ast.h"
+#include "ast/arith_decl_plugin.h"
 
 // #define AST_LL_PP_SHOW_FAMILY_NAME
 

src/ast/ast_ll_pp.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef AST_LL_PP_H_
 #define AST_LL_PP_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 #include<iostream>
 
 void ast_ll_pp(std::ostream & out, ast_manager & m, ast * n, bool only_exprs=true, bool compact=true);

src/ast/ast_lt.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"ast.h"
+#include "ast/ast.h"
 
 #define check_symbol(S1,S2) if (S1 != S2) return lt(S1,S2)
 #define check_value(V1,V2) if (V1 != V2) return V1 < V2

src/ast/ast_pp.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef AST_PP_H_
 #define AST_PP_H_
 
-#include"ast_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 struct mk_pp : public mk_ismt2_pp {
     mk_pp(ast * t, ast_manager & m, params_ref const & p, unsigned indent = 0, unsigned num_vars = 0, char const * var_prefix = 0):

src/ast/ast_pp_util.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include "ast_pp_util.h"
-#include "ast_smt2_pp.h"
-#include "ast_smt_pp.h"
+#include "ast/ast_pp_util.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_smt_pp.h"
 
 void ast_pp_util::collect(expr* e) {
     coll.visit(e);

src/ast/ast_pp_util.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef AST_PP_UTIL_H_
 #define AST_PP_UTIL_H_
 
-#include "decl_collector.h"
+#include "ast/decl_collector.h"
 
 class ast_pp_util {
     ast_manager&        m;

src/ast/ast_printer.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"ast_printer.h"
-#include"pp.h"
+#include "ast/ast_printer.h"
+#include "ast/pp.h"
 
 class simple_ast_printer_context : public ast_printer_context {
     ast_manager & m_manager;

src/ast/ast_printer.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef AST_PRINTER_H_
 #define AST_PRINTER_H_
 
-#include"ast.h"
-#include"ast_smt2_pp.h"
+#include "ast/ast.h"
+#include "ast/ast_smt2_pp.h"
 
 class ast_printer {
 public:

src/ast/ast_smt2_pp.cpp

@@ -18,12 +18,12 @@ Author:
 Revision History:
 
 --*/
-#include"ast_smt2_pp.h"
-#include"shared_occs.h"
-#include"pp.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"algebraic_numbers.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/shared_occs.h"
+#include "ast/pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "math/polynomial/algebraic_numbers.h"
 #include"pp_params.hpp"
 using namespace format_ns;
 

src/ast/ast_smt2_pp.h

@@ -22,16 +22,16 @@ Revision History:
 #ifndef AST_SMT2_PP_H_
 #define AST_SMT2_PP_H_
 
-#include"format.h"
-#include"params.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"smt2_util.h"
+#include "ast/format.h"
+#include "util/params.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "util/smt2_util.h"
 
 class smt2_pp_environment {
 protected:

src/ast/ast_smt_pp.cpp

@@ -21,17 +21,17 @@ Revision History:
 
 #include<sstream>
 #include<iostream>
-#include"ast_smt_pp.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"vector.h"
-#include"for_each_ast.h"
-#include"decl_collector.h"
-#include"smt2_util.h"
-#include"seq_decl_plugin.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "util/vector.h"
+#include "ast/for_each_ast.h"
+#include "ast/decl_collector.h"
+#include "util/smt2_util.h"
+#include "ast/seq_decl_plugin.h"
 
 // ---------------------------------------
 // smt_renaming

src/ast/ast_smt_pp.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef AST_SMT_PP_H_
 #define AST_SMT_PP_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 #include<string>
-#include"map.h"
+#include "util/map.h"
 
 class smt_renaming {
     typedef map<symbol, symbol, symbol_hash_proc, symbol_eq_proc> symbol2symbol;

src/ast/ast_trail.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef AST_TRAIL_H_
 #define AST_TRAIL_H_
 
-#include"ast.h"
-#include"trail.h"
+#include "ast/ast.h"
+#include "util/trail.h"
 
 
 template<typename S, typename T>

src/ast/ast_translation.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "datatype_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "format.h"
-#include "ast_translation.h"
-#include "ast_ll_pp.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/format.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_ll_pp.h"
 
 ast_translation::~ast_translation() {
     reset_cache();

src/ast/ast_translation.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef AST_TRANSLATION_H_
 #define AST_TRANSLATION_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class ast_translation {
     struct frame {

src/ast/ast_util.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "ast_util.h"
+#include "ast/ast_util.h"
 
 app * mk_list_assoc_app(ast_manager & m, func_decl * f, unsigned num_args, expr * const * args) {
     SASSERT(f->is_associative());

src/ast/ast_util.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef AST_UTIL_H_
 #define AST_UTIL_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 template<typename C>
 void remove_duplicates(C & v) {

src/ast/bv_decl_plugin.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"bv_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 bv_decl_plugin::bv_decl_plugin():
     m_bv_sym("bv"),

src/ast/bv_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef BV_DECL_PLUGIN_H_
 #define BV_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 enum bv_sort_kind {
     BV_SORT

src/ast/datatype_decl_plugin.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"datatype_decl_plugin.h"
-#include"warning.h"
-#include"ast_smt2_pp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_smt2_pp.h"
 
 
 /**

src/ast/datatype_decl_plugin.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DATATYPE_DECL_PLUGIN_H_
 #define DATATYPE_DECL_PLUGIN_H_
 
-#include"ast.h"
-#include"tptr.h"
-#include"buffer.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/tptr.h"
+#include "util/buffer.h"
+#include "util/obj_hashtable.h"
 
 enum datatype_sort_kind {
     DATATYPE_SORT

src/ast/decl_collector.cpp

@@ -17,7 +17,7 @@ Author:
 Revision History:
 
 --*/
-#include"decl_collector.h"
+#include "ast/decl_collector.h"
 
 void decl_collector::visit_sort(sort * n) {
     family_id fid = n->get_family_id();

src/ast/decl_collector.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef SMT_DECL_COLLECTOR_H_
 #define SMT_DECL_COLLECTOR_H_
 
-#include"ast.h"
-#include"datatype_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/datatype_decl_plugin.h"
 
 class decl_collector {
     ast_manager &         m_manager;

src/ast/dl_decl_plugin.cpp

@@ -18,12 +18,12 @@ Revision History:
 --*/
 #include<sstream>
 
-#include "ast_pp.h"
-#include "array_decl_plugin.h"
-#include "datatype_decl_plugin.h"
-#include "dl_decl_plugin.h"
-#include "warning.h"
-#include "reg_decl_plugins.h"
+#include "ast/ast_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/reg_decl_plugins.h"
 
 namespace datalog {
 

src/ast/dl_decl_plugin.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef DL_DECL_PLUGIN_H_
 #define DL_DECL_PLUGIN_H_
 
-#include"ast.h"
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 namespace datalog {
 

src/ast/expr2polynomial.cpp

@@ -17,13 +17,13 @@ Author:
 Notes:
 
 --*/
-#include"expr2polynomial.h"
-#include"expr2var.h"
-#include"arith_decl_plugin.h"
-#include"ast_smt2_pp.h"
-#include"z3_exception.h"
-#include"cooperate.h"
-#include"common_msgs.h"
+#include "ast/expr2polynomial.h"
+#include "ast/expr2var.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/z3_exception.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
 
 struct expr2polynomial::imp {
     struct frame {

src/ast/expr2polynomial.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef EXPR2POLYNOMIAL_H_
 #define EXPR2POLYNOMIAL_H_
 
-#include"ast.h"
-#include"polynomial.h"
+#include "ast/ast.h"
+#include "math/polynomial/polynomial.h"
 
 class expr2var;
 

src/ast/expr2var.cpp

@@ -20,9 +20,9 @@ Author:
 Notes:
 
 --*/
-#include"expr2var.h"
-#include"ast_smt2_pp.h"
-#include"ref_util.h"
+#include "ast/expr2var.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/ref_util.h"
 
 void expr2var::insert(expr * n, var v) {
     if (!is_uninterp_const(n)) {

src/ast/expr2var.h

@@ -23,8 +23,8 @@ Notes:
 #ifndef EXPR2VAR_H_
 #define EXPR2VAR_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief The mapping between Z3 expressions and (low level) variables.