diff --git a/scripts/update_include.py b/scripts/update_include.py new file mode 100644 index 000000000..555d9f094 --- /dev/null +++ b/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') diff --git a/src/ackermannization/ackermannize_bv_model_converter.cpp b/src/ackermannization/ackermannize_bv_model_converter.cpp index d47735a56..360714c8b 100644 --- a/src/ackermannization/ackermannize_bv_model_converter.cpp +++ b/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); diff --git a/src/ackermannization/ackermannize_bv_model_converter.h b/src/ackermannization/ackermannize_bv_model_converter.h index e51792bad..d0255a0d4 100644 --- a/src/ackermannization/ackermannize_bv_model_converter.h +++ b/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); diff --git a/src/ackermannization/ackermannize_bv_tactic.cpp b/src/ackermannization/ackermannize_bv_tactic.cpp index 70230e346..82ac50a95 100644 --- a/src/ackermannization/ackermannize_bv_tactic.cpp +++ b/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 { diff --git a/src/ackermannization/ackermannize_bv_tactic.h b/src/ackermannization/ackermannize_bv_tactic.h index 3e3d5636c..803defb06 100644 --- a/src/ackermannization/ackermannize_bv_tactic.h +++ b/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); diff --git a/src/ackermannization/ackr_bound_probe.cpp b/src/ackermannization/ackr_bound_probe.cpp index 5cb8e9448..50b9cc092 100644 --- a/src/ackermannization/ackr_bound_probe.cpp +++ b/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". diff --git a/src/ackermannization/ackr_bound_probe.h b/src/ackermannization/ackr_bound_probe.h index 6c0a66605..169b3068e 100644 --- a/src/ackermannization/ackr_bound_probe.h +++ b/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(); diff --git a/src/ackermannization/ackr_helper.cpp b/src/ackermannization/ackr_helper.cpp index 803fc3c54..2e0fda687 100644 --- a/src/ackermannization/ackr_helper.cpp +++ b/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(); diff --git a/src/ackermannization/ackr_helper.h b/src/ackermannization/ackr_helper.h index 327763da4..651b25b12 100644 --- a/src/ackermannization/ackr_helper.h +++ b/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: diff --git a/src/ackermannization/ackr_info.h b/src/ackermannization/ackr_info.h index 76be45e2b..0b67e144f 100644 --- a/src/ackermannization/ackr_info.h +++ b/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 diff --git a/src/ackermannization/ackr_model_converter.cpp b/src/ackermannization/ackr_model_converter.cpp index ea4f858ad..0697686eb 100644 --- a/src/ackermannization/ackr_model_converter.cpp +++ b/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 { diff --git a/src/ackermannization/ackr_model_converter.h b/src/ackermannization/ackr_model_converter.h index 2c1f0c78c..cee7472aa 100644 --- a/src/ackermannization/ackr_model_converter.h +++ b/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); diff --git a/src/ackermannization/lackr.cpp b/src/ackermannization/lackr.cpp index 461d2080f..76fbe0617 100644 --- a/src/ackermannization/lackr.cpp +++ b/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) diff --git a/src/ackermannization/lackr.h b/src/ackermannization/lackr.h index 4bf1d6965..554ad6ef8 100644 --- a/src/ackermannization/lackr.h +++ b/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) {} diff --git a/src/ackermannization/lackr_model_constructor.cpp b/src/ackermannization/lackr_model_constructor.cpp index 8e99fe2a2..641c70cbc 100644 --- a/src/ackermannization/lackr_model_constructor.cpp +++ b/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: diff --git a/src/ackermannization/lackr_model_constructor.h b/src/ackermannization/lackr_model_constructor.h index 71c9c0710..d5847a24c 100644 --- a/src/ackermannization/lackr_model_constructor.h +++ b/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: diff --git a/src/ackermannization/lackr_model_converter_lazy.cpp b/src/ackermannization/lackr_model_converter_lazy.cpp index 5a0d1c4be..2a7adb839 100644 --- a/src/ackermannization/lackr_model_converter_lazy.cpp +++ b/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: diff --git a/src/ackermannization/lackr_model_converter_lazy.h b/src/ackermannization/lackr_model_converter_lazy.h index c9b3eac80..0581976a9 100644 --- a/src/ackermannization/lackr_model_converter_lazy.h +++ b/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); diff --git a/src/api/api_algebraic.cpp b/src/api/api_algebraic.cpp index c4e4dac5d..40e8c846b 100644 --- a/src/api/api_algebraic.cpp +++ b/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) { \ diff --git a/src/api/api_arith.cpp b/src/api/api_arith.cpp index 51aea9676..80eb261ad 100644 --- a/src/api/api_arith.cpp +++ b/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) diff --git a/src/api/api_array.cpp b/src/api/api_array.cpp index ed431882e..f4682ea8f 100644 --- a/src/api/api_array.cpp +++ b/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" { diff --git a/src/api/api_ast.cpp b/src/api/api_ast.cpp index d34cad2f4..6ae10b8f9 100644 --- a/src/api/api_ast.cpp +++ b/src/api/api_ast.cpp @@ -17,26 +17,26 @@ Revision History: --*/ #include #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); diff --git a/src/api/api_ast_map.cpp b/src/api/api_ast_map.cpp index aa52faa98..fc593c1f5 100644 --- a/src/api/api_ast_map.cpp +++ b/src/api/api_ast_map.cpp @@ -16,13 +16,13 @@ Revision History: --*/ #include -#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); diff --git a/src/api/api_ast_map.h b/src/api/api_ast_map.h index dc1cf90ad..3dacc54f1 100644 --- a/src/api/api_ast_map.h +++ b/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; diff --git a/src/api/api_ast_vector.cpp b/src/api/api_ast_vector.cpp index 40df13708..04802cba5 100644 --- a/src/api/api_ast_vector.cpp +++ b/src/api/api_ast_vector.cpp @@ -16,12 +16,12 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_ast_vector.h b/src/api/api_ast_vector.h index 4fcf8ffb8..ced20481e 100644 --- a/src/api/api_ast_vector.h +++ b/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; diff --git a/src/api/api_bv.cpp b/src/api/api_bv.cpp index ff090ef54..52fcb867c 100644 --- a/src/api/api_bv.cpp +++ b/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" { diff --git a/src/api/api_config_params.cpp b/src/api/api_config_params.cpp index a04a9f12c..d35297f59 100644 --- a/src/api/api_config_params.cpp +++ b/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) { diff --git a/src/api/api_context.cpp b/src/api/api_context.cpp index bcd3c60f2..2c93ee85d 100644 --- a/src/api/api_context.cpp +++ b/src/api/api_context.cpp @@ -18,15 +18,15 @@ Revision History: --*/ #include -#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); diff --git a/src/api/api_context.h b/src/api/api_context.h index 4685fd04e..6f8dc43f6 100644 --- a/src/api/api_context.h +++ b/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; diff --git a/src/api/api_datalog.cpp b/src/api/api_datalog.cpp index 8843256c6..b57247fb1 100644 --- a/src/api/api_datalog.cpp +++ b/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 { diff --git a/src/api/api_datalog.h b/src/api/api_datalog.h index 8c095d546..c8dbc4180 100644 --- a/src/api/api_datalog.h +++ b/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*); diff --git a/src/api/api_datatype.cpp b/src/api/api_datatype.cpp index 647cdc581..7e9758a04 100644 --- a/src/api/api_datatype.cpp +++ b/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" { diff --git a/src/api/api_fpa.cpp b/src/api/api_fpa.cpp index 6dad5048f..8e4d13af4 100644 --- a/src/api/api_fpa.cpp +++ b/src/api/api_fpa.cpp @@ -17,10 +17,10 @@ Notes: --*/ #include -#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)); diff --git a/src/api/api_goal.cpp b/src/api/api_goal.cpp index 295e1d939..3fe23828d 100644 --- a/src/api/api_goal.cpp +++ b/src/api/api_goal.cpp @@ -16,11 +16,11 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_goal.h b/src/api/api_goal.h index 1e47b832a..4e9729df5 100644 --- a/src/api/api_goal.h +++ b/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; diff --git a/src/api/api_interp.cpp b/src/api/api_interp.cpp index 10aa06568..276e56989 100644 --- a/src/api/api_interp.cpp +++ b/src/api/api_interp.cpp @@ -17,27 +17,27 @@ --*/ #include #include -#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; diff --git a/src/api/api_log.cpp b/src/api/api_log.cpp index 43ed98986..aa00de424 100644 --- a/src/api/api_log.cpp +++ b/src/api/api_log.cpp @@ -16,9 +16,9 @@ Revision History: --*/ #include -#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; diff --git a/src/api/api_model.cpp b/src/api/api_model.cpp index 67c0f2f08..ccd70e79e 100644 --- a/src/api/api_model.cpp +++ b/src/api/api_model.cpp @@ -16,15 +16,15 @@ Revision History: --*/ #include -#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" diff --git a/src/api/api_model.h b/src/api/api_model.h index 9a53b59bc..64427cfb8 100644 --- a/src/api/api_model.h +++ b/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; diff --git a/src/api/api_numeral.cpp b/src/api/api_numeral.cpp index 40ebcf652..c3717b5d2 100644 --- a/src/api/api_numeral.cpp +++ b/src/api/api_numeral.cpp @@ -16,14 +16,14 @@ Revision History: --*/ #include -#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); diff --git a/src/api/api_opt.cpp b/src/api/api_opt.cpp index 0d1b4ef8d..8c49b526e 100644 --- a/src/api/api_opt.cpp +++ b/src/api/api_opt.cpp @@ -16,18 +16,18 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_params.cpp b/src/api/api_params.cpp index 1efaffca8..86dfe9a93 100644 --- a/src/api/api_params.cpp +++ b/src/api/api_params.cpp @@ -18,11 +18,11 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_parsers.cpp b/src/api/api_parsers.cpp index 8f6eb1125..8c2723e9a 100644 --- a/src/api/api_parsers.cpp +++ b/src/api/api_parsers.cpp @@ -16,14 +16,14 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_pb.cpp b/src/api/api_pb.cpp index bb4a40c9a..97e627ec0 100644 --- a/src/api/api_pb.cpp +++ b/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" { diff --git a/src/api/api_polynomial.cpp b/src/api/api_polynomial.cpp index eebe36717..398fdeb3a 100644 --- a/src/api/api_polynomial.cpp +++ b/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 { diff --git a/src/api/api_polynomial.h b/src/api/api_polynomial.h index b93372ca9..fbb1e7e13 100644 --- a/src/api/api_polynomial.h +++ b/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 { diff --git a/src/api/api_quant.cpp b/src/api/api_quant.cpp index e87b9446f..f7d5bf13a 100644 --- a/src/api/api_quant.cpp +++ b/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" { diff --git a/src/api/api_rcf.cpp b/src/api/api_rcf.cpp index a4770c56c..377e83a44 100644 --- a/src/api/api_rcf.cpp +++ b/src/api/api_rcf.cpp @@ -20,10 +20,10 @@ Notes: --*/ #include -#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(); diff --git a/src/api/api_seq.cpp b/src/api/api_seq.cpp index 986e6f497..a652fd912 100644 --- a/src/api/api_seq.cpp +++ b/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" { diff --git a/src/api/api_solver.cpp b/src/api/api_solver.cpp index 6dc41efb2..6435b8288 100644 --- a/src/api/api_solver.cpp +++ b/src/api/api_solver.cpp @@ -17,22 +17,22 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_solver.h b/src/api/api_solver.h index ea59ccf33..4f344a00d 100644 --- a/src/api/api_solver.h +++ b/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 m_solver_factory; diff --git a/src/api/api_stats.cpp b/src/api/api_stats.cpp index b39c8368a..440aec22d 100644 --- a/src/api/api_stats.cpp +++ b/src/api/api_stats.cpp @@ -16,10 +16,10 @@ Revision History: --*/ #include -#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" { diff --git a/src/api/api_stats.h b/src/api/api_stats.h index 1c0c0c82e..5ce616084 100644 --- a/src/api/api_stats.h +++ b/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; diff --git a/src/api/api_tactic.cpp b/src/api/api_tactic.cpp index 7068619c1..661660a63 100644 --- a/src/api/api_tactic.cpp +++ b/src/api/api_tactic.cpp @@ -16,14 +16,14 @@ Revision History: --*/ #include -#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) { } diff --git a/src/api/api_tactic.h b/src/api/api_tactic.h index 373b85b39..fd2f05185 100644 --- a/src/api/api_tactic.h +++ b/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; diff --git a/src/api/api_util.h b/src/api/api_util.h index 7857e7c38..bc6781c2c 100644 --- a/src/api/api_util.h +++ b/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 } diff --git a/src/api/z3.h b/src/api/z3.h index ffa200807..22a1b9b5d 100644 --- a/src/api/z3.h +++ b/src/api/z3.h @@ -22,16 +22,16 @@ Notes: #define Z3_H_ #include -#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 diff --git a/src/api/z3_logger.h b/src/api/z3_logger.h index 4d83f90c2..dd2816bff 100644 --- a/src/api/z3_logger.h +++ b/src/api/z3_logger.h @@ -17,7 +17,7 @@ Notes: --*/ #include -#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); diff --git a/src/api/z3_private.h b/src/api/z3_private.h index e5fe4b521..7b60a6ab9 100644 --- a/src/api/z3_private.h +++ b/src/api/z3_private.h @@ -19,8 +19,8 @@ Notes: --*/ #include -#include"rational.h" -#include"z3_macros.h" +#include "util/rational.h" +#include "api/z3_macros.h" #ifndef Z3_PRIVATE_H_ #define Z3_PRIVATE_H_ diff --git a/src/api/z3_replayer.cpp b/src/api/z3_replayer.cpp index 68f279e3d..84dcfc363 100644 --- a/src/api/z3_replayer.cpp +++ b/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 #include diff --git a/src/api/z3_replayer.h b/src/api/z3_replayer.h index 88654363d..e1b32af75 100644 --- a/src/api/z3_replayer.h +++ b/src/api/z3_replayer.h @@ -20,8 +20,8 @@ Notes: #define Z3_REPLAYER_H_ #include -#include"z3.h" -#include"z3_exception.h" +#include "api/z3.h" +#include "util/z3_exception.h" class z3_replayer; diff --git a/src/api/z3_v1.h b/src/api/z3_v1.h index 11f492d88..66de943c2 100644 --- a/src/api/z3_v1.h +++ b/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 diff --git a/src/ast/act_cache.cpp b/src/ast/act_cache.cpp index 1d1341184..74a7d6fca 100644 --- a/src/ast/act_cache.cpp +++ b/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 diff --git a/src/ast/act_cache.h b/src/ast/act_cache.h index b3567dec2..67c5cf050 100644 --- a/src/ast/act_cache.h +++ b/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; diff --git a/src/ast/arith_decl_plugin.cpp b/src/ast/arith_decl_plugin.cpp index 12d1a4307..fa169316b 100644 --- a/src/ast/arith_decl_plugin.cpp +++ b/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; diff --git a/src/ast/arith_decl_plugin.h b/src/ast/arith_decl_plugin.h index 43bf4be65..a66ddd967 100644 --- a/src/ast/arith_decl_plugin.h +++ b/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 { diff --git a/src/ast/array_decl_plugin.cpp b/src/ast/array_decl_plugin.cpp index ab21c4c88..efcad1d5e 100644 --- a/src/ast/array_decl_plugin.cpp +++ b/src/ast/array_decl_plugin.cpp @@ -17,10 +17,10 @@ Revision History: --*/ #include -#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"), diff --git a/src/ast/array_decl_plugin.h b/src/ast/array_decl_plugin.h index 36a8d50a5..e06cb3065 100644 --- a/src/ast/array_decl_plugin.h +++ b/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) { diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp index 1c3be5e68..88055d73b 100644 --- a/src/ast/ast.cpp +++ b/src/ast/ast.cpp @@ -18,14 +18,14 @@ Revision History: --*/ #include #include -#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" // ----------------------------------- // diff --git a/src/ast/ast.h b/src/ast/ast.h index f71d5135c..277cdfca9 100644 --- a/src/ast/ast.h +++ b/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 diff --git a/src/ast/ast_ll_pp.cpp b/src/ast/ast_ll_pp.cpp index 3dc660681..c00053780 100644 --- a/src/ast/ast_ll_pp.cpp +++ b/src/ast/ast_ll_pp.cpp @@ -18,8 +18,8 @@ Revision History: --*/ #include -#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 diff --git a/src/ast/ast_ll_pp.h b/src/ast/ast_ll_pp.h index 7fc527833..19d5679b6 100644 --- a/src/ast/ast_ll_pp.h +++ b/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 void ast_ll_pp(std::ostream & out, ast_manager & m, ast * n, bool only_exprs=true, bool compact=true); diff --git a/src/ast/ast_lt.cpp b/src/ast/ast_lt.cpp index 2fba4f7a6..b6b52966e 100644 --- a/src/ast/ast_lt.cpp +++ b/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 diff --git a/src/ast/ast_pp.h b/src/ast/ast_pp.h index ecd7e3b13..997b1a6e0 100644 --- a/src/ast/ast_pp.h +++ b/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): diff --git a/src/ast/ast_pp_util.cpp b/src/ast/ast_pp_util.cpp index 3021b702b..677422b8a 100644 --- a/src/ast/ast_pp_util.cpp +++ b/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); diff --git a/src/ast/ast_pp_util.h b/src/ast/ast_pp_util.h index a5aac2136..964a862a2 100644 --- a/src/ast/ast_pp_util.h +++ b/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; diff --git a/src/ast/ast_printer.cpp b/src/ast/ast_printer.cpp index 8d6ed91f7..b5cf60ee9 100644 --- a/src/ast/ast_printer.cpp +++ b/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; diff --git a/src/ast/ast_printer.h b/src/ast/ast_printer.h index 78fe822f6..87fa8ef3d 100644 --- a/src/ast/ast_printer.h +++ b/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: diff --git a/src/ast/ast_smt2_pp.cpp b/src/ast/ast_smt2_pp.cpp index f97397108..89cab9de4 100644 --- a/src/ast/ast_smt2_pp.cpp +++ b/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; diff --git a/src/ast/ast_smt2_pp.h b/src/ast/ast_smt2_pp.h index c3e72f7bc..3e8b1aa39 100644 --- a/src/ast/ast_smt2_pp.h +++ b/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: diff --git a/src/ast/ast_smt_pp.cpp b/src/ast/ast_smt_pp.cpp index fe02f24a0..9ebfdfbef 100644 --- a/src/ast/ast_smt_pp.cpp +++ b/src/ast/ast_smt_pp.cpp @@ -21,17 +21,17 @@ Revision History: #include #include -#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 diff --git a/src/ast/ast_smt_pp.h b/src/ast/ast_smt_pp.h index e88465828..dd2a6d753 100644 --- a/src/ast/ast_smt_pp.h +++ b/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 -#include"map.h" +#include "util/map.h" class smt_renaming { typedef map symbol2symbol; diff --git a/src/ast/ast_trail.h b/src/ast/ast_trail.h index 4e2c542fd..d5245bd77 100644 --- a/src/ast/ast_trail.h +++ b/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 diff --git a/src/ast/ast_translation.cpp b/src/ast/ast_translation.cpp index 4b1a80908..0c56b6de6 100644 --- a/src/ast/ast_translation.cpp +++ b/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(); diff --git a/src/ast/ast_translation.h b/src/ast/ast_translation.h index ec187110b..b278791d7 100644 --- a/src/ast/ast_translation.h +++ b/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 { diff --git a/src/ast/ast_util.cpp b/src/ast/ast_util.cpp index 0129a88d5..68f5b2486 100644 --- a/src/ast/ast_util.cpp +++ b/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()); diff --git a/src/ast/ast_util.h b/src/ast/ast_util.h index 6244e16b9..446854f5e 100644 --- a/src/ast/ast_util.h +++ b/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 void remove_duplicates(C & v) { diff --git a/src/ast/bv_decl_plugin.cpp b/src/ast/bv_decl_plugin.cpp index 321943c72..4632b6604 100644 --- a/src/ast/bv_decl_plugin.cpp +++ b/src/ast/bv_decl_plugin.cpp @@ -17,11 +17,11 @@ Revision History: --*/ #include -#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"), diff --git a/src/ast/bv_decl_plugin.h b/src/ast/bv_decl_plugin.h index 33cf094b9..5e533cd98 100644 --- a/src/ast/bv_decl_plugin.h +++ b/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 diff --git a/src/ast/datatype_decl_plugin.cpp b/src/ast/datatype_decl_plugin.cpp index 34b092ee9..b4f30767f 100644 --- a/src/ast/datatype_decl_plugin.cpp +++ b/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" /** diff --git a/src/ast/datatype_decl_plugin.h b/src/ast/datatype_decl_plugin.h index b2bcf3ab0..3d008ad9c 100644 --- a/src/ast/datatype_decl_plugin.h +++ b/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 diff --git a/src/ast/decl_collector.cpp b/src/ast/decl_collector.cpp index 773ebefc7..e000f43df 100644 --- a/src/ast/decl_collector.cpp +++ b/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(); diff --git a/src/ast/decl_collector.h b/src/ast/decl_collector.h index 0067d18eb..053d6df41 100644 --- a/src/ast/decl_collector.h +++ b/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; diff --git a/src/ast/dl_decl_plugin.cpp b/src/ast/dl_decl_plugin.cpp index f7d6d9d1c..1be3c4756 100644 --- a/src/ast/dl_decl_plugin.cpp +++ b/src/ast/dl_decl_plugin.cpp @@ -18,12 +18,12 @@ Revision History: --*/ #include -#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 { diff --git a/src/ast/dl_decl_plugin.h b/src/ast/dl_decl_plugin.h index 66ce45c3c..75969d385 100644 --- a/src/ast/dl_decl_plugin.h +++ b/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 { diff --git a/src/ast/expr2polynomial.cpp b/src/ast/expr2polynomial.cpp index a06ce7e2a..7413624cd 100644 --- a/src/ast/expr2polynomial.cpp +++ b/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 { diff --git a/src/ast/expr2polynomial.h b/src/ast/expr2polynomial.h index 6b2fd6116..e7cbac6e5 100644 --- a/src/ast/expr2polynomial.h +++ b/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; diff --git a/src/ast/expr2var.cpp b/src/ast/expr2var.cpp index a0d93a620..2f850d645 100644 --- a/src/ast/expr2var.cpp +++ b/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)) { diff --git a/src/ast/expr2var.h b/src/ast/expr2var.h index 43d9c31f4..2b4d8c3fe 100644 --- a/src/ast/expr2var.h +++ b/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. diff --git a/src/ast/expr_abstract.cpp b/src/ast/expr_abstract.cpp index 513162043..46682eed6 100644 --- a/src/ast/expr_abstract.cpp +++ b/src/ast/expr_abstract.cpp @@ -17,8 +17,8 @@ Notes: --*/ -#include "expr_abstract.h" -#include "map.h" +#include "ast/expr_abstract.h" +#include "util/map.h" void expr_abstractor::operator()(unsigned base, unsigned num_bound, expr* const* bound, expr* n, expr_ref& result) { diff --git a/src/ast/expr_abstract.h b/src/ast/expr_abstract.h index 5c91a914e..84fb8c2b0 100644 --- a/src/ast/expr_abstract.h +++ b/src/ast/expr_abstract.h @@ -19,7 +19,7 @@ Notes: #ifndef EXPR_ABSTRACT_H_ #define EXPR_ABSTRACT_H_ -#include"ast.h" +#include "ast/ast.h" class expr_abstractor { ast_manager& m; diff --git a/src/ast/expr_functors.cpp b/src/ast/expr_functors.cpp index 592d96a68..4906ed3d7 100644 --- a/src/ast/expr_functors.cpp +++ b/src/ast/expr_functors.cpp @@ -19,7 +19,7 @@ Revision History: --*/ -#include "expr_functors.h" +#include "ast/expr_functors.h" // ---------- // check_pred diff --git a/src/ast/expr_functors.h b/src/ast/expr_functors.h index da2b43dea..322b9402a 100644 --- a/src/ast/expr_functors.h +++ b/src/ast/expr_functors.h @@ -22,8 +22,8 @@ Revision History: #ifndef EXPR_FUNCTORS_H_ #define EXPR_FUNCTORS_H_ -#include "ast.h" -#include "expr_map.h" +#include "ast/ast.h" +#include "ast/expr_map.h" class i_expr_pred { public: diff --git a/src/ast/expr_map.cpp b/src/ast/expr_map.cpp index 87db2186b..89fcccb00 100644 --- a/src/ast/expr_map.cpp +++ b/src/ast/expr_map.cpp @@ -18,8 +18,8 @@ Author: Notes: --*/ -#include"expr_map.h" -#include"dec_ref_util.h" +#include "ast/expr_map.h" +#include "util/dec_ref_util.h" expr_map::expr_map(ast_manager & m): m_manager(m), diff --git a/src/ast/expr_map.h b/src/ast/expr_map.h index 2b49a4a30..b32d52092 100644 --- a/src/ast/expr_map.h +++ b/src/ast/expr_map.h @@ -21,8 +21,8 @@ Notes: #ifndef EXPR_MAP_H_ #define EXPR_MAP_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" /** \brief Map from expressions to expressions+proofs. diff --git a/src/ast/expr_stat.cpp b/src/ast/expr_stat.cpp index 8ac259afa..689edc263 100644 --- a/src/ast/expr_stat.cpp +++ b/src/ast/expr_stat.cpp @@ -19,8 +19,8 @@ Author: Revision History: --*/ -#include"for_each_expr.h" -#include"expr_stat.h" +#include "ast/for_each_expr.h" +#include "ast/expr_stat.h" void get_expr_stat(expr * n, expr_stat & r) { typedef std::pair pair; diff --git a/src/ast/expr_substitution.cpp b/src/ast/expr_substitution.cpp index 8d6f0319c..149a59ce5 100644 --- a/src/ast/expr_substitution.cpp +++ b/src/ast/expr_substitution.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"expr_substitution.h" -#include"ref_util.h" +#include "ast/expr_substitution.h" +#include "util/ref_util.h" typedef obj_map expr2proof; typedef obj_map expr2expr_dependency; diff --git a/src/ast/expr_substitution.h b/src/ast/expr_substitution.h index 073b56110..d209ab6b4 100644 --- a/src/ast/expr_substitution.h +++ b/src/ast/expr_substitution.h @@ -19,7 +19,7 @@ Notes: #ifndef EXPR_SUBSTITUTION_H_ #define EXPR_SUBSTITUTION_H_ -#include"ast.h" +#include "ast/ast.h" class expr_substitution { ast_manager & m_manager; diff --git a/src/ast/for_each_ast.cpp b/src/ast/for_each_ast.cpp index f5b8218ae..77e975b98 100644 --- a/src/ast/for_each_ast.cpp +++ b/src/ast/for_each_ast.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"for_each_ast.h" +#include "ast/for_each_ast.h" struct ast_counter_proc { unsigned m_num; diff --git a/src/ast/for_each_ast.h b/src/ast/for_each_ast.h index a254ed058..0b70eb1a1 100644 --- a/src/ast/for_each_ast.h +++ b/src/ast/for_each_ast.h @@ -19,9 +19,9 @@ Revision History: #ifndef FOR_EACH_AST_H_ #define FOR_EACH_AST_H_ -#include"ast.h" -#include"trace.h" -#include"map.h" +#include "ast/ast.h" +#include "util/trace.h" +#include "util/map.h" template bool for_each_ast_args(ptr_vector & stack, ast_mark & visited, unsigned num_args, T * const * args) { diff --git a/src/ast/for_each_expr.cpp b/src/ast/for_each_expr.cpp index cca42b01c..d46388801 100644 --- a/src/ast/for_each_expr.cpp +++ b/src/ast/for_each_expr.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"for_each_expr.h" +#include "ast/for_each_expr.h" struct expr_counter_proc { unsigned m_num; diff --git a/src/ast/for_each_expr.h b/src/ast/for_each_expr.h index 3f5dbaac7..50a4089dc 100644 --- a/src/ast/for_each_expr.h +++ b/src/ast/for_each_expr.h @@ -19,8 +19,8 @@ Revision History: #ifndef FOR_EACH_EXPR_H_ #define FOR_EACH_EXPR_H_ -#include"ast.h" -#include"trace.h" +#include "ast/ast.h" +#include "util/trace.h" template void for_each_expr_core(ForEachProc & proc, ExprMark & visited, expr * n) { diff --git a/src/ast/format.cpp b/src/ast/format.cpp index 1a36ca8ae..835892121 100644 --- a/src/ast/format.cpp +++ b/src/ast/format.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"format.h" -#include"recurse_expr_def.h" +#include "ast/format.h" +#include "ast/recurse_expr_def.h" namespace format_ns { diff --git a/src/ast/format.h b/src/ast/format.h index a41ed9bd9..827f9bc1c 100644 --- a/src/ast/format.h +++ b/src/ast/format.h @@ -19,7 +19,7 @@ Revision History: #ifndef FORMAT_H_ #define FORMAT_H_ -#include"ast.h" +#include "ast/ast.h" namespace format_ns { typedef app format; diff --git a/src/ast/fpa/bv2fpa_converter.cpp b/src/ast/fpa/bv2fpa_converter.cpp index c113627f9..7e4f2f133 100644 --- a/src/ast/fpa/bv2fpa_converter.cpp +++ b/src/ast/fpa/bv2fpa_converter.cpp @@ -18,12 +18,12 @@ Notes: --*/ #include -#include"ast_smt2_pp.h" -#include"well_sorted.h" -#include"th_rewriter.h" -#include"fpa_rewriter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/rewriter/fpa_rewriter.h" -#include"bv2fpa_converter.h" +#include "ast/fpa/bv2fpa_converter.h" bv2fpa_converter::bv2fpa_converter(ast_manager & m) : diff --git a/src/ast/fpa/bv2fpa_converter.h b/src/ast/fpa/bv2fpa_converter.h index 5150056c4..943f544ca 100644 --- a/src/ast/fpa/bv2fpa_converter.h +++ b/src/ast/fpa/bv2fpa_converter.h @@ -19,11 +19,11 @@ Notes: #ifndef BV2FPA_CONVERTER_H_ #define BV2FPA_CONVERTER_H_ -#include"fpa_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"th_rewriter.h" -#include"model_core.h" -#include"fpa2bv_converter.h" +#include "ast/fpa_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/th_rewriter.h" +#include "model/model_core.h" +#include "ast/fpa/fpa2bv_converter.h" class bv2fpa_converter { diff --git a/src/ast/fpa/fpa2bv_converter.cpp b/src/ast/fpa/fpa2bv_converter.cpp index 864293380..228795c41 100644 --- a/src/ast/fpa/fpa2bv_converter.cpp +++ b/src/ast/fpa/fpa2bv_converter.cpp @@ -18,12 +18,12 @@ Notes: --*/ #include -#include"ast_smt2_pp.h" -#include"well_sorted.h" -#include"th_rewriter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/th_rewriter.h" -#include"fpa2bv_converter.h" -#include"fpa_rewriter.h" +#include "ast/fpa/fpa2bv_converter.h" +#include "ast/rewriter/fpa_rewriter.h" #define BVULT(X,Y,R) { expr_ref bvult_eq(m), bvult_not(m); m_simp.mk_eq(X, Y, bvult_eq); m_simp.mk_not(bvult_eq, bvult_not); expr_ref t(m); t = m_bv_util.mk_ule(X,Y); m_simp.mk_and(t, bvult_not, R); } diff --git a/src/ast/fpa/fpa2bv_converter.h b/src/ast/fpa/fpa2bv_converter.h index 34417b7fc..19a52dd23 100644 --- a/src/ast/fpa/fpa2bv_converter.h +++ b/src/ast/fpa/fpa2bv_converter.h @@ -19,17 +19,17 @@ Notes: #ifndef FPA2BV_CONVERTER_H_ #define FPA2BV_CONVERTER_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"ref_util.h" -#include"fpa_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"dl_decl_plugin.h" -#include"pb_decl_plugin.h" -#include"seq_decl_plugin.h" -#include"basic_simplifier_plugin.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "util/ref_util.h" +#include "ast/fpa_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/dl_decl_plugin.h" +#include "ast/pb_decl_plugin.h" +#include "ast/seq_decl_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" class fpa2bv_converter { public: diff --git a/src/ast/fpa/fpa2bv_rewriter.cpp b/src/ast/fpa/fpa2bv_rewriter.cpp index 32b62342b..57cd9facc 100644 --- a/src/ast/fpa/fpa2bv_rewriter.cpp +++ b/src/ast/fpa/fpa2bv_rewriter.cpp @@ -18,9 +18,9 @@ Notes: --*/ -#include"rewriter_def.h" -#include"fpa2bv_rewriter.h" -#include"cooperate.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/fpa/fpa2bv_rewriter.h" +#include "util/cooperate.h" #include"fpa2bv_rewriter_params.hpp" diff --git a/src/ast/fpa/fpa2bv_rewriter.h b/src/ast/fpa/fpa2bv_rewriter.h index a130c445b..ab87a3d68 100644 --- a/src/ast/fpa/fpa2bv_rewriter.h +++ b/src/ast/fpa/fpa2bv_rewriter.h @@ -20,9 +20,9 @@ Notes: #ifndef FPA2BV_REWRITER_H_ #define FPA2BV_REWRITER_H_ -#include"rewriter.h" -#include"bv_decl_plugin.h" -#include"fpa2bv_converter.h" +#include "ast/rewriter/rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/fpa/fpa2bv_converter.h" struct fpa2bv_rewriter_cfg : public default_rewriter_cfg { ast_manager & m_manager; diff --git a/src/ast/fpa_decl_plugin.cpp b/src/ast/fpa_decl_plugin.cpp index e039bcbd9..fc69c5f89 100644 --- a/src/ast/fpa_decl_plugin.cpp +++ b/src/ast/fpa_decl_plugin.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"fpa_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" +#include "ast/fpa_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" fpa_decl_plugin::fpa_decl_plugin(): m_values(m_fm), diff --git a/src/ast/fpa_decl_plugin.h b/src/ast/fpa_decl_plugin.h index cf341a07b..0cba3ae62 100644 --- a/src/ast/fpa_decl_plugin.h +++ b/src/ast/fpa_decl_plugin.h @@ -19,11 +19,11 @@ Revision History: #ifndef fpa_decl_plugin_H_ #define fpa_decl_plugin_H_ -#include"ast.h" -#include"id_gen.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"mpf.h" +#include "ast/ast.h" +#include "util/id_gen.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "util/mpf.h" enum fpa_sort_kind { FLOATING_POINT_SORT, diff --git a/src/ast/func_decl_dependencies.cpp b/src/ast/func_decl_dependencies.cpp index d53c2d9b1..a5412f206 100644 --- a/src/ast/func_decl_dependencies.cpp +++ b/src/ast/func_decl_dependencies.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"func_decl_dependencies.h" -#include"for_each_expr.h" -#include"ast_util.h" +#include "ast/func_decl_dependencies.h" +#include "ast/for_each_expr.h" +#include "ast/ast_util.h" struct collect_dependencies_proc { ast_manager & m_manager; diff --git a/src/ast/func_decl_dependencies.h b/src/ast/func_decl_dependencies.h index e354540c2..0a3c1892f 100644 --- a/src/ast/func_decl_dependencies.h +++ b/src/ast/func_decl_dependencies.h @@ -19,8 +19,8 @@ Revision History: #ifndef FUNC_DECL_DEPENDENCIES_H_ #define FUNC_DECL_DEPENDENCIES_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" // Set of dependencies typedef obj_hashtable func_decl_set; diff --git a/src/ast/has_free_vars.cpp b/src/ast/has_free_vars.cpp index ba2c9eeb8..09d6d7740 100644 --- a/src/ast/has_free_vars.cpp +++ b/src/ast/has_free_vars.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"ast.h" -#include"expr_delta_pair.h" -#include"hashtable.h" +#include "ast/ast.h" +#include "ast/expr_delta_pair.h" +#include "util/hashtable.h" class contains_vars { typedef hashtable, default_eq > cache; diff --git a/src/ast/macro_substitution.cpp b/src/ast/macro_substitution.cpp index 9cf337d21..7b4cd6244 100644 --- a/src/ast/macro_substitution.cpp +++ b/src/ast/macro_substitution.cpp @@ -18,8 +18,8 @@ Author: Notes: --*/ -#include"macro_substitution.h" -#include"ref_util.h" +#include "ast/macro_substitution.h" +#include "util/ref_util.h" typedef obj_map func_decl2proof; typedef obj_map func_decl2expr_dependency; diff --git a/src/ast/macro_substitution.h b/src/ast/macro_substitution.h index 356449590..7c65421fd 100644 --- a/src/ast/macro_substitution.h +++ b/src/ast/macro_substitution.h @@ -21,7 +21,7 @@ Notes: #ifndef MACRO_SUBSTITUTION_H_ #define MACRO_SUBSTITUTION_H_ -#include"ast.h" +#include "ast/ast.h" class macro_substitution { ast_manager & m_manager; diff --git a/src/ast/macros/macro_finder.cpp b/src/ast/macros/macro_finder.cpp index ee211c44f..285c0e5fb 100644 --- a/src/ast/macros/macro_finder.cpp +++ b/src/ast/macros/macro_finder.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include"macro_finder.h" -#include"occurs.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "ast/macros/macro_finder.h" +#include "ast/occurs.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" bool macro_finder::is_macro(expr * n, app_ref & head, expr_ref & def) { if (!is_quantifier(n) || !to_quantifier(n)->is_forall()) diff --git a/src/ast/macros/macro_finder.h b/src/ast/macros/macro_finder.h index 04ec11939..7f1b27f0e 100644 --- a/src/ast/macros/macro_finder.h +++ b/src/ast/macros/macro_finder.h @@ -19,8 +19,8 @@ Revision History: #ifndef MACRO_FINDER_H_ #define MACRO_FINDER_H_ -#include"macro_manager.h" -#include"arith_simplifier_plugin.h" +#include "ast/macros/macro_manager.h" +#include "ast/simplifier/arith_simplifier_plugin.h" bool is_macro_head(expr * n, unsigned num_decls); diff --git a/src/ast/macros/macro_manager.cpp b/src/ast/macros/macro_manager.cpp index b17e1ce28..bd330a2de 100644 --- a/src/ast/macros/macro_manager.cpp +++ b/src/ast/macros/macro_manager.cpp @@ -19,11 +19,11 @@ Revision History: Leonardo de Moura (leonardo) 2010-12-15: Moved dependency management to func_decl_dependencies.h --*/ -#include"macro_manager.h" -#include"for_each_expr.h" -#include"var_subst.h" -#include"ast_pp.h" -#include"recurse_expr_def.h" +#include "ast/macros/macro_manager.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "ast/recurse_expr_def.h" macro_manager::macro_manager(ast_manager & m, simplifier & s): m_manager(m), diff --git a/src/ast/macros/macro_manager.h b/src/ast/macros/macro_manager.h index bc015de41..a0a42b790 100644 --- a/src/ast/macros/macro_manager.h +++ b/src/ast/macros/macro_manager.h @@ -19,12 +19,12 @@ Revision History: #ifndef MACRO_MANAGER_H_ #define MACRO_MANAGER_H_ -#include"ast_util.h" -#include"obj_hashtable.h" -#include"simplifier.h" -#include"recurse_expr.h" -#include"func_decl_dependencies.h" -#include"macro_util.h" +#include "ast/ast_util.h" +#include "util/obj_hashtable.h" +#include "ast/simplifier/simplifier.h" +#include "ast/recurse_expr.h" +#include "ast/func_decl_dependencies.h" +#include "ast/macros/macro_util.h" /** \brief Macros are universally quantified formulas of the form: diff --git a/src/ast/macros/macro_util.cpp b/src/ast/macros/macro_util.cpp index fce6f1b28..35f2fbcfb 100644 --- a/src/ast/macros/macro_util.cpp +++ b/src/ast/macros/macro_util.cpp @@ -17,17 +17,17 @@ Author: Revision History: --*/ -#include"macro_util.h" -#include"occurs.h" -#include"ast_util.h" -#include"arith_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" -#include"var_subst.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"for_each_expr.h" -#include"well_sorted.h" -#include"bool_rewriter.h" +#include "ast/macros/macro_util.h" +#include "ast/occurs.h" +#include "ast/ast_util.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/for_each_expr.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/bool_rewriter.h" macro_util::macro_util(ast_manager & m, simplifier & s): m_manager(m), diff --git a/src/ast/macros/macro_util.h b/src/ast/macros/macro_util.h index 8aa8e550e..d76f2f0d3 100644 --- a/src/ast/macros/macro_util.h +++ b/src/ast/macros/macro_util.h @@ -20,9 +20,9 @@ Revision History: #ifndef MACRO_UTIL_H_ #define MACRO_UTIL_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"simplifier.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "ast/simplifier/simplifier.h" class poly_simplifier_plugin; class arith_simplifier_plugin; diff --git a/src/ast/macros/quasi_macros.cpp b/src/ast/macros/quasi_macros.cpp index b26b7faba..b39adde03 100644 --- a/src/ast/macros/quasi_macros.cpp +++ b/src/ast/macros/quasi_macros.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"quasi_macros.h" -#include"for_each_expr.h" -#include"ast_pp.h" -#include"uint_set.h" -#include"var_subst.h" +#include "ast/macros/quasi_macros.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" +#include "util/uint_set.h" +#include "ast/rewriter/var_subst.h" quasi_macros::quasi_macros(ast_manager & m, macro_manager & mm, simplifier & s) : m_manager(m), diff --git a/src/ast/macros/quasi_macros.h b/src/ast/macros/quasi_macros.h index 5640fad30..3a9b6074e 100644 --- a/src/ast/macros/quasi_macros.h +++ b/src/ast/macros/quasi_macros.h @@ -20,9 +20,9 @@ Revision History: #define QUASI_MACROS_H_ #include -#include"macro_manager.h" -#include"basic_simplifier_plugin.h" -#include"simplifier.h" +#include "ast/macros/macro_manager.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/simplifier.h" /** \brief Finds quasi macros and applies them. diff --git a/src/ast/normal_forms/defined_names.cpp b/src/ast/normal_forms/defined_names.cpp index 1ac2049ac..12085b992 100644 --- a/src/ast/normal_forms/defined_names.cpp +++ b/src/ast/normal_forms/defined_names.cpp @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include"defined_names.h" -#include"obj_hashtable.h" -#include"used_vars.h" -#include"var_subst.h" -#include"ast_smt2_pp.h" -#include"ast_pp.h" +#include "ast/normal_forms/defined_names.h" +#include "util/obj_hashtable.h" +#include "ast/used_vars.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_pp.h" struct defined_names::impl { typedef obj_map expr2name; diff --git a/src/ast/normal_forms/defined_names.h b/src/ast/normal_forms/defined_names.h index 69e365f3d..764822f66 100644 --- a/src/ast/normal_forms/defined_names.h +++ b/src/ast/normal_forms/defined_names.h @@ -20,7 +20,7 @@ Revision History: #ifndef DEFINED_NAMES_H_ #define DEFINED_NAMES_H_ -#include"ast.h" +#include "ast/ast.h" /** \brief Mapping from expressions to skolem functions that are used to name them. diff --git a/src/ast/normal_forms/name_exprs.cpp b/src/ast/normal_forms/name_exprs.cpp index 5a2e1659d..7cc2719c9 100644 --- a/src/ast/normal_forms/name_exprs.cpp +++ b/src/ast/normal_forms/name_exprs.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"name_exprs.h" -#include"rewriter_def.h" -#include"ast_smt2_pp.h" +#include "ast/normal_forms/name_exprs.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_smt2_pp.h" class name_exprs_core : public name_exprs { struct cfg : public default_rewriter_cfg { diff --git a/src/ast/normal_forms/name_exprs.h b/src/ast/normal_forms/name_exprs.h index 9403f3d12..9f896190f 100644 --- a/src/ast/normal_forms/name_exprs.h +++ b/src/ast/normal_forms/name_exprs.h @@ -19,8 +19,8 @@ Notes: #ifndef NAME_EXPRS_H_ #define NAME_EXPRS_H_ -#include"ast.h" -#include"defined_names.h" +#include "ast/ast.h" +#include "ast/normal_forms/defined_names.h" class expr_predicate { public: diff --git a/src/ast/normal_forms/nnf.cpp b/src/ast/normal_forms/nnf.cpp index e15e26bf2..cca9c2c93 100644 --- a/src/ast/normal_forms/nnf.cpp +++ b/src/ast/normal_forms/nnf.cpp @@ -17,18 +17,18 @@ Notes: Major revision on 2011-10-06 --*/ -#include"nnf.h" +#include "ast/normal_forms/nnf.h" #include"nnf_params.hpp" -#include"warning.h" -#include"used_vars.h" -#include"well_sorted.h" -#include"var_subst.h" +#include "util/warning.h" +#include "ast/used_vars.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/var_subst.h" -#include"name_exprs.h" -#include"act_cache.h" -#include"cooperate.h" +#include "ast/normal_forms/name_exprs.h" +#include "ast/act_cache.h" +#include "util/cooperate.h" -#include"ast_smt2_pp.h" +#include "ast/ast_smt2_pp.h" /** \brief NNF translation mode. The cheapest mode is NNF_SKOLEM, and diff --git a/src/ast/normal_forms/nnf.h b/src/ast/normal_forms/nnf.h index 60d50e3b6..073cc91e4 100644 --- a/src/ast/normal_forms/nnf.h +++ b/src/ast/normal_forms/nnf.h @@ -20,9 +20,9 @@ Notes: #ifndef NNF_H_ #define NNF_H_ -#include"ast.h" -#include"params.h" -#include"defined_names.h" +#include "ast/ast.h" +#include "util/params.h" +#include "ast/normal_forms/defined_names.h" class nnf { struct imp; diff --git a/src/ast/normal_forms/pull_quant.cpp b/src/ast/normal_forms/pull_quant.cpp index 74c7cafde..56bada7c1 100644 --- a/src/ast/normal_forms/pull_quant.cpp +++ b/src/ast/normal_forms/pull_quant.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"pull_quant.h" -#include"var_subst.h" -#include"rewriter_def.h" -#include"ast_pp.h" +#include "ast/normal_forms/pull_quant.h" +#include "ast/rewriter/var_subst.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" struct pull_quant::imp { diff --git a/src/ast/normal_forms/pull_quant.h b/src/ast/normal_forms/pull_quant.h index dcdae056b..aadbad651 100644 --- a/src/ast/normal_forms/pull_quant.h +++ b/src/ast/normal_forms/pull_quant.h @@ -19,7 +19,7 @@ Notes: #ifndef PULL_QUANT_H_ #define PULL_QUANT_H_ -#include"ast.h" +#include "ast/ast.h" /** \brief Pull nested quantifiers in a formula. diff --git a/src/ast/num_occurs.cpp b/src/ast/num_occurs.cpp index c5d50475e..2448dd081 100644 --- a/src/ast/num_occurs.cpp +++ b/src/ast/num_occurs.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"num_occurs.h" +#include "ast/num_occurs.h" void num_occurs::process(expr * t, expr_fast_mark1 & visited) { ptr_buffer stack; diff --git a/src/ast/num_occurs.h b/src/ast/num_occurs.h index 3c51dbe5c..92215f440 100644 --- a/src/ast/num_occurs.h +++ b/src/ast/num_occurs.h @@ -19,8 +19,8 @@ Revision History: #ifndef NUM_OCCURS_H_ #define NUM_OCCURS_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" /** \brief Functor for computing the number of occurrences of each sub-expression in a expression F. diff --git a/src/ast/occurs.cpp b/src/ast/occurs.cpp index 9d2360351..c76e73748 100644 --- a/src/ast/occurs.cpp +++ b/src/ast/occurs.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"occurs.h" +#include "ast/occurs.h" -#include"for_each_expr.h" +#include "ast/for_each_expr.h" // ----------------------------------- // diff --git a/src/ast/pattern/expr_pattern_match.cpp b/src/ast/pattern/expr_pattern_match.cpp index e18831650..770832d1f 100644 --- a/src/ast/pattern/expr_pattern_match.cpp +++ b/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) { diff --git a/src/ast/pattern/expr_pattern_match.h b/src/ast/pattern/expr_pattern_match.h index 245edd877..6d9d47e1e 100644 --- a/src/ast/pattern/expr_pattern_match.h +++ b/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 { diff --git a/src/ast/pattern/pattern_inference.cpp b/src/ast/pattern/pattern_inference.cpp index 64ec064a8..25feaed26 100644 --- a/src/ast/pattern/pattern_inference.cpp +++ b/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";); diff --git a/src/ast/pattern/pattern_inference.h b/src/ast/pattern/pattern_inference.h index d4ab708e9..a138d1033 100644 --- a/src/ast/pattern/pattern_inference.h +++ b/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 diff --git a/src/ast/pattern/pattern_inference_params.cpp b/src/ast/pattern/pattern_inference_params.cpp index b36d372f5..8d978e09c 100644 --- a/src/ast/pattern/pattern_inference_params.cpp +++ b/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) { diff --git a/src/ast/pattern/pattern_inference_params.h b/src/ast/pattern/pattern_inference_params.h index 0dc413399..fde64a8eb 100644 --- a/src/ast/pattern/pattern_inference_params.h +++ b/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 diff --git a/src/ast/pb_decl_plugin.cpp b/src/ast/pb_decl_plugin.cpp index 28f889739..06c6aac48 100644 --- a/src/ast/pb_decl_plugin.cpp +++ b/src/ast/pb_decl_plugin.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include "pb_decl_plugin.h" -#include "ast_util.h" +#include "ast/pb_decl_plugin.h" +#include "ast/ast_util.h" pb_decl_plugin::pb_decl_plugin(): m_at_most_sym("at-most"), diff --git a/src/ast/pb_decl_plugin.h b/src/ast/pb_decl_plugin.h index 36b1a9512..7fdb592aa 100644 --- a/src/ast/pb_decl_plugin.h +++ b/src/ast/pb_decl_plugin.h @@ -27,7 +27,7 @@ hence: #ifndef PB_DECL_PLUGIN_H_ #define PB_DECL_PLUGIN_H_ -#include"ast.h" +#include "ast/ast.h" enum pb_op_kind { OP_AT_MOST_K, // at most K Booleans are true. diff --git a/src/ast/pp.cpp b/src/ast/pp.cpp index 13247127d..522d3eca6 100644 --- a/src/ast/pp.cpp +++ b/src/ast/pp.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"pp.h" +#include "ast/pp.h" #include"pp_params.hpp" using namespace format_ns; diff --git a/src/ast/pp.h b/src/ast/pp.h index bfb907552..e702d298a 100644 --- a/src/ast/pp.h +++ b/src/ast/pp.h @@ -19,8 +19,8 @@ Revision History: #ifndef PP_H_ #define PP_H_ -#include"format.h" -#include"params.h" +#include "ast/format.h" +#include "util/params.h" void pp(std::ostream & out, format_ns::format * f, ast_manager & m, params_ref const & p = params_ref()); diff --git a/src/ast/proof_checker/proof_checker.cpp b/src/ast/proof_checker/proof_checker.cpp index 45223cdb7..70eee5920 100644 --- a/src/ast/proof_checker/proof_checker.cpp +++ b/src/ast/proof_checker/proof_checker.cpp @@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "proof_checker.h" -#include "ast_ll_pp.h" -#include "ast_pp.h" +#include "ast/proof_checker/proof_checker.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" // include "spc_decl_plugin.h" -#include "ast_smt_pp.h" -#include "arith_decl_plugin.h" -#include "th_rewriter.h" -#include "var_subst.h" +#include "ast/ast_smt_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/rewriter/var_subst.h" #define IS_EQUIV(_e_) (m.is_eq(_e_) || m.is_iff(_e_)) diff --git a/src/ast/proof_checker/proof_checker.h b/src/ast/proof_checker/proof_checker.h index 5e1a170ee..ce2684c51 100644 --- a/src/ast/proof_checker/proof_checker.h +++ b/src/ast/proof_checker/proof_checker.h @@ -19,8 +19,8 @@ Revision History: #ifndef PROOF_CHECKER_H_ #define PROOF_CHECKER_H_ -#include "ast.h" -#include "map.h" +#include "ast/ast.h" +#include "util/map.h" class proof_checker { ast_manager& m; diff --git a/src/ast/recurse_expr.h b/src/ast/recurse_expr.h index 46375d955..866e39d3f 100644 --- a/src/ast/recurse_expr.h +++ b/src/ast/recurse_expr.h @@ -19,8 +19,8 @@ Revision History: #ifndef RECURSE_EXPR_H_ #define RECURSE_EXPR_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" template class recurse_expr : public Visitor { diff --git a/src/ast/recurse_expr_def.h b/src/ast/recurse_expr_def.h index 5149baa93..d4f608c5a 100644 --- a/src/ast/recurse_expr_def.h +++ b/src/ast/recurse_expr_def.h @@ -19,7 +19,7 @@ Revision History: #ifndef RECURSE_EXPR_DEF_H_ #define RECURSE_EXPR_DEF_H_ -#include"recurse_expr.h" +#include "ast/recurse_expr.h" template inline void recurse_expr::visit(expr * n, bool & visited) { diff --git a/src/ast/reg_decl_plugins.cpp b/src/ast/reg_decl_plugins.cpp index b4ff63ede..985ecee9e 100644 --- a/src/ast/reg_decl_plugins.cpp +++ b/src/ast/reg_decl_plugins.cpp @@ -17,15 +17,15 @@ Author: Revision History: --*/ -#include"ast.h" -#include"arith_decl_plugin.h" -#include"array_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"dl_decl_plugin.h" -#include"seq_decl_plugin.h" -#include"pb_decl_plugin.h" -#include"fpa_decl_plugin.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/dl_decl_plugin.h" +#include "ast/seq_decl_plugin.h" +#include "ast/pb_decl_plugin.h" +#include "ast/fpa_decl_plugin.h" void reg_decl_plugins(ast_manager & m) { if (!m.get_plugin(m.mk_family_id(symbol("arith")))) { diff --git a/src/ast/rewriter/arith_rewriter.cpp b/src/ast/rewriter/arith_rewriter.cpp index 258c28369..4b91ad789 100644 --- a/src/ast/rewriter/arith_rewriter.cpp +++ b/src/ast/rewriter/arith_rewriter.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"arith_rewriter.h" +#include "ast/rewriter/arith_rewriter.h" #include"arith_rewriter_params.hpp" -#include"poly_rewriter_def.h" -#include"algebraic_numbers.h" -#include"ast_pp.h" +#include "ast/rewriter/poly_rewriter_def.h" +#include "math/polynomial/algebraic_numbers.h" +#include "ast/ast_pp.h" void arith_rewriter::updt_local_params(params_ref const & _p) { arith_rewriter_params p(_p); diff --git a/src/ast/rewriter/arith_rewriter.h b/src/ast/rewriter/arith_rewriter.h index 68a60e1f0..de849dbd7 100644 --- a/src/ast/rewriter/arith_rewriter.h +++ b/src/ast/rewriter/arith_rewriter.h @@ -19,8 +19,8 @@ Notes: #ifndef ARITH_REWRITER_H_ #define ARITH_REWRITER_H_ -#include"poly_rewriter.h" -#include"arith_decl_plugin.h" +#include "ast/rewriter/poly_rewriter.h" +#include "ast/arith_decl_plugin.h" class arith_rewriter_core { protected: diff --git a/src/ast/rewriter/array_rewriter.cpp b/src/ast/rewriter/array_rewriter.cpp index 6f6b5b62e..85f639bc9 100644 --- a/src/ast/rewriter/array_rewriter.cpp +++ b/src/ast/rewriter/array_rewriter.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"array_rewriter.h" +#include "ast/rewriter/array_rewriter.h" #include"array_rewriter_params.hpp" -#include"ast_lt.h" -#include"ast_pp.h" +#include "ast/ast_lt.h" +#include "ast/ast_pp.h" void array_rewriter::updt_params(params_ref const & _p) { array_rewriter_params p(_p); diff --git a/src/ast/rewriter/array_rewriter.h b/src/ast/rewriter/array_rewriter.h index 4ff48d496..90b3b6f34 100644 --- a/src/ast/rewriter/array_rewriter.h +++ b/src/ast/rewriter/array_rewriter.h @@ -19,10 +19,10 @@ Notes: #ifndef ARRAY_REWRITER_H_ #define ARRAY_REWRITER_H_ -#include"array_decl_plugin.h" -#include"rewriter_types.h" -#include"lbool.h" -#include"params.h" +#include "ast/array_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/lbool.h" +#include "util/params.h" /** \brief Cheap rewrite rules for Arrays diff --git a/src/ast/rewriter/ast_counter.cpp b/src/ast/rewriter/ast_counter.cpp index f2c8cabf7..bc11e4fb0 100644 --- a/src/ast/rewriter/ast_counter.cpp +++ b/src/ast/rewriter/ast_counter.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include "ast_counter.h" +#include "ast/rewriter/ast_counter.h" void counter::update(unsigned el, int delta) { int & counter = get(el); diff --git a/src/ast/rewriter/ast_counter.h b/src/ast/rewriter/ast_counter.h index 4509d2549..a2d1c239b 100644 --- a/src/ast/rewriter/ast_counter.h +++ b/src/ast/rewriter/ast_counter.h @@ -24,10 +24,10 @@ Revision History: #ifndef AST_COUNTER_H_ #define AST_COUNTER_H_ -#include "ast.h" -#include "map.h" -#include "uint_set.h" -#include "var_subst.h" +#include "ast/ast.h" +#include "util/map.h" +#include "util/uint_set.h" +#include "ast/rewriter/var_subst.h" class counter { protected: diff --git a/src/ast/rewriter/bit_blaster/bit_blaster.cpp b/src/ast/rewriter/bit_blaster/bit_blaster.cpp index 1055ceb58..6632fe811 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster.cpp +++ b/src/ast/rewriter/bit_blaster/bit_blaster.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"bit_blaster.h" -#include"bit_blaster_tpl_def.h" -#include"ast_pp.h" -#include"bv_decl_plugin.h" +#include "ast/rewriter/bit_blaster/bit_blaster.h" +#include "ast/rewriter/bit_blaster/bit_blaster_tpl_def.h" +#include "ast/ast_pp.h" +#include "ast/bv_decl_plugin.h" bit_blaster_cfg::bit_blaster_cfg(bv_util & u, bit_blaster_params const & p, bool_rewriter& rw): m_util(u), diff --git a/src/ast/rewriter/bit_blaster/bit_blaster.h b/src/ast/rewriter/bit_blaster/bit_blaster.h index 6221eeaf9..ffaa69e12 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster.h +++ b/src/ast/rewriter/bit_blaster/bit_blaster.h @@ -19,11 +19,11 @@ Revision History: #ifndef BIT_BLASTER_H_ #define BIT_BLASTER_H_ -#include"bool_rewriter.h" -#include"bit_blaster_params.h" -#include"bit_blaster_tpl.h" -#include"bv_decl_plugin.h" -#include"rational.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/bit_blaster/bit_blaster_params.h" +#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h" +#include "ast/bv_decl_plugin.h" +#include "util/rational.h" class bit_blaster_cfg { public: diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp index 68f2a2b8e..c47dacc96 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp +++ b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp @@ -16,13 +16,13 @@ Author: Notes: --*/ -#include"bit_blaster_rewriter.h" -#include"bv_decl_plugin.h" -#include"bit_blaster_tpl_def.h" -#include"rewriter_def.h" -#include"bool_rewriter.h" -#include"ref_util.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/bit_blaster/bit_blaster_tpl_def.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/bool_rewriter.h" +#include "util/ref_util.h" +#include "ast/ast_smt2_pp.h" struct blaster_cfg { typedef rational numeral; diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h index 8db328ec8..6ffed00ae 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h +++ b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef BIT_BLASTER_REWRITER_H_ #define BIT_BLASTER_REWRITER_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"params.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "util/params.h" class bit_blaster_rewriter { struct imp; diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h b/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h index b812de941..8407b0791 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h +++ b/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h @@ -19,7 +19,7 @@ Revision History: #ifndef BIT_BLASTER_TPL_H_ #define BIT_BLASTER_TPL_H_ -#include"rational.h" +#include "util/rational.h" template class bit_blaster_tpl : public Cfg { diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h index 15b87697f..cd66a5124 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h +++ b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include"bit_blaster_tpl.h" -#include"rational.h" -#include"ast_pp.h" -#include"cooperate.h" -#include"common_msgs.h" -#include"rewriter_types.h" +#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h" +#include "util/rational.h" +#include "ast/ast_pp.h" +#include "util/cooperate.h" +#include "util/common_msgs.h" +#include "ast/rewriter/rewriter_types.h" template diff --git a/src/ast/rewriter/bool_rewriter.cpp b/src/ast/rewriter/bool_rewriter.cpp index f6597fbc5..511e7607d 100644 --- a/src/ast/rewriter/bool_rewriter.cpp +++ b/src/ast/rewriter/bool_rewriter.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"bool_rewriter.h" +#include "ast/rewriter/bool_rewriter.h" #include"bool_rewriter_params.hpp" -#include"rewriter_def.h" +#include "ast/rewriter/rewriter_def.h" void bool_rewriter::updt_params(params_ref const & _p) { bool_rewriter_params p(_p); diff --git a/src/ast/rewriter/bool_rewriter.h b/src/ast/rewriter/bool_rewriter.h index b1d2dec53..be9799c13 100644 --- a/src/ast/rewriter/bool_rewriter.h +++ b/src/ast/rewriter/bool_rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef BOOL_REWRITER_H_ #define BOOL_REWRITER_H_ -#include"ast.h" -#include"rewriter.h" -#include"params.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "util/params.h" /** \brief Apply basic Boolean rewriting operations. diff --git a/src/ast/rewriter/bv_bounds.cpp b/src/ast/rewriter/bv_bounds.cpp index 76cdfbdbe..fd263efb2 100644 --- a/src/ast/rewriter/bv_bounds.cpp +++ b/src/ast/rewriter/bv_bounds.cpp @@ -14,8 +14,8 @@ Revision History: --*/ -#include"bv_bounds.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/bv_bounds.h" +#include "ast/ast_smt2_pp.h" bv_bounds::~bv_bounds() { reset(); diff --git a/src/ast/rewriter/bv_bounds.h b/src/ast/rewriter/bv_bounds.h index eeefc2c11..3d8ec9ebb 100644 --- a/src/ast/rewriter/bv_bounds.h +++ b/src/ast/rewriter/bv_bounds.h @@ -19,9 +19,9 @@ --*/ #ifndef BV_BOUNDS_H_23754 #define BV_BOUNDS_H_23754 -#include"ast.h" -#include"bv_decl_plugin.h" -#include"rewriter_types.h" +#include "ast/ast.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" /* \brief A class to analyze constraints on bit vectors. diff --git a/src/ast/rewriter/bv_rewriter.cpp b/src/ast/rewriter/bv_rewriter.cpp index 0246f2b16..d176c8008 100644 --- a/src/ast/rewriter/bv_rewriter.cpp +++ b/src/ast/rewriter/bv_rewriter.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"bv_rewriter.h" +#include "ast/rewriter/bv_rewriter.h" #include"bv_rewriter_params.hpp" -#include"poly_rewriter_def.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/poly_rewriter_def.h" +#include "ast/ast_smt2_pp.h" void bv_rewriter::updt_local_params(params_ref const & _p) { @@ -2314,7 +2314,7 @@ void bv_rewriter::mk_t1_add_t2_eq_c(expr * t1, expr * t2, expr * c, expr_ref & r result = m().mk_eq(t1, m_util.mk_bv_sub(c, t2)); } -#include "ast_pp.h" +#include "ast/ast_pp.h" bool bv_rewriter::isolate_term(expr* lhs, expr* rhs, expr_ref& result) { if (!m_util.is_numeral(lhs) || !is_add(rhs)) { diff --git a/src/ast/rewriter/bv_rewriter.h b/src/ast/rewriter/bv_rewriter.h index b5482e5fa..1109251e0 100644 --- a/src/ast/rewriter/bv_rewriter.h +++ b/src/ast/rewriter/bv_rewriter.h @@ -19,11 +19,11 @@ Notes: #ifndef BV_REWRITER_H_ #define BV_REWRITER_H_ -#include"poly_rewriter.h" -#include"bv_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"mk_extract_proc.h" -#include"bv_trailing.h" +#include "ast/rewriter/poly_rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/mk_extract_proc.h" +#include "ast/rewriter/bv_trailing.h" class bv_rewriter_core { protected: diff --git a/src/ast/rewriter/bv_trailing.cpp b/src/ast/rewriter/bv_trailing.cpp index f0b96a91f..5cdf27574 100644 --- a/src/ast/rewriter/bv_trailing.cpp +++ b/src/ast/rewriter/bv_trailing.cpp @@ -14,9 +14,9 @@ Revision History: --*/ -#include"bv_trailing.h" -#include"bv_decl_plugin.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/bv_trailing.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_smt2_pp.h" // The analyzer gives up analysis after going TRAILING_DEPTH deep. // This number shouldn't be too big. diff --git a/src/ast/rewriter/bv_trailing.h b/src/ast/rewriter/bv_trailing.h index 862a1bea6..3ad46cb5d 100644 --- a/src/ast/rewriter/bv_trailing.h +++ b/src/ast/rewriter/bv_trailing.h @@ -18,9 +18,9 @@ --*/ #ifndef BV_TRAILING_H_ #define BV_TRAILING_H_ -#include"ast.h" -#include"rewriter_types.h" -#include"mk_extract_proc.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter_types.h" +#include "ast/rewriter/mk_extract_proc.h" class bv_trailing { public: bv_trailing(mk_extract_proc& ep); diff --git a/src/ast/rewriter/datatype_rewriter.cpp b/src/ast/rewriter/datatype_rewriter.cpp index be198c3d9..d38c9e476 100644 --- a/src/ast/rewriter/datatype_rewriter.cpp +++ b/src/ast/rewriter/datatype_rewriter.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"datatype_rewriter.h" +#include "ast/rewriter/datatype_rewriter.h" br_status datatype_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result) { SASSERT(f->get_family_id() == get_fid()); diff --git a/src/ast/rewriter/datatype_rewriter.h b/src/ast/rewriter/datatype_rewriter.h index 43fbc46d9..8aae29b3a 100644 --- a/src/ast/rewriter/datatype_rewriter.h +++ b/src/ast/rewriter/datatype_rewriter.h @@ -19,8 +19,8 @@ Notes: #ifndef DATATYPE_REWRITER_H_ #define DATATYPE_REWRITER_H_ -#include"datatype_decl_plugin.h" -#include"rewriter_types.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" class datatype_rewriter { datatype_util m_util; diff --git a/src/ast/rewriter/der.cpp b/src/ast/rewriter/der.cpp index aef5d8ddd..56f895b8a 100644 --- a/src/ast/rewriter/der.cpp +++ b/src/ast/rewriter/der.cpp @@ -18,13 +18,13 @@ Revision History: Christoph Wintersteiger, 2010-03-30: Added Destr. Multi-Equality Resolution --*/ -#include"der.h" -#include"occurs.h" -#include"for_each_expr.h" -#include"rewriter_def.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/der.h" +#include "ast/occurs.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" static bool is_var(expr * e, unsigned num_decls) { return is_var(e) && to_var(e)->get_idx() < num_decls; diff --git a/src/ast/rewriter/der.h b/src/ast/rewriter/der.h index 9de028be8..47e57c4fb 100644 --- a/src/ast/rewriter/der.h +++ b/src/ast/rewriter/der.h @@ -21,8 +21,8 @@ Revision History: #ifndef DER_H_ #define DER_H_ -#include"ast.h" -#include"var_subst.h" +#include "ast/ast.h" +#include "ast/rewriter/var_subst.h" /* New DER: the class DER (above) eliminates variables one by one. diff --git a/src/ast/rewriter/distribute_forall.cpp b/src/ast/rewriter/distribute_forall.cpp index c64c0f089..77db3bc28 100644 --- a/src/ast/rewriter/distribute_forall.cpp +++ b/src/ast/rewriter/distribute_forall.cpp @@ -18,11 +18,11 @@ Revision History: Christoph Wintersteiger 2010-04-06: Added implementation. --*/ -#include"var_subst.h" -#include"ast_ll_pp.h" -#include"ast_util.h" -#include"distribute_forall.h" -#include"bool_rewriter.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_util.h" +#include "ast/rewriter/distribute_forall.h" +#include "ast/rewriter/bool_rewriter.h" distribute_forall::distribute_forall(ast_manager & m) : m_manager(m), diff --git a/src/ast/rewriter/distribute_forall.h b/src/ast/rewriter/distribute_forall.h index b2c239239..ab0976945 100644 --- a/src/ast/rewriter/distribute_forall.h +++ b/src/ast/rewriter/distribute_forall.h @@ -21,8 +21,8 @@ Revision History: #ifndef DISTRIBUTE_FORALL_H_ #define DISTRIBUTE_FORALL_H_ -#include"ast.h" -#include"act_cache.h" +#include "ast/ast.h" +#include "ast/act_cache.h" /** \brief Apply the following transformation diff --git a/src/ast/rewriter/dl_rewriter.cpp b/src/ast/rewriter/dl_rewriter.cpp index ddae6c9eb..74ea7814e 100644 --- a/src/ast/rewriter/dl_rewriter.cpp +++ b/src/ast/rewriter/dl_rewriter.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"dl_rewriter.h" +#include "ast/rewriter/dl_rewriter.h" br_status dl_rewriter::mk_app_core( func_decl * f, unsigned num_args, expr* const* args, expr_ref& result) { diff --git a/src/ast/rewriter/dl_rewriter.h b/src/ast/rewriter/dl_rewriter.h index ecb3f0944..dca2f26dd 100644 --- a/src/ast/rewriter/dl_rewriter.h +++ b/src/ast/rewriter/dl_rewriter.h @@ -19,8 +19,8 @@ Notes: #ifndef DL_REWRITER_H_ #define DL_REWRITER_H_ -#include"dl_decl_plugin.h" -#include"rewriter_types.h" +#include "ast/dl_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" class dl_rewriter { datalog::dl_decl_util m_util; diff --git a/src/ast/rewriter/enum2bv_rewriter.cpp b/src/ast/rewriter/enum2bv_rewriter.cpp index 08e7b0f69..eb6b195f0 100644 --- a/src/ast/rewriter/enum2bv_rewriter.cpp +++ b/src/ast/rewriter/enum2bv_rewriter.cpp @@ -17,11 +17,11 @@ Notes: --*/ -#include"rewriter.h" -#include"rewriter_def.h" -#include"enum2bv_rewriter.h" -#include"ast_util.h" -#include"ast_pp.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/enum2bv_rewriter.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" struct enum2bv_rewriter::imp { ast_manager& m; diff --git a/src/ast/rewriter/enum2bv_rewriter.h b/src/ast/rewriter/enum2bv_rewriter.h index 1b2c6160f..934271071 100644 --- a/src/ast/rewriter/enum2bv_rewriter.h +++ b/src/ast/rewriter/enum2bv_rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef ENUM_REWRITER_H_ #define ENUM_REWRITER_H_ -#include"datatype_decl_plugin.h" -#include"rewriter_types.h" -#include"expr_functors.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" +#include "ast/expr_functors.h" class enum2bv_rewriter { struct imp; diff --git a/src/ast/rewriter/expr_replacer.cpp b/src/ast/rewriter/expr_replacer.cpp index 3552c7d49..70e12dced 100644 --- a/src/ast/rewriter/expr_replacer.cpp +++ b/src/ast/rewriter/expr_replacer.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"expr_replacer.h" -#include"rewriter_def.h" -#include"th_rewriter.h" -#include"cooperate.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/th_rewriter.h" +#include "util/cooperate.h" void expr_replacer::operator()(expr * t, expr_ref & result, proof_ref & result_pr) { expr_dependency_ref result_dep(m()); diff --git a/src/ast/rewriter/expr_replacer.h b/src/ast/rewriter/expr_replacer.h index 2e445eadc..811cd1f23 100644 --- a/src/ast/rewriter/expr_replacer.h +++ b/src/ast/rewriter/expr_replacer.h @@ -19,9 +19,9 @@ Notes: #ifndef EXPR_REPLACER_H_ #define EXPR_REPLACER_H_ -#include"ast.h" -#include"expr_substitution.h" -#include"params.h" +#include "ast/ast.h" +#include "ast/expr_substitution.h" +#include "util/params.h" /** \brief Abstract interface for functors that replace constants with expressions. diff --git a/src/ast/rewriter/expr_safe_replace.cpp b/src/ast/rewriter/expr_safe_replace.cpp index 2655ac00d..31453691e 100644 --- a/src/ast/rewriter/expr_safe_replace.cpp +++ b/src/ast/rewriter/expr_safe_replace.cpp @@ -18,9 +18,9 @@ Revision History: --*/ -#include "expr_safe_replace.h" -#include "rewriter.h" -#include "ast_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/rewriter/rewriter.h" +#include "ast/ast_pp.h" void expr_safe_replace::insert(expr* src, expr* dst) { diff --git a/src/ast/rewriter/expr_safe_replace.h b/src/ast/rewriter/expr_safe_replace.h index 84a74ccaa..fb66661af 100644 --- a/src/ast/rewriter/expr_safe_replace.h +++ b/src/ast/rewriter/expr_safe_replace.h @@ -22,7 +22,7 @@ Revision History: #ifndef EXPR_SAFE_REPLACE_H_ #define EXPR_SAFE_REPLACE_H_ -#include "ast.h" +#include "ast/ast.h" class expr_safe_replace { ast_manager& m; diff --git a/src/ast/rewriter/factor_rewriter.cpp b/src/ast/rewriter/factor_rewriter.cpp index 9e988caf7..abcdabc9c 100644 --- a/src/ast/rewriter/factor_rewriter.cpp +++ b/src/ast/rewriter/factor_rewriter.cpp @@ -18,9 +18,9 @@ Notes: --*/ -#include"factor_rewriter.h" -#include"ast_pp.h" -#include"rewriter_def.h" +#include "ast/rewriter/factor_rewriter.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/rewriter_def.h" factor_rewriter::factor_rewriter(ast_manager & m): m_manager(m), m_arith(m), m_factors(m) { } diff --git a/src/ast/rewriter/factor_rewriter.h b/src/ast/rewriter/factor_rewriter.h index 389eacd87..aae9b05b3 100644 --- a/src/ast/rewriter/factor_rewriter.h +++ b/src/ast/rewriter/factor_rewriter.h @@ -20,9 +20,9 @@ Notes: #ifndef FACTOR_REWRITER_H_ #define FACTOR_REWRITER_H_ -#include"ast.h" -#include"rewriter.h" -#include"arith_decl_plugin.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "ast/arith_decl_plugin.h" class factor_rewriter { typedef obj_map powers_t; diff --git a/src/ast/rewriter/fpa_rewriter.cpp b/src/ast/rewriter/fpa_rewriter.cpp index 26487c5a4..f82d6df3e 100644 --- a/src/ast/rewriter/fpa_rewriter.cpp +++ b/src/ast/rewriter/fpa_rewriter.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"fpa_rewriter.h" +#include "ast/rewriter/fpa_rewriter.h" #include"fpa_rewriter_params.hpp" -#include"ast_smt2_pp.h" +#include "ast/ast_smt2_pp.h" fpa_rewriter::fpa_rewriter(ast_manager & m, params_ref const & p) : m_util(m), diff --git a/src/ast/rewriter/fpa_rewriter.h b/src/ast/rewriter/fpa_rewriter.h index 0d9c6a380..45710122c 100644 --- a/src/ast/rewriter/fpa_rewriter.h +++ b/src/ast/rewriter/fpa_rewriter.h @@ -19,11 +19,11 @@ Notes: #ifndef FLOAT_REWRITER_H_ #define FLOAT_REWRITER_H_ -#include"ast.h" -#include"rewriter.h" -#include"params.h" -#include"fpa_decl_plugin.h" -#include"mpf.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "util/params.h" +#include "ast/fpa_decl_plugin.h" +#include "util/mpf.h" class fpa_rewriter { fpa_util m_util; diff --git a/src/ast/rewriter/label_rewriter.cpp b/src/ast/rewriter/label_rewriter.cpp index 3017f413c..8adefb896 100644 --- a/src/ast/rewriter/label_rewriter.cpp +++ b/src/ast/rewriter/label_rewriter.cpp @@ -17,9 +17,9 @@ Notes: --*/ -#include"rewriter.h" -#include"rewriter_def.h" -#include"label_rewriter.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/label_rewriter.h" label_rewriter::label_rewriter(ast_manager & m) : diff --git a/src/ast/rewriter/label_rewriter.h b/src/ast/rewriter/label_rewriter.h index 6400aa442..f2f578fbb 100644 --- a/src/ast/rewriter/label_rewriter.h +++ b/src/ast/rewriter/label_rewriter.h @@ -19,8 +19,8 @@ Notes: #ifndef LABEL_REWRITER_H_ #define LABEL_REWRITER_H_ -#include"ast.h" -#include"rewriter_types.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter_types.h" class label_rewriter : public default_rewriter_cfg { diff --git a/src/ast/rewriter/mk_extract_proc.cpp b/src/ast/rewriter/mk_extract_proc.cpp index 5f470acd3..da22c3b80 100644 --- a/src/ast/rewriter/mk_extract_proc.cpp +++ b/src/ast/rewriter/mk_extract_proc.cpp @@ -14,7 +14,7 @@ Revision History: --*/ -#include"mk_extract_proc.h" +#include "ast/rewriter/mk_extract_proc.h" mk_extract_proc::mk_extract_proc(bv_util & u): m_util(u), m_high(0), diff --git a/src/ast/rewriter/mk_extract_proc.h b/src/ast/rewriter/mk_extract_proc.h index 2b242d0f5..4e7b1d1b7 100644 --- a/src/ast/rewriter/mk_extract_proc.h +++ b/src/ast/rewriter/mk_extract_proc.h @@ -16,8 +16,8 @@ --*/ #ifndef MK_EXTRACT_PROC_H_ #define MK_EXTRACT_PROC_H_ -#include"ast.h" -#include"bv_decl_plugin.h" +#include "ast/ast.h" +#include "ast/bv_decl_plugin.h" class mk_extract_proc { bv_util & m_util; unsigned m_high; diff --git a/src/ast/rewriter/mk_simplified_app.cpp b/src/ast/rewriter/mk_simplified_app.cpp index 45245ce1b..eac26ddc3 100644 --- a/src/ast/rewriter/mk_simplified_app.cpp +++ b/src/ast/rewriter/mk_simplified_app.cpp @@ -16,13 +16,13 @@ Author: Notes: --*/ -#include"mk_simplified_app.h" -#include"bool_rewriter.h" -#include"arith_rewriter.h" -#include"bv_rewriter.h" -#include"datatype_rewriter.h" -#include"array_rewriter.h" -#include"fpa_rewriter.h" +#include "ast/rewriter/mk_simplified_app.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/rewriter/bv_rewriter.h" +#include "ast/rewriter/datatype_rewriter.h" +#include "ast/rewriter/array_rewriter.h" +#include "ast/rewriter/fpa_rewriter.h" struct mk_simplified_app::imp { ast_manager & m; diff --git a/src/ast/rewriter/mk_simplified_app.h b/src/ast/rewriter/mk_simplified_app.h index 40e6f993d..d979637d2 100644 --- a/src/ast/rewriter/mk_simplified_app.h +++ b/src/ast/rewriter/mk_simplified_app.h @@ -19,9 +19,9 @@ Notes: #ifndef MK_SIMPLIFIED_APP_H_ #define MK_SIMPLIFIED_APP_H_ -#include"ast.h" -#include"params.h" -#include"rewriter_types.h" +#include "ast/ast.h" +#include "util/params.h" +#include "ast/rewriter/rewriter_types.h" class mk_simplified_app { struct imp; diff --git a/src/ast/rewriter/pb2bv_rewriter.cpp b/src/ast/rewriter/pb2bv_rewriter.cpp index 37c87cd5b..39d6e2143 100644 --- a/src/ast/rewriter/pb2bv_rewriter.cpp +++ b/src/ast/rewriter/pb2bv_rewriter.cpp @@ -17,14 +17,14 @@ Notes: --*/ -#include"rewriter.h" -#include"rewriter_def.h" -#include"statistics.h" -#include"pb2bv_rewriter.h" -#include"sorting_network.h" -#include"ast_util.h" -#include"ast_pp.h" -#include"lbool.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/statistics.h" +#include "ast/rewriter/pb2bv_rewriter.h" +#include "util/sorting_network.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" +#include "util/lbool.h" struct pb2bv_rewriter::imp { diff --git a/src/ast/rewriter/pb2bv_rewriter.h b/src/ast/rewriter/pb2bv_rewriter.h index 47d8361cb..a4176922a 100644 --- a/src/ast/rewriter/pb2bv_rewriter.h +++ b/src/ast/rewriter/pb2bv_rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef PB2BV_REWRITER_H_ #define PB2BV_REWRITER_H_ -#include"pb_decl_plugin.h" -#include"rewriter_types.h" -#include"expr_functors.h" +#include "ast/pb_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" +#include "ast/expr_functors.h" class pb2bv_rewriter { struct imp; diff --git a/src/ast/rewriter/pb_rewriter.cpp b/src/ast/rewriter/pb_rewriter.cpp index b14d350b1..5660f9d65 100644 --- a/src/ast/rewriter/pb_rewriter.cpp +++ b/src/ast/rewriter/pb_rewriter.cpp @@ -17,11 +17,11 @@ Notes: --*/ -#include "pb_rewriter.h" -#include "pb_rewriter_def.h" -#include "ast_pp.h" -#include "ast_util.h" -#include "ast_smt_pp.h" +#include "ast/rewriter/pb_rewriter.h" +#include "ast/rewriter/pb_rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "ast/ast_smt_pp.h" class pb_ast_rewriter_util { diff --git a/src/ast/rewriter/pb_rewriter.h b/src/ast/rewriter/pb_rewriter.h index ba98d774e..f52aea12b 100644 --- a/src/ast/rewriter/pb_rewriter.h +++ b/src/ast/rewriter/pb_rewriter.h @@ -19,10 +19,10 @@ Notes: #ifndef PB_REWRITER_H_ #define PB_REWRITER_H_ -#include"pb_decl_plugin.h" -#include"rewriter_types.h" -#include"params.h" -#include"lbool.h" +#include "ast/pb_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/params.h" +#include "util/lbool.h" template diff --git a/src/ast/rewriter/pb_rewriter_def.h b/src/ast/rewriter/pb_rewriter_def.h index a713a05a7..aa2c2a61f 100644 --- a/src/ast/rewriter/pb_rewriter_def.h +++ b/src/ast/rewriter/pb_rewriter_def.h @@ -19,7 +19,7 @@ Notes: #ifndef PB_REWRITER_DEF_H_ #define PB_REWRITER_DEF_H_ -#include"pb_rewriter.h" +#include "ast/rewriter/pb_rewriter.h" template diff --git a/src/ast/rewriter/poly_rewriter.h b/src/ast/rewriter/poly_rewriter.h index ea0b9e85a..5d38e4b10 100644 --- a/src/ast/rewriter/poly_rewriter.h +++ b/src/ast/rewriter/poly_rewriter.h @@ -19,10 +19,10 @@ Notes: #ifndef POLY_REWRITER_H_ #define POLY_REWRITER_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"rewriter_types.h" -#include"params.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/params.h" template class poly_rewriter : public Config { diff --git a/src/ast/rewriter/poly_rewriter_def.h b/src/ast/rewriter/poly_rewriter_def.h index 962c9660e..81d3aec9f 100644 --- a/src/ast/rewriter/poly_rewriter_def.h +++ b/src/ast/rewriter/poly_rewriter_def.h @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"poly_rewriter.h" +#include "ast/rewriter/poly_rewriter.h" #include"poly_rewriter_params.hpp" -#include"ast_lt.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "ast/ast_lt.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" template diff --git a/src/ast/rewriter/quant_hoist.cpp b/src/ast/rewriter/quant_hoist.cpp index e59a079e7..2059139e4 100644 --- a/src/ast/rewriter/quant_hoist.cpp +++ b/src/ast/rewriter/quant_hoist.cpp @@ -19,14 +19,14 @@ Revision History: --*/ -#include "quant_hoist.h" -#include "expr_functors.h" -#include "ast_smt_pp.h" -#include "bool_rewriter.h" -#include "var_subst.h" -#include "ast_pp.h" -#include "ast_counter.h" -#include "expr_safe_replace.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/expr_functors.h" +#include "ast/ast_smt_pp.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/ast_counter.h" +#include "ast/rewriter/expr_safe_replace.h" // // Bring quantifiers of common type into prenex form. diff --git a/src/ast/rewriter/quant_hoist.h b/src/ast/rewriter/quant_hoist.h index 90e6ec7ad..c94e0fde3 100644 --- a/src/ast/rewriter/quant_hoist.h +++ b/src/ast/rewriter/quant_hoist.h @@ -22,7 +22,7 @@ Revision History: #ifndef QUANTIFIER_HOISTER_H_ #define QUANTIFIER_HOISTER_H_ -#include "ast.h" +#include "ast/ast.h" class quantifier_hoister { class impl; diff --git a/src/ast/rewriter/rewriter.cpp b/src/ast/rewriter/rewriter.cpp index c7b110dff..36ad2dec4 100644 --- a/src/ast/rewriter/rewriter.cpp +++ b/src/ast/rewriter/rewriter.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"rewriter_def.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" void rewriter_core::init_cache_stack() { SASSERT(m_cache_stack.empty()); diff --git a/src/ast/rewriter/rewriter.h b/src/ast/rewriter/rewriter.h index 2b4f4b14e..17742f670 100644 --- a/src/ast/rewriter/rewriter.h +++ b/src/ast/rewriter/rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef REWRITER_H_ #define REWRITER_H_ -#include"ast.h" -#include"rewriter_types.h" -#include"act_cache.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter_types.h" +#include "ast/act_cache.h" /** \brief Common infrastructure for AST rewriters. diff --git a/src/ast/rewriter/rewriter_def.h b/src/ast/rewriter/rewriter_def.h index 76f149df7..163118d17 100644 --- a/src/ast/rewriter/rewriter_def.h +++ b/src/ast/rewriter/rewriter_def.h @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"rewriter.h" -#include"ast_smt2_pp.h" +#include "ast/rewriter/rewriter.h" +#include "ast/ast_smt2_pp.h" template template diff --git a/src/ast/rewriter/rewriter_types.h b/src/ast/rewriter/rewriter_types.h index f5947eb92..094357fed 100644 --- a/src/ast/rewriter/rewriter_types.h +++ b/src/ast/rewriter/rewriter_types.h @@ -19,8 +19,8 @@ Notes: #ifndef REWRITER_TYPES_H_ #define REWRITER_TYPES_H_ -#include"z3_exception.h" -#include"common_msgs.h" +#include "util/z3_exception.h" +#include "util/common_msgs.h" /** \brief Builtin rewrite result status diff --git a/src/ast/rewriter/seq_rewriter.cpp b/src/ast/rewriter/seq_rewriter.cpp index ce707b108..90792ad64 100644 --- a/src/ast/rewriter/seq_rewriter.cpp +++ b/src/ast/rewriter/seq_rewriter.cpp @@ -18,15 +18,15 @@ Notes: --*/ -#include"seq_rewriter.h" -#include"arith_decl_plugin.h" -#include"ast_pp.h" -#include"ast_util.h" -#include"uint_set.h" -#include"automaton.h" -#include"well_sorted.h" -#include"var_subst.h" -#include"symbolic_automata_def.h" +#include "ast/rewriter/seq_rewriter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "util/uint_set.h" +#include "math/automata/automaton.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/var_subst.h" +#include "math/automata/symbolic_automata_def.h" expr_ref sym_expr::accept(expr* e) { diff --git a/src/ast/rewriter/seq_rewriter.h b/src/ast/rewriter/seq_rewriter.h index 210b2d72c..add941ddb 100644 --- a/src/ast/rewriter/seq_rewriter.h +++ b/src/ast/rewriter/seq_rewriter.h @@ -19,13 +19,13 @@ Notes: #ifndef SEQ_REWRITER_H_ #define SEQ_REWRITER_H_ -#include"seq_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"rewriter_types.h" -#include"params.h" -#include"lbool.h" -#include"automaton.h" -#include"symbolic_automata.h" +#include "ast/seq_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/params.h" +#include "util/lbool.h" +#include "math/automata/automaton.h" +#include "math/automata/symbolic_automata.h" class sym_expr { enum ty { diff --git a/src/ast/rewriter/th_rewriter.cpp b/src/ast/rewriter/th_rewriter.cpp index b561e02fc..240b43b30 100644 --- a/src/ast/rewriter/th_rewriter.cpp +++ b/src/ast/rewriter/th_rewriter.cpp @@ -16,24 +16,24 @@ Author: Notes: --*/ -#include"th_rewriter.h" +#include "ast/rewriter/th_rewriter.h" #include"rewriter_params.hpp" -#include"bool_rewriter.h" -#include"arith_rewriter.h" -#include"bv_rewriter.h" -#include"datatype_rewriter.h" -#include"array_rewriter.h" -#include"fpa_rewriter.h" -#include"dl_rewriter.h" -#include"pb_rewriter.h" -#include"seq_rewriter.h" -#include"rewriter_def.h" -#include"expr_substitution.h" -#include"ast_smt2_pp.h" -#include"cooperate.h" -#include"var_subst.h" -#include"ast_util.h" -#include"well_sorted.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/rewriter/bv_rewriter.h" +#include "ast/rewriter/datatype_rewriter.h" +#include "ast/rewriter/array_rewriter.h" +#include "ast/rewriter/fpa_rewriter.h" +#include "ast/rewriter/dl_rewriter.h" +#include "ast/rewriter/pb_rewriter.h" +#include "ast/rewriter/seq_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/expr_substitution.h" +#include "ast/ast_smt2_pp.h" +#include "util/cooperate.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_util.h" +#include "ast/well_sorted.h" struct th_rewriter_cfg : public default_rewriter_cfg { bool_rewriter m_b_rw; diff --git a/src/ast/rewriter/th_rewriter.h b/src/ast/rewriter/th_rewriter.h index 6aa4bb3da..db495e8da 100644 --- a/src/ast/rewriter/th_rewriter.h +++ b/src/ast/rewriter/th_rewriter.h @@ -19,9 +19,9 @@ Notes: #ifndef TH_REWRITER_H_ #define TH_REWRITER_H_ -#include"ast.h" -#include"rewriter_types.h" -#include"params.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/params.h" class expr_substitution; diff --git a/src/ast/rewriter/var_subst.cpp b/src/ast/rewriter/var_subst.cpp index fd290c8fe..756e62a5f 100644 --- a/src/ast/rewriter/var_subst.cpp +++ b/src/ast/rewriter/var_subst.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"var_subst.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"ast_smt2_pp.h" -#include"well_sorted.h" -#include"for_each_expr.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/well_sorted.h" +#include "ast/for_each_expr.h" void var_subst::operator()(expr * n, unsigned num_args, expr * const * args, expr_ref & result) { SASSERT(is_well_sorted(result.m(), n)); diff --git a/src/ast/rewriter/var_subst.h b/src/ast/rewriter/var_subst.h index 21aa58399..b6a25cfdb 100644 --- a/src/ast/rewriter/var_subst.h +++ b/src/ast/rewriter/var_subst.h @@ -19,9 +19,9 @@ Notes: #ifndef VAR_SUBST_H_ #define VAR_SUBST_H_ -#include"rewriter.h" -#include"used_vars.h" -#include"params.h" +#include "ast/rewriter/rewriter.h" +#include "ast/used_vars.h" +#include "util/params.h" /** \brief Alias for var_shifter class. diff --git a/src/ast/scoped_proof.h b/src/ast/scoped_proof.h index 2bbba5122..0a650ceb7 100644 --- a/src/ast/scoped_proof.h +++ b/src/ast/scoped_proof.h @@ -19,7 +19,7 @@ Revision History: #ifndef SCOPED_PROOF_H_ #define SCOPED_PROOF_H_ -#include "ast.h" +#include "ast/ast.h" class scoped_proof_mode { ast_manager& m; diff --git a/src/ast/seq_decl_plugin.cpp b/src/ast/seq_decl_plugin.cpp index 750fe0f9d..7cc0ccb12 100644 --- a/src/ast/seq_decl_plugin.cpp +++ b/src/ast/seq_decl_plugin.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include "seq_decl_plugin.h" -#include "arith_decl_plugin.h" -#include "array_decl_plugin.h" -#include "ast_pp.h" +#include "ast/seq_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/ast_pp.h" #include static bool is_hex_digit(char ch, unsigned& d) { diff --git a/src/ast/seq_decl_plugin.h b/src/ast/seq_decl_plugin.h index e2722aa9a..17fa50423 100644 --- a/src/ast/seq_decl_plugin.h +++ b/src/ast/seq_decl_plugin.h @@ -21,8 +21,8 @@ Revision History: #ifndef SEQ_DECL_PLUGIN_H_ #define SEQ_DECL_PLUGIN_H_ -#include "ast.h" -#include "bv_decl_plugin.h" +#include "ast/ast.h" +#include "ast/bv_decl_plugin.h" enum seq_sort_kind { diff --git a/src/ast/shared_occs.cpp b/src/ast/shared_occs.cpp index 5f624e1ac..89867e8c1 100644 --- a/src/ast/shared_occs.cpp +++ b/src/ast/shared_occs.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"shared_occs.h" -#include"ast_smt2_pp.h" -#include"ref_util.h" +#include "ast/shared_occs.h" +#include "ast/ast_smt2_pp.h" +#include "util/ref_util.h" inline void shared_occs::insert(expr * t) { obj_hashtable::entry * dummy; diff --git a/src/ast/shared_occs.h b/src/ast/shared_occs.h index 1566098aa..40921922a 100644 --- a/src/ast/shared_occs.h +++ b/src/ast/shared_occs.h @@ -19,8 +19,8 @@ Revision History: #ifndef SHARED_OCCS_H_ #define SHARED_OCCS_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" class shared_occs_mark { ptr_buffer m_to_unmark; diff --git a/src/ast/simplifier/arith_simplifier_params.cpp b/src/ast/simplifier/arith_simplifier_params.cpp index 8584cdae0..efe21c43d 100644 --- a/src/ast/simplifier/arith_simplifier_params.cpp +++ b/src/ast/simplifier/arith_simplifier_params.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"arith_simplifier_params.h" +#include "ast/simplifier/arith_simplifier_params.h" #include"arith_simplifier_params_helper.hpp" void arith_simplifier_params::updt_params(params_ref const & _p) { diff --git a/src/ast/simplifier/arith_simplifier_params.h b/src/ast/simplifier/arith_simplifier_params.h index 6186ee4a2..8a4150099 100644 --- a/src/ast/simplifier/arith_simplifier_params.h +++ b/src/ast/simplifier/arith_simplifier_params.h @@ -19,7 +19,7 @@ Revision History: #ifndef ARITH_SIMPLIFIER_PARAMS_H_ #define ARITH_SIMPLIFIER_PARAMS_H_ -#include"params.h" +#include "util/params.h" struct arith_simplifier_params { bool m_arith_expand_eqs; diff --git a/src/ast/simplifier/arith_simplifier_plugin.cpp b/src/ast/simplifier/arith_simplifier_plugin.cpp index ef320578a..8410ce143 100644 --- a/src/ast/simplifier/arith_simplifier_plugin.cpp +++ b/src/ast/simplifier/arith_simplifier_plugin.cpp @@ -14,10 +14,10 @@ Author: Leonardo (leonardo) 2008-01-08 --*/ -#include"arith_simplifier_plugin.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" arith_simplifier_plugin::~arith_simplifier_plugin() { } diff --git a/src/ast/simplifier/arith_simplifier_plugin.h b/src/ast/simplifier/arith_simplifier_plugin.h index e6181e211..21ab8f6b4 100644 --- a/src/ast/simplifier/arith_simplifier_plugin.h +++ b/src/ast/simplifier/arith_simplifier_plugin.h @@ -17,10 +17,10 @@ Author: #ifndef ARITH_SIMPLIFIER_PLUGIN_H_ #define ARITH_SIMPLIFIER_PLUGIN_H_ -#include"basic_simplifier_plugin.h" -#include"poly_simplifier_plugin.h" -#include"arith_decl_plugin.h" -#include"arith_simplifier_params.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/poly_simplifier_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/simplifier/arith_simplifier_params.h" /** \brief Simplifier for the arith family. diff --git a/src/ast/simplifier/array_simplifier_params.cpp b/src/ast/simplifier/array_simplifier_params.cpp index bffff44d9..94a858ac6 100644 --- a/src/ast/simplifier/array_simplifier_params.cpp +++ b/src/ast/simplifier/array_simplifier_params.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"array_simplifier_params.h" +#include "ast/simplifier/array_simplifier_params.h" #include"array_simplifier_params_helper.hpp" void array_simplifier_params::updt_params(params_ref const & _p) { diff --git a/src/ast/simplifier/array_simplifier_params.h b/src/ast/simplifier/array_simplifier_params.h index c62b990b9..559e3de54 100644 --- a/src/ast/simplifier/array_simplifier_params.h +++ b/src/ast/simplifier/array_simplifier_params.h @@ -19,7 +19,7 @@ Revision History: #ifndef ARRAY_SIMPLIFIER_PARAMS_H_ #define ARRAY_SIMPLIFIER_PARAMS_H_ -#include"params.h" +#include "util/params.h" struct array_simplifier_params { bool m_array_canonize_simplify; diff --git a/src/ast/simplifier/array_simplifier_plugin.cpp b/src/ast/simplifier/array_simplifier_plugin.cpp index 85ef2e92f..754daab69 100644 --- a/src/ast/simplifier/array_simplifier_plugin.cpp +++ b/src/ast/simplifier/array_simplifier_plugin.cpp @@ -24,9 +24,9 @@ Notes TODO: --*/ -#include "array_simplifier_plugin.h" -#include "ast_ll_pp.h" -#include "ast_pp.h" +#include "ast/simplifier/array_simplifier_plugin.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" array_simplifier_plugin::array_simplifier_plugin( diff --git a/src/ast/simplifier/array_simplifier_plugin.h b/src/ast/simplifier/array_simplifier_plugin.h index 34db04b67..62eb5e5ff 100644 --- a/src/ast/simplifier/array_simplifier_plugin.h +++ b/src/ast/simplifier/array_simplifier_plugin.h @@ -19,15 +19,15 @@ Revision History: #ifndef ARRAY_SIMPLIFIER_PLUGIN_H_ #define ARRAY_SIMPLIFIER_PLUGIN_H_ -#include"ast.h" -#include"map.h" -#include"array_decl_plugin.h" -#include"simplifier_plugin.h" -#include"basic_simplifier_plugin.h" -#include"array_simplifier_params.h" -#include"simplifier.h" -#include"obj_hashtable.h" -#include"lbool.h" +#include "ast/ast.h" +#include "util/map.h" +#include "ast/array_decl_plugin.h" +#include "ast/simplifier/simplifier_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/array_simplifier_params.h" +#include "ast/simplifier/simplifier.h" +#include "util/obj_hashtable.h" +#include "util/lbool.h" class array_simplifier_plugin : public simplifier_plugin { diff --git a/src/ast/simplifier/base_simplifier.h b/src/ast/simplifier/base_simplifier.h index cb630cb7f..73a04d605 100644 --- a/src/ast/simplifier/base_simplifier.h +++ b/src/ast/simplifier/base_simplifier.h @@ -19,8 +19,8 @@ Notes: #ifndef BASE_SIMPLIFIER_H_ #define BASE_SIMPLIFIER_H_ -#include"expr_map.h" -#include"ast_pp.h" +#include "ast/expr_map.h" +#include "ast/ast_pp.h" /** \brief Implements basic functionality used by expression simplifiers. diff --git a/src/ast/simplifier/basic_simplifier_plugin.cpp b/src/ast/simplifier/basic_simplifier_plugin.cpp index 6c713bb10..25998d832 100644 --- a/src/ast/simplifier/basic_simplifier_plugin.cpp +++ b/src/ast/simplifier/basic_simplifier_plugin.cpp @@ -14,9 +14,9 @@ Author: Leonardo (leonardo) 2008-01-07 --*/ -#include"basic_simplifier_plugin.h" -#include"ast_ll_pp.h" -#include"bool_rewriter.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/ast_ll_pp.h" +#include "ast/rewriter/bool_rewriter.h" basic_simplifier_plugin::basic_simplifier_plugin(ast_manager & m): simplifier_plugin(symbol("basic"), m), diff --git a/src/ast/simplifier/basic_simplifier_plugin.h b/src/ast/simplifier/basic_simplifier_plugin.h index d39d6badb..f28a19b56 100644 --- a/src/ast/simplifier/basic_simplifier_plugin.h +++ b/src/ast/simplifier/basic_simplifier_plugin.h @@ -17,7 +17,7 @@ Author: #ifndef BASIC_SIMPLIFIER_PLUGIN_H_ #define BASIC_SIMPLIFIER_PLUGIN_H_ -#include"simplifier_plugin.h" +#include "ast/simplifier/simplifier_plugin.h" class bool_rewriter; diff --git a/src/ast/simplifier/bit2int.cpp b/src/ast/simplifier/bit2int.cpp index 08c3da774..6f7dd1cbe 100644 --- a/src/ast/simplifier/bit2int.cpp +++ b/src/ast/simplifier/bit2int.cpp @@ -19,10 +19,10 @@ Revision History: --*/ -#include "bit2int.h" -#include "ast_pp.h" -#include "ast_ll_pp.h" -#include "for_each_ast.h" +#include "ast/simplifier/bit2int.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/for_each_ast.h" #define CHECK(_x_) if (!(_x_)) { UNREACHABLE(); } diff --git a/src/ast/simplifier/bit2int.h b/src/ast/simplifier/bit2int.h index 6277a83ae..84ae1f4a4 100644 --- a/src/ast/simplifier/bit2int.h +++ b/src/ast/simplifier/bit2int.h @@ -19,11 +19,11 @@ Revision History: #ifndef BIT2INT_H_ #define BIT2INT_H_ -#include"bv_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"act_cache.h" -#include"basic_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/act_cache.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" class bit2int { diff --git a/src/ast/simplifier/bv_elim.cpp b/src/ast/simplifier/bv_elim.cpp index 8dc2671ca..1875e333b 100644 --- a/src/ast/simplifier/bv_elim.cpp +++ b/src/ast/simplifier/bv_elim.cpp @@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "bv_elim.h" -#include "bv_decl_plugin.h" -#include "var_subst.h" +#include "ast/simplifier/bv_elim.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/var_subst.h" #include void bv_elim::elim(quantifier* q, quantifier_ref& r) { diff --git a/src/ast/simplifier/bv_elim.h b/src/ast/simplifier/bv_elim.h index 3bebcfef1..2b8a4778a 100644 --- a/src/ast/simplifier/bv_elim.h +++ b/src/ast/simplifier/bv_elim.h @@ -20,8 +20,8 @@ Revision History: #ifndef BV_ELIM_H_ #define BV_ELIM_H_ -#include "ast.h" -#include "simplifier.h" +#include "ast/ast.h" +#include "ast/simplifier/simplifier.h" class bv_elim { ast_manager& m_manager; diff --git a/src/ast/simplifier/bv_simplifier_params.cpp b/src/ast/simplifier/bv_simplifier_params.cpp index 1ed263aa6..2639b230c 100644 --- a/src/ast/simplifier/bv_simplifier_params.cpp +++ b/src/ast/simplifier/bv_simplifier_params.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"bv_simplifier_params.h" +#include "ast/simplifier/bv_simplifier_params.h" #include"bv_simplifier_params_helper.hpp" #include"bv_rewriter_params.hpp" diff --git a/src/ast/simplifier/bv_simplifier_params.h b/src/ast/simplifier/bv_simplifier_params.h index dafa99065..8c0792203 100644 --- a/src/ast/simplifier/bv_simplifier_params.h +++ b/src/ast/simplifier/bv_simplifier_params.h @@ -19,7 +19,7 @@ Revision History: #ifndef BV_SIMPLIFIER_PARAMS_H_ #define BV_SIMPLIFIER_PARAMS_H_ -#include"params.h" +#include "util/params.h" struct bv_simplifier_params { bool m_hi_div0; //!< if true, uses the hardware interpretation for div0, mod0, ... if false, div0, mod0, ... are considered uninterpreted. diff --git a/src/ast/simplifier/bv_simplifier_plugin.cpp b/src/ast/simplifier/bv_simplifier_plugin.cpp index a72e7e117..c23d2e748 100644 --- a/src/ast/simplifier/bv_simplifier_plugin.cpp +++ b/src/ast/simplifier/bv_simplifier_plugin.cpp @@ -15,12 +15,12 @@ Author: Nikolaj Bjorner (nbjorner) 2008-01-05 --*/ -#include"bv_simplifier_plugin.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"arith_decl_plugin.h" -#include"obj_hashtable.h" -#include"ast_util.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "util/obj_hashtable.h" +#include "ast/ast_util.h" bv_simplifier_plugin::~bv_simplifier_plugin() { flush_caches(); diff --git a/src/ast/simplifier/bv_simplifier_plugin.h b/src/ast/simplifier/bv_simplifier_plugin.h index 484edca95..7208b6dc8 100644 --- a/src/ast/simplifier/bv_simplifier_plugin.h +++ b/src/ast/simplifier/bv_simplifier_plugin.h @@ -17,12 +17,12 @@ Author: #ifndef BV_SIMPLIFIER_PLUGIN_H_ #define BV_SIMPLIFIER_PLUGIN_H_ -#include"basic_simplifier_plugin.h" -#include"poly_simplifier_plugin.h" -#include"bv_decl_plugin.h" -#include"map.h" -#include"bv_simplifier_params.h" -#include"arith_decl_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/poly_simplifier_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "util/map.h" +#include "ast/simplifier/bv_simplifier_params.h" +#include "ast/arith_decl_plugin.h" /** \brief Simplifier for the bv family. diff --git a/src/ast/simplifier/datatype_simplifier_plugin.cpp b/src/ast/simplifier/datatype_simplifier_plugin.cpp index b434a8bd0..b665ed101 100644 --- a/src/ast/simplifier/datatype_simplifier_plugin.cpp +++ b/src/ast/simplifier/datatype_simplifier_plugin.cpp @@ -15,7 +15,7 @@ Author: --*/ -#include"datatype_simplifier_plugin.h" +#include "ast/simplifier/datatype_simplifier_plugin.h" datatype_simplifier_plugin::datatype_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b): simplifier_plugin(symbol("datatype"), m), diff --git a/src/ast/simplifier/datatype_simplifier_plugin.h b/src/ast/simplifier/datatype_simplifier_plugin.h index b675bf92e..e976beba7 100644 --- a/src/ast/simplifier/datatype_simplifier_plugin.h +++ b/src/ast/simplifier/datatype_simplifier_plugin.h @@ -17,8 +17,8 @@ Author: #ifndef DATATYPE_SIMPLIFIER_PLUGIN_H_ #define DATATYPE_SIMPLIFIER_PLUGIN_H_ -#include"basic_simplifier_plugin.h" -#include"datatype_decl_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/datatype_decl_plugin.h" /** \brief Simplifier for the arith family. diff --git a/src/ast/simplifier/elim_bounds.cpp b/src/ast/simplifier/elim_bounds.cpp index 7a40b8602..738fc3012 100644 --- a/src/ast/simplifier/elim_bounds.cpp +++ b/src/ast/simplifier/elim_bounds.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"elim_bounds.h" -#include"used_vars.h" -#include"obj_hashtable.h" -#include"var_subst.h" -#include"ast_pp.h" +#include "ast/simplifier/elim_bounds.h" +#include "ast/used_vars.h" +#include "util/obj_hashtable.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" elim_bounds::elim_bounds(ast_manager & m): m_manager(m), diff --git a/src/ast/simplifier/elim_bounds.h b/src/ast/simplifier/elim_bounds.h index f8276c150..d4da953a8 100644 --- a/src/ast/simplifier/elim_bounds.h +++ b/src/ast/simplifier/elim_bounds.h @@ -19,9 +19,9 @@ Revision History: #ifndef ELIM_BOUNDS_H_ #define ELIM_BOUNDS_H_ -#include"ast.h" -#include"arith_decl_plugin.h" -#include"simplifier.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" +#include "ast/simplifier/simplifier.h" /** \brief Functor for eliminating irrelevant bounds in quantified formulas. diff --git a/src/ast/simplifier/fpa_simplifier_plugin.cpp b/src/ast/simplifier/fpa_simplifier_plugin.cpp index 5775f1af0..2d333c872 100644 --- a/src/ast/simplifier/fpa_simplifier_plugin.cpp +++ b/src/ast/simplifier/fpa_simplifier_plugin.cpp @@ -14,7 +14,7 @@ Author: Christoph (cwinter) 2015-01-14 --*/ -#include"fpa_simplifier_plugin.h" +#include "ast/simplifier/fpa_simplifier_plugin.h" fpa_simplifier_plugin::fpa_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b) : simplifier_plugin(symbol("fpa"), m), diff --git a/src/ast/simplifier/fpa_simplifier_plugin.h b/src/ast/simplifier/fpa_simplifier_plugin.h index 0ee8debf2..8c9f8de4e 100644 --- a/src/ast/simplifier/fpa_simplifier_plugin.h +++ b/src/ast/simplifier/fpa_simplifier_plugin.h @@ -17,9 +17,9 @@ Author: #ifndef FPA_SIMPLIFIER_PLUGIN_H_ #define FPA_SIMPLIFIER_PLUGIN_H_ -#include"basic_simplifier_plugin.h" -#include"fpa_decl_plugin.h" -#include"fpa_rewriter.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/fpa_decl_plugin.h" +#include "ast/rewriter/fpa_rewriter.h" class fpa_simplifier_plugin : public simplifier_plugin { fpa_util m_util; diff --git a/src/ast/simplifier/inj_axiom.cpp b/src/ast/simplifier/inj_axiom.cpp index 5925e23ac..2aa828ffa 100644 --- a/src/ast/simplifier/inj_axiom.cpp +++ b/src/ast/simplifier/inj_axiom.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"inj_axiom.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"has_free_vars.h" -#include"well_sorted.h" +#include "ast/simplifier/inj_axiom.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/has_free_vars.h" +#include "ast/well_sorted.h" /** \brief Little HACK for simplifying injectivity axioms diff --git a/src/ast/simplifier/inj_axiom.h b/src/ast/simplifier/inj_axiom.h index da441c15b..a6df16515 100644 --- a/src/ast/simplifier/inj_axiom.h +++ b/src/ast/simplifier/inj_axiom.h @@ -19,7 +19,7 @@ Revision History: #ifndef INJ_AXIOM_H_ #define INJ_AXIOM_H_ -#include"ast.h" +#include "ast/ast.h" bool simplify_inj_axiom(ast_manager & m, quantifier * q, expr_ref & result); diff --git a/src/ast/simplifier/maximise_ac_sharing.cpp b/src/ast/simplifier/maximise_ac_sharing.cpp index d5cf69a72..93e5a43f0 100644 --- a/src/ast/simplifier/maximise_ac_sharing.cpp +++ b/src/ast/simplifier/maximise_ac_sharing.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include"maximise_ac_sharing.h" -#include"ast_pp.h" -#include"basic_simplifier_plugin.h" +#include "ast/simplifier/maximise_ac_sharing.h" +#include "ast/ast_pp.h" +#include "ast/simplifier/basic_simplifier_plugin.h" maximise_ac_sharing::ac_plugin::ac_plugin(symbol const & fname, ast_manager & m, maximise_ac_sharing & owner): simplifier_plugin(fname, m), diff --git a/src/ast/simplifier/maximise_ac_sharing.h b/src/ast/simplifier/maximise_ac_sharing.h index bd369387c..cf488e20d 100644 --- a/src/ast/simplifier/maximise_ac_sharing.h +++ b/src/ast/simplifier/maximise_ac_sharing.h @@ -19,10 +19,10 @@ Revision History: #ifndef MAXIMISE_AC_SHARING_H_ #define MAXIMISE_AC_SHARING_H_ -#include"simplifier.h" -#include"hashtable.h" -#include"bv_decl_plugin.h" -#include"region.h" +#include "ast/simplifier/simplifier.h" +#include "util/hashtable.h" +#include "ast/bv_decl_plugin.h" +#include "util/region.h" /** \brief Functor used to maximise the amount of shared terms in an expression. diff --git a/src/ast/simplifier/poly_simplifier_plugin.cpp b/src/ast/simplifier/poly_simplifier_plugin.cpp index e5e74ca56..88637d694 100644 --- a/src/ast/simplifier/poly_simplifier_plugin.cpp +++ b/src/ast/simplifier/poly_simplifier_plugin.cpp @@ -14,11 +14,11 @@ Author: Leonardo (leonardo) 2008-01-08 --*/ -#include"poly_simplifier_plugin.h" -#include"ast_pp.h" -#include"ast_util.h" -#include"ast_smt2_pp.h" -#include"ast_ll_pp.h" +#include "ast/simplifier/poly_simplifier_plugin.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_ll_pp.h" poly_simplifier_plugin::poly_simplifier_plugin(symbol const & fname, ast_manager & m, decl_kind add, decl_kind mul, decl_kind uminus, decl_kind sub, decl_kind num): diff --git a/src/ast/simplifier/poly_simplifier_plugin.h b/src/ast/simplifier/poly_simplifier_plugin.h index ed6d506c5..fe5572b20 100644 --- a/src/ast/simplifier/poly_simplifier_plugin.h +++ b/src/ast/simplifier/poly_simplifier_plugin.h @@ -17,7 +17,7 @@ Author: #ifndef POLY_SIMPLIFIER_PLUGIN_H_ #define POLY_SIMPLIFIER_PLUGIN_H_ -#include "simplifier_plugin.h" +#include "ast/simplifier/simplifier_plugin.h" /** \brief Abstract class that provides simplification functions for polynomials. diff --git a/src/ast/simplifier/pull_ite_tree.cpp b/src/ast/simplifier/pull_ite_tree.cpp index 05bb3d885..072bbd12c 100644 --- a/src/ast/simplifier/pull_ite_tree.cpp +++ b/src/ast/simplifier/pull_ite_tree.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"pull_ite_tree.h" -#include"recurse_expr_def.h" -#include"for_each_expr.h" -#include"ast_pp.h" +#include "ast/simplifier/pull_ite_tree.h" +#include "ast/recurse_expr_def.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" pull_ite_tree::pull_ite_tree(ast_manager & m, simplifier & s): m_manager(m), diff --git a/src/ast/simplifier/pull_ite_tree.h b/src/ast/simplifier/pull_ite_tree.h index 14c447697..bc4a0bb68 100644 --- a/src/ast/simplifier/pull_ite_tree.h +++ b/src/ast/simplifier/pull_ite_tree.h @@ -19,11 +19,11 @@ Revision History: #ifndef PULL_ITE_TREE_H_ #define PULL_ITE_TREE_H_ -#include"ast.h" -#include"simplifier.h" -#include"recurse_expr.h" -#include"obj_hashtable.h" -#include"expr_map.h" +#include "ast/ast.h" +#include "ast/simplifier/simplifier.h" +#include "ast/recurse_expr.h" +#include "util/obj_hashtable.h" +#include "ast/expr_map.h" /** \brief Functor for applying the following transformation diff --git a/src/ast/simplifier/push_app_ite.cpp b/src/ast/simplifier/push_app_ite.cpp index e33f0d094..8b56dcd85 100644 --- a/src/ast/simplifier/push_app_ite.cpp +++ b/src/ast/simplifier/push_app_ite.cpp @@ -17,8 +17,8 @@ Author: Revision History: --*/ -#include"push_app_ite.h" -#include"ast_pp.h" +#include "ast/simplifier/push_app_ite.h" +#include "ast/ast_pp.h" push_app_ite::push_app_ite(simplifier & s, bool conservative): simplifier(s.get_manager()), diff --git a/src/ast/simplifier/push_app_ite.h b/src/ast/simplifier/push_app_ite.h index 104a7ea74..96400b1af 100644 --- a/src/ast/simplifier/push_app_ite.h +++ b/src/ast/simplifier/push_app_ite.h @@ -19,8 +19,8 @@ Revision History: #ifndef PUSH_APP_ITE_H_ #define PUSH_APP_ITE_H_ -#include"ast.h" -#include"simplifier.h" +#include "ast/ast.h" +#include "ast/simplifier/simplifier.h" /** \brief Functor for applying the following transformation: diff --git a/src/ast/simplifier/seq_simplifier_plugin.cpp b/src/ast/simplifier/seq_simplifier_plugin.cpp index 0b7bddf0a..2125c4f4c 100644 --- a/src/ast/simplifier/seq_simplifier_plugin.cpp +++ b/src/ast/simplifier/seq_simplifier_plugin.cpp @@ -14,7 +14,7 @@ Author: Nikolaj Bjorner (nbjorner) 2016-02-05 --*/ -#include"seq_simplifier_plugin.h" +#include "ast/simplifier/seq_simplifier_plugin.h" seq_simplifier_plugin::seq_simplifier_plugin(ast_manager & m, basic_simplifier_plugin & b) : simplifier_plugin(symbol("seq"), m), diff --git a/src/ast/simplifier/seq_simplifier_plugin.h b/src/ast/simplifier/seq_simplifier_plugin.h index 45668678c..a37a2209f 100644 --- a/src/ast/simplifier/seq_simplifier_plugin.h +++ b/src/ast/simplifier/seq_simplifier_plugin.h @@ -17,9 +17,9 @@ Author: #ifndef SEQ_SIMPLIFIER_PLUGIN_H_ #define SEQ_SIMPLIFIER_PLUGIN_H_ -#include"basic_simplifier_plugin.h" -#include"seq_decl_plugin.h" -#include"seq_rewriter.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/seq_decl_plugin.h" +#include "ast/rewriter/seq_rewriter.h" class seq_simplifier_plugin : public simplifier_plugin { seq_util m_util; diff --git a/src/ast/simplifier/simplifier.cpp b/src/ast/simplifier/simplifier.cpp index 498244919..c02753440 100644 --- a/src/ast/simplifier/simplifier.cpp +++ b/src/ast/simplifier/simplifier.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"simplifier.h" -#include"var_subst.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"well_sorted.h" -#include"ast_smt_pp.h" +#include "ast/simplifier/simplifier.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/well_sorted.h" +#include "ast/ast_smt_pp.h" simplifier::simplifier(ast_manager & m): base_simplifier(m), diff --git a/src/ast/simplifier/simplifier.h b/src/ast/simplifier/simplifier.h index 899b25810..5148721f1 100644 --- a/src/ast/simplifier/simplifier.h +++ b/src/ast/simplifier/simplifier.h @@ -19,11 +19,11 @@ Notes: #ifndef SIMPLIFIER_H_ #define SIMPLIFIER_H_ -#include"base_simplifier.h" -#include"simplifier_plugin.h" -#include"plugin_manager.h" -#include"ast_util.h" -#include"obj_hashtable.h" +#include "ast/simplifier/base_simplifier.h" +#include "ast/simplifier/simplifier_plugin.h" +#include "util/plugin_manager.h" +#include "ast/ast_util.h" +#include "util/obj_hashtable.h" /** \brief Local simplifier. diff --git a/src/ast/simplifier/simplifier_plugin.cpp b/src/ast/simplifier/simplifier_plugin.cpp index 1cdaadf8a..a62b15131 100644 --- a/src/ast/simplifier/simplifier_plugin.cpp +++ b/src/ast/simplifier/simplifier_plugin.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"simplifier_plugin.h" +#include "ast/simplifier/simplifier_plugin.h" /** \brief Copy every args[i] mult[i] times to new_args. diff --git a/src/ast/simplifier/simplifier_plugin.h b/src/ast/simplifier/simplifier_plugin.h index b018dc731..26b5bcd59 100644 --- a/src/ast/simplifier/simplifier_plugin.h +++ b/src/ast/simplifier/simplifier_plugin.h @@ -18,7 +18,7 @@ Author: #ifndef SIMPLIFIER_PLUGIN_H_ #define SIMPLIFIER_PLUGIN_H_ -#include"ast.h" +#include "ast/ast.h" class simplifier; diff --git a/src/ast/static_features.cpp b/src/ast/static_features.cpp index a3ad7fd07..3c8333d02 100644 --- a/src/ast/static_features.cpp +++ b/src/ast/static_features.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"static_features.h" -#include"ast_pp.h" +#include "ast/static_features.h" +#include "ast/ast_pp.h" static_features::static_features(ast_manager & m): m_manager(m), diff --git a/src/ast/static_features.h b/src/ast/static_features.h index e7f69e041..5473ba0ff 100644 --- a/src/ast/static_features.h +++ b/src/ast/static_features.h @@ -19,13 +19,13 @@ Revision History: #ifndef STATIC_FEATURES_H_ #define STATIC_FEATURES_H_ -#include"ast.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"fpa_decl_plugin.h" -#include"seq_decl_plugin.h" -#include"map.h" +#include "ast/ast.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/seq_decl_plugin.h" +#include "util/map.h" struct static_features { ast_manager & m_manager; diff --git a/src/ast/substitution/expr_offset.h b/src/ast/substitution/expr_offset.h index ea4f36206..1f27f222a 100644 --- a/src/ast/substitution/expr_offset.h +++ b/src/ast/substitution/expr_offset.h @@ -24,7 +24,7 @@ Revision History: #ifndef EXPR_OFFSET_H_ #define EXPR_OFFSET_H_ -#include"ast.h" +#include "ast/ast.h" class expr_offset { expr * m_expr; diff --git a/src/ast/substitution/expr_offset_map.h b/src/ast/substitution/expr_offset_map.h index 83e22493b..371c7500e 100644 --- a/src/ast/substitution/expr_offset_map.h +++ b/src/ast/substitution/expr_offset_map.h @@ -19,8 +19,8 @@ Revision History: #ifndef EXPR_OFFSET_MAP_H_ #define EXPR_OFFSET_MAP_H_ -#include"expr_offset.h" -#include"vector.h" +#include "ast/substitution/expr_offset.h" +#include "util/vector.h" /** \brief A mapping from expr_offset to some value of type T. diff --git a/src/ast/substitution/matcher.cpp b/src/ast/substitution/matcher.cpp index ce9bdcb3e..a0786e5b4 100644 --- a/src/ast/substitution/matcher.cpp +++ b/src/ast/substitution/matcher.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"matcher.h" +#include "ast/substitution/matcher.h" bool matcher::operator()(expr * e1, expr * e2, substitution & s) { reset(); diff --git a/src/ast/substitution/matcher.h b/src/ast/substitution/matcher.h index c4936579e..1e8c3005a 100644 --- a/src/ast/substitution/matcher.h +++ b/src/ast/substitution/matcher.h @@ -19,8 +19,8 @@ Revision History: #ifndef MATCHER_H_ #define MATCHER_H_ -#include"substitution.h" -#include"hashtable.h" +#include "ast/substitution/substitution.h" +#include "util/hashtable.h" /** \brief Functor for matching expressions. diff --git a/src/ast/substitution/substitution.cpp b/src/ast/substitution/substitution.cpp index f741d3fd4..d54a8e057 100644 --- a/src/ast/substitution/substitution.cpp +++ b/src/ast/substitution/substitution.cpp @@ -17,10 +17,10 @@ Author: Revision History: --*/ -#include"substitution.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"rewriter.h" +#include "ast/substitution/substitution.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/rewriter/rewriter.h" substitution::substitution(ast_manager & m): m_manager(m), diff --git a/src/ast/substitution/substitution.h b/src/ast/substitution/substitution.h index ebd12ef3a..0d318e4fb 100644 --- a/src/ast/substitution/substitution.h +++ b/src/ast/substitution/substitution.h @@ -33,9 +33,9 @@ Revision History: #ifndef SUBSTITUTION_H_ #define SUBSTITUTION_H_ -#include"expr_offset_map.h" -#include"var_offset_map.h" -#include"ast_pp.h" +#include "ast/substitution/expr_offset_map.h" +#include "ast/substitution/var_offset_map.h" +#include "ast/ast_pp.h" /** \brief A mapping from (variable,offset) to expr_offset. diff --git a/src/ast/substitution/substitution_tree.cpp b/src/ast/substitution/substitution_tree.cpp index 6aaa2da66..9befb582f 100644 --- a/src/ast/substitution/substitution_tree.cpp +++ b/src/ast/substitution/substitution_tree.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"substitution_tree.h" -#include"ast_pp.h" -#include"ast_smt2_pp.h" +#include "ast/substitution/substitution_tree.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" /** \brief Return the next available register. diff --git a/src/ast/substitution/substitution_tree.h b/src/ast/substitution/substitution_tree.h index 167d08183..7a8c30a63 100644 --- a/src/ast/substitution/substitution_tree.h +++ b/src/ast/substitution/substitution_tree.h @@ -19,8 +19,8 @@ Revision History: #ifndef SUBSTITUTION_TREE_H_ #define SUBSTITUTION_TREE_H_ -#include"ast.h" -#include"substitution.h" +#include "ast/ast.h" +#include "ast/substitution/substitution.h" /** \brief Substitution tree visitor. diff --git a/src/ast/substitution/unifier.cpp b/src/ast/substitution/unifier.cpp index a5bd4d155..4942b5498 100644 --- a/src/ast/substitution/unifier.cpp +++ b/src/ast/substitution/unifier.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"unifier.h" -#include"ast_pp.h" +#include "ast/substitution/unifier.h" +#include "ast/ast_pp.h" void unifier::reset(unsigned num_offsets) { m_todo.reset(); diff --git a/src/ast/substitution/unifier.h b/src/ast/substitution/unifier.h index 24735117c..171b880e2 100644 --- a/src/ast/substitution/unifier.h +++ b/src/ast/substitution/unifier.h @@ -19,8 +19,8 @@ Revision History: #ifndef UNIFIER_H_ #define UNIFIER_H_ -#include"ast.h" -#include"substitution.h" +#include "ast/ast.h" +#include "ast/substitution/substitution.h" /** \brief Functor for unifying expressions. diff --git a/src/ast/substitution/var_offset_map.h b/src/ast/substitution/var_offset_map.h index f03b80aed..f5488483a 100644 --- a/src/ast/substitution/var_offset_map.h +++ b/src/ast/substitution/var_offset_map.h @@ -19,8 +19,8 @@ Revision History: #ifndef VAR_OFFSET_MAP_H_ #define VAR_OFFSET_MAP_H_ -#include"ast.h" -#include"vector.h" +#include "ast/ast.h" +#include "util/vector.h" /** \brief A mapping from variable-id + offset to some value of type T. diff --git a/src/ast/used_symbols.h b/src/ast/used_symbols.h index 994e3321a..2fd4830fe 100644 --- a/src/ast/used_symbols.h +++ b/src/ast/used_symbols.h @@ -19,9 +19,9 @@ Revision History: #ifndef USED_SYMBOLS_H_ #define USED_SYMBOLS_H_ -#include"ast.h" -#include"hashtable.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/hashtable.h" +#include "util/obj_hashtable.h" struct do_nothing_rename_proc { symbol operator()(symbol const & s) const { return s; } diff --git a/src/ast/used_vars.cpp b/src/ast/used_vars.cpp index f33c5cb50..a1cd65feb 100644 --- a/src/ast/used_vars.cpp +++ b/src/ast/used_vars.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"used_vars.h" +#include "ast/used_vars.h" void used_vars::process(expr * n, unsigned delta) { unsigned j, idx; diff --git a/src/ast/used_vars.h b/src/ast/used_vars.h index b14798e7d..56d633997 100644 --- a/src/ast/used_vars.h +++ b/src/ast/used_vars.h @@ -19,8 +19,8 @@ Revision History: #ifndef USED_VARS_H_ #define USED_VARS_H_ -#include"ast.h" -#include"expr_delta_pair.h" +#include "ast/ast.h" +#include "ast/expr_delta_pair.h" class used_vars { ptr_vector m_found_vars; diff --git a/src/ast/well_sorted.cpp b/src/ast/well_sorted.cpp index b0afe566b..f78cd9121 100644 --- a/src/ast/well_sorted.cpp +++ b/src/ast/well_sorted.cpp @@ -18,12 +18,12 @@ Revision History: --*/ #include -#include"for_each_expr.h" -#include"well_sorted.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"warning.h" -#include"ast_smt2_pp.h" +#include "ast/for_each_expr.h" +#include "ast/well_sorted.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "util/warning.h" +#include "ast/ast_smt2_pp.h" struct well_sorted_proc { ast_manager & m_manager; diff --git a/src/cmd_context/basic_cmds.cpp b/src/cmd_context/basic_cmds.cpp index ea6d1c232..ace4b6a55 100644 --- a/src/cmd_context/basic_cmds.cpp +++ b/src/cmd_context/basic_cmds.cpp @@ -15,20 +15,20 @@ Author: Notes: --*/ -#include"cmd_context.h" +#include "cmd_context/cmd_context.h" #include"version.h" -#include"ast_smt_pp.h" -#include"ast_smt2_pp.h" -#include"ast_pp.h" -#include"model_smt2_pp.h" -#include"array_decl_plugin.h" -#include"pp.h" -#include"cmd_util.h" -#include"simplify_cmd.h" -#include"eval_cmd.h" -#include"gparams.h" -#include"env_params.h" -#include"well_sorted.h" +#include "ast/ast_smt_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "ast/array_decl_plugin.h" +#include "ast/pp.h" +#include "cmd_context/cmd_util.h" +#include "cmd_context/simplify_cmd.h" +#include "cmd_context/eval_cmd.h" +#include "util/gparams.h" +#include "util/env_params.h" +#include "ast/well_sorted.h" #include"pp_params.hpp" class help_cmd : public cmd { diff --git a/src/cmd_context/check_logic.cpp b/src/cmd_context/check_logic.cpp index 0faddce73..1aace7716 100644 --- a/src/cmd_context/check_logic.cpp +++ b/src/cmd_context/check_logic.cpp @@ -16,15 +16,15 @@ Author: Revision History: --*/ -#include"check_logic.h" -#include"arith_decl_plugin.h" -#include"array_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"seq_decl_plugin.h" -#include"pb_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"ast_pp.h" -#include"for_each_expr.h" +#include "cmd_context/check_logic.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/seq_decl_plugin.h" +#include "ast/pb_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/for_each_expr.h" #include struct check_logic::imp { diff --git a/src/cmd_context/check_logic.h b/src/cmd_context/check_logic.h index 888c6ed9f..b9050fc14 100644 --- a/src/cmd_context/check_logic.h +++ b/src/cmd_context/check_logic.h @@ -19,7 +19,7 @@ Revision History: #ifndef CHECK_LOGIC_H_ #define CHECK_LOGIC_H_ -#include"ast.h" +#include "ast/ast.h" class check_logic { struct imp; diff --git a/src/cmd_context/cmd_context.cpp b/src/cmd_context/cmd_context.cpp index 45ad08a78..1c9372228 100644 --- a/src/cmd_context/cmd_context.cpp +++ b/src/cmd_context/cmd_context.cpp @@ -17,36 +17,36 @@ Notes: --*/ #include -#include"tptr.h" -#include"cmd_context.h" -#include"func_decl_dependencies.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"seq_decl_plugin.h" -#include"pb_decl_plugin.h" -#include"fpa_decl_plugin.h" -#include"ast_pp.h" -#include"var_subst.h" -#include"pp.h" -#include"ast_smt2_pp.h" -#include"basic_cmds.h" -#include"cancel_eh.h" -#include"scoped_ctrl_c.h" -#include"dec_ref_util.h" -#include"decl_collector.h" -#include"well_sorted.h" -#include"model_evaluator.h" -#include"for_each_expr.h" -#include"scoped_timer.h" -#include"interpolant_cmds.h" -#include"model_smt2_pp.h" -#include"model_v2_pp.h" +#include "util/tptr.h" +#include "cmd_context/cmd_context.h" +#include "ast/func_decl_dependencies.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/seq_decl_plugin.h" +#include "ast/pb_decl_plugin.h" +#include "ast/fpa_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/var_subst.h" +#include "ast/pp.h" +#include "ast/ast_smt2_pp.h" +#include "cmd_context/basic_cmds.h" +#include "util/cancel_eh.h" +#include "util/scoped_ctrl_c.h" +#include "util/dec_ref_util.h" +#include "ast/decl_collector.h" +#include "ast/well_sorted.h" +#include "model/model_evaluator.h" +#include "ast/for_each_expr.h" +#include "util/scoped_timer.h" +#include "cmd_context/interpolant_cmds.h" +#include "model/model_smt2_pp.h" +#include "model/model_v2_pp.h" #include"model_params.hpp" -#include"th_rewriter.h" -#include"tactic_exception.h" -#include"smt_logics.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/tactic_exception.h" +#include "solver/smt_logics.h" func_decls::func_decls(ast_manager & m, func_decl * f): m_decls(TAG(func_decl*, f, 0)) { diff --git a/src/cmd_context/cmd_context.h b/src/cmd_context/cmd_context.h index 171d59a21..ca4883e74 100644 --- a/src/cmd_context/cmd_context.h +++ b/src/cmd_context/cmd_context.h @@ -23,21 +23,21 @@ Notes: #include #include -#include"ast.h" -#include"ast_printer.h" -#include"pdecl.h" -#include"dictionary.h" -#include"solver.h" -#include"datatype_decl_plugin.h" -#include"stopwatch.h" -#include"cmd_context_types.h" -#include"event_handler.h" -#include"sexpr.h" -#include"tactic_manager.h" -#include"check_logic.h" -#include"progress_callback.h" -#include"scoped_ptr_vector.h" -#include"context_params.h" +#include "ast/ast.h" +#include "ast/ast_printer.h" +#include "cmd_context/pdecl.h" +#include "util/dictionary.h" +#include "solver/solver.h" +#include "ast/datatype_decl_plugin.h" +#include "util/stopwatch.h" +#include "util/cmd_context_types.h" +#include "util/event_handler.h" +#include "util/sexpr.h" +#include "cmd_context/tactic_manager.h" +#include "cmd_context/check_logic.h" +#include "solver/progress_callback.h" +#include "util/scoped_ptr_vector.h" +#include "cmd_context/context_params.h" class func_decls { diff --git a/src/cmd_context/cmd_context_to_goal.cpp b/src/cmd_context/cmd_context_to_goal.cpp index c0b4379aa..beff9a7bd 100644 --- a/src/cmd_context/cmd_context_to_goal.cpp +++ b/src/cmd_context/cmd_context_to_goal.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"goal.h" +#include "cmd_context/cmd_context.h" +#include "tactic/goal.h" /** \brief Assert expressions from ctx into t. diff --git a/src/cmd_context/cmd_util.cpp b/src/cmd_context/cmd_util.cpp index 9774c75ff..ae626118c 100644 --- a/src/cmd_context/cmd_util.cpp +++ b/src/cmd_context/cmd_util.cpp @@ -15,7 +15,7 @@ Author: Notes: --*/ -#include"cmd_context.h" +#include "cmd_context/cmd_context.h" ast * get_ast_ref(cmd_context & ctx, symbol const & v) { object_ref * r = ctx.find_object_ref(v); diff --git a/src/cmd_context/context_params.cpp b/src/cmd_context/context_params.cpp index ff8b50c60..9a3339b84 100644 --- a/src/cmd_context/context_params.cpp +++ b/src/cmd_context/context_params.cpp @@ -17,11 +17,11 @@ Author: Notes: --*/ -#include"context_params.h" -#include"gparams.h" -#include"params.h" -#include"ast.h" -#include"solver.h" +#include "cmd_context/context_params.h" +#include "util/gparams.h" +#include "util/params.h" +#include "ast/ast.h" +#include "solver/solver.h" context_params::context_params() { m_unsat_core = false; diff --git a/src/cmd_context/context_params.h b/src/cmd_context/context_params.h index 40b6c9482..c238af556 100644 --- a/src/cmd_context/context_params.h +++ b/src/cmd_context/context_params.h @@ -20,7 +20,7 @@ Notes: #ifndef CONTEXT_PARAMS_H_ #define CONTEXT_PARAMS_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class context_params { diff --git a/src/cmd_context/echo_tactic.cpp b/src/cmd_context/echo_tactic.cpp index 218d9c196..848ae5429 100644 --- a/src/cmd_context/echo_tactic.cpp +++ b/src/cmd_context/echo_tactic.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"tactic.h" -#include"probe.h" -#include"cmd_context.h" +#include "tactic/tactic.h" +#include "tactic/probe.h" +#include "cmd_context/cmd_context.h" class echo_tactic : public skip_tactic { cmd_context & m_ctx; diff --git a/src/cmd_context/eval_cmd.cpp b/src/cmd_context/eval_cmd.cpp index 3b00179c6..9d3c1ced3 100644 --- a/src/cmd_context/eval_cmd.cpp +++ b/src/cmd_context/eval_cmd.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"model_evaluator.h" -#include"parametric_cmd.h" -#include"scoped_timer.h" -#include"scoped_ctrl_c.h" -#include"cancel_eh.h" +#include "cmd_context/cmd_context.h" +#include "model/model_evaluator.h" +#include "cmd_context/parametric_cmd.h" +#include "util/scoped_timer.h" +#include "util/scoped_ctrl_c.h" +#include "util/cancel_eh.h" class eval_cmd : public parametric_cmd { expr * m_target; diff --git a/src/cmd_context/extra_cmds/dbg_cmds.cpp b/src/cmd_context/extra_cmds/dbg_cmds.cpp index 16815ccb6..7d20685ac 100644 --- a/src/cmd_context/extra_cmds/dbg_cmds.cpp +++ b/src/cmd_context/extra_cmds/dbg_cmds.cpp @@ -16,20 +16,20 @@ Notes: --*/ #include -#include"cmd_context.h" -#include"cmd_util.h" -#include"rewriter.h" -#include"shared_occs.h" -#include"for_each_expr.h" -#include"rewriter.h" -#include"bool_rewriter.h" -#include"ast_lt.h" -#include"simplify_cmd.h" -#include"ast_smt2_pp.h" -#include"bound_manager.h" -#include"used_vars.h" -#include"var_subst.h" -#include"gparams.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/cmd_util.h" +#include "ast/rewriter/rewriter.h" +#include "ast/shared_occs.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/ast_lt.h" +#include "cmd_context/simplify_cmd.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/arith/bound_manager.h" +#include "ast/used_vars.h" +#include "ast/rewriter/var_subst.h" +#include "util/gparams.h" #ifndef _EXTERNAL_RELEASE diff --git a/src/cmd_context/extra_cmds/polynomial_cmds.cpp b/src/cmd_context/extra_cmds/polynomial_cmds.cpp index afd4713bd..33f252a64 100644 --- a/src/cmd_context/extra_cmds/polynomial_cmds.cpp +++ b/src/cmd_context/extra_cmds/polynomial_cmds.cpp @@ -16,19 +16,19 @@ Notes: --*/ #include -#include"cmd_context.h" -#include"cmd_util.h" -#include"scoped_timer.h" -#include"scoped_ctrl_c.h" -#include"cancel_eh.h" -#include"ast_smt2_pp.h" -#include"expr2polynomial.h" -#include"parametric_cmd.h" -#include"mpq.h" -#include"algebraic_numbers.h" -#include"polynomial_var2value.h" -#include"expr2var.h" -#include"pp.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/cmd_util.h" +#include "util/scoped_timer.h" +#include "util/scoped_ctrl_c.h" +#include "util/cancel_eh.h" +#include "ast/ast_smt2_pp.h" +#include "ast/expr2polynomial.h" +#include "cmd_context/parametric_cmd.h" +#include "util/mpq.h" +#include "math/polynomial/algebraic_numbers.h" +#include "math/polynomial/polynomial_var2value.h" +#include "ast/expr2var.h" +#include "ast/pp.h" #include"pp_params.hpp" static void to_poly(cmd_context & ctx, expr * t) { diff --git a/src/cmd_context/extra_cmds/subpaving_cmds.cpp b/src/cmd_context/extra_cmds/subpaving_cmds.cpp index d6496bccc..3c8a657ac 100644 --- a/src/cmd_context/extra_cmds/subpaving_cmds.cpp +++ b/src/cmd_context/extra_cmds/subpaving_cmds.cpp @@ -16,12 +16,12 @@ Notes: --*/ #include -#include"cmd_context.h" -#include"cmd_util.h" -#include"expr2subpaving.h" -#include"th_rewriter.h" -#include"ast_smt2_pp.h" -#include"expr2var.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/cmd_util.h" +#include "math/subpaving/tactic/expr2subpaving.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/expr2var.h" static void to_subpaving(cmd_context & ctx, expr * t) { ast_manager & m = ctx.m(); diff --git a/src/cmd_context/interpolant_cmds.cpp b/src/cmd_context/interpolant_cmds.cpp index 2bfdd9848..65e7a17d8 100644 --- a/src/cmd_context/interpolant_cmds.cpp +++ b/src/cmd_context/interpolant_cmds.cpp @@ -16,23 +16,23 @@ --*/ #include -#include"cmd_context.h" -#include"cmd_util.h" -#include"scoped_timer.h" -#include"scoped_ctrl_c.h" -#include"cancel_eh.h" -#include"ast_pp.h" -#include"ast_smt_pp.h" -#include"ast_smt2_pp.h" -#include"parametric_cmd.h" -#include"mpq.h" -#include"expr2var.h" -#include"pp.h" -#include"iz3interp.h" -#include"iz3checker.h" -#include"iz3profiling.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/cmd_util.h" +#include "util/scoped_timer.h" +#include "util/scoped_ctrl_c.h" +#include "util/cancel_eh.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" +#include "ast/ast_smt2_pp.h" +#include "cmd_context/parametric_cmd.h" +#include "util/mpq.h" +#include "ast/expr2var.h" +#include "ast/pp.h" +#include "interp/iz3interp.h" +#include "interp/iz3checker.h" +#include "interp/iz3profiling.h" #include"interp_params.hpp" -#include"scoped_proof.h" +#include "ast/scoped_proof.h" static void show_interpolant_and_maybe_check(cmd_context & ctx, ptr_vector &cnsts, diff --git a/src/cmd_context/parametric_cmd.cpp b/src/cmd_context/parametric_cmd.cpp index c229bc29c..4a85821b2 100644 --- a/src/cmd_context/parametric_cmd.cpp +++ b/src/cmd_context/parametric_cmd.cpp @@ -16,8 +16,8 @@ Notes: --*/ #include -#include"cmd_context.h" -#include"parametric_cmd.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/parametric_cmd.h" char const * parametric_cmd::get_descr(cmd_context & ctx) const { if (m_descr == 0) { diff --git a/src/cmd_context/parametric_cmd.h b/src/cmd_context/parametric_cmd.h index cac5fe38e..6d676d6f9 100644 --- a/src/cmd_context/parametric_cmd.h +++ b/src/cmd_context/parametric_cmd.h @@ -18,10 +18,10 @@ Notes: #ifndef PARAMETRIC_CMD_H_ #define PARAMETRIC_CMD_H_ -#include"params.h" -#include"symbol.h" -#include"string_buffer.h" -#include"cmd_context_types.h" +#include "util/params.h" +#include "util/symbol.h" +#include "util/string_buffer.h" +#include "util/cmd_context_types.h" class parametric_cmd : public cmd { public: diff --git a/src/cmd_context/pdecl.cpp b/src/cmd_context/pdecl.cpp index bd2ef849a..983dbbc78 100644 --- a/src/cmd_context/pdecl.cpp +++ b/src/cmd_context/pdecl.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"pdecl.h" -#include"datatype_decl_plugin.h" +#include "cmd_context/pdecl.h" +#include "ast/datatype_decl_plugin.h" using namespace format_ns; class psort_inst_cache { diff --git a/src/cmd_context/pdecl.h b/src/cmd_context/pdecl.h index 31005fe0d..2dfbb93ae 100644 --- a/src/cmd_context/pdecl.h +++ b/src/cmd_context/pdecl.h @@ -19,10 +19,10 @@ Revision History: #ifndef PDECL_H_ #define PDECL_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"dictionary.h" -#include"format.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "util/dictionary.h" +#include "ast/format.h" class pdecl_manager; diff --git a/src/cmd_context/simplify_cmd.cpp b/src/cmd_context/simplify_cmd.cpp index 8b354c8b7..5112a6ea2 100644 --- a/src/cmd_context/simplify_cmd.cpp +++ b/src/cmd_context/simplify_cmd.cpp @@ -15,16 +15,16 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"th_rewriter.h" -#include"shared_occs.h" -#include"ast_smt_pp.h" -#include"for_each_expr.h" -#include"parametric_cmd.h" -#include"scoped_timer.h" -#include"scoped_ctrl_c.h" -#include"cancel_eh.h" -#include"seq_rewriter.h" +#include "cmd_context/cmd_context.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/shared_occs.h" +#include "ast/ast_smt_pp.h" +#include "ast/for_each_expr.h" +#include "cmd_context/parametric_cmd.h" +#include "util/scoped_timer.h" +#include "util/scoped_ctrl_c.h" +#include "util/cancel_eh.h" +#include "ast/rewriter/seq_rewriter.h" #include class simplify_cmd : public parametric_cmd { diff --git a/src/cmd_context/tactic_cmds.cpp b/src/cmd_context/tactic_cmds.cpp index 119deec8c..b5ad0707d 100644 --- a/src/cmd_context/tactic_cmds.cpp +++ b/src/cmd_context/tactic_cmds.cpp @@ -16,21 +16,21 @@ Notes: --*/ #include -#include"tactic_cmds.h" -#include"cmd_context.h" -#include"cmd_util.h" -#include"parametric_cmd.h" -#include"scoped_timer.h" -#include"scoped_ctrl_c.h" -#include"cancel_eh.h" -#include"model_smt2_pp.h" -#include"ast_smt2_pp.h" -#include"tactic.h" -#include"tactical.h" -#include"probe.h" -#include"check_sat_result.h" -#include"cmd_context_to_goal.h" -#include"echo_tactic.h" +#include "cmd_context/tactic_cmds.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/cmd_util.h" +#include "cmd_context/parametric_cmd.h" +#include "util/scoped_timer.h" +#include "util/scoped_ctrl_c.h" +#include "util/cancel_eh.h" +#include "model/model_smt2_pp.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/tactic.h" +#include "tactic/tactical.h" +#include "tactic/probe.h" +#include "solver/check_sat_result.h" +#include "cmd_context/cmd_context_to_goal.h" +#include "cmd_context/echo_tactic.h" tactic_cmd::~tactic_cmd() { dealloc(m_factory); diff --git a/src/cmd_context/tactic_cmds.h b/src/cmd_context/tactic_cmds.h index e21d818bb..fc15c795b 100644 --- a/src/cmd_context/tactic_cmds.h +++ b/src/cmd_context/tactic_cmds.h @@ -18,9 +18,9 @@ Notes: #ifndef TACTIC_CMDS_H_ #define TACTIC_CMDS_H_ -#include"ast.h" -#include"cmd_context_types.h" -#include"ref.h" +#include "ast/ast.h" +#include "util/cmd_context_types.h" +#include "util/ref.h" class tactic; class probe; diff --git a/src/cmd_context/tactic_manager.cpp b/src/cmd_context/tactic_manager.cpp index 3442dd9b9..94b5e35ab 100644 --- a/src/cmd_context/tactic_manager.cpp +++ b/src/cmd_context/tactic_manager.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"tactic_manager.h" +#include "cmd_context/tactic_manager.h" tactic_manager::~tactic_manager() { finalize_tactic_cmds(); diff --git a/src/cmd_context/tactic_manager.h b/src/cmd_context/tactic_manager.h index 44a25f01e..276c756ba 100644 --- a/src/cmd_context/tactic_manager.h +++ b/src/cmd_context/tactic_manager.h @@ -18,8 +18,8 @@ Notes: #ifndef TACTIC_MANAGER_H_ #define TACTIC_MANAGER_H_ -#include"tactic_cmds.h" -#include"dictionary.h" +#include "cmd_context/tactic_cmds.h" +#include "util/dictionary.h" class tactic_manager { protected: diff --git a/src/duality/duality.h b/src/duality/duality.h index 72d72ac6b..0ef6be30e 100644 --- a/src/duality/duality.h +++ b/src/duality/duality.h @@ -20,7 +20,7 @@ #pragma once -#include "duality_wrapper.h" +#include "duality/duality_wrapper.h" #include #include diff --git a/src/duality/duality_profiling.cpp b/src/duality/duality_profiling.cpp index e841f674b..2e659f0a1 100755 --- a/src/duality/duality_profiling.cpp +++ b/src/duality/duality_profiling.cpp @@ -31,8 +31,8 @@ #pragma warning(disable:4267) #endif -#include "duality_wrapper.h" -#include "iz3profiling.h" +#include "duality/duality_wrapper.h" +#include "interp/iz3profiling.h" namespace Duality { diff --git a/src/duality/duality_rpfp.cpp b/src/duality/duality_rpfp.cpp index c86ff9f62..c9ad8fd56 100755 --- a/src/duality/duality_rpfp.cpp +++ b/src/duality/duality_rpfp.cpp @@ -33,8 +33,8 @@ #include -#include "duality.h" -#include "duality_profiling.h" +#include "duality/duality.h" +#include "duality/duality_profiling.h" // TODO: do we need these? #ifdef Z3OPS diff --git a/src/duality/duality_solver.cpp b/src/duality/duality_solver.cpp index 1869b74ce..1711b65ad 100644 --- a/src/duality/duality_solver.cpp +++ b/src/duality/duality_solver.cpp @@ -25,8 +25,8 @@ #pragma warning(disable:4267) #endif -#include "duality.h" -#include "duality_profiling.h" +#include "duality/duality.h" +#include "duality/duality_profiling.h" #include #include diff --git a/src/duality/duality_wrapper.cpp b/src/duality/duality_wrapper.cpp index 35033f739..4493beddf 100755 --- a/src/duality/duality_wrapper.cpp +++ b/src/duality/duality_wrapper.cpp @@ -25,15 +25,15 @@ #pragma warning(disable:4101) #endif -#include "duality_wrapper.h" +#include "duality/duality_wrapper.h" #include -#include "smt_solver.h" -#include "iz3interp.h" -#include "statistics.h" -#include "expr_abstract.h" -#include "stopwatch.h" -#include "model_smt2_pp.h" -#include "qe_lite.h" +#include "smt/smt_solver.h" +#include "interp/iz3interp.h" +#include "util/statistics.h" +#include "ast/expr_abstract.h" +#include "util/stopwatch.h" +#include "model/model_smt2_pp.h" +#include "qe/qe_lite.h" namespace Duality { diff --git a/src/duality/duality_wrapper.h b/src/duality/duality_wrapper.h index e5e55efed..8e2d70ea6 100644 --- a/src/duality/duality_wrapper.h +++ b/src/duality/duality_wrapper.h @@ -30,28 +30,28 @@ #include"version.h" #include -#include "iz3hash.h" -#include "model.h" -#include "solver.h" +#include "interp/iz3hash.h" +#include "model/model.h" +#include "solver/solver.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"scoped_proof.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" +#include "ast/scoped_proof.h" namespace Duality { diff --git a/src/interp/iz3base.cpp b/src/interp/iz3base.cpp index d0f8c3a75..b9284b869 100755 --- a/src/interp/iz3base.cpp +++ b/src/interp/iz3base.cpp @@ -25,12 +25,12 @@ #pragma warning(disable:4101) #endif -#include "iz3base.h" +#include "interp/iz3base.h" #include #include #include #include -#include "solver.h" +#include "solver/solver.h" #include "../smt/smt_solver.h" diff --git a/src/interp/iz3base.h b/src/interp/iz3base.h index 59cbf3a61..ac171aa9e 100755 --- a/src/interp/iz3base.h +++ b/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 <> diff --git a/src/interp/iz3checker.cpp b/src/interp/iz3checker.cpp index 69cfea8b8..8fa99fe10 100755 --- a/src/interp/iz3checker.cpp +++ b/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 #include diff --git a/src/interp/iz3checker.h b/src/interp/iz3checker.h index 6028e60db..175b5a43a 100644 --- a/src/interp/iz3checker.h +++ b/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, diff --git a/src/interp/iz3exception.h b/src/interp/iz3exception.h index 134c049cf..b3f841565 100644 --- a/src/interp/iz3exception.h +++ b/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: diff --git a/src/interp/iz3hash.h b/src/interp/iz3hash.h index 9cf03b53d..483c7ca49 100644 --- a/src/interp/iz3hash.h +++ b/src/interp/iz3hash.h @@ -36,7 +36,7 @@ #include #include #include -#include "hash.h" +#include "util/hash.h" #define stl_ext hash_space diff --git a/src/interp/iz3interp.cpp b/src/interp/iz3interp.cpp index bb83349da..f9bf03951 100755 --- a/src/interp/iz3interp.cpp +++ b/src/interp/iz3interp.cpp @@ -33,13 +33,13 @@ #include #include -#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; diff --git a/src/interp/iz3interp.h b/src/interp/iz3interp.h index 601c8c3f5..9763208f1 100644 --- a/src/interp/iz3interp.h +++ b/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; diff --git a/src/interp/iz3mgr.cpp b/src/interp/iz3mgr.cpp index 2e55d7040..306807f1f 100755 --- a/src/interp/iz3mgr.cpp +++ b/src/interp/iz3mgr.cpp @@ -27,15 +27,15 @@ #pragma warning(disable:4800) #endif -#include "iz3mgr.h" +#include "interp/iz3mgr.h" #include #include #include #include -#include "expr_abstract.h" -#include "params.h" +#include "ast/expr_abstract.h" +#include "util/params.h" using namespace stl_ext; diff --git a/src/interp/iz3mgr.h b/src/interp/iz3mgr.h index 424b95359..e6e08f84d 100755 --- a/src/interp/iz3mgr.h +++ b/src/interp/iz3mgr.h @@ -25,26 +25,26 @@ #include #include -#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. */ diff --git a/src/interp/iz3pp.cpp b/src/interp/iz3pp.cpp index 066e04e83..787fa4ec7 100644 --- a/src/interp/iz3pp.cpp +++ b/src/interp/iz3pp.cpp @@ -26,14 +26,14 @@ #include #include -#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; diff --git a/src/interp/iz3pp.h b/src/interp/iz3pp.h index c66b4a4fa..eec88d35e 100644 --- a/src/interp/iz3pp.h +++ b/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 */ diff --git a/src/interp/iz3profiling.cpp b/src/interp/iz3profiling.cpp index f3b3d0efc..df3126e4f 100755 --- a/src/interp/iz3profiling.cpp +++ b/src/interp/iz3profiling.cpp @@ -24,14 +24,14 @@ #pragma warning(disable:4101) #endif -#include "iz3profiling.h" +#include "interp/iz3profiling.h" #include #include #include #include #include -#include "stopwatch.h" +#include "util/stopwatch.h" // FIXME fill in these stubs diff --git a/src/interp/iz3proof.cpp b/src/interp/iz3proof.cpp index 9adcce3c3..bc046ceff 100755 --- a/src/interp/iz3proof.cpp +++ b/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 #include diff --git a/src/interp/iz3proof.h b/src/interp/iz3proof.h index 213afce5e..ba4507ba2 100755 --- a/src/interp/iz3proof.h +++ b/src/interp/iz3proof.h @@ -22,8 +22,8 @@ #include -#include "iz3base.h" -#include "iz3secondary.h" +#include "interp/iz3base.h" +#include "interp/iz3secondary.h" // #define CHECK_PROOFS diff --git a/src/interp/iz3proof_itp.cpp b/src/interp/iz3proof_itp.cpp index 26ef7386c..eb7f8e325 100755 --- a/src/interp/iz3proof_itp.cpp +++ b/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; diff --git a/src/interp/iz3proof_itp.h b/src/interp/iz3proof_itp.h index bd9eca441..c9a36e9b1 100644 --- a/src/interp/iz3proof_itp.h +++ b/src/interp/iz3proof_itp.h @@ -22,8 +22,8 @@ #include -#include "iz3base.h" -#include "iz3secondary.h" +#include "interp/iz3base.h" +#include "interp/iz3secondary.h" // #define CHECK_PROOFS diff --git a/src/interp/iz3scopes.cpp b/src/interp/iz3scopes.cpp index b70f37a06..e3a28abdd 100755 --- a/src/interp/iz3scopes.cpp +++ b/src/interp/iz3scopes.cpp @@ -21,7 +21,7 @@ #include -#include "iz3scopes.h" +#include "interp/iz3scopes.h" /** computes the least common ancestor of two nodes in the tree, or SHRT_MAX if none */ diff --git a/src/interp/iz3scopes.h b/src/interp/iz3scopes.h index 38f9e2292..745256e57 100755 --- a/src/interp/iz3scopes.h +++ b/src/interp/iz3scopes.h @@ -23,7 +23,7 @@ #include #include -#include "iz3hash.h" +#include "interp/iz3hash.h" class scopes { diff --git a/src/interp/iz3secondary.h b/src/interp/iz3secondary.h index 46d080595..a5a949b54 100755 --- a/src/interp/iz3secondary.h +++ b/src/interp/iz3secondary.h @@ -23,7 +23,7 @@ /** Interface class for secondary provers. */ -#include "iz3base.h" +#include "interp/iz3base.h" #include class iz3secondary : public iz3mgr { diff --git a/src/interp/iz3translate.cpp b/src/interp/iz3translate.cpp index 4f6741989..ebbee46ca 100755 --- a/src/interp/iz3translate.cpp +++ b/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 #include diff --git a/src/interp/iz3translate.h b/src/interp/iz3translate.h index 15e836cd8..3430d11b3 100755 --- a/src/interp/iz3translate.h +++ b/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 diff --git a/src/interp/iz3translate_direct.cpp b/src/interp/iz3translate_direct.cpp index de1da6ce6..b88e488b4 100755 --- a/src/interp/iz3translate_direct.cpp +++ b/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 #include diff --git a/src/math/automata/automaton.cpp b/src/math/automata/automaton.cpp index ab908525e..20cfc3a84 100644 --- a/src/math/automata/automaton.cpp +++ b/src/math/automata/automaton.cpp @@ -18,6 +18,6 @@ Revision History: --*/ -#include "automaton.h" +#include "math/automata/automaton.h" template class automaton; diff --git a/src/math/automata/automaton.h b/src/math/automata/automaton.h index 2a68cba08..cf4dcbfc6 100644 --- a/src/math/automata/automaton.h +++ b/src/math/automata/automaton.h @@ -22,9 +22,9 @@ Revision History: #define AUTOMATON_H_ -#include "util.h" -#include "vector.h" -#include "uint_set.h" +#include "util/util.h" +#include "util/vector.h" +#include "util/uint_set.h" template class default_value_manager { diff --git a/src/math/automata/boolean_algebra.h b/src/math/automata/boolean_algebra.h index 4f5527f5e..e49d414c4 100644 --- a/src/math/automata/boolean_algebra.h +++ b/src/math/automata/boolean_algebra.h @@ -21,7 +21,7 @@ Revision History: #ifndef BOOLEAN_ALGEBRA_H_ #define BOOLEAN_ALGEBRA_H_ -#include "util.h" +#include "util/util.h" template class positive_boolean_algebra { diff --git a/src/math/automata/symbolic_automata.h b/src/math/automata/symbolic_automata.h index 5c2b4a2a4..4a8e7a74d 100644 --- a/src/math/automata/symbolic_automata.h +++ b/src/math/automata/symbolic_automata.h @@ -22,8 +22,8 @@ Revision History: #define SYMBOLIC_AUTOMATA_H_ -#include "automaton.h" -#include "boolean_algebra.h" +#include "math/automata/automaton.h" +#include "math/automata/boolean_algebra.h" template > diff --git a/src/math/automata/symbolic_automata_def.h b/src/math/automata/symbolic_automata_def.h index 01476eb53..c1ee53214 100644 --- a/src/math/automata/symbolic_automata_def.h +++ b/src/math/automata/symbolic_automata_def.h @@ -22,8 +22,8 @@ Revision History: #define SYMBOLIC_AUTOMATA_DEF_H_ -#include "symbolic_automata.h" -#include "hashtable.h" +#include "math/automata/symbolic_automata.h" +#include "util/hashtable.h" diff --git a/src/math/euclid/euclidean_solver.cpp b/src/math/euclid/euclidean_solver.cpp index b33dbf3aa..1be239c36 100644 --- a/src/math/euclid/euclidean_solver.cpp +++ b/src/math/euclid/euclidean_solver.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"euclidean_solver.h" -#include"numeral_buffer.h" -#include"heap.h" +#include "math/euclid/euclidean_solver.h" +#include "util/numeral_buffer.h" +#include "util/heap.h" struct euclidean_solver::imp { typedef unsigned var; diff --git a/src/math/euclid/euclidean_solver.h b/src/math/euclid/euclidean_solver.h index 98a202e5e..74d0d7fa4 100644 --- a/src/math/euclid/euclidean_solver.h +++ b/src/math/euclid/euclidean_solver.h @@ -19,8 +19,8 @@ Revision History: #ifndef EUCLIDEAN_SOLVER_H_ #define EUCLIDEAN_SOLVER_H_ -#include"mpq.h" -#include"vector.h" +#include "util/mpq.h" +#include "util/vector.h" class euclidean_solver { struct imp; diff --git a/src/math/grobner/grobner.cpp b/src/math/grobner/grobner.cpp index baa16b405..3295c4eae 100644 --- a/src/math/grobner/grobner.cpp +++ b/src/math/grobner/grobner.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"grobner.h" -#include"ast_pp.h" -#include"ref_util.h" +#include "math/grobner/grobner.h" +#include "ast/ast_pp.h" +#include "util/ref_util.h" // #define PROFILE_GB diff --git a/src/math/grobner/grobner.h b/src/math/grobner/grobner.h index 770f0a538..f024a33e4 100644 --- a/src/math/grobner/grobner.h +++ b/src/math/grobner/grobner.h @@ -19,12 +19,12 @@ Revision History: #ifndef GROBNER_H_ #define GROBNER_H_ -#include"ast.h" -#include"arith_decl_plugin.h" -#include"heap.h" -#include"obj_hashtable.h" -#include"region.h" -#include"dependency.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" +#include "util/heap.h" +#include "util/obj_hashtable.h" +#include "util/region.h" +#include "util/dependency.h" struct grobner_stats { diff --git a/src/math/hilbert/heap_trie.h b/src/math/hilbert/heap_trie.h index e288bb076..ace5381b8 100644 --- a/src/math/hilbert/heap_trie.h +++ b/src/math/hilbert/heap_trie.h @@ -37,11 +37,11 @@ Notes: #ifndef HEAP_TRIE_H_ #define HEAP_TRIE_H_ -#include "map.h" -#include "vector.h" -#include "buffer.h" -#include "statistics.h" -#include "small_object_allocator.h" +#include "util/map.h" +#include "util/vector.h" +#include "util/buffer.h" +#include "util/statistics.h" +#include "util/small_object_allocator.h" template diff --git a/src/math/hilbert/hilbert_basis.cpp b/src/math/hilbert/hilbert_basis.cpp index adac63e5c..9baa0beac 100644 --- a/src/math/hilbert/hilbert_basis.cpp +++ b/src/math/hilbert/hilbert_basis.cpp @@ -17,11 +17,11 @@ Revision History: --*/ -#include "hilbert_basis.h" -#include "heap.h" -#include "map.h" -#include "heap_trie.h" -#include "stopwatch.h" +#include "math/hilbert/hilbert_basis.h" +#include "util/heap.h" +#include "util/map.h" +#include "math/hilbert/heap_trie.h" +#include "util/stopwatch.h" typedef int_hashtable > int_table; diff --git a/src/math/hilbert/hilbert_basis.h b/src/math/hilbert/hilbert_basis.h index 2cfb4e36f..a0350492a 100644 --- a/src/math/hilbert/hilbert_basis.h +++ b/src/math/hilbert/hilbert_basis.h @@ -28,11 +28,11 @@ Revision History: #ifndef HILBERT_BASIS_H_ #define HILBERT_BASIS_H_ -#include "rational.h" -#include "lbool.h" -#include "statistics.h" -#include "checked_int64.h" -#include "rlimit.h" +#include "util/rational.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "util/checked_int64.h" +#include "util/rlimit.h" typedef vector rational_vector; diff --git a/src/math/interval/interval.h b/src/math/interval/interval.h index 4c0204604..bae644fac 100644 --- a/src/math/interval/interval.h +++ b/src/math/interval/interval.h @@ -19,9 +19,9 @@ Revision History: #ifndef INTERVAL_H_ #define INTERVAL_H_ -#include"mpq.h" -#include"ext_numeral.h" -#include"rlimit.h" +#include "util/mpq.h" +#include "util/ext_numeral.h" +#include "util/rlimit.h" /** \brief Default configuration for interval manager. diff --git a/src/math/interval/interval_def.h b/src/math/interval/interval_def.h index 43bf9f91a..e18d9edda 100644 --- a/src/math/interval/interval_def.h +++ b/src/math/interval/interval_def.h @@ -19,12 +19,12 @@ Revision History: #ifndef INTERVAL_DEF_H_ #define INTERVAL_DEF_H_ -#include"interval.h" -#include"debug.h" -#include"trace.h" -#include"scoped_numeral.h" -#include"cooperate.h" -#include"common_msgs.h" +#include "math/interval/interval.h" +#include "util/debug.h" +#include "util/trace.h" +#include "util/scoped_numeral.h" +#include "util/cooperate.h" +#include "util/common_msgs.h" #define DEFAULT_PI_PRECISION 2 diff --git a/src/math/interval/interval_mpq.cpp b/src/math/interval/interval_mpq.cpp index fa7cec853..7d3de6379 100644 --- a/src/math/interval/interval_mpq.cpp +++ b/src/math/interval/interval_mpq.cpp @@ -16,6 +16,6 @@ Author: Revision History: --*/ -#include"interval_def.h" +#include "math/interval/interval_def.h" template class interval_manager; diff --git a/src/math/polynomial/algebraic_numbers.cpp b/src/math/polynomial/algebraic_numbers.cpp index 986c17664..353a8c107 100644 --- a/src/math/polynomial/algebraic_numbers.cpp +++ b/src/math/polynomial/algebraic_numbers.cpp @@ -16,17 +16,17 @@ Author: Notes: --*/ -#include"algebraic_numbers.h" -#include"upolynomial.h" -#include"mpbq.h" -#include"basic_interval.h" -#include"cooperate.h" -#include"sexpr2upolynomial.h" -#include"scoped_ptr_vector.h" -#include"mpbqi.h" -#include"timeit.h" +#include "math/polynomial/algebraic_numbers.h" +#include "math/polynomial/upolynomial.h" +#include "util/mpbq.h" +#include "util/basic_interval.h" +#include "util/cooperate.h" +#include "math/polynomial/sexpr2upolynomial.h" +#include "util/scoped_ptr_vector.h" +#include "util/mpbqi.h" +#include "util/timeit.h" #include"algebraic_params.hpp" -#include"common_msgs.h" +#include "util/common_msgs.h" namespace algebraic_numbers { diff --git a/src/math/polynomial/algebraic_numbers.h b/src/math/polynomial/algebraic_numbers.h index e86be7752..3a8ee766b 100644 --- a/src/math/polynomial/algebraic_numbers.h +++ b/src/math/polynomial/algebraic_numbers.h @@ -19,16 +19,16 @@ Notes: #ifndef ALGEBRAIC_NUMBERS_H_ #define ALGEBRAIC_NUMBERS_H_ -#include"rational.h" -#include"mpq.h" -#include"polynomial.h" -#include"z3_exception.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"tptr.h" -#include"statistics.h" -#include"params.h" -#include"rlimit.h" +#include "util/rational.h" +#include "util/mpq.h" +#include "math/polynomial/polynomial.h" +#include "util/z3_exception.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/tptr.h" +#include "util/statistics.h" +#include "util/params.h" +#include "util/rlimit.h" class small_object_allocator; class mpbq_manager; diff --git a/src/math/polynomial/polynomial.cpp b/src/math/polynomial/polynomial.cpp index 1a4aa8304..80669648e 100644 --- a/src/math/polynomial/polynomial.cpp +++ b/src/math/polynomial/polynomial.cpp @@ -16,24 +16,24 @@ Author: Notes: --*/ -#include"polynomial.h" -#include"vector.h" -#include"chashtable.h" -#include"small_object_allocator.h" -#include"id_gen.h" -#include"buffer.h" -#include"scoped_ptr_vector.h" -#include"cooperate.h" -#include"upolynomial_factorization.h" -#include"polynomial_primes.h" -#include"permutation.h" -#include"algebraic_numbers.h" -#include"mpzzp.h" -#include"timeit.h" -#include"linear_eq_solver.h" -#include"scoped_numeral_buffer.h" -#include"ref_buffer.h" -#include"common_msgs.h" +#include "math/polynomial/polynomial.h" +#include "util/vector.h" +#include "util/chashtable.h" +#include "util/small_object_allocator.h" +#include "util/id_gen.h" +#include "util/buffer.h" +#include "util/scoped_ptr_vector.h" +#include "util/cooperate.h" +#include "math/polynomial/upolynomial_factorization.h" +#include "math/polynomial/polynomial_primes.h" +#include "util/permutation.h" +#include "math/polynomial/algebraic_numbers.h" +#include "util/mpzzp.h" +#include "util/timeit.h" +#include "math/polynomial/linear_eq_solver.h" +#include "util/scoped_numeral_buffer.h" +#include "util/ref_buffer.h" +#include "util/common_msgs.h" namespace polynomial { diff --git a/src/math/polynomial/polynomial.h b/src/math/polynomial/polynomial.h index cb1880495..138331ef3 100644 --- a/src/math/polynomial/polynomial.h +++ b/src/math/polynomial/polynomial.h @@ -19,16 +19,16 @@ Notes: #ifndef POLYNOMIAL_H_ #define POLYNOMIAL_H_ -#include"mpz.h" -#include"rational.h" -#include"obj_ref.h" -#include"ref_vector.h" -#include"z3_exception.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"params.h" -#include"mpbqi.h" -#include"rlimit.h" +#include "util/mpz.h" +#include "util/rational.h" +#include "util/obj_ref.h" +#include "util/ref_vector.h" +#include "util/z3_exception.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/params.h" +#include "util/mpbqi.h" +#include "util/rlimit.h" class small_object_allocator; diff --git a/src/math/polynomial/polynomial_cache.cpp b/src/math/polynomial/polynomial_cache.cpp index dee0e722d..9a021ce36 100644 --- a/src/math/polynomial/polynomial_cache.cpp +++ b/src/math/polynomial/polynomial_cache.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"polynomial_cache.h" -#include"chashtable.h" +#include "math/polynomial/polynomial_cache.h" +#include "util/chashtable.h" namespace polynomial { diff --git a/src/math/polynomial/polynomial_cache.h b/src/math/polynomial/polynomial_cache.h index 538a08b5c..4ebb05b04 100644 --- a/src/math/polynomial/polynomial_cache.h +++ b/src/math/polynomial/polynomial_cache.h @@ -19,7 +19,7 @@ Notes: #ifndef POLYNOMIAL_CACHE_H_ #define POLYNOMIAL_CACHE_H_ -#include"polynomial.h" +#include "math/polynomial/polynomial.h" namespace polynomial { diff --git a/src/math/polynomial/polynomial_var2value.h b/src/math/polynomial/polynomial_var2value.h index 7da2e5980..c4aa16dfa 100644 --- a/src/math/polynomial/polynomial_var2value.h +++ b/src/math/polynomial/polynomial_var2value.h @@ -19,8 +19,8 @@ Notes: #ifndef POLYNOMIAL_VAR2VALUE_H_ #define POLYNOMIAL_VAR2VALUE_H_ -#include"polynomial.h" -#include"scoped_numeral_vector.h" +#include "math/polynomial/polynomial.h" +#include "util/scoped_numeral_vector.h" namespace polynomial { diff --git a/src/math/polynomial/rpolynomial.cpp b/src/math/polynomial/rpolynomial.cpp index 03cfac8c8..5e7a829f6 100644 --- a/src/math/polynomial/rpolynomial.cpp +++ b/src/math/polynomial/rpolynomial.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"rpolynomial.h" -#include"tptr.h" -#include"buffer.h" +#include "math/polynomial/rpolynomial.h" +#include "util/tptr.h" +#include "util/buffer.h" namespace rpolynomial { diff --git a/src/math/polynomial/rpolynomial.h b/src/math/polynomial/rpolynomial.h index b84dcca95..f2ba78894 100644 --- a/src/math/polynomial/rpolynomial.h +++ b/src/math/polynomial/rpolynomial.h @@ -19,12 +19,12 @@ Notes: #ifndef RPOLYNOMIAL_H_ #define RPOLYNOMIAL_H_ -#include"mpz.h" -#include"rational.h" -#include"obj_ref.h" -#include"ref_vector.h" -#include"z3_exception.h" -#include"polynomial.h" +#include "util/mpz.h" +#include "util/rational.h" +#include "util/obj_ref.h" +#include "util/ref_vector.h" +#include "util/z3_exception.h" +#include "math/polynomial/polynomial.h" namespace rpolynomial { diff --git a/src/math/polynomial/sexpr2upolynomial.cpp b/src/math/polynomial/sexpr2upolynomial.cpp index ea3de77da..790fefeb8 100644 --- a/src/math/polynomial/sexpr2upolynomial.cpp +++ b/src/math/polynomial/sexpr2upolynomial.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"sexpr2upolynomial.h" -#include"sexpr.h" +#include "math/polynomial/sexpr2upolynomial.h" +#include "util/sexpr.h" sexpr2upolynomial_exception::sexpr2upolynomial_exception(char const * msg, sexpr const * s): cmd_exception(msg, s->get_line(), s->get_pos()) { diff --git a/src/math/polynomial/sexpr2upolynomial.h b/src/math/polynomial/sexpr2upolynomial.h index 64488b0f4..0b849ad36 100644 --- a/src/math/polynomial/sexpr2upolynomial.h +++ b/src/math/polynomial/sexpr2upolynomial.h @@ -19,8 +19,8 @@ Notes: #ifndef SEXPR2UPOLYNOMIAL_H_ #define SEXPR2UPOLYNOMIAL_H_ -#include"upolynomial.h" -#include"cmd_context_types.h" +#include "math/polynomial/upolynomial.h" +#include "util/cmd_context_types.h" class sexpr; class sexpr2upolynomial_exception : public cmd_exception { diff --git a/src/math/polynomial/upolynomial.cpp b/src/math/polynomial/upolynomial.cpp index aa26ccf4c..fe890b040 100644 --- a/src/math/polynomial/upolynomial.cpp +++ b/src/math/polynomial/upolynomial.cpp @@ -21,12 +21,12 @@ Author: Notes: --*/ -#include"upolynomial.h" -#include"upolynomial_factorization.h" -#include"polynomial_primes.h" -#include"buffer.h" -#include"cooperate.h" -#include"common_msgs.h" +#include "math/polynomial/upolynomial.h" +#include "math/polynomial/upolynomial_factorization.h" +#include "math/polynomial/polynomial_primes.h" +#include "util/buffer.h" +#include "util/cooperate.h" +#include "util/common_msgs.h" namespace upolynomial { diff --git a/src/math/polynomial/upolynomial.h b/src/math/polynomial/upolynomial.h index 789759dc6..e0df0dd31 100644 --- a/src/math/polynomial/upolynomial.h +++ b/src/math/polynomial/upolynomial.h @@ -24,12 +24,12 @@ Notes: #ifndef UPOLYNOMIAL_H_ #define UPOLYNOMIAL_H_ -#include"mpzzp.h" -#include"rational.h" -#include"polynomial.h" -#include"z3_exception.h" -#include"mpbq.h" -#include"rlimit.h" +#include "util/mpzzp.h" +#include "util/rational.h" +#include "math/polynomial/polynomial.h" +#include "util/z3_exception.h" +#include "util/mpbq.h" +#include "util/rlimit.h" #define FACTOR_VERBOSE_LVL 1000 namespace upolynomial { diff --git a/src/math/polynomial/upolynomial_factorization.cpp b/src/math/polynomial/upolynomial_factorization.cpp index 5a7aefa18..11a37648a 100644 --- a/src/math/polynomial/upolynomial_factorization.cpp +++ b/src/math/polynomial/upolynomial_factorization.cpp @@ -22,10 +22,10 @@ Notes: [3] Henri Cohen. A Course in Computational Algebraic Number Theory. Springer Verlag, 1993. --*/ -#include"trace.h" -#include"util.h" -#include"upolynomial_factorization_int.h" -#include"prime_generator.h" +#include "util/trace.h" +#include "util/util.h" +#include "math/polynomial/upolynomial_factorization_int.h" +#include "util/prime_generator.h" using namespace std; diff --git a/src/math/polynomial/upolynomial_factorization.h b/src/math/polynomial/upolynomial_factorization.h index ba184d613..6fe0f2be6 100644 --- a/src/math/polynomial/upolynomial_factorization.h +++ b/src/math/polynomial/upolynomial_factorization.h @@ -25,10 +25,10 @@ Notes: #ifndef UPOLYNOMIAL_FACTORIZATION_H_ #define UPOLYNOMIAL_FACTORIZATION_H_ -#include"upolynomial.h" -#include"polynomial.h" -#include"bit_vector.h" -#include"z3_exception.h" +#include "math/polynomial/upolynomial.h" +#include "math/polynomial/polynomial.h" +#include "util/bit_vector.h" +#include "util/z3_exception.h" namespace upolynomial { typedef manager::scoped_numeral scoped_numeral; diff --git a/src/math/polynomial/upolynomial_factorization_int.h b/src/math/polynomial/upolynomial_factorization_int.h index 86fe52b03..640c5ad5c 100644 --- a/src/math/polynomial/upolynomial_factorization_int.h +++ b/src/math/polynomial/upolynomial_factorization_int.h @@ -26,7 +26,7 @@ Notes: #ifndef UPOLYNOMIAL_FACTORIZATION_INT_H_ #define UPOLYNOMIAL_FACTORIZATION_INT_H_ -#include"upolynomial_factorization.h" +#include "math/polynomial/upolynomial_factorization.h" namespace upolynomial { // copy p from some manager to zp_p in Z_p[x] diff --git a/src/math/realclosure/mpz_matrix.cpp b/src/math/realclosure/mpz_matrix.cpp index 799a5817e..62a328b8d 100644 --- a/src/math/realclosure/mpz_matrix.cpp +++ b/src/math/realclosure/mpz_matrix.cpp @@ -28,8 +28,8 @@ Author: Notes: --*/ -#include"mpz_matrix.h" -#include"buffer.h" +#include "math/realclosure/mpz_matrix.h" +#include "util/buffer.h" mpz_matrix_manager::mpz_matrix_manager(unsynch_mpz_manager & nm, small_object_allocator & a): m_nm(nm), diff --git a/src/math/realclosure/mpz_matrix.h b/src/math/realclosure/mpz_matrix.h index bd9c1bd45..f5d7358da 100644 --- a/src/math/realclosure/mpz_matrix.h +++ b/src/math/realclosure/mpz_matrix.h @@ -31,7 +31,7 @@ Notes: #ifndef MPZ_MATRIX_H_ #define MPZ_MATRIX_H_ -#include"mpz.h" +#include "util/mpz.h" /** \brief A mxn matrix. diff --git a/src/math/realclosure/realclosure.cpp b/src/math/realclosure/realclosure.cpp index 0268470f7..93cfc98f4 100644 --- a/src/math/realclosure/realclosure.cpp +++ b/src/math/realclosure/realclosure.cpp @@ -19,17 +19,17 @@ Author: Notes: --*/ -#include"realclosure.h" +#include "math/realclosure/realclosure.h" #include"rcf_params.hpp" -#include"array.h" -#include"mpbq.h" -#include"mpz_matrix.h" -#include"interval_def.h" -#include"obj_ref.h" -#include"ref_vector.h" -#include"ref_buffer.h" -#include"cooperate.h" -#include"common_msgs.h" +#include "util/array.h" +#include "util/mpbq.h" +#include "math/realclosure/mpz_matrix.h" +#include "math/interval/interval_def.h" +#include "util/obj_ref.h" +#include "util/ref_vector.h" +#include "util/ref_buffer.h" +#include "util/cooperate.h" +#include "util/common_msgs.h" #ifndef REALCLOSURE_INI_BUFFER_SIZE #define REALCLOSURE_INI_BUFFER_SIZE 32 diff --git a/src/math/realclosure/realclosure.h b/src/math/realclosure/realclosure.h index 10d35f58d..c18f626a3 100644 --- a/src/math/realclosure/realclosure.h +++ b/src/math/realclosure/realclosure.h @@ -22,13 +22,13 @@ Notes: #ifndef REALCLOSURE_H_ #define REALCLOSURE_H_ -#include"mpq.h" -#include"params.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"interval.h" -#include"z3_exception.h" -#include"rlimit.h" +#include "util/mpq.h" +#include "util/params.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "math/interval/interval.h" +#include "util/z3_exception.h" +#include "util/rlimit.h" namespace realclosure { class num; diff --git a/src/math/simplex/model_based_opt.h b/src/math/simplex/model_based_opt.h index eb0bc2570..54360d0ac 100644 --- a/src/math/simplex/model_based_opt.h +++ b/src/math/simplex/model_based_opt.h @@ -21,9 +21,9 @@ Revision History: #ifndef __MODEL_BASED_OPT_H__ #define __MODEL_BASED_OPT_H__ -#include "util.h" -#include "rational.h" -#include"inf_eps_rational.h" +#include "util/util.h" +#include "util/rational.h" +#include "util/inf_eps_rational.h" namespace opt { diff --git a/src/math/simplex/network_flow.h b/src/math/simplex/network_flow.h index 13aff5089..d4c7df77f 100644 --- a/src/math/simplex/network_flow.h +++ b/src/math/simplex/network_flow.h @@ -28,9 +28,9 @@ Notes: #ifndef NETWORK_FLOW_H_ #define NETWORK_FLOW_H_ -#include"inf_rational.h" -#include"diff_logic.h" -#include"spanning_tree.h" +#include "util/inf_rational.h" +#include "smt/diff_logic.h" +#include "smt/spanning_tree.h" namespace smt { diff --git a/src/math/simplex/network_flow_def.h b/src/math/simplex/network_flow_def.h index a4a6246ce..4a7d00a23 100644 --- a/src/math/simplex/network_flow_def.h +++ b/src/math/simplex/network_flow_def.h @@ -20,9 +20,9 @@ Notes: #ifndef NETWORK_FLOW_DEF_H_ #define NETWORK_FLOW_DEF_H_ -#include"network_flow.h" -#include"uint_set.h" -#include"spanning_tree_def.h" +#include "math/simplex/network_flow.h" +#include "util/uint_set.h" +#include "smt/spanning_tree_def.h" namespace smt { diff --git a/src/math/simplex/simplex.cpp b/src/math/simplex/simplex.cpp index 494c0b6bb..42bb46eef 100644 --- a/src/math/simplex/simplex.cpp +++ b/src/math/simplex/simplex.cpp @@ -17,9 +17,9 @@ Notes: --*/ -#include"simplex.h" -#include"sparse_matrix_def.h" -#include"simplex_def.h" +#include "math/simplex/simplex.h" +#include "math/simplex/sparse_matrix_def.h" +#include "math/simplex/simplex_def.h" namespace simplex { template class simplex; template class simplex; diff --git a/src/math/simplex/simplex.h b/src/math/simplex/simplex.h index 277179507..5c412e356 100644 --- a/src/math/simplex/simplex.h +++ b/src/math/simplex/simplex.h @@ -32,11 +32,11 @@ Notes: #ifndef SIMPLEX_H_ #define SIMPLEX_H_ -#include "sparse_matrix.h" -#include "mpq_inf.h" -#include "heap.h" -#include "lbool.h" -#include "uint_set.h" +#include "math/simplex/sparse_matrix.h" +#include "util/mpq_inf.h" +#include "util/heap.h" +#include "util/lbool.h" +#include "util/uint_set.h" namespace simplex { diff --git a/src/math/simplex/sparse_matrix.h b/src/math/simplex/sparse_matrix.h index 803d27fde..dc4ce8695 100644 --- a/src/math/simplex/sparse_matrix.h +++ b/src/math/simplex/sparse_matrix.h @@ -19,8 +19,8 @@ Notes: #ifndef SPARSE_MATRIX_H_ #define SPARSE_MATRIX_H_ -#include "mpq_inf.h" -#include "statistics.h" +#include "util/mpq_inf.h" +#include "util/statistics.h" namespace simplex { diff --git a/src/math/simplex/sparse_matrix_def.h b/src/math/simplex/sparse_matrix_def.h index b050e45e1..be18a8702 100644 --- a/src/math/simplex/sparse_matrix_def.h +++ b/src/math/simplex/sparse_matrix_def.h @@ -21,8 +21,8 @@ Notes: #ifndef SPARSE_MATRIX_DEF_H_ #define SPARSE_MATRIX_DEF_H_ -#include "sparse_matrix.h" -#include "uint_set.h" +#include "math/simplex/sparse_matrix.h" +#include "util/uint_set.h" namespace simplex { diff --git a/src/math/subpaving/subpaving.cpp b/src/math/subpaving/subpaving.cpp index 8aa394abe..96fc5b6d7 100644 --- a/src/math/subpaving/subpaving.cpp +++ b/src/math/subpaving/subpaving.cpp @@ -22,13 +22,13 @@ Author: Revision History: --*/ -#include"subpaving.h" -#include"subpaving_types.h" -#include"subpaving_mpq.h" -#include"subpaving_mpf.h" -#include"subpaving_hwf.h" -#include"subpaving_mpff.h" -#include"subpaving_mpfx.h" +#include "math/subpaving/subpaving.h" +#include "math/subpaving/subpaving_types.h" +#include "math/subpaving/subpaving_mpq.h" +#include "math/subpaving/subpaving_mpf.h" +#include "math/subpaving/subpaving_hwf.h" +#include "math/subpaving/subpaving_mpff.h" +#include "math/subpaving/subpaving_mpfx.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving.h b/src/math/subpaving/subpaving.h index c6daca5cc..2c2c9978f 100644 --- a/src/math/subpaving/subpaving.h +++ b/src/math/subpaving/subpaving.h @@ -25,10 +25,10 @@ Revision History: #ifndef SUBPAVING_H_ #define SUBPAVING_H_ -#include"mpq.h" -#include"subpaving_types.h" -#include"params.h" -#include"statistics.h" +#include "util/mpq.h" +#include "math/subpaving/subpaving_types.h" +#include "util/params.h" +#include "util/statistics.h" template class f2n; class mpf_manager; diff --git a/src/math/subpaving/subpaving_hwf.cpp b/src/math/subpaving/subpaving_hwf.cpp index 142db72f6..7279a6273 100644 --- a/src/math/subpaving/subpaving_hwf.cpp +++ b/src/math/subpaving/subpaving_hwf.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"subpaving_hwf.h" -#include"subpaving_t_def.h" +#include "math/subpaving/subpaving_hwf.h" +#include "math/subpaving/subpaving_t_def.h" // force template instantiation template class subpaving::context_t; diff --git a/src/math/subpaving/subpaving_hwf.h b/src/math/subpaving/subpaving_hwf.h index f57035b01..52594e050 100644 --- a/src/math/subpaving/subpaving_hwf.h +++ b/src/math/subpaving/subpaving_hwf.h @@ -19,9 +19,9 @@ Revision History: #ifndef SUBPAVING_HWF_H_ #define SUBPAVING_HWF_H_ -#include"subpaving_t.h" -#include"f2n.h" -#include"hwf.h" +#include "math/subpaving/subpaving_t.h" +#include "util/f2n.h" +#include "util/hwf.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving_mpf.cpp b/src/math/subpaving/subpaving_mpf.cpp index 96ada040b..ef8b5903c 100644 --- a/src/math/subpaving/subpaving_mpf.cpp +++ b/src/math/subpaving/subpaving_mpf.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"subpaving_mpf.h" -#include"subpaving_t_def.h" +#include "math/subpaving/subpaving_mpf.h" +#include "math/subpaving/subpaving_t_def.h" // force template instantiation template class subpaving::context_t; diff --git a/src/math/subpaving/subpaving_mpf.h b/src/math/subpaving/subpaving_mpf.h index 16e4b38cc..8e0d4cfc7 100644 --- a/src/math/subpaving/subpaving_mpf.h +++ b/src/math/subpaving/subpaving_mpf.h @@ -19,9 +19,9 @@ Revision History: #ifndef SUBPAVING_MPF_H_ #define SUBPAVING_MPF_H_ -#include"subpaving_t.h" -#include"mpf.h" -#include"f2n.h" +#include "math/subpaving/subpaving_t.h" +#include "util/mpf.h" +#include "util/f2n.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving_mpff.cpp b/src/math/subpaving/subpaving_mpff.cpp index f5be655ba..18dcd4e6e 100644 --- a/src/math/subpaving/subpaving_mpff.cpp +++ b/src/math/subpaving/subpaving_mpff.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"subpaving_mpff.h" -#include"subpaving_t_def.h" +#include "math/subpaving/subpaving_mpff.h" +#include "math/subpaving/subpaving_t_def.h" // force template instantiation template class subpaving::context_t; diff --git a/src/math/subpaving/subpaving_mpff.h b/src/math/subpaving/subpaving_mpff.h index c0ddb019d..8e5c7f3ea 100644 --- a/src/math/subpaving/subpaving_mpff.h +++ b/src/math/subpaving/subpaving_mpff.h @@ -19,8 +19,8 @@ Revision History: #ifndef SUBPAVING_MPFF_H_ #define SUBPAVING_MPFF_H_ -#include"subpaving_t.h" -#include"mpff.h" +#include "math/subpaving/subpaving_t.h" +#include "util/mpff.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving_mpfx.cpp b/src/math/subpaving/subpaving_mpfx.cpp index b8a1e048f..23902dce3 100644 --- a/src/math/subpaving/subpaving_mpfx.cpp +++ b/src/math/subpaving/subpaving_mpfx.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"subpaving_mpfx.h" -#include"subpaving_t_def.h" +#include "math/subpaving/subpaving_mpfx.h" +#include "math/subpaving/subpaving_t_def.h" // force template instantiation template class subpaving::context_t; diff --git a/src/math/subpaving/subpaving_mpfx.h b/src/math/subpaving/subpaving_mpfx.h index 6213df1e5..5802b1abf 100644 --- a/src/math/subpaving/subpaving_mpfx.h +++ b/src/math/subpaving/subpaving_mpfx.h @@ -19,8 +19,8 @@ Revision History: #ifndef SUBPAVING_MPFX_H_ #define SUBPAVING_MPFX_H_ -#include"subpaving_t.h" -#include"mpfx.h" +#include "math/subpaving/subpaving_t.h" +#include "util/mpfx.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving_mpq.cpp b/src/math/subpaving/subpaving_mpq.cpp index b7b76a5e3..77b1405a7 100644 --- a/src/math/subpaving/subpaving_mpq.cpp +++ b/src/math/subpaving/subpaving_mpq.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"subpaving_mpq.h" -#include"subpaving_t_def.h" +#include "math/subpaving/subpaving_mpq.h" +#include "math/subpaving/subpaving_t_def.h" // force template instantiation template class subpaving::context_t; diff --git a/src/math/subpaving/subpaving_mpq.h b/src/math/subpaving/subpaving_mpq.h index 04bcd6059..b08eb9ccd 100644 --- a/src/math/subpaving/subpaving_mpq.h +++ b/src/math/subpaving/subpaving_mpq.h @@ -19,8 +19,8 @@ Revision History: #ifndef SUBPAVING_MPQ_H_ #define SUBPAVING_MPQ_H_ -#include"subpaving_t.h" -#include"mpq.h" +#include "math/subpaving/subpaving_t.h" +#include "util/mpq.h" namespace subpaving { diff --git a/src/math/subpaving/subpaving_t.h b/src/math/subpaving/subpaving_t.h index ccef1a318..a4bc02ff6 100644 --- a/src/math/subpaving/subpaving_t.h +++ b/src/math/subpaving/subpaving_t.h @@ -20,18 +20,18 @@ Revision History: #define SUBPAVING_T_H_ #include -#include"tptr.h" -#include"small_object_allocator.h" -#include"chashtable.h" -#include"parray.h" -#include"interval.h" -#include"scoped_numeral_vector.h" -#include"subpaving_types.h" -#include"params.h" -#include"statistics.h" -#include"lbool.h" -#include"id_gen.h" -#include"rlimit.h" +#include "util/tptr.h" +#include "util/small_object_allocator.h" +#include "util/chashtable.h" +#include "util/parray.h" +#include "math/interval/interval.h" +#include "util/scoped_numeral_vector.h" +#include "math/subpaving/subpaving_types.h" +#include "util/params.h" +#include "util/statistics.h" +#include "util/lbool.h" +#include "util/id_gen.h" +#include "util/rlimit.h" #ifdef _MSC_VER #pragma warning(disable : 4200) #pragma warning(disable : 4355) diff --git a/src/math/subpaving/subpaving_t_def.h b/src/math/subpaving/subpaving_t_def.h index 6ae7d97b1..108b6aac3 100644 --- a/src/math/subpaving/subpaving_t_def.h +++ b/src/math/subpaving/subpaving_t_def.h @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include"subpaving_t.h" -#include"interval_def.h" -#include"buffer.h" -#include"cooperate.h" -#include"z3_exception.h" -#include"common_msgs.h" +#include "math/subpaving/subpaving_t.h" +#include "math/interval/interval_def.h" +#include "util/buffer.h" +#include "util/cooperate.h" +#include "util/z3_exception.h" +#include "util/common_msgs.h" namespace subpaving { diff --git a/src/math/subpaving/tactic/expr2subpaving.cpp b/src/math/subpaving/tactic/expr2subpaving.cpp index 267a04b9a..b00c0007f 100644 --- a/src/math/subpaving/tactic/expr2subpaving.cpp +++ b/src/math/subpaving/tactic/expr2subpaving.cpp @@ -17,14 +17,14 @@ Author: Notes: --*/ -#include"expr2subpaving.h" -#include"expr2var.h" -#include"ref_util.h" -#include"z3_exception.h" -#include"cooperate.h" -#include"arith_decl_plugin.h" -#include"scoped_numeral_buffer.h" -#include"common_msgs.h" +#include "math/subpaving/tactic/expr2subpaving.h" +#include "ast/expr2var.h" +#include "util/ref_util.h" +#include "util/z3_exception.h" +#include "util/cooperate.h" +#include "ast/arith_decl_plugin.h" +#include "util/scoped_numeral_buffer.h" +#include "util/common_msgs.h" struct expr2subpaving::imp { struct frame { diff --git a/src/math/subpaving/tactic/expr2subpaving.h b/src/math/subpaving/tactic/expr2subpaving.h index 8e6e69332..d95699759 100644 --- a/src/math/subpaving/tactic/expr2subpaving.h +++ b/src/math/subpaving/tactic/expr2subpaving.h @@ -20,8 +20,8 @@ Notes: #ifndef EXPR2SUBPAVING_H_ #define EXPR2SUBPAVING_H_ -#include"ast.h" -#include"subpaving.h" +#include "ast/ast.h" +#include "math/subpaving/subpaving.h" class expr2var; diff --git a/src/math/subpaving/tactic/subpaving_tactic.cpp b/src/math/subpaving/tactic/subpaving_tactic.cpp index 2d0199223..6a7bc11e8 100644 --- a/src/math/subpaving/tactic/subpaving_tactic.cpp +++ b/src/math/subpaving/tactic/subpaving_tactic.cpp @@ -16,16 +16,16 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"expr2subpaving.h" -#include"expr2var.h" -#include"arith_decl_plugin.h" -#include"ast_smt2_pp.h" -#include"hwf.h" -#include"mpff.h" -#include"mpfx.h" -#include"f2n.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "math/subpaving/tactic/expr2subpaving.h" +#include "ast/expr2var.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_smt2_pp.h" +#include "util/hwf.h" +#include "util/mpff.h" +#include "util/mpfx.h" +#include "util/f2n.h" class subpaving_tactic : public tactic { diff --git a/src/math/subpaving/tactic/subpaving_tactic.h b/src/math/subpaving/tactic/subpaving_tactic.h index 30a72b888..208f762de 100644 --- a/src/math/subpaving/tactic/subpaving_tactic.h +++ b/src/math/subpaving/tactic/subpaving_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef SUBPAVING_TACTIC_H_ #define SUBPAVING_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/model/func_interp.cpp b/src/model/func_interp.cpp index 01e160eb0..2ead63e0a 100644 --- a/src/model/func_interp.cpp +++ b/src/model/func_interp.cpp @@ -15,11 +15,11 @@ Author: Revision History: --*/ -#include"func_interp.h" -#include"var_subst.h" -#include"obj_hashtable.h" -#include"ast_pp.h" -#include"ast_smt2_pp.h" +#include "model/func_interp.h" +#include "ast/rewriter/var_subst.h" +#include "util/obj_hashtable.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" func_entry::func_entry(ast_manager & m, unsigned arity, expr * const * args, expr * result): m_args_are_values(true), diff --git a/src/model/func_interp.h b/src/model/func_interp.h index d0d61546e..47eb0e82c 100644 --- a/src/model/func_interp.h +++ b/src/model/func_interp.h @@ -30,8 +30,8 @@ Revision History: #ifndef FUNC_INTERP_H_ #define FUNC_INTERP_H_ -#include"ast.h" -#include"ast_translation.h" +#include "ast/ast.h" +#include "ast/ast_translation.h" class func_interp; diff --git a/src/model/model.cpp b/src/model/model.cpp index 951c7f744..7ac1300de 100644 --- a/src/model/model.cpp +++ b/src/model/model.cpp @@ -16,14 +16,14 @@ Author: Revision History: --*/ -#include"model.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"var_subst.h" -#include"array_decl_plugin.h" -#include"well_sorted.h" -#include"used_symbols.h" -#include"model_evaluator.h" +#include "model/model.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/rewriter/var_subst.h" +#include "ast/array_decl_plugin.h" +#include "ast/well_sorted.h" +#include "ast/used_symbols.h" +#include "model/model_evaluator.h" model::model(ast_manager & m): model_core(m) { diff --git a/src/model/model.h b/src/model/model.h index 338b6ad74..f6de8ce0e 100644 --- a/src/model/model.h +++ b/src/model/model.h @@ -19,9 +19,9 @@ Revision History: #ifndef MODEL_H_ #define MODEL_H_ -#include"model_core.h" -#include"ref.h" -#include"ast_translation.h" +#include "model/model_core.h" +#include "util/ref.h" +#include "ast/ast_translation.h" class model : public model_core { protected: diff --git a/src/model/model2expr.cpp b/src/model/model2expr.cpp index 05aea6ee7..990f9df0f 100644 --- a/src/model/model2expr.cpp +++ b/src/model/model2expr.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include "model2expr.h" -#include "for_each_ast.h" -#include "bool_rewriter.h" -#include "var_subst.h" +#include "model/model2expr.h" +#include "ast/for_each_ast.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/var_subst.h" struct for_each_symbol_proc { symbol_set& m_symbols; diff --git a/src/model/model2expr.h b/src/model/model2expr.h index 272ba20b6..d55e31bba 100644 --- a/src/model/model2expr.h +++ b/src/model/model2expr.h @@ -19,7 +19,7 @@ Revision History: #ifndef MODEL2EXPR_H_ #define MODEL2EXPR_H_ -#include"model.h" +#include "model/model.h" void model2expr(model& m, expr_ref& result); diff --git a/src/model/model_core.cpp b/src/model/model_core.cpp index 503abac2f..9da1e76f9 100644 --- a/src/model/model_core.cpp +++ b/src/model/model_core.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"model_core.h" +#include "model/model_core.h" model_core::~model_core() { decl2expr::iterator it1 = m_interp.begin(); diff --git a/src/model/model_core.h b/src/model/model_core.h index c42451c5a..ec128c796 100644 --- a/src/model/model_core.h +++ b/src/model/model_core.h @@ -19,9 +19,9 @@ Revision History: #ifndef MODEL_CORE_H_ #define MODEL_CORE_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"func_interp.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "model/func_interp.h" class model_core { protected: diff --git a/src/model/model_evaluator.cpp b/src/model/model_evaluator.cpp index 805ed8e5d..5020fb98b 100644 --- a/src/model/model_evaluator.cpp +++ b/src/model/model_evaluator.cpp @@ -16,23 +16,23 @@ Author: Revision History: --*/ -#include"model.h" +#include "model/model.h" #include"model_evaluator_params.hpp" -#include"rewriter_types.h" -#include"model_evaluator.h" -#include"bool_rewriter.h" -#include"arith_rewriter.h" -#include"bv_rewriter.h" -#include"pb_rewriter.h" -#include"seq_rewriter.h" -#include"datatype_rewriter.h" -#include"array_rewriter.h" -#include"fpa_rewriter.h" -#include"rewriter_def.h" -#include"cooperate.h" -#include"ast_pp.h" -#include"ast_util.h" -#include"model_smt2_pp.h" +#include "ast/rewriter/rewriter_types.h" +#include "model/model_evaluator.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/rewriter/bv_rewriter.h" +#include "ast/rewriter/pb_rewriter.h" +#include "ast/rewriter/seq_rewriter.h" +#include "ast/rewriter/datatype_rewriter.h" +#include "ast/rewriter/array_rewriter.h" +#include "ast/rewriter/fpa_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/cooperate.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "model/model_smt2_pp.h" struct evaluator_cfg : public default_rewriter_cfg { diff --git a/src/model/model_evaluator.h b/src/model/model_evaluator.h index ba55e96ba..2497ec927 100644 --- a/src/model/model_evaluator.h +++ b/src/model/model_evaluator.h @@ -19,9 +19,9 @@ Revision History: #ifndef MODEL_EVALUATOR_H_ #define MODEL_EVALUATOR_H_ -#include"ast.h" -#include"rewriter_types.h" -#include"params.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter_types.h" +#include "util/params.h" class model; typedef rewriter_exception model_evaluator_exception; diff --git a/src/model/model_implicant.cpp b/src/model/model_implicant.cpp index 0d37a04df..6abdacfba 100644 --- a/src/model/model_implicant.cpp +++ b/src/model/model_implicant.cpp @@ -22,23 +22,23 @@ Notes: --*/ #include -#include "array_decl_plugin.h" -#include "ast_pp.h" -#include "bool_rewriter.h" -#include "for_each_expr.h" -#include "model.h" -#include "ref_vector.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "util.h" -#include "model_implicant.h" -#include "arith_decl_plugin.h" -#include "expr_replacer.h" -#include "model_smt2_pp.h" -#include "poly_rewriter.h" -#include "poly_rewriter_def.h" -#include "arith_rewriter.h" -#include "scoped_proof.h" +#include "ast/array_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/for_each_expr.h" +#include "model/model.h" +#include "util/ref_vector.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/util.h" +#include "model/model_implicant.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/expr_replacer.h" +#include "model/model_smt2_pp.h" +#include "ast/rewriter/poly_rewriter.h" +#include "ast/rewriter/poly_rewriter_def.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/scoped_proof.h" diff --git a/src/model/model_implicant.h b/src/model/model_implicant.h index 91bfe9894..c34a4b810 100644 --- a/src/model/model_implicant.h +++ b/src/model/model_implicant.h @@ -20,14 +20,14 @@ Revision History: #ifndef MODEL_IMPLICANT_H_ #define MODEL_IMPLICANT_H_ -#include "ast.h" -#include "ast_pp.h" -#include "obj_hashtable.h" -#include "ref_vector.h" -#include "trace.h" -#include "vector.h" -#include "arith_decl_plugin.h" -#include "array_decl_plugin.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "util/obj_hashtable.h" +#include "util/ref_vector.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" class model; class model_core; diff --git a/src/model/model_pp.cpp b/src/model/model_pp.cpp index b968c7184..2f9b114bb 100644 --- a/src/model/model_pp.cpp +++ b/src/model/model_pp.cpp @@ -17,12 +17,12 @@ Revision History: --*/ -#include"model_pp.h" -#include"model_core.h" -#include"ast_pp.h" -#include"ast_smt2_pp.h" -#include"used_symbols.h" -#include"pp.h" +#include "model/model_pp.h" +#include "model/model_core.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/used_symbols.h" +#include "ast/pp.h" static void display_uninterp_sorts(std::ostream & out, model_core const & md) { ast_manager & m = md.get_manager(); diff --git a/src/model/model_smt2_pp.cpp b/src/model/model_smt2_pp.cpp index 929668638..152cbc8d3 100644 --- a/src/model/model_smt2_pp.cpp +++ b/src/model/model_smt2_pp.cpp @@ -18,10 +18,10 @@ Revision History: --*/ #include -#include"model_smt2_pp.h" -#include"ast_smt2_pp.h" -#include"func_decl_dependencies.h" -#include"pp.h" +#include "model/model_smt2_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/func_decl_dependencies.h" +#include "ast/pp.h" using namespace format_ns; static void pp_indent(std::ostream & out, unsigned indent) { diff --git a/src/model/model_smt2_pp.h b/src/model/model_smt2_pp.h index c123bfb24..c43e26ca6 100644 --- a/src/model/model_smt2_pp.h +++ b/src/model/model_smt2_pp.h @@ -20,8 +20,8 @@ Revision History: #ifndef MODEL_SMT2_PP_H_ #define MODEL_SMT2_PP_H_ -#include"ast_printer.h" -#include"model_core.h" +#include "ast/ast_printer.h" +#include "model/model_core.h" void model_smt2_pp(std::ostream & out, ast_printer_context & ctx, model_core const & m, unsigned indent); void model_smt2_pp(std::ostream & out, ast_manager & m, model_core const & md, unsigned indent); diff --git a/src/model/model_v2_pp.cpp b/src/model/model_v2_pp.cpp index 4600ccc9e..dae9b2104 100644 --- a/src/model/model_v2_pp.cpp +++ b/src/model/model_v2_pp.cpp @@ -15,9 +15,9 @@ Author: Revision History: --*/ -#include"model_v2_pp.h" -#include"model_core.h" -#include"ast_pp.h" +#include "model/model_v2_pp.h" +#include "model/model_core.h" +#include "ast/ast_pp.h" static void display_function(std::ostream & out, model_core const & md, func_decl * f, bool partial) { ast_manager & m = md.get_manager(); diff --git a/src/muz/base/bind_variables.cpp b/src/muz/base/bind_variables.cpp index 0cc50625e..2ba7d1473 100644 --- a/src/muz/base/bind_variables.cpp +++ b/src/muz/base/bind_variables.cpp @@ -18,7 +18,7 @@ Notes: --*/ -#include "bind_variables.h" +#include "muz/base/bind_variables.h" bind_variables::bind_variables(ast_manager & m): m(m), diff --git a/src/muz/base/bind_variables.h b/src/muz/base/bind_variables.h index 18af319f8..693010132 100644 --- a/src/muz/base/bind_variables.h +++ b/src/muz/base/bind_variables.h @@ -21,7 +21,7 @@ Notes: #ifndef BIND_VARIABLES_H_ #define BIND_VARIABLES_H_ -#include"ast.h" +#include "ast/ast.h" class bind_variables { typedef obj_map var2bound; diff --git a/src/muz/base/dl_boogie_proof.cpp b/src/muz/base/dl_boogie_proof.cpp index 75579323c..ec999c05e 100644 --- a/src/muz/base/dl_boogie_proof.cpp +++ b/src/muz/base/dl_boogie_proof.cpp @@ -51,11 +51,11 @@ Example from Boogie: ") */ -#include "dl_boogie_proof.h" -#include "model_pp.h" -#include "proof_utils.h" -#include "ast_pp.h" -#include "ast_util.h" +#include "muz/base/dl_boogie_proof.h" +#include "model/model_pp.h" +#include "muz/base/proof_utils.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" namespace datalog { diff --git a/src/muz/base/dl_boogie_proof.h b/src/muz/base/dl_boogie_proof.h index 0f829dbdf..f335159b6 100644 --- a/src/muz/base/dl_boogie_proof.h +++ b/src/muz/base/dl_boogie_proof.h @@ -48,8 +48,8 @@ define-fun) when Boogie supports this. */ -#include "ast.h" -#include "model.h" +#include "ast/ast.h" +#include "model/model.h" namespace datalog { class boogie_proof { diff --git a/src/muz/base/dl_context.cpp b/src/muz/base/dl_context.cpp index 2ca74a73b..28a456b22 100644 --- a/src/muz/base/dl_context.cpp +++ b/src/muz/base/dl_context.cpp @@ -19,16 +19,16 @@ Revision History: #include #include -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"dl_context.h" -#include"for_each_expr.h" -#include"ast_smt_pp.h" -#include"ast_smt2_pp.h" -#include"datatype_decl_plugin.h" -#include"scoped_proof.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "muz/base/dl_context.h" +#include "ast/for_each_expr.h" +#include "ast/ast_smt_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/scoped_proof.h" #include"fixedpoint_params.hpp" -#include"ast_pp_util.h" +#include "ast/ast_pp_util.h" namespace datalog { diff --git a/src/muz/base/dl_context.h b/src/muz/base/dl_context.h index ba841c84f..0e1d47609 100644 --- a/src/muz/base/dl_context.h +++ b/src/muz/base/dl_context.h @@ -23,26 +23,26 @@ Revision History: #undef min #undef max #endif -#include"arith_decl_plugin.h" -#include"map.h" -#include"th_rewriter.h" -#include"str_hashtable.h" -#include"var_subst.h" -#include"dl_costs.h" -#include"dl_decl_plugin.h" -#include"dl_rule_set.h" -#include"lbool.h" -#include"statistics.h" -#include"params.h" -#include"trail.h" -#include"model_converter.h" -#include"model2expr.h" -#include"smt_params.h" -#include"dl_rule_transformer.h" -#include"expr_functors.h" -#include"dl_engine_base.h" -#include"bind_variables.h" -#include"rule_properties.h" +#include "ast/arith_decl_plugin.h" +#include "util/map.h" +#include "ast/rewriter/th_rewriter.h" +#include "util/str_hashtable.h" +#include "ast/rewriter/var_subst.h" +#include "muz/base/dl_costs.h" +#include "ast/dl_decl_plugin.h" +#include "muz/base/dl_rule_set.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "util/params.h" +#include "util/trail.h" +#include "tactic/model_converter.h" +#include "model/model2expr.h" +#include "smt/params/smt_params.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/expr_functors.h" +#include "muz/base/dl_engine_base.h" +#include "muz/base/bind_variables.h" +#include "muz/base/rule_properties.h" struct fixedpoint_params; diff --git a/src/muz/base/dl_costs.cpp b/src/muz/base/dl_costs.cpp index fe085d7f7..f97a4d451 100644 --- a/src/muz/base/dl_costs.cpp +++ b/src/muz/base/dl_costs.cpp @@ -17,11 +17,11 @@ Revision History: --*/ -#include "debug.h" -#include "stopwatch.h" -#include "dl_context.h" -#include "dl_rule.h" -#include "dl_costs.h" +#include "util/debug.h" +#include "util/stopwatch.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_costs.h" namespace datalog { diff --git a/src/muz/base/dl_costs.h b/src/muz/base/dl_costs.h index f3f97f6fd..fd5a99f15 100644 --- a/src/muz/base/dl_costs.h +++ b/src/muz/base/dl_costs.h @@ -22,7 +22,7 @@ Revision History: #include -#include "ast.h" +#include "ast/ast.h" class stopwatch; diff --git a/src/muz/base/dl_engine_base.h b/src/muz/base/dl_engine_base.h index 9878f3a9e..b2bb3dc63 100644 --- a/src/muz/base/dl_engine_base.h +++ b/src/muz/base/dl_engine_base.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_ENGINE_BASE_H_ #define DL_ENGINE_BASE_H_ -#include "model.h" +#include "model/model.h" namespace datalog { enum DL_ENGINE { diff --git a/src/muz/base/dl_rule.cpp b/src/muz/base/dl_rule.cpp index 27d62538e..4581c8aac 100644 --- a/src/muz/base/dl_rule.cpp +++ b/src/muz/base/dl_rule.cpp @@ -24,26 +24,26 @@ Revision History: #include #include -#include"ast_pp.h" -#include"dl_context.h" -#include"map.h" -#include"recurse_expr_def.h" -#include"dl_rule.h" -#include"qe.h" -#include"for_each_expr.h" -#include"used_vars.h" -#include"var_subst.h" -#include"rewriter_def.h" -#include"th_rewriter.h" -#include"ast_smt2_pp.h" -#include"used_symbols.h" -#include"quant_hoist.h" -#include"expr_replacer.h" -#include"bool_rewriter.h" -#include"expr_safe_replace.h" -#include"filter_model_converter.h" -#include"scoped_proof.h" -#include"datatype_decl_plugin.h" +#include "ast/ast_pp.h" +#include "muz/base/dl_context.h" +#include "util/map.h" +#include "ast/recurse_expr_def.h" +#include "muz/base/dl_rule.h" +#include "qe/qe.h" +#include "ast/for_each_expr.h" +#include "ast/used_vars.h" +#include "ast/rewriter/var_subst.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/used_symbols.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "tactic/filter_model_converter.h" +#include "ast/scoped_proof.h" +#include "ast/datatype_decl_plugin.h" namespace datalog { diff --git a/src/muz/base/dl_rule.h b/src/muz/base/dl_rule.h index 856814531..ea0e64e4f 100644 --- a/src/muz/base/dl_rule.h +++ b/src/muz/base/dl_rule.h @@ -20,19 +20,19 @@ Revision History: #ifndef DL_RULE_H_ #define DL_RULE_H_ -#include"ast.h" -#include"dl_costs.h" -#include"dl_util.h" -#include"used_vars.h" -#include"proof_converter.h" -#include"model_converter.h" -#include"ast_counter.h" -#include"rewriter.h" -#include"hnf.h" -#include"qe_lite.h" -#include"var_subst.h" -#include"datatype_decl_plugin.h" -#include"label_rewriter.h" +#include "ast/ast.h" +#include "muz/base/dl_costs.h" +#include "muz/base/dl_util.h" +#include "ast/used_vars.h" +#include "tactic/proof_converter.h" +#include "tactic/model_converter.h" +#include "ast/rewriter/ast_counter.h" +#include "ast/rewriter/rewriter.h" +#include "muz/base/hnf.h" +#include "qe/qe_lite.h" +#include "ast/rewriter/var_subst.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/label_rewriter.h" namespace datalog { diff --git a/src/muz/base/dl_rule_set.cpp b/src/muz/base/dl_rule_set.cpp index 229db4d27..65c940091 100644 --- a/src/muz/base/dl_rule_set.cpp +++ b/src/muz/base/dl_rule_set.cpp @@ -19,9 +19,9 @@ Revision History: #include #include -#include"dl_context.h" -#include"dl_rule_set.h" -#include"ast_pp.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "ast/ast_pp.h" namespace datalog { diff --git a/src/muz/base/dl_rule_set.h b/src/muz/base/dl_rule_set.h index 2e7401fea..748574d96 100644 --- a/src/muz/base/dl_rule_set.h +++ b/src/muz/base/dl_rule_set.h @@ -19,8 +19,8 @@ Revision History: #ifndef DL_RULE_SET_H_ #define DL_RULE_SET_H_ -#include"obj_hashtable.h" -#include"dl_rule.h" +#include "util/obj_hashtable.h" +#include "muz/base/dl_rule.h" namespace datalog { diff --git a/src/muz/base/dl_rule_subsumption_index.cpp b/src/muz/base/dl_rule_subsumption_index.cpp index 43f801bbf..f3fb545b6 100644 --- a/src/muz/base/dl_rule_subsumption_index.cpp +++ b/src/muz/base/dl_rule_subsumption_index.cpp @@ -20,9 +20,9 @@ Revision History: #include -#include "ast_pp.h" +#include "ast/ast_pp.h" -#include "dl_rule_subsumption_index.h" +#include "muz/base/dl_rule_subsumption_index.h" namespace datalog { diff --git a/src/muz/base/dl_rule_subsumption_index.h b/src/muz/base/dl_rule_subsumption_index.h index 89f7d44b7..2d09200f1 100644 --- a/src/muz/base/dl_rule_subsumption_index.h +++ b/src/muz/base/dl_rule_subsumption_index.h @@ -21,7 +21,7 @@ Revision History: #ifndef DL_RULE_SUBSUMPTION_INDEX_H_ #define DL_RULE_SUBSUMPTION_INDEX_H_ -#include "dl_context.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/base/dl_rule_transformer.cpp b/src/muz/base/dl_rule_transformer.cpp index 2df8b9453..9206efef6 100644 --- a/src/muz/base/dl_rule_transformer.cpp +++ b/src/muz/base/dl_rule_transformer.cpp @@ -20,9 +20,9 @@ Revision History: #include #include -#include"dl_context.h" -#include"dl_rule_transformer.h" -#include"stopwatch.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "util/stopwatch.h" namespace datalog { diff --git a/src/muz/base/dl_rule_transformer.h b/src/muz/base/dl_rule_transformer.h index d166acdd0..dc930ae2b 100644 --- a/src/muz/base/dl_rule_transformer.h +++ b/src/muz/base/dl_rule_transformer.h @@ -19,10 +19,10 @@ Revision History: #ifndef DL_RULE_TRANSFORMER_H_ #define DL_RULE_TRANSFORMER_H_ -#include"map.h" -#include"vector.h" -#include"dl_rule.h" -#include"dl_rule_set.h" +#include "util/map.h" +#include "util/vector.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_set.h" namespace datalog { diff --git a/src/muz/base/dl_util.cpp b/src/muz/base/dl_util.cpp index 0f254ee0a..f0439a55c 100644 --- a/src/muz/base/dl_util.cpp +++ b/src/muz/base/dl_util.cpp @@ -23,14 +23,14 @@ Revision History: #ifdef _WINDOWS #include #endif -#include"ast_pp.h" -#include"bool_rewriter.h" -#include"for_each_expr.h" -#include"scoped_proof.h" -#include"dl_context.h" -#include"dl_rule.h" -#include"dl_util.h" -#include"stopwatch.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/for_each_expr.h" +#include "ast/scoped_proof.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_util.h" +#include "util/stopwatch.h" namespace datalog { diff --git a/src/muz/base/dl_util.h b/src/muz/base/dl_util.h index a4e9f192e..48d420bfb 100644 --- a/src/muz/base/dl_util.h +++ b/src/muz/base/dl_util.h @@ -20,17 +20,17 @@ Revision History: #define DL_UTIL_H_ #include -#include"ast.h" -#include"hashtable.h" -#include"obj_hashtable.h" -#include"uint_set.h" -#include"horn_subsume_model_converter.h" -#include"replace_proof_converter.h" -#include"substitution.h" -#include"ast_counter.h" -#include"statistics.h" -#include"stopwatch.h" -#include"lbool.h" +#include "ast/ast.h" +#include "util/hashtable.h" +#include "util/obj_hashtable.h" +#include "util/uint_set.h" +#include "tactic/horn_subsume_model_converter.h" +#include "tactic/replace_proof_converter.h" +#include "ast/substitution/substitution.h" +#include "ast/rewriter/ast_counter.h" +#include "util/statistics.h" +#include "util/stopwatch.h" +#include "util/lbool.h" namespace datalog { diff --git a/src/muz/base/hnf.cpp b/src/muz/base/hnf.cpp index 6d1c19a13..7db30a9f0 100644 --- a/src/muz/base/hnf.cpp +++ b/src/muz/base/hnf.cpp @@ -43,20 +43,20 @@ Notes: --*/ -#include"hnf.h" -#include"warning.h" -#include"used_vars.h" -#include"well_sorted.h" -#include"var_subst.h" -#include"name_exprs.h" -#include"act_cache.h" -#include"cooperate.h" -#include"ast_pp.h" -#include"quant_hoist.h" -#include"ast_util.h" -#include"dl_util.h" -#include"for_each_ast.h" -#include"for_each_expr.h" +#include "muz/base/hnf.h" +#include "util/warning.h" +#include "ast/used_vars.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/var_subst.h" +#include "ast/normal_forms/name_exprs.h" +#include "ast/act_cache.h" +#include "util/cooperate.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/ast_util.h" +#include "muz/base/dl_util.h" +#include "ast/for_each_ast.h" +#include "ast/for_each_expr.h" class hnf::imp { diff --git a/src/muz/base/hnf.h b/src/muz/base/hnf.h index 23b379d4d..330dfab70 100644 --- a/src/muz/base/hnf.h +++ b/src/muz/base/hnf.h @@ -25,10 +25,10 @@ Copyright (c) 2015 Microsoft Corporation #ifndef HNF_H_ #define HNF_H_ -#include"ast.h" -#include"params.h" -#include"defined_names.h" -#include"proof_converter.h" +#include "ast/ast.h" +#include "util/params.h" +#include "ast/normal_forms/defined_names.h" +#include "tactic/proof_converter.h" class hnf { class imp; diff --git a/src/muz/base/proof_utils.cpp b/src/muz/base/proof_utils.cpp index 59856c160..bbf9da0a4 100644 --- a/src/muz/base/proof_utils.cpp +++ b/src/muz/base/proof_utils.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "dl_util.h" -#include "proof_utils.h" -#include "ast_smt2_pp.h" -#include "var_subst.h" +#include "muz/base/dl_util.h" +#include "muz/base/proof_utils.h" +#include "ast/ast_smt2_pp.h" +#include "ast/rewriter/var_subst.h" class reduce_hypotheses { typedef obj_hashtable expr_set; diff --git a/src/muz/base/rule_properties.cpp b/src/muz/base/rule_properties.cpp index 247519d63..21317a07c 100644 --- a/src/muz/base/rule_properties.cpp +++ b/src/muz/base/rule_properties.cpp @@ -18,11 +18,11 @@ Notes: --*/ -#include"expr_functors.h" -#include"rule_properties.h" -#include"dl_rule_set.h" -#include"for_each_expr.h" -#include"dl_context.h" +#include "ast/expr_functors.h" +#include "muz/base/rule_properties.h" +#include "muz/base/dl_rule_set.h" +#include "ast/for_each_expr.h" +#include "muz/base/dl_context.h" using namespace datalog; rule_properties::rule_properties(ast_manager & m, rule_manager& rm, context& ctx, i_expr_pred& p): diff --git a/src/muz/base/rule_properties.h b/src/muz/base/rule_properties.h index f53ad3841..197633aff 100644 --- a/src/muz/base/rule_properties.h +++ b/src/muz/base/rule_properties.h @@ -21,10 +21,10 @@ Notes: #ifndef RULE_PROPERTIES_H_ #define RULE_PROPERTIES_H_ -#include"ast.h" -#include"datatype_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"dl_rule.h" +#include "ast/ast.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "muz/base/dl_rule.h" namespace datalog { class rule_properties { diff --git a/src/muz/bmc/dl_bmc_engine.cpp b/src/muz/bmc/dl_bmc_engine.cpp index 8cc5c4f60..186a021da 100644 --- a/src/muz/bmc/dl_bmc_engine.cpp +++ b/src/muz/bmc/dl_bmc_engine.cpp @@ -17,21 +17,21 @@ Revision History: --*/ -#include "dl_context.h" -#include "dl_rule_transformer.h" -#include "dl_bmc_engine.h" -#include "dl_mk_slice.h" -#include "smt_kernel.h" -#include "datatype_decl_plugin.h" -#include "dl_decl_plugin.h" -#include "bool_rewriter.h" -#include "model_smt2_pp.h" -#include "ast_smt_pp.h" -#include "well_sorted.h" -#include "rewriter_def.h" -#include "dl_transforms.h" -#include "dl_mk_rule_inliner.h" -#include "scoped_proof.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/bmc/dl_bmc_engine.h" +#include "muz/transforms/dl_mk_slice.h" +#include "smt/smt_kernel.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/dl_decl_plugin.h" +#include "ast/rewriter/bool_rewriter.h" +#include "model/model_smt2_pp.h" +#include "ast/ast_smt_pp.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/transforms/dl_transforms.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "ast/scoped_proof.h" namespace datalog { diff --git a/src/muz/bmc/dl_bmc_engine.h b/src/muz/bmc/dl_bmc_engine.h index a9ef44066..39bdd1fbe 100644 --- a/src/muz/bmc/dl_bmc_engine.h +++ b/src/muz/bmc/dl_bmc_engine.h @@ -20,11 +20,11 @@ Revision History: #ifndef DL_BMC_ENGINE_H_ #define DL_BMC_ENGINE_H_ -#include "params.h" -#include "statistics.h" -#include "smt_kernel.h" -#include "bv_decl_plugin.h" -#include "smt_params.h" +#include "util/params.h" +#include "util/statistics.h" +#include "smt/smt_kernel.h" +#include "ast/bv_decl_plugin.h" +#include "smt/params/smt_params.h" namespace datalog { diff --git a/src/muz/clp/clp_context.cpp b/src/muz/clp/clp_context.cpp index 7dec835a9..d1ce80e12 100644 --- a/src/muz/clp/clp_context.cpp +++ b/src/muz/clp/clp_context.cpp @@ -17,13 +17,13 @@ Revision History: --*/ -#include "clp_context.h" -#include "dl_context.h" -#include "unifier.h" -#include "var_subst.h" -#include "substitution.h" -#include "smt_kernel.h" -#include "dl_transforms.h" +#include "muz/clp/clp_context.h" +#include "muz/base/dl_context.h" +#include "ast/substitution/unifier.h" +#include "ast/rewriter/var_subst.h" +#include "ast/substitution/substitution.h" +#include "smt/smt_kernel.h" +#include "muz/transforms/dl_transforms.h" namespace datalog { diff --git a/src/muz/clp/clp_context.h b/src/muz/clp/clp_context.h index 214dd891a..44f99d564 100644 --- a/src/muz/clp/clp_context.h +++ b/src/muz/clp/clp_context.h @@ -19,10 +19,10 @@ Revision History: #ifndef CLP_CONTEXT_H_ #define CLP_CONTEXT_H_ -#include "ast.h" -#include "lbool.h" -#include "statistics.h" -#include "dl_engine_base.h" +#include "ast/ast.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "muz/base/dl_engine_base.h" namespace datalog { class context; diff --git a/src/muz/dataflow/dataflow.cpp b/src/muz/dataflow/dataflow.cpp index 73e152ad7..7908231c5 100644 --- a/src/muz/dataflow/dataflow.cpp +++ b/src/muz/dataflow/dataflow.cpp @@ -15,8 +15,8 @@ Author: --*/ -#include "dataflow.h" -#include "reachability.h" +#include "muz/dataflow/dataflow.h" +#include "muz/dataflow/reachability.h" namespace datalog { diff --git a/src/muz/dataflow/dataflow.h b/src/muz/dataflow/dataflow.h index d2be194eb..5e91a0149 100644 --- a/src/muz/dataflow/dataflow.h +++ b/src/muz/dataflow/dataflow.h @@ -18,10 +18,10 @@ Author: #ifndef DATAFLOW_H_ #define DATAFLOW_H_ -#include "dl_rule.h" -#include "dl_rule_set.h" -#include "hashtable.h" -#include "vector.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_set.h" +#include "util/hashtable.h" +#include "util/vector.h" namespace datalog { template class fact_reader; diff --git a/src/muz/dataflow/reachability.h b/src/muz/dataflow/reachability.h index 54da04967..da593a794 100644 --- a/src/muz/dataflow/reachability.h +++ b/src/muz/dataflow/reachability.h @@ -17,7 +17,7 @@ Author: #ifndef REACHABILITY_H_ #define REACHABILITY_H_ -#include "dataflow.h" +#include "muz/dataflow/dataflow.h" namespace datalog { class reachability_info { diff --git a/src/muz/ddnf/ddnf.cpp b/src/muz/ddnf/ddnf.cpp index 6863a908f..0e2f6b35f 100644 --- a/src/muz/ddnf/ddnf.cpp +++ b/src/muz/ddnf/ddnf.cpp @@ -20,12 +20,12 @@ Revision History: --*/ -#include "ddnf.h" -#include "dl_rule_set.h" -#include "dl_context.h" -#include "scoped_proof.h" -#include "bv_decl_plugin.h" -#include "tbv.h" +#include "muz/ddnf/ddnf.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_context.h" +#include "ast/scoped_proof.h" +#include "ast/bv_decl_plugin.h" +#include "muz/rel/tbv.h" namespace datalog { diff --git a/src/muz/ddnf/ddnf.h b/src/muz/ddnf/ddnf.h index 997009026..29e9b1555 100644 --- a/src/muz/ddnf/ddnf.h +++ b/src/muz/ddnf/ddnf.h @@ -19,10 +19,10 @@ Revision History: #ifndef DDNF_H_ #define DDNF_H_ -#include "ast.h" -#include "lbool.h" -#include "statistics.h" -#include "dl_engine_base.h" +#include "ast/ast.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "muz/base/dl_engine_base.h" class tbv; class tbv_manager; diff --git a/src/muz/duality/duality_dl_interface.cpp b/src/muz/duality/duality_dl_interface.cpp index 978391ad2..30f8a7dfa 100755 --- a/src/muz/duality/duality_dl_interface.cpp +++ b/src/muz/duality/duality_dl_interface.cpp @@ -18,26 +18,26 @@ --*/ -#include "dl_context.h" -#include "dl_mk_coi_filter.h" -#include "dl_mk_interp_tail_simplifier.h" -#include "dl_mk_subsumption_checker.h" -#include "dl_mk_rule_inliner.h" -#include "dl_rule.h" -#include "dl_rule_transformer.h" -#include "smt2parser.h" -#include "duality_dl_interface.h" -#include "dl_rule_set.h" -#include "dl_mk_slice.h" -#include "dl_mk_unfold.h" -#include "dl_mk_coalesce.h" -#include "expr_abstract.h" -#include "model_smt2_pp.h" -#include "model_v2_pp.h" +#include "muz/base/dl_context.h" +#include "muz/transforms/dl_mk_coi_filter.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "muz/transforms/dl_mk_subsumption_checker.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_transformer.h" +#include "parsers/smt2/smt2parser.h" +#include "muz/duality/duality_dl_interface.h" +#include "muz/base/dl_rule_set.h" +#include "muz/transforms/dl_mk_slice.h" +#include "muz/transforms/dl_mk_unfold.h" +#include "muz/transforms/dl_mk_coalesce.h" +#include "ast/expr_abstract.h" +#include "model/model_smt2_pp.h" +#include "model/model_v2_pp.h" #include "fixedpoint_params.hpp" -#include "used_vars.h" -#include "func_decl_dependencies.h" -#include "dl_transforms.h" +#include "ast/used_vars.h" +#include "ast/func_decl_dependencies.h" +#include "muz/transforms/dl_transforms.h" // template class symbol_table; @@ -48,8 +48,8 @@ #pragma warning(disable:4101) #endif -#include "duality.h" -#include "duality_profiling.h" +#include "duality/duality.h" +#include "duality/duality_profiling.h" // using namespace Duality; diff --git a/src/muz/duality/duality_dl_interface.h b/src/muz/duality/duality_dl_interface.h index a7c186074..21291a45b 100644 --- a/src/muz/duality/duality_dl_interface.h +++ b/src/muz/duality/duality_dl_interface.h @@ -21,11 +21,11 @@ #ifndef DUALITY_DL_INTERFACE_H_ #define DUALITY_DL_INTERFACE_H_ -#include "lbool.h" -#include "dl_rule.h" -#include "dl_rule_set.h" -#include "dl_engine_base.h" -#include "statistics.h" +#include "util/lbool.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_engine_base.h" +#include "util/statistics.h" namespace datalog { class context; diff --git a/src/muz/fp/datalog_parser.cpp b/src/muz/fp/datalog_parser.cpp index b51af7d53..7191f1931 100644 --- a/src/muz/fp/datalog_parser.cpp +++ b/src/muz/fp/datalog_parser.cpp @@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include"datalog_parser.h" -#include"string_buffer.h" -#include"str_hashtable.h" -#include"ast_pp.h" -#include"arith_decl_plugin.h" -#include"region.h" -#include"warning.h" +#include "muz/fp/datalog_parser.h" +#include "util/string_buffer.h" +#include "util/str_hashtable.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "util/region.h" +#include "util/warning.h" #include #include #include diff --git a/src/muz/fp/datalog_parser.h b/src/muz/fp/datalog_parser.h index 70b251585..c52fc6589 100644 --- a/src/muz/fp/datalog_parser.h +++ b/src/muz/fp/datalog_parser.h @@ -19,8 +19,8 @@ Revision History: #ifndef DATALOG_PARSER_H_ #define DATALOG_PARSER_H_ -#include "ast.h" -#include "dl_context.h" +#include "ast/ast.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/fp/dl_cmds.cpp b/src/muz/fp/dl_cmds.cpp index a98143aed..a82737b78 100644 --- a/src/muz/fp/dl_cmds.cpp +++ b/src/muz/fp/dl_cmds.cpp @@ -15,21 +15,21 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"dl_cmds.h" -#include"dl_external_relation.h" -#include"dl_context.h" -#include"dl_register_engine.h" -#include"dl_decl_plugin.h" -#include"dl_instruction.h" -#include"dl_compiler.h" -#include"dl_rule.h" -#include"ast_pp.h" -#include"parametric_cmd.h" -#include"cancel_eh.h" -#include"scoped_ctrl_c.h" -#include"scoped_timer.h" -#include"trail.h" +#include "cmd_context/cmd_context.h" +#include "muz/fp/dl_cmds.h" +#include "muz/rel/dl_external_relation.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "ast/dl_decl_plugin.h" +#include "muz/rel/dl_instruction.h" +#include "muz/rel/dl_compiler.h" +#include "muz/base/dl_rule.h" +#include "ast/ast_pp.h" +#include "cmd_context/parametric_cmd.h" +#include "util/cancel_eh.h" +#include "util/scoped_ctrl_c.h" +#include "util/scoped_timer.h" +#include "util/trail.h" #include"fixedpoint_params.hpp" #include diff --git a/src/muz/fp/dl_cmds.h b/src/muz/fp/dl_cmds.h index a06e6140e..326ff2413 100644 --- a/src/muz/fp/dl_cmds.h +++ b/src/muz/fp/dl_cmds.h @@ -18,7 +18,7 @@ Notes: #ifndef DL_CMDS_H_ #define DL_CMDS_H_ -#include "ast.h" +#include "ast/ast.h" class cmd_context; diff --git a/src/muz/fp/dl_register_engine.cpp b/src/muz/fp/dl_register_engine.cpp index 6e1ba40ce..4d32cb543 100644 --- a/src/muz/fp/dl_register_engine.cpp +++ b/src/muz/fp/dl_register_engine.cpp @@ -16,14 +16,14 @@ Author: Revision History: --*/ -#include "dl_register_engine.h" -#include "dl_bmc_engine.h" -#include "clp_context.h" -#include "tab_context.h" -#include "rel_context.h" -#include "pdr_dl_interface.h" -#include "ddnf.h" -#include "duality_dl_interface.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/bmc/dl_bmc_engine.h" +#include "muz/clp/clp_context.h" +#include "muz/tab/tab_context.h" +#include "muz/rel/rel_context.h" +#include "muz/pdr/pdr_dl_interface.h" +#include "muz/ddnf/ddnf.h" +#include "muz/duality/duality_dl_interface.h" namespace datalog { register_engine::register_engine(): m_ctx(0) {} diff --git a/src/muz/fp/dl_register_engine.h b/src/muz/fp/dl_register_engine.h index 4d5076b75..11f778346 100644 --- a/src/muz/fp/dl_register_engine.h +++ b/src/muz/fp/dl_register_engine.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_REGISTER_ENGINE_H_ #define DL_REGISTER_ENGINE_H_ -#include "dl_context.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/fp/horn_tactic.cpp b/src/muz/fp/horn_tactic.cpp index b3e7eeb67..8a9f13144 100644 --- a/src/muz/fp/horn_tactic.cpp +++ b/src/muz/fp/horn_tactic.cpp @@ -16,20 +16,20 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"model_converter.h" -#include"proof_converter.h" -#include"horn_tactic.h" -#include"dl_context.h" -#include"dl_register_engine.h" -#include"expr_replacer.h" -#include"dl_rule_transformer.h" -#include"dl_mk_slice.h" -#include"filter_model_converter.h" -#include"dl_transforms.h" +#include "tactic/tactical.h" +#include "tactic/model_converter.h" +#include "tactic/proof_converter.h" +#include "muz/fp/horn_tactic.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "ast/rewriter/expr_replacer.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_slice.h" +#include "tactic/filter_model_converter.h" +#include "muz/transforms/dl_transforms.h" #include"fixedpoint_params.hpp" -#include"ast_util.h" -#include"var_subst.h" +#include "ast/ast_util.h" +#include "ast/rewriter/var_subst.h" class horn_tactic : public tactic { struct imp { diff --git a/src/muz/fp/horn_tactic.h b/src/muz/fp/horn_tactic.h index 72432b4e2..b48585ee2 100644 --- a/src/muz/fp/horn_tactic.h +++ b/src/muz/fp/horn_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef HORN_TACTIC_H_ #define HORN_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/muz/pdr/pdr_closure.cpp b/src/muz/pdr/pdr_closure.cpp index 746b12416..82caf285b 100644 --- a/src/muz/pdr/pdr_closure.cpp +++ b/src/muz/pdr/pdr_closure.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include "pdr_closure.h" -#include "pdr_context.h" -#include "expr_safe_replace.h" -#include "ast_util.h" +#include "muz/pdr/pdr_closure.h" +#include "muz/pdr/pdr_context.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_util.h" namespace pdr { diff --git a/src/muz/pdr/pdr_closure.h b/src/muz/pdr/pdr_closure.h index ab417e90e..8af53376b 100644 --- a/src/muz/pdr/pdr_closure.h +++ b/src/muz/pdr/pdr_closure.h @@ -20,7 +20,7 @@ Revision History: #ifndef PDR_CLOSURE_H_ #define PDR_CLOSURE_H_ -#include "arith_decl_plugin.h" +#include "ast/arith_decl_plugin.h" namespace pdr { diff --git a/src/muz/pdr/pdr_context.cpp b/src/muz/pdr/pdr_context.cpp index 05bb5489a..0190044b1 100644 --- a/src/muz/pdr/pdr_context.cpp +++ b/src/muz/pdr/pdr_context.cpp @@ -25,31 +25,31 @@ Notes: #include -#include "dl_util.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "var_subst.h" -#include "util.h" -#include "pdr_prop_solver.h" -#include "pdr_context.h" -#include "pdr_generalizers.h" -#include "for_each_expr.h" -#include "dl_rule_set.h" -#include "unit_subsumption_tactic.h" -#include "model_smt2_pp.h" -#include "dl_mk_rule_inliner.h" -#include "ast_smt2_pp.h" -#include "qe_lite.h" -#include "ast_ll_pp.h" -#include "proof_checker.h" -#include "smt_value_sort.h" -#include "proof_utils.h" -#include "dl_boogie_proof.h" -#include "scoped_proof.h" -#include "blast_term_ite_tactic.h" -#include "model_implicant.h" -#include "expr_safe_replace.h" -#include "ast_util.h" +#include "muz/base/dl_util.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/var_subst.h" +#include "util/util.h" +#include "muz/pdr/pdr_prop_solver.h" +#include "muz/pdr/pdr_context.h" +#include "muz/pdr/pdr_generalizers.h" +#include "ast/for_each_expr.h" +#include "muz/base/dl_rule_set.h" +#include "smt/tactic/unit_subsumption_tactic.h" +#include "model/model_smt2_pp.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "ast/ast_smt2_pp.h" +#include "qe/qe_lite.h" +#include "ast/ast_ll_pp.h" +#include "ast/proof_checker/proof_checker.h" +#include "smt/smt_value_sort.h" +#include "muz/base/proof_utils.h" +#include "muz/base/dl_boogie_proof.h" +#include "ast/scoped_proof.h" +#include "tactic/core/blast_term_ite_tactic.h" +#include "model/model_implicant.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_util.h" namespace pdr { diff --git a/src/muz/pdr/pdr_context.h b/src/muz/pdr/pdr_context.h index a32a65c48..087f77f9e 100644 --- a/src/muz/pdr/pdr_context.h +++ b/src/muz/pdr/pdr_context.h @@ -25,9 +25,9 @@ Revision History: #undef max #endif #include -#include "pdr_manager.h" -#include "pdr_prop_solver.h" -#include "pdr_reachable_cache.h" +#include "muz/pdr/pdr_manager.h" +#include "muz/pdr/pdr_prop_solver.h" +#include "muz/pdr/pdr_reachable_cache.h" #include "fixedpoint_params.hpp" diff --git a/src/muz/pdr/pdr_dl_interface.cpp b/src/muz/pdr/pdr_dl_interface.cpp index 5f4a200fc..87bc68bd9 100644 --- a/src/muz/pdr/pdr_dl_interface.cpp +++ b/src/muz/pdr/pdr_dl_interface.cpp @@ -17,19 +17,19 @@ Revision History: --*/ -#include "dl_context.h" -#include "dl_mk_coi_filter.h" -#include "dl_rule.h" -#include "dl_rule_transformer.h" -#include "pdr_context.h" -#include "pdr_dl_interface.h" -#include "dl_rule_set.h" -#include "dl_mk_slice.h" -#include "dl_mk_unfold.h" -#include "dl_mk_coalesce.h" -#include "dl_transforms.h" -#include "scoped_proof.h" -#include "model_smt2_pp.h" +#include "muz/base/dl_context.h" +#include "muz/transforms/dl_mk_coi_filter.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/pdr/pdr_context.h" +#include "muz/pdr/pdr_dl_interface.h" +#include "muz/base/dl_rule_set.h" +#include "muz/transforms/dl_mk_slice.h" +#include "muz/transforms/dl_mk_unfold.h" +#include "muz/transforms/dl_mk_coalesce.h" +#include "muz/transforms/dl_transforms.h" +#include "ast/scoped_proof.h" +#include "model/model_smt2_pp.h" using namespace pdr; diff --git a/src/muz/pdr/pdr_dl_interface.h b/src/muz/pdr/pdr_dl_interface.h index 008655a0b..884f89e4b 100644 --- a/src/muz/pdr/pdr_dl_interface.h +++ b/src/muz/pdr/pdr_dl_interface.h @@ -20,12 +20,12 @@ Revision History: #ifndef PDR_DL_INTERFACE_H_ #define PDR_DL_INTERFACE_H_ -#include "lbool.h" -#include "dl_rule.h" -#include "dl_rule_set.h" -#include "dl_util.h" -#include "dl_engine_base.h" -#include "statistics.h" +#include "util/lbool.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_util.h" +#include "muz/base/dl_engine_base.h" +#include "util/statistics.h" namespace datalog { class context; diff --git a/src/muz/pdr/pdr_farkas_learner.cpp b/src/muz/pdr/pdr_farkas_learner.cpp index 54d9ada89..29037f180 100644 --- a/src/muz/pdr/pdr_farkas_learner.cpp +++ b/src/muz/pdr/pdr_farkas_learner.cpp @@ -18,21 +18,21 @@ Revision History: --*/ -#include "ast_smt2_pp.h" -#include "array_decl_plugin.h" -#include "bool_rewriter.h" -#include "dl_decl_plugin.h" -#include "for_each_expr.h" -#include "dl_util.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "pdr_util.h" -#include "pdr_farkas_learner.h" -#include "th_rewriter.h" -#include "ast_ll_pp.h" -#include "arith_bounds_tactic.h" -#include "proof_utils.h" -#include "reg_decl_plugins.h" +#include "ast/ast_smt2_pp.h" +#include "ast/array_decl_plugin.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/dl_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "muz/base/dl_util.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/pdr/pdr_util.h" +#include "muz/pdr/pdr_farkas_learner.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_ll_pp.h" +#include "tactic/arith/arith_bounds_tactic.h" +#include "muz/base/proof_utils.h" +#include "ast/reg_decl_plugins.h" namespace pdr { diff --git a/src/muz/pdr/pdr_farkas_learner.h b/src/muz/pdr/pdr_farkas_learner.h index 3a4d81f96..a5f3482e6 100644 --- a/src/muz/pdr/pdr_farkas_learner.h +++ b/src/muz/pdr/pdr_farkas_learner.h @@ -20,14 +20,14 @@ Revision History: #ifndef PDR_FARKAS_LEARNER_H_ #define PDR_FARKAS_LEARNER_H_ -#include "arith_decl_plugin.h" -#include "ast_translation.h" -#include "bv_decl_plugin.h" -#include "smt_kernel.h" -#include "bool_rewriter.h" -#include "pdr_util.h" -#include "smt_params.h" -#include "tactic.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_translation.h" +#include "ast/bv_decl_plugin.h" +#include "smt/smt_kernel.h" +#include "ast/rewriter/bool_rewriter.h" +#include "muz/pdr/pdr_util.h" +#include "smt/params/smt_params.h" +#include "tactic/tactic.h" namespace pdr { diff --git a/src/muz/pdr/pdr_generalizers.cpp b/src/muz/pdr/pdr_generalizers.cpp index 5b7e11877..b17d3f8b6 100644 --- a/src/muz/pdr/pdr_generalizers.cpp +++ b/src/muz/pdr/pdr_generalizers.cpp @@ -18,13 +18,13 @@ Revision History: --*/ -#include "pdr_context.h" -#include "pdr_farkas_learner.h" -#include "pdr_generalizers.h" -#include "expr_abstract.h" -#include "var_subst.h" -#include "expr_safe_replace.h" -#include "model_smt2_pp.h" +#include "muz/pdr/pdr_context.h" +#include "muz/pdr/pdr_farkas_learner.h" +#include "muz/pdr/pdr_generalizers.h" +#include "ast/expr_abstract.h" +#include "ast/rewriter/var_subst.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "model/model_smt2_pp.h" namespace pdr { diff --git a/src/muz/pdr/pdr_generalizers.h b/src/muz/pdr/pdr_generalizers.h index 3e4576fa1..3d0fe6ccd 100644 --- a/src/muz/pdr/pdr_generalizers.h +++ b/src/muz/pdr/pdr_generalizers.h @@ -20,9 +20,9 @@ Revision History: #ifndef PDR_GENERALIZERS_H_ #define PDR_GENERALIZERS_H_ -#include "pdr_context.h" -#include "pdr_closure.h" -#include "arith_decl_plugin.h" +#include "muz/pdr/pdr_context.h" +#include "muz/pdr/pdr_closure.h" +#include "ast/arith_decl_plugin.h" namespace pdr { diff --git a/src/muz/pdr/pdr_manager.cpp b/src/muz/pdr/pdr_manager.cpp index 319f38255..077d27427 100644 --- a/src/muz/pdr/pdr_manager.cpp +++ b/src/muz/pdr/pdr_manager.cpp @@ -19,15 +19,15 @@ Revision History: --*/ #include -#include "pdr_manager.h" -#include "ast_smt2_pp.h" -#include "for_each_expr.h" -#include "has_free_vars.h" -#include "expr_replacer.h" -#include "expr_abstract.h" -#include "model2expr.h" -#include "model_smt2_pp.h" -#include "model_converter.h" +#include "muz/pdr/pdr_manager.h" +#include "ast/ast_smt2_pp.h" +#include "ast/for_each_expr.h" +#include "ast/has_free_vars.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/expr_abstract.h" +#include "model/model2expr.h" +#include "model/model_smt2_pp.h" +#include "tactic/model_converter.h" namespace pdr { diff --git a/src/muz/pdr/pdr_manager.h b/src/muz/pdr/pdr_manager.h index 790e2465d..9fc98940d 100644 --- a/src/muz/pdr/pdr_manager.h +++ b/src/muz/pdr/pdr_manager.h @@ -23,17 +23,17 @@ Revision History: #include #include -#include "bool_rewriter.h" -#include "expr_replacer.h" -#include "expr_substitution.h" -#include "map.h" -#include "ref_vector.h" -#include "smt_kernel.h" -#include "pdr_util.h" -#include "pdr_sym_mux.h" -#include "pdr_farkas_learner.h" -#include "pdr_smt_context_manager.h" -#include "dl_rule.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/expr_substitution.h" +#include "util/map.h" +#include "util/ref_vector.h" +#include "smt/smt_kernel.h" +#include "muz/pdr/pdr_util.h" +#include "muz/pdr/pdr_sym_mux.h" +#include "muz/pdr/pdr_farkas_learner.h" +#include "muz/pdr/pdr_smt_context_manager.h" +#include "muz/base/dl_rule.h" namespace smt { diff --git a/src/muz/pdr/pdr_prop_solver.cpp b/src/muz/pdr/pdr_prop_solver.cpp index 8c407161e..3055985f4 100644 --- a/src/muz/pdr/pdr_prop_solver.cpp +++ b/src/muz/pdr/pdr_prop_solver.cpp @@ -18,18 +18,18 @@ Revision History: --*/ #include -#include "model.h" -#include "pdr_util.h" -#include "pdr_prop_solver.h" -#include "ast_smt2_pp.h" -#include "dl_util.h" -#include "model_pp.h" -#include "smt_params.h" -#include "datatype_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "pdr_farkas_learner.h" -#include "ast_smt2_pp.h" -#include "expr_replacer.h" +#include "model/model.h" +#include "muz/pdr/pdr_util.h" +#include "muz/pdr/pdr_prop_solver.h" +#include "ast/ast_smt2_pp.h" +#include "muz/base/dl_util.h" +#include "model/model_pp.h" +#include "smt/params/smt_params.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "muz/pdr/pdr_farkas_learner.h" +#include "ast/ast_smt2_pp.h" +#include "ast/rewriter/expr_replacer.h" // // Auxiliary structure to introduce propositional names for assumptions that are not diff --git a/src/muz/pdr/pdr_prop_solver.h b/src/muz/pdr/pdr_prop_solver.h index ad7e1fd9a..463163fbd 100644 --- a/src/muz/pdr/pdr_prop_solver.h +++ b/src/muz/pdr/pdr_prop_solver.h @@ -23,13 +23,13 @@ Revision History: #include #include #include -#include "ast.h" -#include "obj_hashtable.h" -#include "smt_kernel.h" -#include "util.h" -#include "vector.h" -#include "pdr_manager.h" -#include "pdr_smt_context_manager.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "smt/smt_kernel.h" +#include "util/util.h" +#include "util/vector.h" +#include "muz/pdr/pdr_manager.h" +#include "muz/pdr/pdr_smt_context_manager.h" namespace pdr { diff --git a/src/muz/pdr/pdr_reachable_cache.cpp b/src/muz/pdr/pdr_reachable_cache.cpp index 2bedc1393..d28c1415b 100644 --- a/src/muz/pdr/pdr_reachable_cache.cpp +++ b/src/muz/pdr/pdr_reachable_cache.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include "pdr_reachable_cache.h" +#include "muz/pdr/pdr_reachable_cache.h" namespace pdr { diff --git a/src/muz/pdr/pdr_reachable_cache.h b/src/muz/pdr/pdr_reachable_cache.h index 66832ba42..0833541ba 100644 --- a/src/muz/pdr/pdr_reachable_cache.h +++ b/src/muz/pdr/pdr_reachable_cache.h @@ -20,10 +20,10 @@ Revision History: #ifndef REACHABLE_CACHE_H_ #define REACHABLE_CACHE_H_ -#include "ast.h" -#include "ref_vector.h" -#include "pdr_manager.h" -#include "pdr_smt_context_manager.h" +#include "ast/ast.h" +#include "util/ref_vector.h" +#include "muz/pdr/pdr_manager.h" +#include "muz/pdr/pdr_smt_context_manager.h" namespace pdr { class reachable_cache { diff --git a/src/muz/pdr/pdr_smt_context_manager.cpp b/src/muz/pdr/pdr_smt_context_manager.cpp index b6aa8411d..e912bd658 100644 --- a/src/muz/pdr/pdr_smt_context_manager.cpp +++ b/src/muz/pdr/pdr_smt_context_manager.cpp @@ -17,12 +17,12 @@ Revision History: --*/ -#include "pdr_smt_context_manager.h" -#include "has_free_vars.h" -#include "ast_pp.h" -#include "ast_smt_pp.h" +#include "muz/pdr/pdr_smt_context_manager.h" +#include "ast/has_free_vars.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" #include -#include "smt_params.h" +#include "smt/params/smt_params.h" namespace pdr { diff --git a/src/muz/pdr/pdr_smt_context_manager.h b/src/muz/pdr/pdr_smt_context_manager.h index 173367a41..735b2cd62 100644 --- a/src/muz/pdr/pdr_smt_context_manager.h +++ b/src/muz/pdr/pdr_smt_context_manager.h @@ -20,9 +20,9 @@ Revision History: #ifndef PDR_SMT_CONTEXT_MANAGER_H_ #define PDR_SMT_CONTEXT_MANAGER_H_ -#include "smt_kernel.h" -#include "func_decl_dependencies.h" -#include "dl_util.h" +#include "smt/smt_kernel.h" +#include "ast/func_decl_dependencies.h" +#include "muz/base/dl_util.h" namespace pdr { diff --git a/src/muz/pdr/pdr_sym_mux.cpp b/src/muz/pdr/pdr_sym_mux.cpp index 47edb35ac..72549f2d6 100644 --- a/src/muz/pdr/pdr_sym_mux.cpp +++ b/src/muz/pdr/pdr_sym_mux.cpp @@ -18,13 +18,13 @@ Revision History: --*/ #include -#include "ast_pp.h" -#include "for_each_expr.h" -#include "model.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "pdr_util.h" -#include "pdr_sym_mux.h" +#include "ast/ast_pp.h" +#include "ast/for_each_expr.h" +#include "model/model.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/pdr/pdr_util.h" +#include "muz/pdr/pdr_sym_mux.h" using namespace pdr; diff --git a/src/muz/pdr/pdr_sym_mux.h b/src/muz/pdr/pdr_sym_mux.h index 13bdb71ec..981dc9615 100644 --- a/src/muz/pdr/pdr_sym_mux.h +++ b/src/muz/pdr/pdr_sym_mux.h @@ -20,9 +20,9 @@ Revision History: #ifndef SYM_MUX_H_ #define SYM_MUX_H_ -#include "ast.h" -#include "map.h" -#include "vector.h" +#include "ast/ast.h" +#include "util/map.h" +#include "util/vector.h" #include class model_core; diff --git a/src/muz/pdr/pdr_util.cpp b/src/muz/pdr/pdr_util.cpp index 934be5c63..42a57214a 100644 --- a/src/muz/pdr/pdr_util.cpp +++ b/src/muz/pdr/pdr_util.cpp @@ -22,29 +22,29 @@ Notes: --*/ #include -#include "arith_simplifier_plugin.h" -#include "array_decl_plugin.h" -#include "ast_pp.h" -#include "basic_simplifier_plugin.h" -#include "bv_simplifier_plugin.h" -#include "bool_rewriter.h" -#include "dl_util.h" -#include "for_each_expr.h" -#include "smt_params.h" -#include "model.h" -#include "ref_vector.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "util.h" -#include "pdr_manager.h" -#include "pdr_util.h" -#include "arith_decl_plugin.h" -#include "expr_replacer.h" -#include "model_smt2_pp.h" -#include "poly_rewriter.h" -#include "poly_rewriter_def.h" -#include "arith_rewriter.h" -#include "scoped_proof.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/rewriter/bool_rewriter.h" +#include "muz/base/dl_util.h" +#include "ast/for_each_expr.h" +#include "smt/params/smt_params.h" +#include "model/model.h" +#include "util/ref_vector.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/util.h" +#include "muz/pdr/pdr_manager.h" +#include "muz/pdr/pdr_util.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/expr_replacer.h" +#include "model/model_smt2_pp.h" +#include "ast/rewriter/poly_rewriter.h" +#include "ast/rewriter/poly_rewriter_def.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/scoped_proof.h" diff --git a/src/muz/pdr/pdr_util.h b/src/muz/pdr/pdr_util.h index 09fad8a30..fccb0c40f 100644 --- a/src/muz/pdr/pdr_util.h +++ b/src/muz/pdr/pdr_util.h @@ -20,16 +20,16 @@ Revision History: #ifndef PDR_UTIL_H_ #define PDR_UTIL_H_ -#include "ast.h" -#include "ast_pp.h" -#include "obj_hashtable.h" -#include "ref_vector.h" -#include "simplifier.h" -#include "trace.h" -#include "vector.h" -#include "arith_decl_plugin.h" -#include "array_decl_plugin.h" -#include "bv_decl_plugin.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "util/obj_hashtable.h" +#include "util/ref_vector.h" +#include "ast/simplifier/simplifier.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/bv_decl_plugin.h" class model; diff --git a/src/muz/rel/aig_exporter.cpp b/src/muz/rel/aig_exporter.cpp index ca0030fc3..bc98ab1f8 100644 --- a/src/muz/rel/aig_exporter.cpp +++ b/src/muz/rel/aig_exporter.cpp @@ -11,8 +11,8 @@ Abstract: --*/ -#include "aig_exporter.h" -#include "dl_context.h" +#include "muz/rel/aig_exporter.h" +#include "muz/base/dl_context.h" #include namespace datalog { diff --git a/src/muz/rel/aig_exporter.h b/src/muz/rel/aig_exporter.h index 71af6fb35..ea241fe2b 100644 --- a/src/muz/rel/aig_exporter.h +++ b/src/muz/rel/aig_exporter.h @@ -14,11 +14,11 @@ Abstract: #ifndef AIG_EXPORTER_H_ #define AIG_EXPORTER_H_ -#include "aig.h" -#include "dl_rule_set.h" +#include "tactic/aig/aig.h" +#include "muz/base/dl_rule_set.h" #include #include -#include "rel_context.h" +#include "muz/rel/rel_context.h" namespace datalog { class aig_exporter { diff --git a/src/muz/rel/check_relation.cpp b/src/muz/rel/check_relation.cpp index e630d7083..ddda295cd 100644 --- a/src/muz/rel/check_relation.cpp +++ b/src/muz/rel/check_relation.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "check_relation.h" -#include "dl_relation_manager.h" -#include "ast_util.h" -#include "smt_kernel.h" +#include "muz/rel/check_relation.h" +#include "muz/rel/dl_relation_manager.h" +#include "ast/ast_util.h" +#include "smt/smt_kernel.h" #include diff --git a/src/muz/rel/check_relation.h b/src/muz/rel/check_relation.h index c91567553..0fbb2a269 100644 --- a/src/muz/rel/check_relation.h +++ b/src/muz/rel/check_relation.h @@ -22,8 +22,8 @@ Revision History: #ifndef CHECK_RELATION_H_ #define CHECK_RELATION_H_ -#include "doc.h" -#include "dl_base.h" +#include "muz/rel/doc.h" +#include "muz/rel/dl_base.h" namespace datalog { class check_relation_plugin; diff --git a/src/muz/rel/dl_base.cpp b/src/muz/rel/dl_base.cpp index f79f6c8eb..904faf71f 100644 --- a/src/muz/rel/dl_base.cpp +++ b/src/muz/rel/dl_base.cpp @@ -18,13 +18,13 @@ Revision History: --*/ -#include"ast_pp.h" -#include"union_find.h" -#include"vector.h" -#include"dl_context.h" -#include"dl_base.h" -#include"bool_rewriter.h" -#include"dl_relation_manager.h" +#include "ast/ast_pp.h" +#include "util/union_find.h" +#include "util/vector.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_base.h" +#include "ast/rewriter/bool_rewriter.h" +#include "muz/rel/dl_relation_manager.h" #include diff --git a/src/muz/rel/dl_base.h b/src/muz/rel/dl_base.h index d3422f882..4e59e9258 100644 --- a/src/muz/rel/dl_base.h +++ b/src/muz/rel/dl_base.h @@ -23,12 +23,12 @@ Revision History: #include -#include"ast.h" -#include"map.h" -#include"vector.h" -#include"ref.h" -#include"dl_util.h" -#include"dl_context.h" +#include "ast/ast.h" +#include "util/map.h" +#include "util/vector.h" +#include "util/ref.h" +#include "muz/base/dl_util.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/rel/dl_bound_relation.cpp b/src/muz/rel/dl_bound_relation.cpp index 182046c1e..de6c76456 100644 --- a/src/muz/rel/dl_bound_relation.cpp +++ b/src/muz/rel/dl_bound_relation.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include "dl_bound_relation.h" -#include "debug.h" -#include "ast_pp.h" +#include "muz/rel/dl_bound_relation.h" +#include "util/debug.h" +#include "ast/ast_pp.h" namespace datalog { diff --git a/src/muz/rel/dl_bound_relation.h b/src/muz/rel/dl_bound_relation.h index 485dfbafa..456df737b 100644 --- a/src/muz/rel/dl_bound_relation.h +++ b/src/muz/rel/dl_bound_relation.h @@ -19,14 +19,14 @@ Revision History: #ifndef DL_BOUND_RELATION_H_ #define DL_BOUND_RELATION_H_ -#include "dl_context.h" -#include "dl_relation_manager.h" -#include "dl_base.h" -#include "uint_set.h" -#include "dl_vector_relation.h" -#include "dl_interval_relation.h" -#include "arith_decl_plugin.h" -#include "basic_simplifier_plugin.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_base.h" +#include "util/uint_set.h" +#include "muz/rel/dl_vector_relation.h" +#include "muz/rel/dl_interval_relation.h" +#include "ast/arith_decl_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" namespace datalog { diff --git a/src/muz/rel/dl_check_table.cpp b/src/muz/rel/dl_check_table.cpp index ea4003e5f..0c4be18f1 100644 --- a/src/muz/rel/dl_check_table.cpp +++ b/src/muz/rel/dl_check_table.cpp @@ -19,8 +19,8 @@ Revision History: --*/ -#include "dl_check_table.h" -#include "dl_table.h" +#include "muz/rel/dl_check_table.h" +#include "muz/rel/dl_table.h" namespace datalog { diff --git a/src/muz/rel/dl_check_table.h b/src/muz/rel/dl_check_table.h index 35f399452..412dd2dbc 100644 --- a/src/muz/rel/dl_check_table.h +++ b/src/muz/rel/dl_check_table.h @@ -21,9 +21,9 @@ Revision History: #ifndef DL_CHECK_TABLE_H_ #define DL_CHECK_TABLE_H_ -#include "dl_base.h" -#include "dl_decl_plugin.h" -#include "dl_relation_manager.h" +#include "muz/rel/dl_base.h" +#include "ast/dl_decl_plugin.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { class check_table; diff --git a/src/muz/rel/dl_compiler.cpp b/src/muz/rel/dl_compiler.cpp index 0d4507971..32bcfed50 100644 --- a/src/muz/rel/dl_compiler.cpp +++ b/src/muz/rel/dl_compiler.cpp @@ -19,15 +19,15 @@ Revision History: #include -#include"ref_vector.h" -#include"dl_context.h" -#include"rel_context.h" -#include"dl_rule.h" -#include"dl_util.h" -#include"dl_compiler.h" -#include"ast_pp.h" +#include "util/ref_vector.h" +#include "muz/base/dl_context.h" +#include "muz/rel/rel_context.h" +#include "muz/base/dl_rule.h" +#include "muz/base/dl_util.h" +#include "muz/rel/dl_compiler.h" +#include "ast/ast_pp.h" // include"ast_smt2_pp.h" -#include"ast_util.h" +#include "ast/ast_util.h" namespace datalog { diff --git a/src/muz/rel/dl_compiler.h b/src/muz/rel/dl_compiler.h index 33d92d805..9aedf141a 100644 --- a/src/muz/rel/dl_compiler.h +++ b/src/muz/rel/dl_compiler.h @@ -23,16 +23,16 @@ Revision History: #include #include -#include "ast.h" -#include "hashtable.h" -#include "map.h" -#include "obj_pair_hashtable.h" -#include "ref_vector.h" -#include "vector.h" +#include "ast/ast.h" +#include "util/hashtable.h" +#include "util/map.h" +#include "util/obj_pair_hashtable.h" +#include "util/ref_vector.h" +#include "util/vector.h" -#include "dl_base.h" -#include "dl_context.h" -#include "dl_instruction.h" +#include "muz/rel/dl_base.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_instruction.h" namespace datalog { diff --git a/src/muz/rel/dl_external_relation.cpp b/src/muz/rel/dl_external_relation.cpp index e9c24abd3..ff9bef40e 100644 --- a/src/muz/rel/dl_external_relation.cpp +++ b/src/muz/rel/dl_external_relation.cpp @@ -17,11 +17,11 @@ Revision History: --*/ -#include "debug.h" -#include "ast_pp.h" -#include "dl_context.h" -#include "dl_external_relation.h" -#include "dl_decl_plugin.h" +#include "util/debug.h" +#include "ast/ast_pp.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_external_relation.h" +#include "ast/dl_decl_plugin.h" namespace datalog { diff --git a/src/muz/rel/dl_external_relation.h b/src/muz/rel/dl_external_relation.h index 0bd78b776..0dfb4a7f2 100644 --- a/src/muz/rel/dl_external_relation.h +++ b/src/muz/rel/dl_external_relation.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_EXTERNAL_RELATION_H_ #define DL_EXTERNAL_RELATION_H_ -#include "dl_base.h" +#include "muz/rel/dl_base.h" namespace datalog { diff --git a/src/muz/rel/dl_finite_product_relation.cpp b/src/muz/rel/dl_finite_product_relation.cpp index 879e29699..c036d3cfd 100644 --- a/src/muz/rel/dl_finite_product_relation.cpp +++ b/src/muz/rel/dl_finite_product_relation.cpp @@ -19,11 +19,11 @@ Revision History: #include -#include"dl_context.h" -#include"dl_relation_manager.h" -#include"dl_table_relation.h" -#include"dl_finite_product_relation.h" -#include"bool_rewriter.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_table_relation.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "ast/rewriter/bool_rewriter.h" namespace datalog { diff --git a/src/muz/rel/dl_finite_product_relation.h b/src/muz/rel/dl_finite_product_relation.h index e91ab4a17..946296df1 100644 --- a/src/muz/rel/dl_finite_product_relation.h +++ b/src/muz/rel/dl_finite_product_relation.h @@ -20,9 +20,9 @@ Revision History: #define DL_FINITE_PRODUCT_RELATION_H_ -#include "dl_base.h" -#include "dl_relation_manager.h" -#include "dl_table_relation.h" +#include "muz/rel/dl_base.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_table_relation.h" namespace datalog { diff --git a/src/muz/rel/dl_instruction.cpp b/src/muz/rel/dl_instruction.cpp index f0b88cae1..fb718d8b8 100644 --- a/src/muz/rel/dl_instruction.cpp +++ b/src/muz/rel/dl_instruction.cpp @@ -17,14 +17,14 @@ Revision History: --*/ -#include"ast_pp.h" -#include"stopwatch.h" -#include"dl_context.h" -#include"dl_util.h" -#include"dl_instruction.h" -#include"rel_context.h" -#include"debug.h" -#include"warning.h" +#include "ast/ast_pp.h" +#include "util/stopwatch.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_util.h" +#include "muz/rel/dl_instruction.h" +#include "muz/rel/rel_context.h" +#include "util/debug.h" +#include "util/warning.h" namespace datalog { diff --git a/src/muz/rel/dl_instruction.h b/src/muz/rel/dl_instruction.h index 196f5268c..c29681f37 100644 --- a/src/muz/rel/dl_instruction.h +++ b/src/muz/rel/dl_instruction.h @@ -22,11 +22,11 @@ Revision History: #include #include #include -#include "ast.h" -#include "vector.h" -#include "dl_base.h" -#include "dl_costs.h" -#include "dl_context.h" +#include "ast/ast.h" +#include "util/vector.h" +#include "muz/rel/dl_base.h" +#include "muz/base/dl_costs.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/rel/dl_interval_relation.cpp b/src/muz/rel/dl_interval_relation.cpp index 88c262cbe..ccb7b728b 100644 --- a/src/muz/rel/dl_interval_relation.cpp +++ b/src/muz/rel/dl_interval_relation.cpp @@ -17,12 +17,12 @@ Revision History: --*/ -#include "debug.h" -#include "optional.h" -#include "ast_pp.h" -#include "dl_interval_relation.h" -#include "dl_relation_manager.h" -#include "bool_rewriter.h" +#include "util/debug.h" +#include "util/optional.h" +#include "ast/ast_pp.h" +#include "muz/rel/dl_interval_relation.h" +#include "muz/rel/dl_relation_manager.h" +#include "ast/rewriter/bool_rewriter.h" namespace datalog { diff --git a/src/muz/rel/dl_interval_relation.h b/src/muz/rel/dl_interval_relation.h index a8239ef24..05334624f 100644 --- a/src/muz/rel/dl_interval_relation.h +++ b/src/muz/rel/dl_interval_relation.h @@ -20,13 +20,13 @@ Revision History: #define DL_INTERVAL_RELATION_H_ -#include "dl_context.h" -#include "dl_relation_manager.h" -#include "dl_base.h" -#include "old_interval.h" -#include "dl_vector_relation.h" -#include "arith_decl_plugin.h" -#include "basic_simplifier_plugin.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_base.h" +#include "smt/old_interval.h" +#include "muz/rel/dl_vector_relation.h" +#include "ast/arith_decl_plugin.h" +#include "ast/simplifier/basic_simplifier_plugin.h" namespace datalog { diff --git a/src/muz/rel/dl_lazy_table.cpp b/src/muz/rel/dl_lazy_table.cpp index ec97a4bf5..54105891a 100644 --- a/src/muz/rel/dl_lazy_table.cpp +++ b/src/muz/rel/dl_lazy_table.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include "dl_lazy_table.h" -#include "dl_relation_manager.h" +#include "muz/rel/dl_lazy_table.h" +#include "muz/rel/dl_relation_manager.h" #include namespace datalog { diff --git a/src/muz/rel/dl_lazy_table.h b/src/muz/rel/dl_lazy_table.h index 28360c95f..6752e5a5a 100644 --- a/src/muz/rel/dl_lazy_table.h +++ b/src/muz/rel/dl_lazy_table.h @@ -21,8 +21,8 @@ Revision History: #ifndef DL_LAZY_TABLE_H_ #define DL_LAZY_TABLE_H_ -#include "dl_base.h" -#include "ref.h" +#include "muz/rel/dl_base.h" +#include "util/ref.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_explanations.cpp b/src/muz/rel/dl_mk_explanations.cpp index 7fcbdaaff..fd13978d2 100644 --- a/src/muz/rel/dl_mk_explanations.cpp +++ b/src/muz/rel/dl_mk_explanations.cpp @@ -19,12 +19,12 @@ Revision History: #include -#include"ast_pp.h" -#include"ast_smt_pp.h" -#include"dl_finite_product_relation.h" -#include"dl_product_relation.h" -#include"dl_sieve_relation.h" -#include"dl_mk_explanations.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "muz/rel/dl_product_relation.h" +#include "muz/rel/dl_sieve_relation.h" +#include "muz/rel/dl_mk_explanations.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_explanations.h b/src/muz/rel/dl_mk_explanations.h index 54e56bbe8..6142b61d6 100644 --- a/src/muz/rel/dl_mk_explanations.h +++ b/src/muz/rel/dl_mk_explanations.h @@ -20,8 +20,8 @@ Revision History: #ifndef DL_MK_EXPLANATIONS_H_ #define DL_MK_EXPLANATIONS_H_ -#include "dl_context.h" -#include "dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_similarity_compressor.cpp b/src/muz/rel/dl_mk_similarity_compressor.cpp index b65ed455c..c4abf326a 100644 --- a/src/muz/rel/dl_mk_similarity_compressor.cpp +++ b/src/muz/rel/dl_mk_similarity_compressor.cpp @@ -19,8 +19,8 @@ Revision History: #include #include -#include"dl_mk_similarity_compressor.h" -#include"dl_relation_manager.h" +#include "muz/rel/dl_mk_similarity_compressor.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_similarity_compressor.h b/src/muz/rel/dl_mk_similarity_compressor.h index 9ecbf7bfb..68410831c 100644 --- a/src/muz/rel/dl_mk_similarity_compressor.h +++ b/src/muz/rel/dl_mk_similarity_compressor.h @@ -21,12 +21,12 @@ Revision History: #include -#include"map.h" -#include"obj_pair_hashtable.h" +#include "util/map.h" +#include "util/obj_pair_hashtable.h" -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_simple_joins.cpp b/src/muz/rel/dl_mk_simple_joins.cpp index a8e54085d..60eea2e53 100644 --- a/src/muz/rel/dl_mk_simple_joins.cpp +++ b/src/muz/rel/dl_mk_simple_joins.cpp @@ -20,10 +20,10 @@ Revision History: #include #include #include -#include"dl_mk_simple_joins.h" -#include"dl_relation_manager.h" -#include"ast_pp.h" -#include"trace.h" +#include "muz/rel/dl_mk_simple_joins.h" +#include "muz/rel/dl_relation_manager.h" +#include "ast/ast_pp.h" +#include "util/trace.h" namespace datalog { diff --git a/src/muz/rel/dl_mk_simple_joins.h b/src/muz/rel/dl_mk_simple_joins.h index 1289e7831..4d422e651 100644 --- a/src/muz/rel/dl_mk_simple_joins.h +++ b/src/muz/rel/dl_mk_simple_joins.h @@ -19,12 +19,12 @@ Revision History: #ifndef DL_MK_SIMPLE_JOINS_H_ #define DL_MK_SIMPLE_JOINS_H_ -#include"map.h" -#include"obj_pair_hashtable.h" +#include "util/map.h" +#include "util/obj_pair_hashtable.h" -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/rel/dl_product_relation.cpp b/src/muz/rel/dl_product_relation.cpp index 817ff194c..8a2029748 100644 --- a/src/muz/rel/dl_product_relation.cpp +++ b/src/muz/rel/dl_product_relation.cpp @@ -42,11 +42,11 @@ Notes: --*/ -#include "dl_sieve_relation.h" -#include "dl_table_relation.h" -#include "dl_product_relation.h" -#include "bool_rewriter.h" -#include "ast_pp.h" +#include "muz/rel/dl_sieve_relation.h" +#include "muz/rel/dl_table_relation.h" +#include "muz/rel/dl_product_relation.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/ast_pp.h" namespace datalog { diff --git a/src/muz/rel/dl_product_relation.h b/src/muz/rel/dl_product_relation.h index 6381fcf37..002fe5289 100644 --- a/src/muz/rel/dl_product_relation.h +++ b/src/muz/rel/dl_product_relation.h @@ -20,8 +20,8 @@ Revision History: #define DL_PRODUCT_RELATION_H_ -#include "dl_context.h" -#include "dl_relation_manager.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/dl_relation_manager.cpp b/src/muz/rel/dl_relation_manager.cpp index 5bb47c5c3..1eb973776 100644 --- a/src/muz/rel/dl_relation_manager.cpp +++ b/src/muz/rel/dl_relation_manager.cpp @@ -19,14 +19,14 @@ Revision History: #include -#include"ast_pp.h" -#include"dl_check_table.h" -#include"dl_context.h" -#include"dl_finite_product_relation.h" -#include"dl_product_relation.h" -#include"dl_sieve_relation.h" -#include"dl_table_relation.h" -#include"dl_relation_manager.h" +#include "ast/ast_pp.h" +#include "muz/rel/dl_check_table.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "muz/rel/dl_product_relation.h" +#include "muz/rel/dl_sieve_relation.h" +#include "muz/rel/dl_table_relation.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/dl_relation_manager.h b/src/muz/rel/dl_relation_manager.h index a641a5fd2..c77127eb7 100644 --- a/src/muz/rel/dl_relation_manager.h +++ b/src/muz/rel/dl_relation_manager.h @@ -20,9 +20,9 @@ Revision History: #define DL_RELATION_MANAGER_H_ -#include"map.h" -#include"vector.h" -#include"dl_base.h" +#include "util/map.h" +#include "util/vector.h" +#include "muz/rel/dl_base.h" namespace datalog { diff --git a/src/muz/rel/dl_sieve_relation.cpp b/src/muz/rel/dl_sieve_relation.cpp index 7729ec2eb..0d70212e2 100644 --- a/src/muz/rel/dl_sieve_relation.cpp +++ b/src/muz/rel/dl_sieve_relation.cpp @@ -18,8 +18,8 @@ Revision History: --*/ #include -#include"ast_pp.h" -#include"dl_sieve_relation.h" +#include "ast/ast_pp.h" +#include "muz/rel/dl_sieve_relation.h" namespace datalog { diff --git a/src/muz/rel/dl_sieve_relation.h b/src/muz/rel/dl_sieve_relation.h index 4d89a66ae..021c9d8df 100644 --- a/src/muz/rel/dl_sieve_relation.h +++ b/src/muz/rel/dl_sieve_relation.h @@ -20,8 +20,8 @@ Revision History: #ifndef DL_SIEVE_RELATION_H_ #define DL_SIEVE_RELATION_H_ -#include "dl_context.h" -#include "dl_relation_manager.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/dl_sparse_table.cpp b/src/muz/rel/dl_sparse_table.cpp index f045bee4b..6048f358b 100644 --- a/src/muz/rel/dl_sparse_table.cpp +++ b/src/muz/rel/dl_sparse_table.cpp @@ -18,9 +18,9 @@ Revision History: --*/ #include -#include"dl_context.h" -#include"dl_util.h" -#include"dl_sparse_table.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_util.h" +#include "muz/rel/dl_sparse_table.h" namespace datalog { diff --git a/src/muz/rel/dl_sparse_table.h b/src/muz/rel/dl_sparse_table.h index a45f4e6c6..a699cf165 100644 --- a/src/muz/rel/dl_sparse_table.h +++ b/src/muz/rel/dl_sparse_table.h @@ -24,15 +24,15 @@ Revision History: #include #include -#include "ast.h" -#include "bit_vector.h" -#include "buffer.h" -#include "hashtable.h" -#include "map.h" -#include "ref_vector.h" -#include "vector.h" +#include "ast/ast.h" +#include "util/bit_vector.h" +#include "util/buffer.h" +#include "util/hashtable.h" +#include "util/map.h" +#include "util/ref_vector.h" +#include "util/vector.h" -#include "dl_base.h" +#include "muz/rel/dl_base.h" namespace datalog { diff --git a/src/muz/rel/dl_table.cpp b/src/muz/rel/dl_table.cpp index 9df9dde5e..1c068a878 100644 --- a/src/muz/rel/dl_table.cpp +++ b/src/muz/rel/dl_table.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include"dl_context.h" -#include"dl_util.h" -#include"dl_table.h" -#include"dl_relation_manager.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_util.h" +#include "muz/rel/dl_table.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/dl_table.h b/src/muz/rel/dl_table.h index d25aa31bc..c428191af 100644 --- a/src/muz/rel/dl_table.h +++ b/src/muz/rel/dl_table.h @@ -23,17 +23,17 @@ Revision History: #include #include -#include "ast.h" -#include "bit_vector.h" -#include "buffer.h" -#include "hashtable.h" -#include "map.h" -#include "ref_vector.h" -#include "vector.h" -#include "union_find.h" -#include "dl_base.h" -#include "dl_util.h" -#include "bit_vector.h" +#include "ast/ast.h" +#include "util/bit_vector.h" +#include "util/buffer.h" +#include "util/hashtable.h" +#include "util/map.h" +#include "util/ref_vector.h" +#include "util/vector.h" +#include "util/union_find.h" +#include "muz/rel/dl_base.h" +#include "muz/base/dl_util.h" +#include "util/bit_vector.h" namespace datalog { diff --git a/src/muz/rel/dl_table_plugin.h b/src/muz/rel/dl_table_plugin.h index 7765f54d3..9becc1773 100644 --- a/src/muz/rel/dl_table_plugin.h +++ b/src/muz/rel/dl_table_plugin.h @@ -19,9 +19,9 @@ Revision History: #ifndef DL_TABLE_PLUGIN_H_ #define DL_TABLE_PLUGIN_H_ -#include"ast.h" -#include"map.h" -#include"vector.h" +#include "ast/ast.h" +#include "util/map.h" +#include "util/vector.h" #include"dl_table_ops.h" diff --git a/src/muz/rel/dl_table_relation.cpp b/src/muz/rel/dl_table_relation.cpp index 00a25d169..d8f1c7314 100644 --- a/src/muz/rel/dl_table_relation.cpp +++ b/src/muz/rel/dl_table_relation.cpp @@ -19,9 +19,9 @@ Revision History: #include -#include"dl_context.h" -#include"dl_relation_manager.h" -#include"dl_table_relation.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_table_relation.h" namespace datalog { diff --git a/src/muz/rel/dl_table_relation.h b/src/muz/rel/dl_table_relation.h index 56ca509fa..16ff8c482 100644 --- a/src/muz/rel/dl_table_relation.h +++ b/src/muz/rel/dl_table_relation.h @@ -20,8 +20,8 @@ Revision History: #define DL_TABLE_RELATION_H_ -#include "dl_base.h" -#include "dl_util.h" +#include "muz/rel/dl_base.h" +#include "muz/base/dl_util.h" namespace datalog { diff --git a/src/muz/rel/dl_vector_relation.h b/src/muz/rel/dl_vector_relation.h index 040d23300..85e7a78d1 100644 --- a/src/muz/rel/dl_vector_relation.h +++ b/src/muz/rel/dl_vector_relation.h @@ -19,9 +19,9 @@ Revision History: #ifndef DL_VECTOR_RELATION_H_ #define DL_VECTOR_RELATION_H_ -#include "ast_pp.h" -#include "dl_context.h" -#include "union_find.h" +#include "ast/ast_pp.h" +#include "muz/base/dl_context.h" +#include "util/union_find.h" namespace datalog { diff --git a/src/muz/rel/doc.cpp b/src/muz/rel/doc.cpp index e73395bc9..23d24dfc3 100644 --- a/src/muz/rel/doc.cpp +++ b/src/muz/rel/doc.cpp @@ -20,12 +20,12 @@ Revision History: --*/ -#include "doc.h" -#include "smt_kernel.h" -#include "expr_safe_replace.h" -#include "smt_params.h" -#include "ast_util.h" -#include "ast_pp.h" +#include "muz/rel/doc.h" +#include "smt/smt_kernel.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" doc_manager::doc_manager(unsigned n): m(n), m_alloc("doc") { m_full = m.allocateX(); diff --git a/src/muz/rel/doc.h b/src/muz/rel/doc.h index 23b636cf9..419081892 100644 --- a/src/muz/rel/doc.h +++ b/src/muz/rel/doc.h @@ -23,9 +23,9 @@ Revision History: #ifndef DOC_H_ #define DOC_H_ -#include "tbv.h" -#include "union_find.h" -#include "buffer.h" +#include "muz/rel/tbv.h" +#include "util/union_find.h" +#include "util/buffer.h" class doc; diff --git a/src/muz/rel/karr_relation.cpp b/src/muz/rel/karr_relation.cpp index 0baa297bc..572d5e8d5 100644 --- a/src/muz/rel/karr_relation.cpp +++ b/src/muz/rel/karr_relation.cpp @@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "karr_relation.h" -#include "bool_rewriter.h" -#include "ast_util.h" +#include "muz/rel/karr_relation.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/ast_util.h" namespace datalog { class karr_relation : public relation_base { diff --git a/src/muz/rel/karr_relation.h b/src/muz/rel/karr_relation.h index 8e5c09156..47e10f09e 100644 --- a/src/muz/rel/karr_relation.h +++ b/src/muz/rel/karr_relation.h @@ -19,8 +19,8 @@ Revision History: #ifndef KARR_RELATION_H_ #define KARR_RELATION_H_ -#include"dl_mk_karr_invariants.h" -#include"dl_relation_manager.h" +#include "muz/transforms/dl_mk_karr_invariants.h" +#include "muz/rel/dl_relation_manager.h" namespace datalog { diff --git a/src/muz/rel/rel_context.cpp b/src/muz/rel/rel_context.cpp index abaf88f32..9fb1e89e0 100644 --- a/src/muz/rel/rel_context.cpp +++ b/src/muz/rel/rel_context.cpp @@ -20,36 +20,36 @@ Revision History: --*/ -#include"rel_context.h" -#include"stopwatch.h" -#include"dl_context.h" -#include"dl_compiler.h" -#include"dl_instruction.h" -#include"dl_mk_explanations.h" -#include"dl_mk_magic_sets.h" -#include"dl_product_relation.h" -#include"dl_bound_relation.h" -#include"dl_interval_relation.h" -#include"karr_relation.h" -#include"dl_finite_product_relation.h" -#include"udoc_relation.h" -#include"check_relation.h" -#include"dl_lazy_table.h" -#include"dl_sparse_table.h" -#include"dl_table.h" -#include"dl_table_relation.h" -#include"aig_exporter.h" -#include"dl_mk_simple_joins.h" -#include"dl_mk_similarity_compressor.h" -#include"dl_mk_unbound_compressor.h" -#include"dl_mk_subsumption_checker.h" -#include"dl_mk_coi_filter.h" -#include"dl_mk_filter_rules.h" -#include"dl_mk_rule_inliner.h" -#include"dl_mk_interp_tail_simplifier.h" -#include"dl_mk_bit_blast.h" -#include"dl_mk_separate_negated_tails.h" -#include"ast_util.h" +#include "muz/rel/rel_context.h" +#include "util/stopwatch.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_compiler.h" +#include "muz/rel/dl_instruction.h" +#include "muz/rel/dl_mk_explanations.h" +#include "muz/transforms/dl_mk_magic_sets.h" +#include "muz/rel/dl_product_relation.h" +#include "muz/rel/dl_bound_relation.h" +#include "muz/rel/dl_interval_relation.h" +#include "muz/rel/karr_relation.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "muz/rel/udoc_relation.h" +#include "muz/rel/check_relation.h" +#include "muz/rel/dl_lazy_table.h" +#include "muz/rel/dl_sparse_table.h" +#include "muz/rel/dl_table.h" +#include "muz/rel/dl_table_relation.h" +#include "muz/rel/aig_exporter.h" +#include "muz/rel/dl_mk_simple_joins.h" +#include "muz/rel/dl_mk_similarity_compressor.h" +#include "muz/transforms/dl_mk_unbound_compressor.h" +#include "muz/transforms/dl_mk_subsumption_checker.h" +#include "muz/transforms/dl_mk_coi_filter.h" +#include "muz/transforms/dl_mk_filter_rules.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "muz/transforms/dl_mk_bit_blast.h" +#include "muz/transforms/dl_mk_separate_negated_tails.h" +#include "ast/ast_util.h" namespace datalog { diff --git a/src/muz/rel/rel_context.h b/src/muz/rel/rel_context.h index c263ddc03..f4a87d496 100644 --- a/src/muz/rel/rel_context.h +++ b/src/muz/rel/rel_context.h @@ -20,12 +20,12 @@ Revision History: --*/ #ifndef REL_CONTEXT_H_ #define REL_CONTEXT_H_ -#include "ast.h" -#include "dl_relation_manager.h" -#include "dl_instruction.h" -#include "dl_engine_base.h" -#include "dl_context.h" -#include "lbool.h" +#include "ast/ast.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_instruction.h" +#include "muz/base/dl_engine_base.h" +#include "muz/base/dl_context.h" +#include "util/lbool.h" namespace datalog { diff --git a/src/muz/rel/tbv.cpp b/src/muz/rel/tbv.cpp index 568f63f51..7475750db 100644 --- a/src/muz/rel/tbv.cpp +++ b/src/muz/rel/tbv.cpp @@ -18,9 +18,9 @@ Revision History: --*/ -#include "tbv.h" -#include "hashtable.h" -#include "ast_util.h" +#include "muz/rel/tbv.h" +#include "util/hashtable.h" +#include "ast/ast_util.h" static bool s_debug_alloc = false; diff --git a/src/muz/rel/tbv.h b/src/muz/rel/tbv.h index e2e09d691..1839700d6 100644 --- a/src/muz/rel/tbv.h +++ b/src/muz/rel/tbv.h @@ -21,9 +21,9 @@ Revision History: #ifndef TBV_H_ #define TBV_H_ -#include "fixed_bit_vector.h" -#include "rational.h" -#include "ast.h" +#include "util/fixed_bit_vector.h" +#include "util/rational.h" +#include "ast/ast.h" class tbv; diff --git a/src/muz/rel/udoc_relation.cpp b/src/muz/rel/udoc_relation.cpp index 22e70a367..febabb36d 100644 --- a/src/muz/rel/udoc_relation.cpp +++ b/src/muz/rel/udoc_relation.cpp @@ -21,10 +21,10 @@ Revision History: Notes: --*/ -#include "udoc_relation.h" -#include "dl_relation_manager.h" -#include "ast_util.h" -#include "smt_kernel.h" +#include "muz/rel/udoc_relation.h" +#include "muz/rel/dl_relation_manager.h" +#include "ast/ast_util.h" +#include "smt/smt_kernel.h" namespace datalog { diff --git a/src/muz/rel/udoc_relation.h b/src/muz/rel/udoc_relation.h index 026abfab0..15918d80d 100644 --- a/src/muz/rel/udoc_relation.h +++ b/src/muz/rel/udoc_relation.h @@ -22,8 +22,8 @@ Revision History: #ifndef UDOC_RELATION_H_ #define UDOC_RELATION_H_ -#include "doc.h" -#include "dl_base.h" +#include "muz/rel/doc.h" +#include "muz/rel/dl_base.h" namespace datalog { class udoc_plugin; diff --git a/src/muz/tab/tab_context.cpp b/src/muz/tab/tab_context.cpp index 35eb5d936..8309f812e 100644 --- a/src/muz/tab/tab_context.cpp +++ b/src/muz/tab/tab_context.cpp @@ -17,21 +17,21 @@ Revision History: --*/ -#include "tab_context.h" -#include "trail.h" -#include "dl_rule_set.h" -#include "dl_context.h" -#include "dl_mk_rule_inliner.h" -#include "smt_kernel.h" -#include "qe_lite.h" -#include "bool_rewriter.h" -#include "th_rewriter.h" -#include "datatype_decl_plugin.h" -#include "for_each_expr.h" -#include "matcher.h" -#include "scoped_proof.h" +#include "muz/tab/tab_context.h" +#include "util/trail.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_context.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "smt/smt_kernel.h" +#include "qe/qe_lite.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "ast/substitution/matcher.h" +#include "ast/scoped_proof.h" #include "fixedpoint_params.hpp" -#include "ast_util.h" +#include "ast/ast_util.h" namespace tb { diff --git a/src/muz/tab/tab_context.h b/src/muz/tab/tab_context.h index 703109475..329234524 100644 --- a/src/muz/tab/tab_context.h +++ b/src/muz/tab/tab_context.h @@ -19,10 +19,10 @@ Revision History: #ifndef TAB_CONTEXT_H_ #define TAB_CONTEXT_H_ -#include "ast.h" -#include "lbool.h" -#include "statistics.h" -#include "dl_engine_base.h" +#include "ast/ast.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "muz/base/dl_engine_base.h" namespace datalog { class context; diff --git a/src/muz/transforms/dl_mk_array_blast.cpp b/src/muz/transforms/dl_mk_array_blast.cpp index 031c5098e..373edcd4b 100644 --- a/src/muz/transforms/dl_mk_array_blast.cpp +++ b/src/muz/transforms/dl_mk_array_blast.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include "dl_mk_array_blast.h" -#include "ast_util.h" -#include "scoped_proof.h" +#include "muz/transforms/dl_mk_array_blast.h" +#include "ast/ast_util.h" +#include "ast/scoped_proof.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_array_blast.h b/src/muz/transforms/dl_mk_array_blast.h index 0bec9ae14..e7b951168 100644 --- a/src/muz/transforms/dl_mk_array_blast.h +++ b/src/muz/transforms/dl_mk_array_blast.h @@ -19,13 +19,13 @@ Revision History: #ifndef DL_MK_ARRAY_BLAST_H_ #define DL_MK_ARRAY_BLAST_H_ -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" -#include"dl_mk_interp_tail_simplifier.h" -#include "equiv_proof_converter.h" -#include "array_decl_plugin.h" -#include "expr_safe_replace.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "tactic/equiv_proof_converter.h" +#include "ast/array_decl_plugin.h" +#include "ast/rewriter/expr_safe_replace.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_backwards.cpp b/src/muz/transforms/dl_mk_backwards.cpp index 771de0dc3..986367337 100644 --- a/src/muz/transforms/dl_mk_backwards.cpp +++ b/src/muz/transforms/dl_mk_backwards.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"dl_mk_backwards.h" -#include"dl_context.h" +#include "muz/transforms/dl_mk_backwards.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_backwards.h b/src/muz/transforms/dl_mk_backwards.h index 135f89a18..ca441fd0a 100644 --- a/src/muz/transforms/dl_mk_backwards.h +++ b/src/muz/transforms/dl_mk_backwards.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_MK_BACKWARDS_H_ #define DL_MK_BACKWARDS_H_ -#include"dl_rule_transformer.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_bit_blast.cpp b/src/muz/transforms/dl_mk_bit_blast.cpp index 98172f041..20baf66b6 100644 --- a/src/muz/transforms/dl_mk_bit_blast.cpp +++ b/src/muz/transforms/dl_mk_bit_blast.cpp @@ -17,16 +17,16 @@ Revision History: --*/ -#include "dl_mk_bit_blast.h" -#include "bit_blaster_rewriter.h" -#include "rewriter_def.h" -#include "ast_pp.h" -#include "expr_safe_replace.h" -#include "filter_model_converter.h" -#include "dl_mk_interp_tail_simplifier.h" +#include "muz/transforms/dl_mk_bit_blast.h" +#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "tactic/filter_model_converter.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" #include "fixedpoint_params.hpp" -#include "scoped_proof.h" -#include "model_v2_pp.h" +#include "ast/scoped_proof.h" +#include "model/model_v2_pp.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_bit_blast.h b/src/muz/transforms/dl_mk_bit_blast.h index 8111e8849..31df57567 100644 --- a/src/muz/transforms/dl_mk_bit_blast.h +++ b/src/muz/transforms/dl_mk_bit_blast.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_MK_BIT_BLAST_H_ #define DL_MK_BIT_BLAST_H_ -#include"dl_rule_transformer.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_coalesce.cpp b/src/muz/transforms/dl_mk_coalesce.cpp index 7476a5655..670a65e21 100644 --- a/src/muz/transforms/dl_mk_coalesce.cpp +++ b/src/muz/transforms/dl_mk_coalesce.cpp @@ -26,8 +26,8 @@ Notes: --*/ -#include "dl_mk_coalesce.h" -#include "bool_rewriter.h" +#include "muz/transforms/dl_mk_coalesce.h" +#include "ast/rewriter/bool_rewriter.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_coalesce.h b/src/muz/transforms/dl_mk_coalesce.h index 9b4d009ae..47d702fbb 100644 --- a/src/muz/transforms/dl_mk_coalesce.h +++ b/src/muz/transforms/dl_mk_coalesce.h @@ -20,11 +20,11 @@ Revision History: #ifndef DL_MK_COALESCE_H_ #define DL_MK_COALESCE_H_ -#include"dl_context.h" -#include"dl_rule_set.h" -#include"uint_set.h" -#include"dl_rule_transformer.h" -#include"dl_mk_rule_inliner.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "util/uint_set.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_rule_inliner.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_coi_filter.cpp b/src/muz/transforms/dl_mk_coi_filter.cpp index 0f155f65b..31188bf43 100644 --- a/src/muz/transforms/dl_mk_coi_filter.cpp +++ b/src/muz/transforms/dl_mk_coi_filter.cpp @@ -17,11 +17,11 @@ Author: --*/ -#include "dl_mk_coi_filter.h" -#include "dataflow.h" -#include "reachability.h" -#include "ast_pp.h" -#include "extension_model_converter.h" +#include "muz/transforms/dl_mk_coi_filter.h" +#include "muz/dataflow/dataflow.h" +#include "muz/dataflow/reachability.h" +#include "ast/ast_pp.h" +#include "tactic/extension_model_converter.h" namespace datalog { rule_set * mk_coi_filter::operator()(rule_set const & source) { diff --git a/src/muz/transforms/dl_mk_coi_filter.h b/src/muz/transforms/dl_mk_coi_filter.h index 16abe2f52..c03308b6a 100644 --- a/src/muz/transforms/dl_mk_coi_filter.h +++ b/src/muz/transforms/dl_mk_coi_filter.h @@ -20,8 +20,8 @@ Author: #ifndef DL_MK_COI_FILTER_H_ #define DL_MK_COI_FILTER_H_ -#include "dl_rule_transformer.h" -#include "dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_different.h b/src/muz/transforms/dl_mk_different.h index 47a00edc0..2190d38cd 100644 --- a/src/muz/transforms/dl_mk_different.h +++ b/src/muz/transforms/dl_mk_different.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_MK_DIFFERENT_SYMBOLIC_H_ #define DL_MK_DIFFERENT_SYMBOLIC_H_ -#include"dl_rule_transformer.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_filter_rules.cpp b/src/muz/transforms/dl_mk_filter_rules.cpp index 0d118a589..a8c13fc17 100644 --- a/src/muz/transforms/dl_mk_filter_rules.cpp +++ b/src/muz/transforms/dl_mk_filter_rules.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include"dl_mk_filter_rules.h" -#include"dl_context.h" -#include"for_each_expr.h" -#include"ast_pp.h" +#include "muz/transforms/dl_mk_filter_rules.h" +#include "muz/base/dl_context.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_filter_rules.h b/src/muz/transforms/dl_mk_filter_rules.h index 60ee80e90..b81921d59 100644 --- a/src/muz/transforms/dl_mk_filter_rules.h +++ b/src/muz/transforms/dl_mk_filter_rules.h @@ -19,10 +19,10 @@ Revision History: #ifndef DL_MK_FILTER_RULES_H_ #define DL_MK_FILTER_RULES_H_ -#include"map.h" +#include "util/map.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp b/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp index 1ed847e89..64a2a2aca 100644 --- a/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp +++ b/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp @@ -19,13 +19,13 @@ Revision History: #include -#include"ast_pp.h" -#include"bool_rewriter.h" -#include"rewriter.h" -#include"rewriter_def.h" -#include"dl_mk_rule_inliner.h" -#include"dl_mk_interp_tail_simplifier.h" -#include"ast_util.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "ast/ast_util.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_interp_tail_simplifier.h b/src/muz/transforms/dl_mk_interp_tail_simplifier.h index 568fcff3f..a8a7393cd 100644 --- a/src/muz/transforms/dl_mk_interp_tail_simplifier.h +++ b/src/muz/transforms/dl_mk_interp_tail_simplifier.h @@ -20,11 +20,11 @@ Revision History: #ifndef DL_MK_INTERP_TAIL_SIMPLIFIER_H_ #define DL_MK_INTERP_TAIL_SIMPLIFIER_H_ -#include "dl_context.h" -#include "dl_rule_transformer.h" -#include "unifier.h" -#include "substitution.h" -#include "arith_decl_plugin.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/substitution/unifier.h" +#include "ast/substitution/substitution.h" +#include "ast/arith_decl_plugin.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_karr_invariants.cpp b/src/muz/transforms/dl_mk_karr_invariants.cpp index 99b1c0aea..48219eeb9 100644 --- a/src/muz/transforms/dl_mk_karr_invariants.cpp +++ b/src/muz/transforms/dl_mk_karr_invariants.cpp @@ -32,13 +32,13 @@ Revision History: --*/ -#include"expr_safe_replace.h" -#include"bool_rewriter.h" -#include"for_each_expr.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/for_each_expr.h" -#include"dl_mk_karr_invariants.h" -#include"dl_mk_backwards.h" -#include"dl_mk_loop_counter.h" +#include "muz/transforms/dl_mk_karr_invariants.h" +#include "muz/transforms/dl_mk_backwards.h" +#include "muz/transforms/dl_mk_loop_counter.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_karr_invariants.h b/src/muz/transforms/dl_mk_karr_invariants.h index bf0ba9021..b31f1f8d9 100644 --- a/src/muz/transforms/dl_mk_karr_invariants.h +++ b/src/muz/transforms/dl_mk_karr_invariants.h @@ -19,11 +19,11 @@ Revision History: #ifndef DL_MK_KARR_INVARIANTS_H_ #define DL_MK_KARR_INVARIANTS_H_ -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" -#include"arith_decl_plugin.h" -#include"hilbert_basis.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/arith_decl_plugin.h" +#include "math/hilbert/hilbert_basis.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_loop_counter.cpp b/src/muz/transforms/dl_mk_loop_counter.cpp index f97670ad0..62568640c 100644 --- a/src/muz/transforms/dl_mk_loop_counter.cpp +++ b/src/muz/transforms/dl_mk_loop_counter.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"dl_mk_loop_counter.h" -#include"dl_context.h" +#include "muz/transforms/dl_mk_loop_counter.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_loop_counter.h b/src/muz/transforms/dl_mk_loop_counter.h index 6694ffb52..fb4b6d704 100644 --- a/src/muz/transforms/dl_mk_loop_counter.h +++ b/src/muz/transforms/dl_mk_loop_counter.h @@ -19,8 +19,8 @@ Revision History: #ifndef DL_MK_LOOP_COUNTER_H_ #define DL_MK_LOOP_COUNTER_H_ -#include"dl_rule_transformer.h" -#include"arith_decl_plugin.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/arith_decl_plugin.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_magic_sets.cpp b/src/muz/transforms/dl_mk_magic_sets.cpp index 19dccf417..15a4c1093 100644 --- a/src/muz/transforms/dl_mk_magic_sets.cpp +++ b/src/muz/transforms/dl_mk_magic_sets.cpp @@ -19,8 +19,8 @@ Revision History: #include #include -#include"ast_pp.h" -#include"dl_mk_magic_sets.h" +#include "ast/ast_pp.h" +#include "muz/transforms/dl_mk_magic_sets.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_magic_sets.h b/src/muz/transforms/dl_mk_magic_sets.h index f71af3649..eef40fd71 100644 --- a/src/muz/transforms/dl_mk_magic_sets.h +++ b/src/muz/transforms/dl_mk_magic_sets.h @@ -21,12 +21,12 @@ Revision History: #include -#include"map.h" -#include"obj_pair_hashtable.h" +#include "util/map.h" +#include "util/obj_pair_hashtable.h" -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_magic_symbolic.cpp b/src/muz/transforms/dl_mk_magic_symbolic.cpp index 1d269cff0..2edc57375 100644 --- a/src/muz/transforms/dl_mk_magic_symbolic.cpp +++ b/src/muz/transforms/dl_mk_magic_symbolic.cpp @@ -52,8 +52,8 @@ Revision History: --*/ -#include"dl_mk_magic_symbolic.h" -#include"dl_context.h" +#include "muz/transforms/dl_mk_magic_symbolic.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_magic_symbolic.h b/src/muz/transforms/dl_mk_magic_symbolic.h index db3137c90..9c51a5287 100644 --- a/src/muz/transforms/dl_mk_magic_symbolic.h +++ b/src/muz/transforms/dl_mk_magic_symbolic.h @@ -19,7 +19,7 @@ Revision History: #ifndef DL_MK_MAGIC_SYMBOLIC_H_ #define DL_MK_MAGIC_SYMBOLIC_H_ -#include"dl_rule_transformer.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_quantifier_abstraction.cpp b/src/muz/transforms/dl_mk_quantifier_abstraction.cpp index a22a67416..d2195a8d9 100644 --- a/src/muz/transforms/dl_mk_quantifier_abstraction.cpp +++ b/src/muz/transforms/dl_mk_quantifier_abstraction.cpp @@ -19,10 +19,10 @@ Revision History: --*/ -#include "dl_mk_quantifier_abstraction.h" -#include "dl_context.h" -#include "expr_safe_replace.h" -#include "expr_abstract.h" +#include "muz/transforms/dl_mk_quantifier_abstraction.h" +#include "muz/base/dl_context.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/expr_abstract.h" #include"fixedpoint_params.hpp" diff --git a/src/muz/transforms/dl_mk_quantifier_abstraction.h b/src/muz/transforms/dl_mk_quantifier_abstraction.h index d4a588127..593e458b9 100644 --- a/src/muz/transforms/dl_mk_quantifier_abstraction.h +++ b/src/muz/transforms/dl_mk_quantifier_abstraction.h @@ -26,8 +26,8 @@ Revision History: #define DL_MK_QUANTIFIER_ABSTRACTION_H_ -#include"dl_rule_transformer.h" -#include"array_decl_plugin.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/array_decl_plugin.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_quantifier_instantiation.cpp b/src/muz/transforms/dl_mk_quantifier_instantiation.cpp index 586c52cd6..7eb2284c0 100644 --- a/src/muz/transforms/dl_mk_quantifier_instantiation.cpp +++ b/src/muz/transforms/dl_mk_quantifier_instantiation.cpp @@ -23,9 +23,9 @@ Revision History: --*/ -#include "dl_mk_quantifier_instantiation.h" -#include "dl_context.h" -#include "pattern_inference.h" +#include "muz/transforms/dl_mk_quantifier_instantiation.h" +#include "muz/base/dl_context.h" +#include "ast/pattern/pattern_inference.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_quantifier_instantiation.h b/src/muz/transforms/dl_mk_quantifier_instantiation.h index b9ef5189e..4f1626ec6 100644 --- a/src/muz/transforms/dl_mk_quantifier_instantiation.h +++ b/src/muz/transforms/dl_mk_quantifier_instantiation.h @@ -26,9 +26,9 @@ Revision History: #define DL_MK_QUANTIFIER_INSTANTIATION_H_ -#include "dl_rule_transformer.h" -#include "expr_safe_replace.h" -#include "union_find.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "util/union_find.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_rule_inliner.cpp b/src/muz/transforms/dl_mk_rule_inliner.cpp index c6b3e8be7..1c7a6b219 100644 --- a/src/muz/transforms/dl_mk_rule_inliner.cpp +++ b/src/muz/transforms/dl_mk_rule_inliner.cpp @@ -48,10 +48,10 @@ Subsumption transformation (remove rule): #include -#include "ast_pp.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include "dl_mk_rule_inliner.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/transforms/dl_mk_rule_inliner.h" #include "fixedpoint_params.hpp" namespace datalog { diff --git a/src/muz/transforms/dl_mk_rule_inliner.h b/src/muz/transforms/dl_mk_rule_inliner.h index 66d17fdc8..55b9b9487 100644 --- a/src/muz/transforms/dl_mk_rule_inliner.h +++ b/src/muz/transforms/dl_mk_rule_inliner.h @@ -20,12 +20,12 @@ Revision History: #ifndef DL_MK_RULE_INLINER_H_ #define DL_MK_RULE_INLINER_H_ -#include "dl_context.h" -#include "dl_rule_transformer.h" -#include "dl_mk_interp_tail_simplifier.h" -#include "unifier.h" -#include "substitution.h" -#include "substitution_tree.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "ast/substitution/unifier.h" +#include "ast/substitution/substitution.h" +#include "ast/substitution/substitution_tree.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_scale.cpp b/src/muz/transforms/dl_mk_scale.cpp index 271bf5f62..cc6321b31 100644 --- a/src/muz/transforms/dl_mk_scale.cpp +++ b/src/muz/transforms/dl_mk_scale.cpp @@ -16,8 +16,8 @@ Revision History: --*/ -#include"dl_mk_scale.h" -#include"dl_context.h" +#include "muz/transforms/dl_mk_scale.h" +#include "muz/base/dl_context.h" #include"fixedpoint_params.hpp" namespace datalog { diff --git a/src/muz/transforms/dl_mk_scale.h b/src/muz/transforms/dl_mk_scale.h index 0e4ccf7ea..10a5ea8b2 100644 --- a/src/muz/transforms/dl_mk_scale.h +++ b/src/muz/transforms/dl_mk_scale.h @@ -21,8 +21,8 @@ Revision History: #ifndef DL_MK_SCALE_H_ #define DL_MK_SCALE_H_ -#include"dl_rule_transformer.h" -#include"arith_decl_plugin.h" +#include "muz/base/dl_rule_transformer.h" +#include "ast/arith_decl_plugin.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_separate_negated_tails.cpp b/src/muz/transforms/dl_mk_separate_negated_tails.cpp index 9a78c0d4d..3da759f9b 100644 --- a/src/muz/transforms/dl_mk_separate_negated_tails.cpp +++ b/src/muz/transforms/dl_mk_separate_negated_tails.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include "dl_mk_separate_negated_tails.h" -#include "dl_context.h" +#include "muz/transforms/dl_mk_separate_negated_tails.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_separate_negated_tails.h b/src/muz/transforms/dl_mk_separate_negated_tails.h index 1d2e57e2c..a5cdda003 100644 --- a/src/muz/transforms/dl_mk_separate_negated_tails.h +++ b/src/muz/transforms/dl_mk_separate_negated_tails.h @@ -32,8 +32,8 @@ Revision History: #ifndef DL_MK_SEPARAT_NEGATED_TAILS_H_ #define DL_MK_SEPARAT_NEGATED_TAILS_H_ -#include "dl_rule_transformer.h" -#include "dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/base/dl_context.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_slice.cpp b/src/muz/transforms/dl_mk_slice.cpp index cefda74e8..c094e5520 100644 --- a/src/muz/transforms/dl_mk_slice.cpp +++ b/src/muz/transforms/dl_mk_slice.cpp @@ -50,12 +50,12 @@ Revision History: --*/ -#include "dl_mk_slice.h" -#include "ast_pp.h" -#include "ast_util.h" -#include "expr_functors.h" -#include "dl_mk_rule_inliner.h" -#include "model_smt2_pp.h" +#include "muz/transforms/dl_mk_slice.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "ast/expr_functors.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "model/model_smt2_pp.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_slice.h b/src/muz/transforms/dl_mk_slice.h index b1b9cb46e..4a7d4a81a 100644 --- a/src/muz/transforms/dl_mk_slice.h +++ b/src/muz/transforms/dl_mk_slice.h @@ -19,10 +19,10 @@ Revision History: #ifndef DL_MK_SLICE_H_ #define DL_MK_SLICE_H_ -#include"dl_context.h" -#include"dl_rule_set.h" -#include"uint_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "util/uint_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_subsumption_checker.cpp b/src/muz/transforms/dl_mk_subsumption_checker.cpp index 8fae4ee35..6a3ea8735 100644 --- a/src/muz/transforms/dl_mk_subsumption_checker.cpp +++ b/src/muz/transforms/dl_mk_subsumption_checker.cpp @@ -20,10 +20,10 @@ Revision History: #include -#include"ast_pp.h" -#include "rewriter.h" -#include "rewriter_def.h" -#include"dl_mk_subsumption_checker.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "muz/transforms/dl_mk_subsumption_checker.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_subsumption_checker.h b/src/muz/transforms/dl_mk_subsumption_checker.h index 270418508..01d828d6e 100644 --- a/src/muz/transforms/dl_mk_subsumption_checker.h +++ b/src/muz/transforms/dl_mk_subsumption_checker.h @@ -21,9 +21,9 @@ Revision History: #ifndef DL_MK_SUBSUMPTION_CHECKER_H_ #define DL_MK_SUBSUMPTION_CHECKER_H_ -#include "dl_context.h" -#include "dl_rule_transformer.h" -#include "dl_rule_subsumption_index.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/base/dl_rule_subsumption_index.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_unbound_compressor.cpp b/src/muz/transforms/dl_mk_unbound_compressor.cpp index 78133aab7..47ce20a76 100644 --- a/src/muz/transforms/dl_mk_unbound_compressor.cpp +++ b/src/muz/transforms/dl_mk_unbound_compressor.cpp @@ -19,7 +19,7 @@ Revision History: #include #include -#include"dl_mk_unbound_compressor.h" +#include "muz/transforms/dl_mk_unbound_compressor.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_unbound_compressor.h b/src/muz/transforms/dl_mk_unbound_compressor.h index 51ac1fda8..febb4bd46 100644 --- a/src/muz/transforms/dl_mk_unbound_compressor.h +++ b/src/muz/transforms/dl_mk_unbound_compressor.h @@ -21,12 +21,12 @@ Revision History: #include -#include"map.h" -#include"obj_pair_hashtable.h" +#include "util/map.h" +#include "util/obj_pair_hashtable.h" -#include"dl_context.h" -#include"dl_rule_set.h" -#include"dl_rule_transformer.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "muz/base/dl_rule_transformer.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_unfold.cpp b/src/muz/transforms/dl_mk_unfold.cpp index cc460bca1..c9b8becde 100644 --- a/src/muz/transforms/dl_mk_unfold.cpp +++ b/src/muz/transforms/dl_mk_unfold.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include "dl_mk_unfold.h" +#include "muz/transforms/dl_mk_unfold.h" namespace datalog { diff --git a/src/muz/transforms/dl_mk_unfold.h b/src/muz/transforms/dl_mk_unfold.h index 554ed69e0..8ebe2d328 100644 --- a/src/muz/transforms/dl_mk_unfold.h +++ b/src/muz/transforms/dl_mk_unfold.h @@ -19,11 +19,11 @@ Revision History: #ifndef DL_MK_UNFOLD_H_ #define DL_MK_UNFOLD_H_ -#include"dl_context.h" -#include"dl_rule_set.h" -#include"uint_set.h" -#include"dl_rule_transformer.h" -#include"dl_mk_rule_inliner.h" +#include "muz/base/dl_context.h" +#include "muz/base/dl_rule_set.h" +#include "util/uint_set.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_rule_inliner.h" namespace datalog { diff --git a/src/muz/transforms/dl_transforms.cpp b/src/muz/transforms/dl_transforms.cpp index 81f9d6f64..48e956979 100644 --- a/src/muz/transforms/dl_transforms.cpp +++ b/src/muz/transforms/dl_transforms.cpp @@ -19,20 +19,20 @@ Revision History: --*/ -#include"dl_transforms.h" -#include"dl_rule_transformer.h" -#include"dl_mk_coi_filter.h" -#include"dl_mk_filter_rules.h" -#include"dl_mk_interp_tail_simplifier.h" -#include"dl_mk_rule_inliner.h" -#include"dl_mk_bit_blast.h" -#include"dl_mk_array_blast.h" -#include"dl_mk_karr_invariants.h" -#include"dl_mk_magic_symbolic.h" -#include"dl_mk_quantifier_abstraction.h" -#include"dl_mk_quantifier_instantiation.h" -#include"dl_mk_subsumption_checker.h" -#include"dl_mk_scale.h" +#include "muz/transforms/dl_transforms.h" +#include "muz/base/dl_rule_transformer.h" +#include "muz/transforms/dl_mk_coi_filter.h" +#include "muz/transforms/dl_mk_filter_rules.h" +#include "muz/transforms/dl_mk_interp_tail_simplifier.h" +#include "muz/transforms/dl_mk_rule_inliner.h" +#include "muz/transforms/dl_mk_bit_blast.h" +#include "muz/transforms/dl_mk_array_blast.h" +#include "muz/transforms/dl_mk_karr_invariants.h" +#include "muz/transforms/dl_mk_magic_symbolic.h" +#include "muz/transforms/dl_mk_quantifier_abstraction.h" +#include "muz/transforms/dl_mk_quantifier_instantiation.h" +#include "muz/transforms/dl_mk_subsumption_checker.h" +#include "muz/transforms/dl_mk_scale.h" #include"fixedpoint_params.hpp" namespace datalog { diff --git a/src/muz/transforms/dl_transforms.h b/src/muz/transforms/dl_transforms.h index 71131c99f..df34d2c1d 100644 --- a/src/muz/transforms/dl_transforms.h +++ b/src/muz/transforms/dl_transforms.h @@ -21,7 +21,7 @@ Revision History: #ifndef DL_TRANSFORMS_H_ #define DL_TRANSFORMS_H_ -#include "dl_context.h" +#include "muz/base/dl_context.h" namespace datalog { void apply_default_transformation(context& ctx); diff --git a/src/nlsat/nlsat_assignment.h b/src/nlsat/nlsat_assignment.h index a52a84f3b..097ad76b6 100644 --- a/src/nlsat/nlsat_assignment.h +++ b/src/nlsat/nlsat_assignment.h @@ -19,8 +19,8 @@ Revision History: #ifndef NLSAT_ASSIGNMENT_H_ #define NLSAT_ASSIGNMENT_H_ -#include"nlsat_types.h" -#include"algebraic_numbers.h" +#include "nlsat/nlsat_types.h" +#include "math/polynomial/algebraic_numbers.h" namespace nlsat { diff --git a/src/nlsat/nlsat_clause.cpp b/src/nlsat/nlsat_clause.cpp index b83485ba3..a64ec2856 100644 --- a/src/nlsat/nlsat_clause.cpp +++ b/src/nlsat/nlsat_clause.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"nlsat_clause.h" +#include "nlsat/nlsat_clause.h" namespace nlsat { diff --git a/src/nlsat/nlsat_clause.h b/src/nlsat/nlsat_clause.h index 95928eb1a..898c32449 100644 --- a/src/nlsat/nlsat_clause.h +++ b/src/nlsat/nlsat_clause.h @@ -19,8 +19,8 @@ Revision History: #ifndef NLSAT_CLAUSE_H_ #define NLSAT_CLAUSE_H_ -#include"nlsat_types.h" -#include"vector.h" +#include "nlsat/nlsat_types.h" +#include "util/vector.h" namespace nlsat { diff --git a/src/nlsat/nlsat_evaluator.cpp b/src/nlsat/nlsat_evaluator.cpp index db18d8854..a93c4fb3e 100644 --- a/src/nlsat/nlsat_evaluator.cpp +++ b/src/nlsat/nlsat_evaluator.cpp @@ -17,8 +17,8 @@ Author: Revision History: --*/ -#include"nlsat_evaluator.h" -#include"nlsat_solver.h" +#include "nlsat/nlsat_evaluator.h" +#include "nlsat/nlsat_solver.h" namespace nlsat { diff --git a/src/nlsat/nlsat_evaluator.h b/src/nlsat/nlsat_evaluator.h index a82ce79fb..e43eec80a 100644 --- a/src/nlsat/nlsat_evaluator.h +++ b/src/nlsat/nlsat_evaluator.h @@ -20,9 +20,9 @@ Revision History: #ifndef NLSAT_EVALUATOR_H_ #define NLSAT_EVALUATOR_H_ -#include"nlsat_types.h" -#include"nlsat_assignment.h" -#include"nlsat_interval_set.h" +#include "nlsat/nlsat_types.h" +#include "nlsat/nlsat_assignment.h" +#include "nlsat/nlsat_interval_set.h" namespace nlsat { diff --git a/src/nlsat/nlsat_explain.cpp b/src/nlsat/nlsat_explain.cpp index 5d9491da2..3a6c3f067 100644 --- a/src/nlsat/nlsat_explain.cpp +++ b/src/nlsat/nlsat_explain.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"nlsat_explain.h" -#include"nlsat_assignment.h" -#include"nlsat_evaluator.h" -#include"algebraic_numbers.h" -#include"ref_buffer.h" +#include "nlsat/nlsat_explain.h" +#include "nlsat/nlsat_assignment.h" +#include "nlsat/nlsat_evaluator.h" +#include "math/polynomial/algebraic_numbers.h" +#include "util/ref_buffer.h" namespace nlsat { diff --git a/src/nlsat/nlsat_explain.h b/src/nlsat/nlsat_explain.h index 4309a0090..37580e7bc 100644 --- a/src/nlsat/nlsat_explain.h +++ b/src/nlsat/nlsat_explain.h @@ -19,10 +19,10 @@ Revision History: #ifndef NLSAT_EXPLAIN_H_ #define NLSAT_EXPLAIN_H_ -#include"nlsat_solver.h" -#include"nlsat_scoped_literal_vector.h" -#include"polynomial_cache.h" -#include"algebraic_numbers.h" +#include "nlsat/nlsat_solver.h" +#include "nlsat/nlsat_scoped_literal_vector.h" +#include "math/polynomial/polynomial_cache.h" +#include "math/polynomial/algebraic_numbers.h" namespace nlsat { class evaluator; diff --git a/src/nlsat/nlsat_interval_set.cpp b/src/nlsat/nlsat_interval_set.cpp index 44e1128d1..2028095f4 100644 --- a/src/nlsat/nlsat_interval_set.cpp +++ b/src/nlsat/nlsat_interval_set.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"nlsat_interval_set.h" -#include"algebraic_numbers.h" -#include"buffer.h" +#include "nlsat/nlsat_interval_set.h" +#include "math/polynomial/algebraic_numbers.h" +#include "util/buffer.h" namespace nlsat { diff --git a/src/nlsat/nlsat_interval_set.h b/src/nlsat/nlsat_interval_set.h index a308c8637..24b2ab37f 100644 --- a/src/nlsat/nlsat_interval_set.h +++ b/src/nlsat/nlsat_interval_set.h @@ -19,7 +19,7 @@ Revision History: #ifndef NLSAT_INTERVAL_SET_H_ #define NLSAT_INTERVAL_SET_H_ -#include"nlsat_types.h" +#include "nlsat/nlsat_types.h" namespace nlsat { diff --git a/src/nlsat/nlsat_justification.h b/src/nlsat/nlsat_justification.h index b226dc522..13759e035 100644 --- a/src/nlsat/nlsat_justification.h +++ b/src/nlsat/nlsat_justification.h @@ -20,8 +20,8 @@ Revision History: #ifndef NLSAT_JUSTIFICATION_H_ #define NLSAT_JUSTIFICATION_H_ -#include"nlsat_types.h" -#include"tptr.h" +#include "nlsat/nlsat_types.h" +#include "util/tptr.h" namespace nlsat { diff --git a/src/nlsat/nlsat_scoped_literal_vector.h b/src/nlsat/nlsat_scoped_literal_vector.h index 442853377..61760f06d 100644 --- a/src/nlsat/nlsat_scoped_literal_vector.h +++ b/src/nlsat/nlsat_scoped_literal_vector.h @@ -20,7 +20,7 @@ Revision History: #ifndef NLSAT_SCOPED_LITERAL_VECTOR_H_ #define NLSAT_SCOPED_LITERAL_VECTOR_H_ -#include"nlsat_solver.h" +#include "nlsat/nlsat_solver.h" namespace nlsat { diff --git a/src/nlsat/nlsat_solver.cpp b/src/nlsat/nlsat_solver.cpp index 7582c8389..2e32e2fbd 100644 --- a/src/nlsat/nlsat_solver.cpp +++ b/src/nlsat/nlsat_solver.cpp @@ -18,19 +18,19 @@ Author: Revision History: --*/ -#include"nlsat_solver.h" -#include"nlsat_clause.h" -#include"nlsat_assignment.h" -#include"nlsat_justification.h" -#include"nlsat_evaluator.h" -#include"nlsat_explain.h" -#include"algebraic_numbers.h" -#include"z3_exception.h" -#include"chashtable.h" -#include"id_gen.h" -#include"dependency.h" -#include"polynomial_cache.h" -#include"permutation.h" +#include "nlsat/nlsat_solver.h" +#include "nlsat/nlsat_clause.h" +#include "nlsat/nlsat_assignment.h" +#include "nlsat/nlsat_justification.h" +#include "nlsat/nlsat_evaluator.h" +#include "nlsat/nlsat_explain.h" +#include "math/polynomial/algebraic_numbers.h" +#include "util/z3_exception.h" +#include "util/chashtable.h" +#include "util/id_gen.h" +#include "util/dependency.h" +#include "math/polynomial/polynomial_cache.h" +#include "util/permutation.h" #include"nlsat_params.hpp" #define NLSAT_EXTRA_VERBOSE diff --git a/src/nlsat/nlsat_solver.h b/src/nlsat/nlsat_solver.h index 3668629cd..ac503c603 100644 --- a/src/nlsat/nlsat_solver.h +++ b/src/nlsat/nlsat_solver.h @@ -21,10 +21,10 @@ Revision History: #ifndef NLSAT_SOLVER_H_ #define NLSAT_SOLVER_H_ -#include"nlsat_types.h" -#include"params.h" -#include"statistics.h" -#include"rlimit.h" +#include "nlsat/nlsat_types.h" +#include "util/params.h" +#include "util/statistics.h" +#include "util/rlimit.h" namespace nlsat { diff --git a/src/nlsat/nlsat_types.cpp b/src/nlsat/nlsat_types.cpp index 956be4c5e..dbf7ab360 100644 --- a/src/nlsat/nlsat_types.cpp +++ b/src/nlsat/nlsat_types.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"nlsat_types.h" -#include"debug.h" -#include"hash.h" -#include"polynomial.h" +#include "nlsat/nlsat_types.h" +#include "util/debug.h" +#include "util/hash.h" +#include "math/polynomial/polynomial.h" namespace nlsat { diff --git a/src/nlsat/nlsat_types.h b/src/nlsat/nlsat_types.h index 11e063a17..8704f4444 100644 --- a/src/nlsat/nlsat_types.h +++ b/src/nlsat/nlsat_types.h @@ -19,10 +19,10 @@ Revision History: #ifndef NLSAT_TYPES_H_ #define NLSAT_TYPES_H_ -#include"polynomial.h" -#include"buffer.h" -#include"sat_types.h" -#include"z3_exception.h" +#include "math/polynomial/polynomial.h" +#include "util/buffer.h" +#include "sat/sat_types.h" +#include "util/z3_exception.h" namespace algebraic_numbers { class anum; diff --git a/src/nlsat/tactic/goal2nlsat.cpp b/src/nlsat/tactic/goal2nlsat.cpp index a76cd1213..6d7e1c767 100644 --- a/src/nlsat/tactic/goal2nlsat.cpp +++ b/src/nlsat/tactic/goal2nlsat.cpp @@ -21,17 +21,17 @@ Author: Notes: --*/ -#include"goal2nlsat.h" -#include"goal.h" -#include"goal_util.h" -#include"nlsat_solver.h" -#include"expr2polynomial.h" -#include"expr2var.h" -#include"arith_decl_plugin.h" -#include"tactic.h" -#include"ast_pp.h" -#include"polynomial.h" -#include"algebraic_numbers.h" +#include "nlsat/tactic/goal2nlsat.h" +#include "tactic/goal.h" +#include "tactic/goal_util.h" +#include "nlsat/nlsat_solver.h" +#include "ast/expr2polynomial.h" +#include "ast/expr2var.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/tactic.h" +#include "ast/ast_pp.h" +#include "math/polynomial/polynomial.h" +#include "math/polynomial/algebraic_numbers.h" struct goal2nlsat::imp { struct nlsat_expr2polynomial : public expr2polynomial { diff --git a/src/nlsat/tactic/goal2nlsat.h b/src/nlsat/tactic/goal2nlsat.h index bdb71a6a3..58d85946e 100644 --- a/src/nlsat/tactic/goal2nlsat.h +++ b/src/nlsat/tactic/goal2nlsat.h @@ -24,8 +24,8 @@ Notes: #ifndef GOAL2NLSAT_H_ #define GOAL2NLSAT_H_ -#include"nlsat_types.h" -#include"model_converter.h" +#include "nlsat/nlsat_types.h" +#include "tactic/model_converter.h" class goal; class expr2var; diff --git a/src/nlsat/tactic/nlsat_tactic.cpp b/src/nlsat/tactic/nlsat_tactic.cpp index 4ecdade38..510f503e7 100644 --- a/src/nlsat/tactic/nlsat_tactic.cpp +++ b/src/nlsat/tactic/nlsat_tactic.cpp @@ -16,16 +16,16 @@ Author: Notes: --*/ -#include"tactical.h" -#include"goal2nlsat.h" -#include"nlsat_solver.h" -#include"model.h" -#include"expr2var.h" -#include"arith_decl_plugin.h" -#include"ast_smt2_pp.h" -#include"z3_exception.h" -#include"algebraic_numbers.h" -#include"ast_pp.h" +#include "tactic/tactical.h" +#include "nlsat/tactic/goal2nlsat.h" +#include "nlsat/nlsat_solver.h" +#include "model/model.h" +#include "ast/expr2var.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_smt2_pp.h" +#include "util/z3_exception.h" +#include "math/polynomial/algebraic_numbers.h" +#include "ast/ast_pp.h" class nlsat_tactic : public tactic { struct expr_display_var_proc : public nlsat::display_var_proc { diff --git a/src/nlsat/tactic/nlsat_tactic.h b/src/nlsat/tactic/nlsat_tactic.h index 5f0022026..fe7737c4b 100644 --- a/src/nlsat/tactic/nlsat_tactic.h +++ b/src/nlsat/tactic/nlsat_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef NLSAT_TACTIC_H_ #define NLSAT_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/nlsat/tactic/qfnra_nlsat_tactic.cpp b/src/nlsat/tactic/qfnra_nlsat_tactic.cpp index b05636541..22f64af47 100644 --- a/src/nlsat/tactic/qfnra_nlsat_tactic.cpp +++ b/src/nlsat/tactic/qfnra_nlsat_tactic.cpp @@ -16,18 +16,18 @@ Author: Notes: --*/ -#include"tactical.h" +#include "tactic/tactical.h" -#include"tseitin_cnf_tactic.h" -#include"degree_shift_tactic.h" -#include"purify_arith_tactic.h" -#include"nlsat_tactic.h" -#include"factor_tactic.h" -#include"simplify_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_term_ite_tactic.h" +#include "tactic/core/tseitin_cnf_tactic.h" +#include "tactic/arith/degree_shift_tactic.h" +#include "tactic/arith/purify_arith_tactic.h" +#include "nlsat/tactic/nlsat_tactic.h" +#include "tactic/arith/factor_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_term_ite_tactic.h" tactic * mk_qfnra_nlsat_tactic(ast_manager & m, params_ref const & p) { params_ref main_p = p; diff --git a/src/nlsat/tactic/qfnra_nlsat_tactic.h b/src/nlsat/tactic/qfnra_nlsat_tactic.h index fa106ca93..b1a4d8392 100644 --- a/src/nlsat/tactic/qfnra_nlsat_tactic.h +++ b/src/nlsat/tactic/qfnra_nlsat_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFNRA_NLSAT_TACTIC_H_ #define QFNRA_NLSAT_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/opt/maxres.cpp b/src/opt/maxres.cpp index 7e9381e1d..cbde02009 100644 --- a/src/opt/maxres.cpp +++ b/src/opt/maxres.cpp @@ -52,18 +52,18 @@ Notes: --*/ -#include "solver.h" -#include "maxsmt.h" -#include "maxres.h" -#include "ast_pp.h" -#include "mus.h" -#include "mss.h" -#include "inc_sat_solver.h" -#include "opt_context.h" -#include "pb_decl_plugin.h" +#include "solver/solver.h" +#include "opt/maxsmt.h" +#include "opt/maxres.h" +#include "ast/ast_pp.h" +#include "solver/mus.h" +#include "opt/mss.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "opt/opt_context.h" +#include "ast/pb_decl_plugin.h" #include "opt_params.hpp" -#include "ast_util.h" -#include "smt_solver.h" +#include "ast/ast_util.h" +#include "smt/smt_solver.h" using namespace opt; diff --git a/src/opt/maxsmt.cpp b/src/opt/maxsmt.cpp index f93291599..8df6c04a6 100644 --- a/src/opt/maxsmt.cpp +++ b/src/opt/maxsmt.cpp @@ -18,16 +18,16 @@ Notes: --*/ #include -#include "maxsmt.h" -#include "maxres.h" -#include "wmax.h" -#include "ast_pp.h" -#include "uint_set.h" -#include "opt_context.h" -#include "theory_wmaxsat.h" -#include "theory_pb.h" -#include "ast_util.h" -#include "pb_decl_plugin.h" +#include "opt/maxsmt.h" +#include "opt/maxres.h" +#include "opt/wmax.h" +#include "ast/ast_pp.h" +#include "util/uint_set.h" +#include "opt/opt_context.h" +#include "smt/theory_wmaxsat.h" +#include "smt/theory_pb.h" +#include "ast/ast_util.h" +#include "ast/pb_decl_plugin.h" namespace opt { diff --git a/src/opt/maxsmt.h b/src/opt/maxsmt.h index 358ff4995..0541a9a88 100644 --- a/src/opt/maxsmt.h +++ b/src/opt/maxsmt.h @@ -19,15 +19,15 @@ Notes: #ifndef OPT_MAXSMT_H_ #define OPT_MAXSMT_H_ -#include"ast.h" -#include"params.h" -#include"solver.h" -#include"filter_model_converter.h" -#include"statistics.h" -#include"smt_context.h" -#include"smt_theory.h" -#include"theory_wmaxsat.h" -#include"opt_solver.h" +#include "ast/ast.h" +#include "util/params.h" +#include "solver/solver.h" +#include "tactic/filter_model_converter.h" +#include "util/statistics.h" +#include "smt/smt_context.h" +#include "smt/smt_theory.h" +#include "smt/theory_wmaxsat.h" +#include "opt/opt_solver.h" namespace opt { diff --git a/src/opt/mss.cpp b/src/opt/mss.cpp index 863834b85..cc0fa8d7d 100644 --- a/src/opt/mss.cpp +++ b/src/opt/mss.cpp @@ -18,10 +18,10 @@ Notes: --*/ -#include "solver.h" -#include "mss.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" +#include "solver/solver.h" +#include "opt/mss.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" namespace opt { diff --git a/src/opt/opt_cmds.cpp b/src/opt/opt_cmds.cpp index 0264a6a24..d88b0a406 100644 --- a/src/opt/opt_cmds.cpp +++ b/src/opt/opt_cmds.cpp @@ -21,16 +21,16 @@ Notes: - Deal with push/pop (later) --*/ -#include "opt_cmds.h" -#include "cmd_context.h" -#include "ast_pp.h" -#include "opt_context.h" -#include "cancel_eh.h" -#include "scoped_ctrl_c.h" -#include "scoped_timer.h" -#include "parametric_cmd.h" +#include "opt/opt_cmds.h" +#include "cmd_context/cmd_context.h" +#include "ast/ast_pp.h" +#include "opt/opt_context.h" +#include "util/cancel_eh.h" +#include "util/scoped_ctrl_c.h" +#include "util/scoped_timer.h" +#include "cmd_context/parametric_cmd.h" #include "opt_params.hpp" -#include "model_smt2_pp.h" +#include "model/model_smt2_pp.h" static opt::context& get_opt(cmd_context& cmd, opt::context* opt) { if (opt) { diff --git a/src/opt/opt_cmds.h b/src/opt/opt_cmds.h index f0da778df..60f83d201 100644 --- a/src/opt/opt_cmds.h +++ b/src/opt/opt_cmds.h @@ -18,8 +18,8 @@ Notes: #ifndef OPT_CMDS_H_ #define OPT_CMDS_H_ -#include "ast.h" -#include "opt_context.h" +#include "ast/ast.h" +#include "opt/opt_context.h" class cmd_context; diff --git a/src/opt/opt_context.cpp b/src/opt/opt_context.cpp index 0e1c150c0..beba8a60b 100644 --- a/src/opt/opt_context.cpp +++ b/src/opt/opt_context.cpp @@ -17,32 +17,32 @@ Notes: --*/ -#include "opt_context.h" -#include "ast_pp.h" -#include "opt_solver.h" +#include "opt/opt_context.h" +#include "ast/ast_pp.h" +#include "opt/opt_solver.h" #include "opt_params.hpp" -#include "for_each_expr.h" -#include "goal.h" -#include "tactic.h" -#include "lia2card_tactic.h" -#include "elim01_tactic.h" -#include "solve_eqs_tactic.h" -#include "simplify_tactic.h" -#include "propagate_values_tactic.h" -#include "solve_eqs_tactic.h" -#include "elim_uncnstr_tactic.h" -#include "tactical.h" -#include "model_smt2_pp.h" -#include "card2bv_tactic.h" -#include "eq2bv_tactic.h" -#include "dt2bv_tactic.h" -#include "inc_sat_solver.h" -#include "bv_decl_plugin.h" -#include "pb_decl_plugin.h" -#include "ast_smt_pp.h" -#include "filter_model_converter.h" -#include "ast_pp_util.h" -#include "qsat.h" +#include "ast/for_each_expr.h" +#include "tactic/goal.h" +#include "tactic/tactic.h" +#include "tactic/arith/lia2card_tactic.h" +#include "tactic/arith/elim01_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/tactical.h" +#include "model/model_smt2_pp.h" +#include "tactic/arith/card2bv_tactic.h" +#include "tactic/arith/eq2bv_tactic.h" +#include "tactic/bv/dt2bv_tactic.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "ast/bv_decl_plugin.h" +#include "ast/pb_decl_plugin.h" +#include "ast/ast_smt_pp.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_pp_util.h" +#include "qe/qsat.h" namespace opt { diff --git a/src/opt/opt_context.h b/src/opt/opt_context.h index 66f0ef015..ad40db074 100644 --- a/src/opt/opt_context.h +++ b/src/opt/opt_context.h @@ -18,17 +18,17 @@ Notes: #ifndef OPT_CONTEXT_H_ #define OPT_CONTEXT_H_ -#include "ast.h" -#include "opt_solver.h" -#include "opt_pareto.h" -#include "optsmt.h" -#include "maxsmt.h" -#include "model_converter.h" -#include "tactic.h" -#include "arith_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "cmd_context.h" -#include "qsat.h" +#include "ast/ast.h" +#include "opt/opt_solver.h" +#include "opt/opt_pareto.h" +#include "opt/optsmt.h" +#include "opt/maxsmt.h" +#include "tactic/model_converter.h" +#include "tactic/tactic.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "cmd_context/cmd_context.h" +#include "qe/qsat.h" namespace opt { diff --git a/src/opt/opt_pareto.cpp b/src/opt/opt_pareto.cpp index 1418eb0f9..026d10abc 100644 --- a/src/opt/opt_pareto.cpp +++ b/src/opt/opt_pareto.cpp @@ -18,9 +18,9 @@ Notes: --*/ -#include "opt_pareto.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" +#include "opt/opt_pareto.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" namespace opt { diff --git a/src/opt/opt_pareto.h b/src/opt/opt_pareto.h index 25b327045..c0ccc93da 100644 --- a/src/opt/opt_pareto.h +++ b/src/opt/opt_pareto.h @@ -20,8 +20,8 @@ Notes: #ifndef OPT_PARETO_H_ #define OPT_PARETO_H_ -#include "solver.h" -#include "model.h" +#include "solver/solver.h" +#include "model/model.h" namespace opt { diff --git a/src/opt/opt_sls_solver.h b/src/opt/opt_sls_solver.h index 5b7f630b4..a736c77a2 100644 --- a/src/opt/opt_sls_solver.h +++ b/src/opt/opt_sls_solver.h @@ -20,11 +20,11 @@ Notes: #ifndef OPT_SLS_SOLVER_H_ #define OPT_SLS_SOLVER_H_ -#include "solver_na2as.h" -#include "card2bv_tactic.h" -#include "nnf_tactic.h" -#include "pb_sls.h" -#include "bvsls_opt_engine.h" +#include "solver/solver_na2as.h" +#include "tactic/arith/card2bv_tactic.h" +#include "tactic/core/nnf_tactic.h" +#include "opt/pb_sls.h" +#include "tactic/sls/bvsls_opt_engine.h" namespace opt { diff --git a/src/opt/opt_solver.cpp b/src/opt/opt_solver.cpp index 458a5c540..0c7a14065 100644 --- a/src/opt/opt_solver.cpp +++ b/src/opt/opt_solver.cpp @@ -19,20 +19,20 @@ Notes: --*/ #include -#include "reg_decl_plugins.h" -#include "opt_solver.h" -#include "smt_context.h" -#include "theory_arith.h" -#include "theory_diff_logic.h" -#include "theory_dense_diff_logic.h" -#include "theory_pb.h" -#include "theory_lra.h" -#include "ast_pp.h" -#include "ast_smt_pp.h" +#include "ast/reg_decl_plugins.h" +#include "opt/opt_solver.h" +#include "smt/smt_context.h" +#include "smt/theory_arith.h" +#include "smt/theory_diff_logic.h" +#include "smt/theory_dense_diff_logic.h" +#include "smt/theory_pb.h" +#include "smt/theory_lra.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" #include "pp_params.hpp" #include "opt_params.hpp" -#include "model_smt2_pp.h" -#include "stopwatch.h" +#include "model/model_smt2_pp.h" +#include "util/stopwatch.h" namespace opt { diff --git a/src/opt/opt_solver.h b/src/opt/opt_solver.h index 27168e2ca..4bd23c120 100644 --- a/src/opt/opt_solver.h +++ b/src/opt/opt_solver.h @@ -21,16 +21,16 @@ Notes: #ifndef OPT_SOLVER_H_ #define OPT_SOLVER_H_ -#include"inf_rational.h" -#include"inf_eps_rational.h" -#include"ast.h" -#include"params.h" -#include"solver_na2as.h" -#include"smt_kernel.h" -#include"smt_params.h" -#include"smt_types.h" -#include"theory_opt.h" -#include"filter_model_converter.h" +#include "util/inf_rational.h" +#include "util/inf_eps_rational.h" +#include "ast/ast.h" +#include "util/params.h" +#include "solver/solver_na2as.h" +#include "smt/smt_kernel.h" +#include "smt/params/smt_params.h" +#include "smt/smt_types.h" +#include "smt/theory_opt.h" +#include "tactic/filter_model_converter.h" namespace opt { diff --git a/src/opt/optsmt.cpp b/src/opt/optsmt.cpp index d2363b36e..3c8e31e59 100644 --- a/src/opt/optsmt.cpp +++ b/src/opt/optsmt.cpp @@ -29,14 +29,14 @@ Notes: --*/ #include -#include "optsmt.h" -#include "opt_solver.h" -#include "arith_decl_plugin.h" -#include "theory_arith.h" -#include "ast_pp.h" -#include "ast_util.h" -#include "model_pp.h" -#include "th_rewriter.h" +#include "opt/optsmt.h" +#include "opt/opt_solver.h" +#include "ast/arith_decl_plugin.h" +#include "smt/theory_arith.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "model/model_pp.h" +#include "ast/rewriter/th_rewriter.h" #include "opt_params.hpp" namespace opt { diff --git a/src/opt/optsmt.h b/src/opt/optsmt.h index f90bd1c81..921352898 100644 --- a/src/opt/optsmt.h +++ b/src/opt/optsmt.h @@ -19,7 +19,7 @@ Notes: #ifndef OPTSMT_H_ #define OPTSMT_H_ -#include "opt_solver.h" +#include "opt/opt_solver.h" namespace opt { /** diff --git a/src/opt/pb_sls.cpp b/src/opt/pb_sls.cpp index 32c144652..e28c3cd3d 100644 --- a/src/opt/pb_sls.cpp +++ b/src/opt/pb_sls.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include "pb_sls.h" -#include "smt_literal.h" -#include "ast_pp.h" -#include "th_rewriter.h" -#include "sat_types.h" +#include "opt/pb_sls.h" +#include "smt/smt_literal.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/th_rewriter.h" +#include "sat/sat_types.h" namespace smt { diff --git a/src/opt/pb_sls.h b/src/opt/pb_sls.h index 0ed7e30cc..f83057ce5 100644 --- a/src/opt/pb_sls.h +++ b/src/opt/pb_sls.h @@ -19,11 +19,11 @@ Notes: #ifndef PB_SLS_H_ #define PB_SLS_H_ -#include "pb_decl_plugin.h" -#include "model.h" -#include "lbool.h" -#include "params.h" -#include "statistics.h" +#include "ast/pb_decl_plugin.h" +#include "model/model.h" +#include "util/lbool.h" +#include "util/params.h" +#include "util/statistics.h" namespace smt { diff --git a/src/opt/sortmax.cpp b/src/opt/sortmax.cpp index e3cf59de4..00cab488c 100644 --- a/src/opt/sortmax.cpp +++ b/src/opt/sortmax.cpp @@ -16,15 +16,15 @@ Author: Notes: --*/ -#include "maxsmt.h" -#include "uint_set.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "smt_theory.h" -#include "smt_context.h" -#include "opt_context.h" -#include "sorting_network.h" -#include "filter_model_converter.h" +#include "opt/maxsmt.h" +#include "util/uint_set.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "smt/smt_theory.h" +#include "smt/smt_context.h" +#include "opt/opt_context.h" +#include "util/sorting_network.h" +#include "tactic/filter_model_converter.h" namespace opt { diff --git a/src/opt/wmax.cpp b/src/opt/wmax.cpp index 15b723c8c..afc0334eb 100644 --- a/src/opt/wmax.cpp +++ b/src/opt/wmax.cpp @@ -16,14 +16,14 @@ Author: Notes: --*/ -#include "wmax.h" -#include "uint_set.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "smt_theory.h" -#include "smt_context.h" -#include "theory_wmaxsat.h" -#include "opt_context.h" +#include "opt/wmax.h" +#include "util/uint_set.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "smt/smt_theory.h" +#include "smt/smt_context.h" +#include "smt/theory_wmaxsat.h" +#include "opt/opt_context.h" namespace opt { // ---------------------------------------------------------- diff --git a/src/opt/wmax.h b/src/opt/wmax.h index 3d9d206ad..aabbe3a64 100644 --- a/src/opt/wmax.h +++ b/src/opt/wmax.h @@ -20,7 +20,7 @@ Notes: #ifndef WMAX_H_ #define WMAX_H_ -#include "maxsmt.h" +#include "opt/maxsmt.h" namespace opt { maxsmt_solver_base* mk_wmax(maxsat_context& c, weights_t & ws, expr_ref_vector const& soft); diff --git a/src/parsers/smt/smtlib.cpp b/src/parsers/smt/smtlib.cpp index b743b5b0f..71dd48156 100644 --- a/src/parsers/smt/smtlib.cpp +++ b/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 diff --git a/src/parsers/smt/smtlib.h b/src/parsers/smt/smtlib.h index 62799ea25..f037e3d74 100644 --- a/src/parsers/smt/smtlib.h +++ b/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 { diff --git a/src/parsers/smt/smtlib_solver.cpp b/src/parsers/smt/smtlib_solver.cpp index 7c8572ad8..128b9de88 100644 --- a/src/parsers/smt/smtlib_solver.cpp +++ b/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" diff --git a/src/parsers/smt/smtlib_solver.h b/src/parsers/smt/smtlib_solver.h index fce5ff67f..6288c360b 100644 --- a/src/parsers/smt/smtlib_solver.h +++ b/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; diff --git a/src/parsers/smt/smtparser.cpp b/src/parsers/smt/smtparser.cpp index c9b20850c..15f094e33 100644 --- a/src/parsers/smt/smtparser.cpp +++ b/src/parsers/smt/smtparser.cpp @@ -21,23 +21,23 @@ Revision History: #include #include #include -#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; diff --git a/src/parsers/smt/smtparser.h b/src/parsers/smt/smtparser.h index 9a09d1f4f..d8999e8ab 100644 --- a/src/parsers/smt/smtparser.h +++ b/src/parsers/smt/smtparser.h @@ -20,9 +20,9 @@ Revision History: #define SMT_PARSER_H_ #include -#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 { diff --git a/src/parsers/smt2/smt2parser.cpp b/src/parsers/smt2/smt2parser.cpp index c948389ee..46c719487 100644 --- a/src/parsers/smt2/smt2parser.cpp +++ b/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 diff --git a/src/parsers/smt2/smt2parser.h b/src/parsers/smt2/smt2parser.h index 77fd41d5d..0976fc5f4 100644 --- a/src/parsers/smt2/smt2parser.h +++ b/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); diff --git a/src/parsers/smt2/smt2scanner.cpp b/src/parsers/smt2/smt2scanner.cpp index 1763a4fa5..b31440faf 100644 --- a/src/parsers/smt2/smt2scanner.cpp +++ b/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 { diff --git a/src/parsers/smt2/smt2scanner.h b/src/parsers/smt2/smt2scanner.h index 3ad47dfb1..5283c57cf 100644 --- a/src/parsers/smt2/smt2scanner.h +++ b/src/parsers/smt2/smt2scanner.h @@ -20,10 +20,10 @@ Revision History: #define SMT2SCANNER_H_ #include -#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 { diff --git a/src/parsers/util/cost_parser.cpp b/src/parsers/util/cost_parser.cpp index a13e9b107..765b8ade9 100644 --- a/src/parsers/util/cost_parser.cpp +++ b/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), diff --git a/src/parsers/util/cost_parser.h b/src/parsers/util/cost_parser.h index 37e9ea3a1..f0330d824 100644 --- a/src/parsers/util/cost_parser.h +++ b/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; diff --git a/src/parsers/util/pattern_validation.cpp b/src/parsers/util/pattern_validation.cpp index 0e90e8126..0d076aadd 100644 --- a/src/parsers/util/pattern_validation.cpp +++ b/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; diff --git a/src/parsers/util/pattern_validation.h b/src/parsers/util/pattern_validation.h index 939781936..11656e1df 100644 --- a/src/parsers/util/pattern_validation.h +++ b/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; diff --git a/src/parsers/util/scanner.cpp b/src/parsers/util/scanner.cpp index 690c068e4..4ed47e81f 100644 --- a/src/parsers/util/scanner.cpp +++ b/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) { diff --git a/src/parsers/util/scanner.h b/src/parsers/util/scanner.h index f434da164..cd074479c 100644 --- a/src/parsers/util/scanner.h +++ b/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: diff --git a/src/parsers/util/simple_parser.cpp b/src/parsers/util/simple_parser.cpp index 045a45b24..770da9dbb 100644 --- a/src/parsers/util/simple_parser.cpp +++ b/src/parsers/util/simple_parser.cpp @@ -18,9 +18,9 @@ Revision History: --*/ #include #include -#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), diff --git a/src/parsers/util/simple_parser.h b/src/parsers/util/simple_parser.h index 8589f140b..671412579 100644 --- a/src/parsers/util/simple_parser.h +++ b/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; diff --git a/src/qe/nlarith_util.cpp b/src/qe/nlarith_util.cpp index b7c1aef5d..1da5ef52a 100644 --- a/src/qe/nlarith_util.cpp +++ b/src/qe/nlarith_util.cpp @@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "ast.h" -#include "nlarith_util.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" -#include "qe.h" -#include "expr_replacer.h" -#include "arith_rewriter.h" -#include "arith_simplifier_plugin.h" -#include "expr_functors.h" +#include "ast/ast.h" +#include "qe/nlarith_util.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "qe/qe.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/expr_functors.h" namespace nlarith { diff --git a/src/qe/nlarith_util.h b/src/qe/nlarith_util.h index 5854088ab..7106d2a27 100644 --- a/src/qe/nlarith_util.h +++ b/src/qe/nlarith_util.h @@ -20,8 +20,8 @@ Notes: #ifndef NLARITH_UTIL_H_ #define NLARITH_UTIL_H_ -#include "ast.h" -#include "lbool.h" +#include "ast/ast.h" +#include "util/lbool.h" namespace nlarith { diff --git a/src/qe/nlqsat.cpp b/src/qe/nlqsat.cpp index fbff2e583..a10971165 100644 --- a/src/qe/nlqsat.cpp +++ b/src/qe/nlqsat.cpp @@ -18,22 +18,22 @@ Revision History: --*/ -#include "nlqsat.h" -#include "nlsat_solver.h" -#include "nlsat_explain.h" -#include "nlsat_assignment.h" -#include "qsat.h" -#include "quant_hoist.h" -#include "goal2nlsat.h" -#include "expr2var.h" -#include "uint_set.h" -#include "ast_util.h" -#include "tseitin_cnf_tactic.h" -#include "expr_safe_replace.h" -#include "ast_pp.h" -#include "for_each_expr.h" -#include "rewriter.h" -#include "rewriter_def.h" +#include "qe/nlqsat.h" +#include "nlsat/nlsat_solver.h" +#include "nlsat/nlsat_explain.h" +#include "nlsat/nlsat_assignment.h" +#include "qe/qsat.h" +#include "ast/rewriter/quant_hoist.h" +#include "nlsat/tactic/goal2nlsat.h" +#include "ast/expr2var.h" +#include "util/uint_set.h" +#include "ast/ast_util.h" +#include "tactic/core/tseitin_cnf_tactic.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_pp.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" namespace qe { diff --git a/src/qe/nlqsat.h b/src/qe/nlqsat.h index 9d0cb6af4..25cee55e3 100644 --- a/src/qe/nlqsat.h +++ b/src/qe/nlqsat.h @@ -21,7 +21,7 @@ Revision History: #ifndef QE_NLQSAT_H__ #define QE_NLQSAT_H__ -#include "tactic.h" +#include "tactic/tactic.h" tactic * mk_nlqsat_tactic(ast_manager & m, params_ref const& p = params_ref()); diff --git a/src/qe/qe.cpp b/src/qe/qe.cpp index 4bf3c1580..7c7250c40 100644 --- a/src/qe/qe.cpp +++ b/src/qe/qe.cpp @@ -18,33 +18,33 @@ Revision History: --*/ -#include "qe.h" -#include "smt_theory.h" -#include "bv_decl_plugin.h" -#include "smt_context.h" -#include "theory_bv.h" -#include "ast_ll_pp.h" -#include "ast_pp.h" -#include "ast_smt_pp.h" -#include "expr_abstract.h" -#include "var_subst.h" -#include "for_each_expr.h" -#include "dl_decl_plugin.h" -#include "nlarith_util.h" -#include "expr_replacer.h" -#include "factor_rewriter.h" -#include "expr_functors.h" -#include "quant_hoist.h" -#include "bool_rewriter.h" -#include "th_rewriter.h" -#include "smt_kernel.h" -#include "model_evaluator.h" -#include "has_free_vars.h" -#include "rewriter_def.h" -#include "cooperate.h" -#include "tactical.h" -#include "model_v2_pp.h" -#include "obj_hashtable.h" +#include "qe/qe.h" +#include "smt/smt_theory.h" +#include "ast/bv_decl_plugin.h" +#include "smt/smt_context.h" +#include "smt/theory_bv.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" +#include "ast/expr_abstract.h" +#include "ast/rewriter/var_subst.h" +#include "ast/for_each_expr.h" +#include "ast/dl_decl_plugin.h" +#include "qe/nlarith_util.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/factor_rewriter.h" +#include "ast/expr_functors.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/th_rewriter.h" +#include "smt/smt_kernel.h" +#include "model/model_evaluator.h" +#include "ast/has_free_vars.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/cooperate.h" +#include "tactic/tactical.h" +#include "model/model_v2_pp.h" +#include "util/obj_hashtable.h" namespace qe { diff --git a/src/qe/qe.h b/src/qe/qe.h index a75af19c5..392bfb03b 100644 --- a/src/qe/qe.h +++ b/src/qe/qe.h @@ -21,15 +21,15 @@ Revision History: #ifndef QE_H_ #define QE_H_ -#include "ast.h" -#include "smt_params.h" -#include "statistics.h" -#include "lbool.h" -#include "expr_functors.h" -#include "simplifier.h" -#include "rewriter.h" -#include "model.h" -#include "params.h" +#include "ast/ast.h" +#include "smt/params/smt_params.h" +#include "util/statistics.h" +#include "util/lbool.h" +#include "ast/expr_functors.h" +#include "ast/simplifier/simplifier.h" +#include "ast/rewriter/rewriter.h" +#include "model/model.h" +#include "util/params.h" namespace qe { diff --git a/src/qe/qe_arith.cpp b/src/qe/qe_arith.cpp index 4490d83db..9b3033397 100644 --- a/src/qe/qe_arith.cpp +++ b/src/qe/qe_arith.cpp @@ -19,17 +19,17 @@ Revision History: --*/ -#include "qe_arith.h" -#include "qe_mbp.h" -#include "ast_util.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" -#include "model_v2_pp.h" -#include "th_rewriter.h" -#include "expr_functors.h" -#include "expr_safe_replace.h" -#include "model_based_opt.h" -#include "model_evaluator.h" +#include "qe/qe_arith.h" +#include "qe/qe_mbp.h" +#include "ast/ast_util.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "model/model_v2_pp.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/expr_functors.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "math/simplex/model_based_opt.h" +#include "model/model_evaluator.h" namespace qe { diff --git a/src/qe/qe_arith.h b/src/qe/qe_arith.h index 616d1a8d0..88675d5a4 100644 --- a/src/qe/qe_arith.h +++ b/src/qe/qe_arith.h @@ -8,9 +8,9 @@ Copyright (c) 2015 Microsoft Corporation #ifndef QE_ARITH_H_ #define QE_ARITH_H_ -#include "model.h" -#include "arith_decl_plugin.h" -#include "qe_mbp.h" +#include "model/model.h" +#include "ast/arith_decl_plugin.h" +#include "qe/qe_mbp.h" namespace qe { diff --git a/src/qe/qe_arith_plugin.cpp b/src/qe/qe_arith_plugin.cpp index d8ae75256..1085ec3c2 100644 --- a/src/qe/qe_arith_plugin.cpp +++ b/src/qe/qe_arith_plugin.cpp @@ -18,21 +18,21 @@ Revision History: --*/ -#include "qe.h" -#include "ast_pp.h" -#include "expr_safe_replace.h" -#include "bool_rewriter.h" -#include "bv_decl_plugin.h" -#include "arith_decl_plugin.h" -#include "arith_eq_solver.h" -#include "arith_rewriter.h" -#include "th_rewriter.h" -#include "factor_rewriter.h" -#include "obj_pair_hashtable.h" -#include "nlarith_util.h" -#include "model_evaluator.h" -#include "smt_kernel.h" -#include "qe_arith.h" +#include "qe/qe.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "smt/arith_eq_solver.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/rewriter/factor_rewriter.h" +#include "util/obj_pair_hashtable.h" +#include "qe/nlarith_util.h" +#include "model/model_evaluator.h" +#include "smt/smt_kernel.h" +#include "qe/qe_arith.h" namespace qe { diff --git a/src/qe/qe_array_plugin.cpp b/src/qe/qe_array_plugin.cpp index e7cbe65b9..9eeccd6a4 100644 --- a/src/qe/qe_array_plugin.cpp +++ b/src/qe/qe_array_plugin.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "qe.h" -#include "array_decl_plugin.h" -#include "expr_safe_replace.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" +#include "qe/qe.h" +#include "ast/array_decl_plugin.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" namespace qe { // --------------------- diff --git a/src/qe/qe_arrays.cpp b/src/qe/qe_arrays.cpp index a010c4ae4..6d0bf82bf 100644 --- a/src/qe/qe_arrays.cpp +++ b/src/qe/qe_arrays.cpp @@ -18,13 +18,13 @@ Revision History: --*/ -#include "qe_arrays.h" -#include "rewriter_def.h" -#include "expr_functors.h" -#include "expr_safe_replace.h" -#include "lbool.h" -#include "ast_util.h" -#include "ast_pp.h" +#include "qe/qe_arrays.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/expr_functors.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "util/lbool.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" namespace qe { diff --git a/src/qe/qe_arrays.h b/src/qe/qe_arrays.h index 182d82255..e100ebce4 100644 --- a/src/qe/qe_arrays.h +++ b/src/qe/qe_arrays.h @@ -21,8 +21,8 @@ Revision History: #ifndef __QE_ARRAYS_H_ #define __QE_ARRAYS_H_ -#include "array_decl_plugin.h" -#include "qe_mbp.h" +#include "ast/array_decl_plugin.h" +#include "qe/qe_mbp.h" namespace qe { diff --git a/src/qe/qe_bool_plugin.cpp b/src/qe/qe_bool_plugin.cpp index 39a46ae55..82e09bbed 100644 --- a/src/qe/qe_bool_plugin.cpp +++ b/src/qe/qe_bool_plugin.cpp @@ -24,10 +24,10 @@ Notes: --*/ -#include "qe.h" -#include "expr_safe_replace.h" -#include "ast_pp.h" -#include "model_evaluator.h" +#include "qe/qe.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_pp.h" +#include "model/model_evaluator.h" namespace qe { diff --git a/src/qe/qe_bv_plugin.cpp b/src/qe/qe_bv_plugin.cpp index df1f8c619..6678d6fcf 100644 --- a/src/qe/qe_bv_plugin.cpp +++ b/src/qe/qe_bv_plugin.cpp @@ -20,10 +20,10 @@ Notes: --*/ -#include "qe.h" -#include "expr_safe_replace.h" -#include "bv_decl_plugin.h" -#include "model_evaluator.h" +#include "qe/qe.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/bv_decl_plugin.h" +#include "model/model_evaluator.h" namespace qe { diff --git a/src/qe/qe_cmd.cpp b/src/qe/qe_cmd.cpp index 9144c708c..553cf4471 100644 --- a/src/qe/qe_cmd.cpp +++ b/src/qe/qe_cmd.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "qe_cmd.h" -#include "qe.h" -#include "cmd_context.h" -#include "parametric_cmd.h" +#include "qe/qe_cmd.h" +#include "qe/qe.h" +#include "cmd_context/cmd_context.h" +#include "cmd_context/parametric_cmd.h" class qe_cmd : public parametric_cmd { expr * m_target; diff --git a/src/qe/qe_datatype_plugin.cpp b/src/qe/qe_datatype_plugin.cpp index 78562cf00..4178c3af3 100644 --- a/src/qe/qe_datatype_plugin.cpp +++ b/src/qe/qe_datatype_plugin.cpp @@ -99,13 +99,13 @@ Copyright (c) 2015 Microsoft Corporation // maintain set of equations and disequations with x. // -#include "qe.h" -#include "datatype_decl_plugin.h" -#include "expr_safe_replace.h" -#include "obj_pair_hashtable.h" -#include "for_each_expr.h" -#include "ast_pp.h" -#include "ast_ll_pp.h" +#include "qe/qe.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "util/obj_pair_hashtable.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace qe { diff --git a/src/qe/qe_datatypes.cpp b/src/qe/qe_datatypes.cpp index 8536e337f..db1e6ec85 100644 --- a/src/qe/qe_datatypes.cpp +++ b/src/qe/qe_datatypes.cpp @@ -17,14 +17,14 @@ Revision History: --*/ -#include "qe_arith.h" -#include "ast_pp.h" -#include "th_rewriter.h" -#include "expr_functors.h" -#include "model_v2_pp.h" -#include "expr_safe_replace.h" -#include "obj_pair_hashtable.h" -#include "qe_datatypes.h" +#include "qe/qe_arith.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/expr_functors.h" +#include "model/model_v2_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "util/obj_pair_hashtable.h" +#include "qe/qe_datatypes.h" namespace qe { diff --git a/src/qe/qe_datatypes.h b/src/qe/qe_datatypes.h index f616e7f2e..7352b4ca7 100644 --- a/src/qe/qe_datatypes.h +++ b/src/qe/qe_datatypes.h @@ -21,8 +21,8 @@ Revision History: #ifndef __QE_DATATYPES_H_ #define __QE_DATATYPES_H_ -#include "datatype_decl_plugin.h" -#include "qe_mbp.h" +#include "ast/datatype_decl_plugin.h" +#include "qe/qe_mbp.h" namespace qe { diff --git a/src/qe/qe_dl_plugin.cpp b/src/qe/qe_dl_plugin.cpp index e04f4cbde..7ff7bc11e 100644 --- a/src/qe/qe_dl_plugin.cpp +++ b/src/qe/qe_dl_plugin.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "qe.h" -#include "expr_safe_replace.h" -#include "dl_decl_plugin.h" -#include "obj_pair_hashtable.h" -#include "ast_pp.h" +#include "qe/qe.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/dl_decl_plugin.h" +#include "util/obj_pair_hashtable.h" +#include "ast/ast_pp.h" namespace qe { diff --git a/src/qe/qe_lite.cpp b/src/qe/qe_lite.cpp index ce182a97b..3f84ca98c 100644 --- a/src/qe/qe_lite.cpp +++ b/src/qe/qe_lite.cpp @@ -17,26 +17,26 @@ Revision History: --*/ -#include "qe_lite.h" -#include "expr_abstract.h" -#include "used_vars.h" -#include "occurs.h" -#include "rewriter_def.h" -#include "ast_pp.h" -#include "ast_ll_pp.h" -#include "ast_smt2_pp.h" -#include "tactical.h" -#include "bool_rewriter.h" -#include "var_subst.h" -#include "uint_set.h" -#include "ast_util.h" -#include "th_rewriter.h" -#include "for_each_expr.h" -#include "expr_safe_replace.h" -#include "cooperate.h" -#include "datatype_decl_plugin.h" +#include "qe/qe_lite.h" +#include "ast/expr_abstract.h" +#include "ast/used_vars.h" +#include "ast/occurs.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/var_subst.h" +#include "util/uint_set.h" +#include "ast/ast_util.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "util/cooperate.h" +#include "ast/datatype_decl_plugin.h" -#include "qe_vartest.h" +#include "qe/qe_vartest.h" namespace eq { class der { diff --git a/src/qe/qe_lite.h b/src/qe/qe_lite.h index cff547f36..9f0829a03 100644 --- a/src/qe/qe_lite.h +++ b/src/qe/qe_lite.h @@ -21,9 +21,9 @@ Revision History: #ifndef QE_LITE_H_ #define QE_LITE_H_ -#include "ast.h" -#include "uint_set.h" -#include "params.h" +#include "ast/ast.h" +#include "util/uint_set.h" +#include "util/params.h" class tactic; diff --git a/src/qe/qe_mbp.cpp b/src/qe/qe_mbp.cpp index f4c0c9339..329687a36 100644 --- a/src/qe/qe_mbp.cpp +++ b/src/qe/qe_mbp.cpp @@ -18,18 +18,18 @@ Revision History: --*/ -#include "qe_mbp.h" -#include "qe_arith.h" -#include "qe_arrays.h" -#include "qe_datatypes.h" -#include "expr_safe_replace.h" -#include "ast_pp.h" -#include "ast_util.h" -#include "th_rewriter.h" -#include "model_v2_pp.h" -#include "expr_functors.h" -#include "for_each_expr.h" -#include "model_evaluator.h" +#include "qe/qe_mbp.h" +#include "qe/qe_arith.h" +#include "qe/qe_arrays.h" +#include "qe/qe_datatypes.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "ast/rewriter/th_rewriter.h" +#include "model/model_v2_pp.h" +#include "ast/expr_functors.h" +#include "ast/for_each_expr.h" +#include "model/model_evaluator.h" using namespace qe; diff --git a/src/qe/qe_mbp.h b/src/qe/qe_mbp.h index b195d3a35..d1695843c 100644 --- a/src/qe/qe_mbp.h +++ b/src/qe/qe_mbp.h @@ -21,10 +21,10 @@ Revision History: #ifndef __QE_MBP_H__ #define __QE_MBP_H__ -#include "ast.h" -#include "params.h" -#include "model.h" -#include "model_based_opt.h" +#include "ast/ast.h" +#include "util/params.h" +#include "model/model.h" +#include "math/simplex/model_based_opt.h" namespace qe { diff --git a/src/qe/qe_sat_tactic.cpp b/src/qe/qe_sat_tactic.cpp index c2912692c..69ebc1a42 100644 --- a/src/qe/qe_sat_tactic.cpp +++ b/src/qe/qe_sat_tactic.cpp @@ -20,16 +20,16 @@ Revision History: --*/ -#include "qe_sat_tactic.h" -#include "quant_hoist.h" -#include "ast_pp.h" -#include "smt_kernel.h" -#include "qe.h" -#include "cooperate.h" -#include "model_v2_pp.h" -#include "expr_replacer.h" -#include "th_rewriter.h" -#include "expr_context_simplifier.h" +#include "qe/qe_sat_tactic.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/ast_pp.h" +#include "smt/smt_kernel.h" +#include "qe/qe.h" +#include "util/cooperate.h" +#include "model/model_v2_pp.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/th_rewriter.h" +#include "smt/expr_context_simplifier.h" // plugin registration. // solver specific projection operators. diff --git a/src/qe/qe_sat_tactic.h b/src/qe/qe_sat_tactic.h index 0b276fe8d..57279ed05 100644 --- a/src/qe/qe_sat_tactic.h +++ b/src/qe/qe_sat_tactic.h @@ -22,7 +22,7 @@ Revision History: #ifndef QE_SAT_H_ #define QE_SAT_H_ -#include"tactic.h" +#include "tactic/tactic.h" namespace qe { diff --git a/src/qe/qe_tactic.cpp b/src/qe/qe_tactic.cpp index 935af8550..5d1a74813 100644 --- a/src/qe/qe_tactic.cpp +++ b/src/qe/qe_tactic.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"filter_model_converter.h" -#include"cooperate.h" -#include"qe.h" +#include "tactic/tactical.h" +#include "tactic/filter_model_converter.h" +#include "util/cooperate.h" +#include "qe/qe.h" class qe_tactic : public tactic { statistics m_st; diff --git a/src/qe/qe_tactic.h b/src/qe/qe_tactic.h index 68860f488..c50cc84de 100644 --- a/src/qe/qe_tactic.h +++ b/src/qe/qe_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef QE_TACTIC_H_ #define QE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/qe/qe_vartest.h b/src/qe/qe_vartest.h index b2b4be649..047964825 100644 --- a/src/qe/qe_vartest.h +++ b/src/qe/qe_vartest.h @@ -19,8 +19,8 @@ Revision History: #ifndef QE_VARTEST_H_ #define QE_VARTEST_H_ -#include "ast.h" -#include "uint_set.h" +#include "ast/ast.h" +#include "util/uint_set.h" class is_variable_proc { public: diff --git a/src/qe/qsat.cpp b/src/qe/qsat.cpp index 841bdde9b..abd396818 100644 --- a/src/qe/qsat.cpp +++ b/src/qe/qsat.cpp @@ -20,23 +20,23 @@ Notes: --*/ -#include "smt_kernel.h" -#include "qe_mbp.h" -#include "smt_params.h" -#include "ast_util.h" -#include "quant_hoist.h" -#include "ast_pp.h" -#include "model_v2_pp.h" -#include "qsat.h" -#include "expr_abstract.h" -#include "qe.h" -#include "label_rewriter.h" -#include "expr_replacer.h" -#include "th_rewriter.h" -#include "model_evaluator.h" -#include "smt_solver.h" -#include "solver.h" -#include "mus.h" +#include "smt/smt_kernel.h" +#include "qe/qe_mbp.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" +#include "ast/rewriter/quant_hoist.h" +#include "ast/ast_pp.h" +#include "model/model_v2_pp.h" +#include "qe/qsat.h" +#include "ast/expr_abstract.h" +#include "qe/qe.h" +#include "ast/rewriter/label_rewriter.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/th_rewriter.h" +#include "model/model_evaluator.h" +#include "smt/smt_solver.h" +#include "solver/solver.h" +#include "solver/mus.h" namespace qe { diff --git a/src/qe/qsat.h b/src/qe/qsat.h index b6d21db1e..85a8181d6 100644 --- a/src/qe/qsat.h +++ b/src/qe/qsat.h @@ -21,9 +21,9 @@ Revision History: #ifndef QE_QSAT_H__ #define QE_QSAT_H__ -#include "tactic.h" -#include "filter_model_converter.h" -#include "qe_mbp.h" +#include "tactic/tactic.h" +#include "tactic/filter_model_converter.h" +#include "qe/qe_mbp.h" namespace qe { diff --git a/src/qe/vsubst_tactic.cpp b/src/qe/vsubst_tactic.cpp index c389d9a66..6bd8213d6 100644 --- a/src/qe/vsubst_tactic.cpp +++ b/src/qe/vsubst_tactic.cpp @@ -40,12 +40,12 @@ Notes: a*a + b*b + c < 0 => c < 0 --*/ -#include"tactic.h" -#include"qe.h" -#include"arith_decl_plugin.h" -#include"for_each_expr.h" -#include"extension_model_converter.h" -#include"ast_smt2_pp.h" +#include "tactic/tactic.h" +#include "qe/qe.h" +#include "ast/arith_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "tactic/extension_model_converter.h" +#include "ast/ast_smt2_pp.h" class vsubst_tactic : public tactic { params_ref m_params; diff --git a/src/qe/vsubst_tactic.h b/src/qe/vsubst_tactic.h index 8c0cb682f..2f28bda71 100644 --- a/src/qe/vsubst_tactic.h +++ b/src/qe/vsubst_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef VSUBST_TACTIC_H_ #define VSUBST_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/sat/dimacs.cpp b/src/sat/dimacs.cpp index 3aa8591f9..512be5f4b 100644 --- a/src/sat/dimacs.cpp +++ b/src/sat/dimacs.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"dimacs.h" +#include "sat/dimacs.h" #undef max #undef min -#include"sat_solver.h" +#include "sat/sat_solver.h" class stream_buffer { std::istream & m_stream; diff --git a/src/sat/dimacs.h b/src/sat/dimacs.h index 9d7bb0679..50ebec0c8 100644 --- a/src/sat/dimacs.h +++ b/src/sat/dimacs.h @@ -19,7 +19,7 @@ Revision History: #ifndef DIMACS_H_ #define DIMACS_H_ -#include"sat_types.h" +#include "sat/sat_types.h" void parse_dimacs(std::istream & s, sat::solver & solver); diff --git a/src/sat/sat_asymm_branch.cpp b/src/sat/sat_asymm_branch.cpp index cca0c5c1b..6d8fa05a0 100644 --- a/src/sat/sat_asymm_branch.cpp +++ b/src/sat/sat_asymm_branch.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"sat_asymm_branch.h" +#include "sat/sat_asymm_branch.h" #include"sat_asymm_branch_params.hpp" -#include"sat_solver.h" -#include"stopwatch.h" -#include"trace.h" +#include "sat/sat_solver.h" +#include "util/stopwatch.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_asymm_branch.h b/src/sat/sat_asymm_branch.h index 4ad702c5c..9e28d1600 100644 --- a/src/sat/sat_asymm_branch.h +++ b/src/sat/sat_asymm_branch.h @@ -19,9 +19,9 @@ Revision History: #ifndef SAT_ASYMM_BRANCH_H_ #define SAT_ASYMM_BRANCH_H_ -#include"sat_types.h" -#include"statistics.h" -#include"params.h" +#include "sat/sat_types.h" +#include "util/statistics.h" +#include "util/params.h" namespace sat { class solver; diff --git a/src/sat/sat_clause.cpp b/src/sat/sat_clause.cpp index 1efbd6758..c5829ae4e 100644 --- a/src/sat/sat_clause.cpp +++ b/src/sat/sat_clause.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #include -#include"sat_clause.h" -#include"z3_exception.h" -#include"trace.h" +#include "sat/sat_clause.h" +#include "util/z3_exception.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_clause.h b/src/sat/sat_clause.h index 27a0ed739..5ad08e52a 100644 --- a/src/sat/sat_clause.h +++ b/src/sat/sat_clause.h @@ -19,10 +19,10 @@ Revision History: #ifndef SAT_CLAUSE_H_ #define SAT_CLAUSE_H_ -#include"sat_types.h" -#include"small_object_allocator.h" -#include"id_gen.h" -#include"map.h" +#include "sat/sat_types.h" +#include "util/small_object_allocator.h" +#include "util/id_gen.h" +#include "util/map.h" #ifdef _MSC_VER #pragma warning(disable : 4200) diff --git a/src/sat/sat_clause_set.cpp b/src/sat/sat_clause_set.cpp index 1c424cce3..c223009d6 100644 --- a/src/sat/sat_clause_set.cpp +++ b/src/sat/sat_clause_set.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"sat_clause_set.h" +#include "sat/sat_clause_set.h" namespace sat { diff --git a/src/sat/sat_clause_set.h b/src/sat/sat_clause_set.h index e63c92d08..f9da6a00d 100644 --- a/src/sat/sat_clause_set.h +++ b/src/sat/sat_clause_set.h @@ -19,7 +19,7 @@ Revision History: #ifndef SAT_CLAUSE_SET_H_ #define SAT_CLAUSE_SET_H_ -#include"sat_clause.h" +#include "sat/sat_clause.h" namespace sat { diff --git a/src/sat/sat_clause_use_list.cpp b/src/sat/sat_clause_use_list.cpp index f22e6a822..5ee5b4cda 100644 --- a/src/sat/sat_clause_use_list.cpp +++ b/src/sat/sat_clause_use_list.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"sat_clause.h" -#include"sat_clause_use_list.h" +#include "sat/sat_clause.h" +#include "sat/sat_clause_use_list.h" namespace sat { diff --git a/src/sat/sat_clause_use_list.h b/src/sat/sat_clause_use_list.h index ec283f4c4..121345f21 100644 --- a/src/sat/sat_clause_use_list.h +++ b/src/sat/sat_clause_use_list.h @@ -19,8 +19,8 @@ Revision History: #ifndef SAT_CLAUSE_USE_LIST_H_ #define SAT_CLAUSE_USE_LIST_H_ -#include"sat_types.h" -#include"trace.h" +#include "sat/sat_types.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_cleaner.cpp b/src/sat/sat_cleaner.cpp index 959f5e94f..9dd53d8f6 100644 --- a/src/sat/sat_cleaner.cpp +++ b/src/sat/sat_cleaner.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"sat_cleaner.h" -#include"sat_solver.h" -#include"trace.h" -#include"stopwatch.h" +#include "sat/sat_cleaner.h" +#include "sat/sat_solver.h" +#include "util/trace.h" +#include "util/stopwatch.h" namespace sat { diff --git a/src/sat/sat_cleaner.h b/src/sat/sat_cleaner.h index d886453df..4ffc0be10 100644 --- a/src/sat/sat_cleaner.h +++ b/src/sat/sat_cleaner.h @@ -19,8 +19,8 @@ Revision History: #ifndef SAT_CLEANER_H_ #define SAT_CLEANER_H_ -#include"sat_types.h" -#include"statistics.h" +#include "sat/sat_types.h" +#include "util/statistics.h" namespace sat { diff --git a/src/sat/sat_config.cpp b/src/sat/sat_config.cpp index 9206ea8bc..00ee0f48e 100644 --- a/src/sat/sat_config.cpp +++ b/src/sat/sat_config.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"sat_config.h" -#include"sat_types.h" +#include "sat/sat_config.h" +#include "sat/sat_types.h" #include"sat_params.hpp" namespace sat { diff --git a/src/sat/sat_config.h b/src/sat/sat_config.h index 405cbd092..edd9f0bfc 100644 --- a/src/sat/sat_config.h +++ b/src/sat/sat_config.h @@ -20,7 +20,7 @@ Revision History: #ifndef SAT_CONFIG_H_ #define SAT_CONFIG_H_ -#include"params.h" +#include "util/params.h" namespace sat { diff --git a/src/sat/sat_elim_eqs.cpp b/src/sat/sat_elim_eqs.cpp index b7f83df6c..4cb2fa8ae 100644 --- a/src/sat/sat_elim_eqs.cpp +++ b/src/sat/sat_elim_eqs.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"sat_elim_eqs.h" -#include"sat_solver.h" -#include"trace.h" +#include "sat/sat_elim_eqs.h" +#include "sat/sat_solver.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_elim_eqs.h b/src/sat/sat_elim_eqs.h index 6f81d6ecb..0422b60df 100644 --- a/src/sat/sat_elim_eqs.h +++ b/src/sat/sat_elim_eqs.h @@ -19,7 +19,7 @@ Revision History: #ifndef SAT_ELIM_EQS_H_ #define SAT_ELIM_EQS_H_ -#include"sat_types.h" +#include "sat/sat_types.h" namespace sat { class solver; diff --git a/src/sat/sat_extension.h b/src/sat/sat_extension.h index b0b1c5d96..80144e00d 100644 --- a/src/sat/sat_extension.h +++ b/src/sat/sat_extension.h @@ -19,8 +19,8 @@ Revision History: #ifndef SAT_EXTENSION_H_ #define SAT_EXTENSION_H_ -#include"sat_types.h" -#include"params.h" +#include "sat/sat_types.h" +#include "util/params.h" namespace sat { diff --git a/src/sat/sat_iff3_finder.cpp b/src/sat/sat_iff3_finder.cpp index 789f5dec0..e889af164 100644 --- a/src/sat/sat_iff3_finder.cpp +++ b/src/sat/sat_iff3_finder.cpp @@ -29,8 +29,8 @@ Author: Revision History: --*/ -#include"sat_iff3_finder.h" -#include"sat_solver.h" +#include "sat/sat_iff3_finder.h" +#include "sat/sat_solver.h" namespace sat { diff --git a/src/sat/sat_iff3_finder.h b/src/sat/sat_iff3_finder.h index a74ad1eb1..27cd6de05 100644 --- a/src/sat/sat_iff3_finder.h +++ b/src/sat/sat_iff3_finder.h @@ -29,7 +29,7 @@ Revision History: #ifndef SAT_IFF3_FINDER_H_ #define SAT_IFF3_FINDER_H_ -#include"sat_types.h" +#include "sat/sat_types.h" namespace sat { diff --git a/src/sat/sat_integrity_checker.cpp b/src/sat/sat_integrity_checker.cpp index f7cd371f8..08a6072b6 100644 --- a/src/sat/sat_integrity_checker.cpp +++ b/src/sat/sat_integrity_checker.cpp @@ -17,9 +17,9 @@ Author: Revision History: --*/ -#include"sat_integrity_checker.h" -#include"sat_solver.h" -#include"trace.h" +#include "sat/sat_integrity_checker.h" +#include "sat/sat_solver.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_integrity_checker.h b/src/sat/sat_integrity_checker.h index 5eef1748e..640fce068 100644 --- a/src/sat/sat_integrity_checker.h +++ b/src/sat/sat_integrity_checker.h @@ -20,7 +20,7 @@ Revision History: #ifndef SAT_INTEGRITY_CHECKER_H_ #define SAT_INTEGRITY_CHECKER_H_ -#include"sat_types.h" +#include "sat/sat_types.h" namespace sat { class integrity_checker { diff --git a/src/sat/sat_model_converter.cpp b/src/sat/sat_model_converter.cpp index 525d084dc..1a881618a 100644 --- a/src/sat/sat_model_converter.cpp +++ b/src/sat/sat_model_converter.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"sat_model_converter.h" -#include"sat_clause.h" -#include"trace.h" +#include "sat/sat_model_converter.h" +#include "sat/sat_clause.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_model_converter.h b/src/sat/sat_model_converter.h index eb2237707..9a5ebc0ff 100644 --- a/src/sat/sat_model_converter.h +++ b/src/sat/sat_model_converter.h @@ -19,7 +19,7 @@ Revision History: #ifndef SAT_MODEL_CONVERTER_H_ #define SAT_MODEL_CONVERTER_H_ -#include"sat_types.h" +#include "sat/sat_types.h" namespace sat { /** diff --git a/src/sat/sat_mus.cpp b/src/sat/sat_mus.cpp index 06851d10d..9c455a219 100644 --- a/src/sat/sat_mus.cpp +++ b/src/sat/sat_mus.cpp @@ -18,8 +18,8 @@ Notes: --*/ -#include "sat_solver.h" -#include "sat_mus.h" +#include "sat/sat_solver.h" +#include "sat/sat_mus.h" namespace sat { diff --git a/src/sat/sat_par.cpp b/src/sat/sat_par.cpp index 7a185a3b5..e3d5727ed 100644 --- a/src/sat/sat_par.cpp +++ b/src/sat/sat_par.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include "sat_par.h" +#include "sat/sat_par.h" namespace sat { diff --git a/src/sat/sat_par.h b/src/sat/sat_par.h index 2b2592de7..001036a98 100644 --- a/src/sat/sat_par.h +++ b/src/sat/sat_par.h @@ -19,9 +19,9 @@ Revision History: #ifndef SAT_PAR_H_ #define SAT_PAR_H_ -#include"sat_types.h" -#include"hashtable.h" -#include"map.h" +#include "sat/sat_types.h" +#include "util/hashtable.h" +#include "util/map.h" namespace sat { diff --git a/src/sat/sat_probing.cpp b/src/sat/sat_probing.cpp index f54ee9f89..b23d57164 100644 --- a/src/sat/sat_probing.cpp +++ b/src/sat/sat_probing.cpp @@ -17,8 +17,8 @@ Author: Revision History: --*/ -#include"sat_probing.h" -#include"sat_solver.h" +#include "sat/sat_probing.h" +#include "sat/sat_solver.h" namespace sat { probing::probing(solver & _s, params_ref const & p): diff --git a/src/sat/sat_probing.h b/src/sat/sat_probing.h index cce165a34..391098ef7 100644 --- a/src/sat/sat_probing.h +++ b/src/sat/sat_probing.h @@ -20,9 +20,9 @@ Revision History: #ifndef SAT_PROBING_H_ #define SAT_PROBING_H_ -#include"sat_types.h" -#include"params.h" -#include"statistics.h" +#include "sat/sat_types.h" +#include "util/params.h" +#include "util/statistics.h" namespace sat { diff --git a/src/sat/sat_scc.cpp b/src/sat/sat_scc.cpp index ffbdb31c6..5ab0bbd38 100644 --- a/src/sat/sat_scc.cpp +++ b/src/sat/sat_scc.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"sat_scc.h" -#include"sat_solver.h" -#include"sat_elim_eqs.h" -#include"stopwatch.h" -#include"trace.h" +#include "sat/sat_scc.h" +#include "sat/sat_solver.h" +#include "sat/sat_elim_eqs.h" +#include "util/stopwatch.h" +#include "util/trace.h" #include"sat_scc_params.hpp" namespace sat { diff --git a/src/sat/sat_scc.h b/src/sat/sat_scc.h index f44c39742..c8392685e 100644 --- a/src/sat/sat_scc.h +++ b/src/sat/sat_scc.h @@ -19,9 +19,9 @@ Revision History: #ifndef SAT_SCC_H_ #define SAT_SCC_H_ -#include"sat_types.h" -#include"statistics.h" -#include"params.h" +#include "sat/sat_types.h" +#include "util/statistics.h" +#include "util/params.h" namespace sat { class solver; diff --git a/src/sat/sat_simplifier.cpp b/src/sat/sat_simplifier.cpp index 923f5ae49..ef74a58f4 100644 --- a/src/sat/sat_simplifier.cpp +++ b/src/sat/sat_simplifier.cpp @@ -18,11 +18,11 @@ Author: Revision History: --*/ -#include"sat_simplifier.h" +#include "sat/sat_simplifier.h" #include"sat_simplifier_params.hpp" -#include"sat_solver.h" -#include"stopwatch.h" -#include"trace.h" +#include "sat/sat_solver.h" +#include "util/stopwatch.h" +#include "util/trace.h" namespace sat { diff --git a/src/sat/sat_simplifier.h b/src/sat/sat_simplifier.h index d26d0041f..44e4276e0 100644 --- a/src/sat/sat_simplifier.h +++ b/src/sat/sat_simplifier.h @@ -21,15 +21,15 @@ Revision History: #ifndef SAT_SIMPLIFIER_H_ #define SAT_SIMPLIFIER_H_ -#include"sat_types.h" -#include"sat_clause.h" -#include"sat_clause_set.h" -#include"sat_clause_use_list.h" -#include"sat_watched.h" -#include"sat_model_converter.h" -#include"heap.h" -#include"statistics.h" -#include"params.h" +#include "sat/sat_types.h" +#include "sat/sat_clause.h" +#include "sat/sat_clause_set.h" +#include "sat/sat_clause_use_list.h" +#include "sat/sat_watched.h" +#include "sat/sat_model_converter.h" +#include "util/heap.h" +#include "util/statistics.h" +#include "util/params.h" namespace sat { class solver; diff --git a/src/sat/sat_solver.cpp b/src/sat/sat_solver.cpp index fbfa0ec6b..77bd2283d 100644 --- a/src/sat/sat_solver.cpp +++ b/src/sat/sat_solver.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"sat_solver.h" -#include"sat_integrity_checker.h" -#include"luby.h" -#include"trace.h" -#include"max_cliques.h" +#include "sat/sat_solver.h" +#include "sat/sat_integrity_checker.h" +#include "util/luby.h" +#include "util/trace.h" +#include "util/max_cliques.h" // define to update glue during propagation #define UPDATE_GLUE diff --git a/src/sat/sat_solver.h b/src/sat/sat_solver.h index a26abe1e0..c011eb46d 100644 --- a/src/sat/sat_solver.h +++ b/src/sat/sat_solver.h @@ -19,26 +19,26 @@ Revision History: #ifndef SAT_SOLVER_H_ #define SAT_SOLVER_H_ -#include"sat_types.h" -#include"sat_clause.h" -#include"sat_watched.h" -#include"sat_justification.h" -#include"sat_var_queue.h" -#include"sat_extension.h" -#include"sat_config.h" -#include"sat_cleaner.h" -#include"sat_simplifier.h" -#include"sat_scc.h" -#include"sat_asymm_branch.h" -#include"sat_iff3_finder.h" -#include"sat_probing.h" -#include"sat_mus.h" -#include"sat_par.h" -#include"params.h" -#include"statistics.h" -#include"stopwatch.h" -#include"trace.h" -#include"rlimit.h" +#include "sat/sat_types.h" +#include "sat/sat_clause.h" +#include "sat/sat_watched.h" +#include "sat/sat_justification.h" +#include "sat/sat_var_queue.h" +#include "sat/sat_extension.h" +#include "sat/sat_config.h" +#include "sat/sat_cleaner.h" +#include "sat/sat_simplifier.h" +#include "sat/sat_scc.h" +#include "sat/sat_asymm_branch.h" +#include "sat/sat_iff3_finder.h" +#include "sat/sat_probing.h" +#include "sat/sat_mus.h" +#include "sat/sat_par.h" +#include "util/params.h" +#include "util/statistics.h" +#include "util/stopwatch.h" +#include "util/trace.h" +#include "util/rlimit.h" namespace sat { diff --git a/src/sat/sat_solver/inc_sat_solver.cpp b/src/sat/sat_solver/inc_sat_solver.cpp index baac9f37b..521aa5e71 100644 --- a/src/sat/sat_solver/inc_sat_solver.cpp +++ b/src/sat/sat_solver/inc_sat_solver.cpp @@ -17,24 +17,24 @@ Notes: --*/ -#include "solver.h" -#include "tactical.h" -#include "sat_solver.h" -#include "tactic2solver.h" -#include "aig_tactic.h" -#include "propagate_values_tactic.h" -#include "max_bv_sharing_tactic.h" -#include "card2bv_tactic.h" -#include "bit_blaster_tactic.h" -#include "simplify_tactic.h" -#include "goal2sat.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "filter_model_converter.h" -#include "bit_blaster_model_converter.h" -#include "ast_translation.h" -#include "ast_util.h" -#include "propagate_values_tactic.h" +#include "solver/solver.h" +#include "tactic/tactical.h" +#include "sat/sat_solver.h" +#include "solver/tactic2solver.h" +#include "tactic/aig/aig_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/arith/card2bv_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "sat/tactic/goal2sat.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "tactic/filter_model_converter.h" +#include "tactic/bv/bit_blaster_model_converter.h" +#include "ast/ast_translation.h" +#include "ast/ast_util.h" +#include "tactic/core/propagate_values_tactic.h" // incremental SAT solver. class inc_sat_solver : public solver { diff --git a/src/sat/sat_solver/inc_sat_solver.h b/src/sat/sat_solver/inc_sat_solver.h index 4b0bea50e..658c0583d 100644 --- a/src/sat/sat_solver/inc_sat_solver.h +++ b/src/sat/sat_solver/inc_sat_solver.h @@ -20,7 +20,7 @@ Notes: #ifndef HS_INC_SAT_SOLVER_H_ #define HS_INC_SAT_SOLVER_H_ -#include "solver.h" +#include "solver/solver.h" solver* mk_inc_sat_solver(ast_manager& m, params_ref const& p); diff --git a/src/sat/sat_types.h b/src/sat/sat_types.h index 28d8d761a..6652fb3b0 100644 --- a/src/sat/sat_types.h +++ b/src/sat/sat_types.h @@ -19,12 +19,12 @@ Revision History: #ifndef SAT_TYPES_H_ #define SAT_TYPES_H_ -#include"debug.h" -#include"approx_set.h" -#include"lbool.h" -#include"z3_exception.h" -#include"common_msgs.h" -#include"vector.h" +#include "util/debug.h" +#include "util/approx_set.h" +#include "util/lbool.h" +#include "util/z3_exception.h" +#include "util/common_msgs.h" +#include "util/vector.h" #include namespace sat { diff --git a/src/sat/sat_var_queue.h b/src/sat/sat_var_queue.h index f008fbb88..a14eb4cff 100644 --- a/src/sat/sat_var_queue.h +++ b/src/sat/sat_var_queue.h @@ -19,8 +19,8 @@ Revision History: #ifndef SAT_VAR_QUEUE_H_ #define SAT_VAR_QUEUE_H_ -#include"heap.h" -#include"sat_types.h" +#include "util/heap.h" +#include "sat/sat_types.h" namespace sat { diff --git a/src/sat/sat_watched.cpp b/src/sat/sat_watched.cpp index cc442571c..6335d37fc 100644 --- a/src/sat/sat_watched.cpp +++ b/src/sat/sat_watched.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"sat_watched.h" -#include"sat_clause.h" +#include "sat/sat_watched.h" +#include "sat/sat_clause.h" namespace sat { diff --git a/src/sat/sat_watched.h b/src/sat/sat_watched.h index 2c48b6c9b..e5a02953b 100644 --- a/src/sat/sat_watched.h +++ b/src/sat/sat_watched.h @@ -19,8 +19,8 @@ Revision History: #ifndef SAT_WATCHED_H_ #define SAT_WATCHED_H_ -#include"sat_types.h" -#include"vector.h" +#include "sat/sat_types.h" +#include "util/vector.h" namespace sat { /** diff --git a/src/sat/tactic/atom2bool_var.cpp b/src/sat/tactic/atom2bool_var.cpp index 48ad85152..26f3448d3 100644 --- a/src/sat/tactic/atom2bool_var.cpp +++ b/src/sat/tactic/atom2bool_var.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"atom2bool_var.h" -#include"ast_smt2_pp.h" -#include"ref_util.h" -#include"goal.h" +#include "sat/tactic/atom2bool_var.h" +#include "ast/ast_smt2_pp.h" +#include "util/ref_util.h" +#include "tactic/goal.h" void atom2bool_var::mk_inv(expr_ref_vector & lit2expr) const { obj_map::iterator it = m_mapping.begin(); diff --git a/src/sat/tactic/atom2bool_var.h b/src/sat/tactic/atom2bool_var.h index 3435a1e2c..d360d3fe0 100644 --- a/src/sat/tactic/atom2bool_var.h +++ b/src/sat/tactic/atom2bool_var.h @@ -19,8 +19,8 @@ Notes: #ifndef ATOM2BOOL_VAR_H_ #define ATOM2BOOL_VAR_H_ -#include"expr2var.h" -#include"sat_types.h" +#include "ast/expr2var.h" +#include "sat/sat_types.h" /** \brief Mapping from atoms into SAT boolean variables. diff --git a/src/sat/tactic/goal2sat.cpp b/src/sat/tactic/goal2sat.cpp index 742a4fb1d..0b6ad2c82 100644 --- a/src/sat/tactic/goal2sat.cpp +++ b/src/sat/tactic/goal2sat.cpp @@ -26,16 +26,16 @@ Author: Notes: --*/ -#include"goal2sat.h" -#include"ast_smt2_pp.h" -#include"ref_util.h" -#include"cooperate.h" -#include"filter_model_converter.h" -#include"model_evaluator.h" -#include"for_each_expr.h" -#include"model_v2_pp.h" -#include"tactic.h" -#include"ast_pp.h" +#include "sat/tactic/goal2sat.h" +#include "ast/ast_smt2_pp.h" +#include "util/ref_util.h" +#include "util/cooperate.h" +#include "tactic/filter_model_converter.h" +#include "model/model_evaluator.h" +#include "ast/for_each_expr.h" +#include "model/model_v2_pp.h" +#include "tactic/tactic.h" +#include "ast/ast_pp.h" #include struct goal2sat::imp { diff --git a/src/sat/tactic/goal2sat.h b/src/sat/tactic/goal2sat.h index cd63cd497..199d79f9d 100644 --- a/src/sat/tactic/goal2sat.h +++ b/src/sat/tactic/goal2sat.h @@ -29,10 +29,10 @@ Notes: #ifndef GOAL2SAT_H_ #define GOAL2SAT_H_ -#include"goal.h" -#include"sat_solver.h" -#include"model_converter.h" -#include"atom2bool_var.h" +#include "tactic/goal.h" +#include "sat/sat_solver.h" +#include "tactic/model_converter.h" +#include "sat/tactic/atom2bool_var.h" class goal2sat { struct imp; diff --git a/src/sat/tactic/sat_tactic.cpp b/src/sat/tactic/sat_tactic.cpp index f99e46851..9b706597d 100644 --- a/src/sat/tactic/sat_tactic.cpp +++ b/src/sat/tactic/sat_tactic.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"goal2sat.h" -#include"sat_solver.h" -#include"filter_model_converter.h" -#include"ast_smt2_pp.h" -#include"model_v2_pp.h" +#include "tactic/tactical.h" +#include "sat/tactic/goal2sat.h" +#include "sat/sat_solver.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_smt2_pp.h" +#include "model/model_v2_pp.h" class sat_tactic : public tactic { diff --git a/src/sat/tactic/sat_tactic.h b/src/sat/tactic/sat_tactic.h index 115b01a71..8525f1179 100644 --- a/src/sat/tactic/sat_tactic.h +++ b/src/sat/tactic/sat_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef SAT_TACTIC_H_ #define SAT_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/shell/datalog_frontend.cpp b/src/shell/datalog_frontend.cpp index 83b900c5c..b2b181977 100644 --- a/src/shell/datalog_frontend.cpp +++ b/src/shell/datalog_frontend.cpp @@ -20,22 +20,22 @@ Revision History: #include #include #include -#include"stopwatch.h" +#include "util/stopwatch.h" #ifdef _CYGWIN #undef min #undef max #endif -#include"smt_params.h" -#include"arith_decl_plugin.h" -#include"dl_compiler.h" -#include"dl_mk_filter_rules.h" -#include"dl_finite_product_relation.h" -#include"dl_context.h" -#include"rel_context.h" -#include"dl_register_engine.h" -#include"datalog_parser.h" -#include"datalog_frontend.h" -#include"timeout.h" +#include "smt/params/smt_params.h" +#include "ast/arith_decl_plugin.h" +#include "muz/rel/dl_compiler.h" +#include "muz/transforms/dl_mk_filter_rules.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "muz/base/dl_context.h" +#include "muz/rel/rel_context.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/fp/datalog_parser.h" +#include "shell/datalog_frontend.h" +#include "util/timeout.h" static stopwatch g_overall_time; static stopwatch g_piece_timer; diff --git a/src/shell/dimacs_frontend.cpp b/src/shell/dimacs_frontend.cpp index 09645a25a..999574f1e 100644 --- a/src/shell/dimacs_frontend.cpp +++ b/src/shell/dimacs_frontend.cpp @@ -19,11 +19,11 @@ Revision History: #include #include #include -#include"timeout.h" -#include"rlimit.h" -#include"dimacs.h" -#include"sat_solver.h" -#include"gparams.h" +#include "util/timeout.h" +#include "util/rlimit.h" +#include "sat/dimacs.h" +#include "sat/sat_solver.h" +#include "util/gparams.h" extern bool g_display_statistics; static sat::solver * g_solver = 0; diff --git a/src/shell/lp_frontend.cpp b/src/shell/lp_frontend.cpp index 8acbd28ff..950b4a628 100644 --- a/src/shell/lp_frontend.cpp +++ b/src/shell/lp_frontend.cpp @@ -10,11 +10,11 @@ Author: #include "lp_params.hpp" #include "util/lp/lp_settings.h" #include "util/lp/mps_reader.h" -#include "timeout.h" -#include "cancel_eh.h" -#include "scoped_timer.h" -#include "rlimit.h" -#include "gparams.h" +#include "util/timeout.h" +#include "util/cancel_eh.h" +#include "util/scoped_timer.h" +#include "util/rlimit.h" +#include "util/gparams.h" #include static lean::lp_solver* g_solver = 0; diff --git a/src/shell/main.cpp b/src/shell/main.cpp index b29586f8d..3f3ba5182 100644 --- a/src/shell/main.cpp +++ b/src/shell/main.cpp @@ -18,24 +18,24 @@ Revision History: --*/ #include -#include"memory_manager.h" -#include"trace.h" -#include"debug.h" -#include"util.h" -#include"pp.h" -#include"smtlib_frontend.h" -#include"z3_log_frontend.h" -#include"warning.h" +#include "util/memory_manager.h" +#include "util/trace.h" +#include "util/debug.h" +#include "util/util.h" +#include "ast/pp.h" +#include "shell/smtlib_frontend.h" +#include "shell/z3_log_frontend.h" +#include "util/warning.h" #include"version.h" -#include"dimacs_frontend.h" -#include"datalog_frontend.h" -#include"opt_frontend.h" -#include"timeout.h" -#include"z3_exception.h" -#include"error_codes.h" -#include"gparams.h" -#include"env_params.h" -#include "lp_frontend.h" +#include "shell/dimacs_frontend.h" +#include "shell/datalog_frontend.h" +#include "shell/opt_frontend.h" +#include "util/timeout.h" +#include "util/z3_exception.h" +#include "util/error_codes.h" +#include "util/gparams.h" +#include "util/env_params.h" +#include "shell/lp_frontend.h" typedef enum { IN_UNSPECIFIED, IN_SMTLIB, IN_SMTLIB_2, IN_DATALOG, IN_DIMACS, IN_WCNF, IN_OPB, IN_Z3_LOG, IN_MPS } input_kind; diff --git a/src/shell/opt_frontend.cpp b/src/shell/opt_frontend.cpp index 278dad287..e1aff8669 100644 --- a/src/shell/opt_frontend.cpp +++ b/src/shell/opt_frontend.cpp @@ -7,12 +7,12 @@ Copyright (c) 2015 Microsoft Corporation #include #include #include -#include"opt_context.h" -#include"ast_util.h" -#include"arith_decl_plugin.h" -#include"gparams.h" -#include"timeout.h" -#include"reg_decl_plugins.h" +#include "opt/opt_context.h" +#include "ast/ast_util.h" +#include "ast/arith_decl_plugin.h" +#include "util/gparams.h" +#include "util/timeout.h" +#include "ast/reg_decl_plugins.h" extern bool g_display_statistics; static bool g_first_interrupt = true; diff --git a/src/shell/smtlib_frontend.cpp b/src/shell/smtlib_frontend.cpp index c9fa69221..666a1e1fe 100644 --- a/src/shell/smtlib_frontend.cpp +++ b/src/shell/smtlib_frontend.cpp @@ -21,17 +21,17 @@ Revision History: #include #include #include -#include"smtlib_solver.h" -#include"timeout.h" -#include"smt2parser.h" -#include"dl_cmds.h" -#include"dbg_cmds.h" -#include"opt_cmds.h" -#include"polynomial_cmds.h" -#include"subpaving_cmds.h" -#include"smt2_extra_cmds.h" -#include"smt_strategic_solver.h" -#include"smt_solver.h" +#include "parsers/smt/smtlib_solver.h" +#include "util/timeout.h" +#include "parsers/smt2/smt2parser.h" +#include "muz/fp/dl_cmds.h" +#include "cmd_context/extra_cmds/dbg_cmds.h" +#include "opt/opt_cmds.h" +#include "cmd_context/extra_cmds/polynomial_cmds.h" +#include "cmd_context/extra_cmds/subpaving_cmds.h" +#include "smt/smt2_extra_cmds.h" +#include "tactic/portfolio/smt_strategic_solver.h" +#include "smt/smt_solver.h" extern bool g_display_statistics; static clock_t g_start_time; diff --git a/src/shell/z3_log_frontend.cpp b/src/shell/z3_log_frontend.cpp index 0b5686c66..4a0ce2c3e 100644 --- a/src/shell/z3_log_frontend.cpp +++ b/src/shell/z3_log_frontend.cpp @@ -20,9 +20,9 @@ Revision History: #include #include #include -#include"util.h" -#include"error_codes.h" -#include"z3_replayer.h" +#include "util/util.h" +#include "util/error_codes.h" +#include "api/z3_replayer.h" static void solve(char const * stream_name, std::istream & in) { clock_t start_time = clock(); diff --git a/src/smt/arith_eq_adapter.cpp b/src/smt/arith_eq_adapter.cpp index ce831f9ae..60c109cff 100644 --- a/src/smt/arith_eq_adapter.cpp +++ b/src/smt/arith_eq_adapter.cpp @@ -17,13 +17,13 @@ Revision History: --*/ -#include"smt_context.h" -#include"arith_eq_adapter.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"stats.h" -#include"simplifier.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/arith_eq_adapter.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "util/stats.h" +#include "ast/simplifier/simplifier.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/arith_eq_adapter.h b/src/smt/arith_eq_adapter.h index 7e9a645e6..f18b2999f 100644 --- a/src/smt/arith_eq_adapter.h +++ b/src/smt/arith_eq_adapter.h @@ -19,11 +19,11 @@ Revision History: #ifndef ARITH_EQ_ADAPTER_H_ #define ARITH_EQ_ADAPTER_H_ -#include"smt_theory.h" -#include"obj_pair_hashtable.h" -#include"arith_decl_plugin.h" -#include"statistics.h" -#include"arith_simplifier_plugin.h" +#include "smt/smt_theory.h" +#include "util/obj_pair_hashtable.h" +#include "ast/arith_decl_plugin.h" +#include "util/statistics.h" +#include "ast/simplifier/arith_simplifier_plugin.h" namespace smt { diff --git a/src/smt/arith_eq_solver.cpp b/src/smt/arith_eq_solver.cpp index de88d37bb..128b35dd1 100644 --- a/src/smt/arith_eq_solver.cpp +++ b/src/smt/arith_eq_solver.cpp @@ -14,7 +14,7 @@ Author: Nikolaj Bjorner (nbjorner) 2012-02-25 --*/ -#include"arith_eq_solver.h" +#include "smt/arith_eq_solver.h" arith_eq_solver::~arith_eq_solver() { diff --git a/src/smt/arith_eq_solver.h b/src/smt/arith_eq_solver.h index 8b7e99fcc..b2db35ee1 100644 --- a/src/smt/arith_eq_solver.h +++ b/src/smt/arith_eq_solver.h @@ -17,8 +17,8 @@ Author: #ifndef ARITH_EQ_SOLVER_H_ #define ARITH_EQ_SOLVER_H_ -#include"arith_decl_plugin.h" -#include"arith_rewriter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/arith_rewriter.h" /** \brief Simplifier for the arith family. diff --git a/src/smt/asserted_formulas.cpp b/src/smt/asserted_formulas.cpp index 5c7ed33f8..9753adc5b 100644 --- a/src/smt/asserted_formulas.cpp +++ b/src/smt/asserted_formulas.cpp @@ -16,31 +16,31 @@ Author: Revision History: --*/ -#include"asserted_formulas.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"arith_simplifier_plugin.h" -#include"array_simplifier_plugin.h" -#include"datatype_simplifier_plugin.h" -#include"fpa_simplifier_plugin.h" -#include"seq_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" -#include"for_each_expr.h" -#include"well_sorted.h" -#include"pull_quant.h" -#include"pull_ite_tree.h" -#include"push_app_ite.h" -#include"elim_term_ite.h" -#include"pattern_inference.h" -#include"nnf.h" -#include"bv_elim.h" -#include"inj_axiom.h" -#include"der.h" -#include"elim_bounds.h" -#include"warning.h" -#include"bit2int.h" -#include"distribute_forall.h" -#include"quasi_macros.h" +#include "smt/asserted_formulas.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/array_simplifier_plugin.h" +#include "ast/simplifier/datatype_simplifier_plugin.h" +#include "ast/simplifier/fpa_simplifier_plugin.h" +#include "ast/simplifier/seq_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/for_each_expr.h" +#include "ast/well_sorted.h" +#include "ast/normal_forms/pull_quant.h" +#include "ast/simplifier/pull_ite_tree.h" +#include "ast/simplifier/push_app_ite.h" +#include "smt/elim_term_ite.h" +#include "ast/pattern/pattern_inference.h" +#include "ast/normal_forms/nnf.h" +#include "ast/simplifier/bv_elim.h" +#include "ast/simplifier/inj_axiom.h" +#include "ast/rewriter/der.h" +#include "ast/simplifier/elim_bounds.h" +#include "util/warning.h" +#include "ast/simplifier/bit2int.h" +#include "ast/rewriter/distribute_forall.h" +#include "ast/macros/quasi_macros.h" asserted_formulas::asserted_formulas(ast_manager & m, smt_params & p): m(m), diff --git a/src/smt/asserted_formulas.h b/src/smt/asserted_formulas.h index 6ad36cc70..093680fd9 100644 --- a/src/smt/asserted_formulas.h +++ b/src/smt/asserted_formulas.h @@ -19,17 +19,17 @@ Revision History: #ifndef ASSERTED_FORMULAS_H_ #define ASSERTED_FORMULAS_H_ -#include"smt_params.h" -#include"simplifier.h" -#include"basic_simplifier_plugin.h" -#include"static_features.h" -#include"macro_manager.h" -#include"macro_finder.h" -#include"defined_names.h" -#include"maximise_ac_sharing.h" -#include"bit2int.h" -#include"statistics.h" -#include"pattern_inference.h" +#include "smt/params/smt_params.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/static_features.h" +#include "ast/macros/macro_manager.h" +#include "ast/macros/macro_finder.h" +#include "ast/normal_forms/defined_names.h" +#include "ast/simplifier/maximise_ac_sharing.h" +#include "ast/simplifier/bit2int.h" +#include "util/statistics.h" +#include "ast/pattern/pattern_inference.h" class arith_simplifier_plugin; class bv_simplifier_plugin; diff --git a/src/smt/cached_var_subst.cpp b/src/smt/cached_var_subst.cpp index c36eb6dd2..7c0997bc5 100644 --- a/src/smt/cached_var_subst.cpp +++ b/src/smt/cached_var_subst.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"cached_var_subst.h" +#include "smt/cached_var_subst.h" bool cached_var_subst::key_eq_proc::operator()(cached_var_subst::key * k1, cached_var_subst::key * k2) const { if (k1->m_qa != k2->m_qa) diff --git a/src/smt/cached_var_subst.h b/src/smt/cached_var_subst.h index f9a08a810..6f39841b6 100644 --- a/src/smt/cached_var_subst.h +++ b/src/smt/cached_var_subst.h @@ -19,9 +19,9 @@ Revision History: #ifndef CACHED_VAR_SUBST_H_ #define CACHED_VAR_SUBST_H_ -#include"var_subst.h" -#include"map.h" -#include"smt_enode.h" +#include "ast/rewriter/var_subst.h" +#include "util/map.h" +#include "smt/smt_enode.h" class cached_var_subst { struct key { diff --git a/src/smt/cost_evaluator.cpp b/src/smt/cost_evaluator.cpp index fe30f9261..94151f2b3 100644 --- a/src/smt/cost_evaluator.cpp +++ b/src/smt/cost_evaluator.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"cost_evaluator.h" -#include"warning.h" +#include "smt/cost_evaluator.h" +#include "util/warning.h" cost_evaluator::cost_evaluator(ast_manager & m): m_manager(m), diff --git a/src/smt/cost_evaluator.h b/src/smt/cost_evaluator.h index e6f7fa6e0..73b307fbe 100644 --- a/src/smt/cost_evaluator.h +++ b/src/smt/cost_evaluator.h @@ -19,8 +19,8 @@ Revision History: #ifndef COST_EVALUATOR_H_ #define COST_EVALUATOR_H_ -#include"ast.h" -#include"arith_decl_plugin.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" class cost_evaluator { ast_manager & m_manager; diff --git a/src/smt/diff_logic.h b/src/smt/diff_logic.h index f55945ce4..67d1f045d 100644 --- a/src/smt/diff_logic.h +++ b/src/smt/diff_logic.h @@ -19,12 +19,12 @@ Revision History: #ifndef DIFF_LOGIC_H_ #define DIFF_LOGIC_H_ -#include"vector.h" -#include"heap.h" -#include"statistics.h" -#include"trace.h" -#include"warning.h" -#include"uint_set.h" +#include "util/vector.h" +#include "util/heap.h" +#include "util/statistics.h" +#include "util/trace.h" +#include "util/warning.h" +#include "util/uint_set.h" #include typedef int dl_var; diff --git a/src/smt/dyn_ack.cpp b/src/smt/dyn_ack.cpp index 533d143c3..baa8129bb 100644 --- a/src/smt/dyn_ack.cpp +++ b/src/smt/dyn_ack.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"dyn_ack.h" -#include"ast_pp.h" +#include "smt/smt_context.h" +#include "smt/dyn_ack.h" +#include "ast/ast_pp.h" namespace smt { diff --git a/src/smt/dyn_ack.h b/src/smt/dyn_ack.h index 0c390f0ba..9986dd498 100644 --- a/src/smt/dyn_ack.h +++ b/src/smt/dyn_ack.h @@ -19,12 +19,12 @@ Revision History: #ifndef DYN_ACK_H_ #define DYN_ACK_H_ -#include"ast.h" -#include"dyn_ack_params.h" -#include"obj_hashtable.h" -#include"obj_pair_hashtable.h" -#include"obj_triple_hashtable.h" -#include"smt_clause.h" +#include "ast/ast.h" +#include "smt/params/dyn_ack_params.h" +#include "util/obj_hashtable.h" +#include "util/obj_pair_hashtable.h" +#include "util/obj_triple_hashtable.h" +#include "smt/smt_clause.h" namespace smt { diff --git a/src/smt/elim_term_ite.cpp b/src/smt/elim_term_ite.cpp index 74b804c21..b750e6bf5 100644 --- a/src/smt/elim_term_ite.cpp +++ b/src/smt/elim_term_ite.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"elim_term_ite.h" -#include"ast_smt2_pp.h" +#include "smt/elim_term_ite.h" +#include "ast/ast_smt2_pp.h" void elim_term_ite::operator()(expr * n, expr_ref_vector & new_defs, diff --git a/src/smt/elim_term_ite.h b/src/smt/elim_term_ite.h index fc682b39a..2b9c66a64 100644 --- a/src/smt/elim_term_ite.h +++ b/src/smt/elim_term_ite.h @@ -19,8 +19,8 @@ Revision History: #ifndef ELIM_TERM_ITE_H_ #define ELIM_TERM_ITE_H_ -#include"simplifier.h" -#include"defined_names.h" +#include "ast/simplifier/simplifier.h" +#include "ast/normal_forms/defined_names.h" class elim_term_ite : public simplifier { defined_names & m_defined_names; diff --git a/src/smt/expr_context_simplifier.cpp b/src/smt/expr_context_simplifier.cpp index 66252c3cf..c420543e1 100644 --- a/src/smt/expr_context_simplifier.cpp +++ b/src/smt/expr_context_simplifier.cpp @@ -17,11 +17,11 @@ Revision History: --*/ -#include "expr_context_simplifier.h" -#include "ast_pp.h" -#include "obj_hashtable.h" -#include "smt_kernel.h" -#include "for_each_expr.h" +#include "smt/expr_context_simplifier.h" +#include "ast/ast_pp.h" +#include "util/obj_hashtable.h" +#include "smt/smt_kernel.h" +#include "ast/for_each_expr.h" // table lookup before/after simplification. diff --git a/src/smt/expr_context_simplifier.h b/src/smt/expr_context_simplifier.h index 7745bffff..ed15044e7 100644 --- a/src/smt/expr_context_simplifier.h +++ b/src/smt/expr_context_simplifier.h @@ -19,12 +19,12 @@ Revision History: #ifndef EXPR_CONTEXT_SIMPLIFIER_H_ #define EXPR_CONTEXT_SIMPLIFIER_H_ -#include "ast.h" -#include "obj_hashtable.h" -#include "basic_simplifier_plugin.h" -#include "smt_params.h" -#include "smt_kernel.h" -#include "arith_decl_plugin.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "smt/params/smt_params.h" +#include "smt/smt_kernel.h" +#include "ast/arith_decl_plugin.h" class expr_context_simplifier { typedef obj_map context_map; diff --git a/src/smt/fingerprints.cpp b/src/smt/fingerprints.cpp index 6cb0bfd2a..435350396 100644 --- a/src/smt/fingerprints.cpp +++ b/src/smt/fingerprints.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"fingerprints.h" +#include "smt/fingerprints.h" namespace smt { diff --git a/src/smt/fingerprints.h b/src/smt/fingerprints.h index 80905f8be..fc3259ca7 100644 --- a/src/smt/fingerprints.h +++ b/src/smt/fingerprints.h @@ -19,7 +19,7 @@ Revision History: #ifndef FINGERPRINTS_H_ #define FINGERPRINTS_H_ -#include"smt_enode.h" +#include "smt/smt_enode.h" namespace smt { diff --git a/src/smt/mam.cpp b/src/smt/mam.cpp index ba9f970a2..f59a57bf3 100644 --- a/src/smt/mam.cpp +++ b/src/smt/mam.cpp @@ -16,14 +16,14 @@ Author: Revision History: --*/ -#include"mam.h" -#include"smt_context.h" -#include"pool.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"trail.h" -#include"stopwatch.h" -#include"ast_smt2_pp.h" +#include "smt/mam.h" +#include "smt/smt_context.h" +#include "util/pool.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "util/trail.h" +#include "util/stopwatch.h" +#include "ast/ast_smt2_pp.h" #include // #define _PROFILE_MAM diff --git a/src/smt/mam.h b/src/smt/mam.h index dd56d7984..635cb30e7 100644 --- a/src/smt/mam.h +++ b/src/smt/mam.h @@ -19,8 +19,8 @@ Revision History: #ifndef MAM_H_ #define MAM_H_ -#include"ast.h" -#include"smt_types.h" +#include "ast/ast.h" +#include "smt/smt_types.h" namespace smt { /** diff --git a/src/smt/old_interval.cpp b/src/smt/old_interval.cpp index da03bc03e..d126c2f32 100644 --- a/src/smt/old_interval.cpp +++ b/src/smt/old_interval.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"old_interval.h" +#include "smt/old_interval.h" void ext_numeral::neg() { switch (m_kind) { diff --git a/src/smt/old_interval.h b/src/smt/old_interval.h index b2f1d8fbd..e9cb73b8f 100644 --- a/src/smt/old_interval.h +++ b/src/smt/old_interval.h @@ -19,8 +19,8 @@ Revision History: #ifndef OLD_INTERVAL_H_ #define OLD_INTERVAL_H_ -#include"rational.h" -#include"dependency.h" +#include "util/rational.h" +#include "util/dependency.h" class ext_numeral { public: diff --git a/src/smt/params/dyn_ack_params.cpp b/src/smt/params/dyn_ack_params.cpp index b62530fbf..1a51b45bd 100644 --- a/src/smt/params/dyn_ack_params.cpp +++ b/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) { diff --git a/src/smt/params/dyn_ack_params.h b/src/smt/params/dyn_ack_params.h index 017b7fe94..223242788 100644 --- a/src/smt/params/dyn_ack_params.h +++ b/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, diff --git a/src/smt/params/preprocessor_params.cpp b/src/smt/params/preprocessor_params.cpp index 7a0e96248..599400c0c 100644 --- a/src/smt/params/preprocessor_params.cpp +++ b/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) { diff --git a/src/smt/params/preprocessor_params.h b/src/smt/params/preprocessor_params.h index 4ffad48a2..c343c55fa 100644 --- a/src/smt/params/preprocessor_params.h +++ b/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, diff --git a/src/smt/params/qi_params.cpp b/src/smt/params/qi_params.cpp index 8182222e4..34a58c14e 100644 --- a/src/smt/params/qi_params.cpp +++ b/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) { diff --git a/src/smt/params/qi_params.h b/src/smt/params/qi_params.h index c9736909a..2cee6dc72 100644 --- a/src/smt/params/qi_params.h +++ b/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 diff --git a/src/smt/params/smt_params.cpp b/src/smt/params/smt_params.cpp index 92ff1de90..453fb3e8e 100644 --- a/src/smt/params/smt_params.cpp +++ b/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); diff --git a/src/smt/params/smt_params.h b/src/smt/params/smt_params.h index 4b7c924e4..5f93276a1 100644 --- a/src/smt/params/smt_params.h +++ b/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, diff --git a/src/smt/params/theory_arith_params.cpp b/src/smt/params/theory_arith_params.cpp index 944911f9b..e6ecd50b8 100644 --- a/src/smt/params/theory_arith_params.cpp +++ b/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) { diff --git a/src/smt/params/theory_arith_params.h b/src/smt/params/theory_arith_params.h index 943bd711e..d73a67985 100644 --- a/src/smt/params/theory_arith_params.h +++ b/src/smt/params/theory_arith_params.h @@ -20,7 +20,7 @@ Revision History: #define THEORY_ARITH_PARAMS_H_ #include -#include"params.h" +#include "util/params.h" enum arith_solver_id { AS_NO_ARITH, diff --git a/src/smt/params/theory_array_params.cpp b/src/smt/params/theory_array_params.cpp index c0015bf2c..a73411c7f 100644 --- a/src/smt/params/theory_array_params.cpp +++ b/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) { diff --git a/src/smt/params/theory_array_params.h b/src/smt/params/theory_array_params.h index af51427c4..af3fdebeb 100644 --- a/src/smt/params/theory_array_params.h +++ b/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, diff --git a/src/smt/params/theory_bv_params.cpp b/src/smt/params/theory_bv_params.cpp index 631c5765b..48ad07047 100644 --- a/src/smt/params/theory_bv_params.cpp +++ b/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) { diff --git a/src/smt/params/theory_bv_params.h b/src/smt/params/theory_bv_params.h index 5830e5176..52aaa4c9c 100644 --- a/src/smt/params/theory_bv_params.h +++ b/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, diff --git a/src/smt/params/theory_pb_params.cpp b/src/smt/params/theory_pb_params.cpp index a1e13a6e7..be1cc681b 100644 --- a/src/smt/params/theory_pb_params.cpp +++ b/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) { diff --git a/src/smt/params/theory_pb_params.h b/src/smt/params/theory_pb_params.h index 6a129e601..9bfd262c4 100644 --- a/src/smt/params/theory_pb_params.h +++ b/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 { diff --git a/src/smt/params/theory_str_params.cpp b/src/smt/params/theory_str_params.cpp index 6090086b8..62dc881d8 100644 --- a/src/smt/params/theory_str_params.cpp +++ b/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) { diff --git a/src/smt/params/theory_str_params.h b/src/smt/params/theory_str_params.h index 207b635d7..c841609db 100644 --- a/src/smt/params/theory_str_params.h +++ b/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 { /* diff --git a/src/smt/proto_model/array_factory.cpp b/src/smt/proto_model/array_factory.cpp index a929f6d9a..d112331f0 100644 --- a/src/smt/proto_model/array_factory.cpp +++ b/src/smt/proto_model/array_factory.cpp @@ -17,11 +17,11 @@ Revision History: --*/ -#include"array_factory.h" -#include"array_decl_plugin.h" -#include"proto_model.h" -#include"func_interp.h" -#include"ast_pp.h" +#include "smt/proto_model/array_factory.h" +#include "ast/array_decl_plugin.h" +#include "smt/proto_model/proto_model.h" +#include "model/func_interp.h" +#include "ast/ast_pp.h" func_decl * mk_aux_decl_for_array_sort(ast_manager & m, sort * s) { ptr_buffer domain; diff --git a/src/smt/proto_model/array_factory.h b/src/smt/proto_model/array_factory.h index 6801ae081..4d4f52944 100644 --- a/src/smt/proto_model/array_factory.h +++ b/src/smt/proto_model/array_factory.h @@ -19,7 +19,7 @@ Revision History: #ifndef ARRAY_FACTORY_H_ #define ARRAY_FACTORY_H_ -#include"struct_factory.h" +#include "smt/proto_model/struct_factory.h" class func_interp; diff --git a/src/smt/proto_model/datatype_factory.cpp b/src/smt/proto_model/datatype_factory.cpp index 3b0ec8e5f..f5079b0e5 100644 --- a/src/smt/proto_model/datatype_factory.cpp +++ b/src/smt/proto_model/datatype_factory.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"datatype_factory.h" -#include"proto_model.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"expr_functors.h" +#include "smt/proto_model/datatype_factory.h" +#include "smt/proto_model/proto_model.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/expr_functors.h" datatype_factory::datatype_factory(ast_manager & m, proto_model & md): struct_factory(m, m.mk_family_id("datatype"), md), diff --git a/src/smt/proto_model/datatype_factory.h b/src/smt/proto_model/datatype_factory.h index 3dddb843d..9f64b8daa 100644 --- a/src/smt/proto_model/datatype_factory.h +++ b/src/smt/proto_model/datatype_factory.h @@ -19,8 +19,8 @@ Revision History: #ifndef DATATYPE_FACTORY_H_ #define DATATYPE_FACTORY_H_ -#include"struct_factory.h" -#include"datatype_decl_plugin.h" +#include "smt/proto_model/struct_factory.h" +#include "ast/datatype_decl_plugin.h" class datatype_factory : public struct_factory { datatype_util m_util; diff --git a/src/smt/proto_model/numeral_factory.cpp b/src/smt/proto_model/numeral_factory.cpp index 49ff15167..a5d5ac18a 100644 --- a/src/smt/proto_model/numeral_factory.cpp +++ b/src/smt/proto_model/numeral_factory.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"numeral_factory.h" -#include"ast_pp.h" +#include "smt/proto_model/numeral_factory.h" +#include "ast/ast_pp.h" app * arith_factory::mk_value_core(rational const & val, sort * s) { return m_util.mk_numeral(val, s); diff --git a/src/smt/proto_model/numeral_factory.h b/src/smt/proto_model/numeral_factory.h index 9b1ff6a81..f1b68223b 100644 --- a/src/smt/proto_model/numeral_factory.h +++ b/src/smt/proto_model/numeral_factory.h @@ -19,9 +19,9 @@ Revision History: #ifndef NUMERAL_FACTORY_H_ #define NUMERAL_FACTORY_H_ -#include"value_factory.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" +#include "smt/proto_model/value_factory.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" class numeral_factory : public simple_factory { public: diff --git a/src/smt/proto_model/proto_model.cpp b/src/smt/proto_model/proto_model.cpp index 129bed87e..c69fa6edc 100644 --- a/src/smt/proto_model/proto_model.cpp +++ b/src/smt/proto_model/proto_model.cpp @@ -16,15 +16,15 @@ Author: Revision History: --*/ -#include"proto_model.h" +#include "smt/proto_model/proto_model.h" #include"model_params.hpp" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"var_subst.h" -#include"array_decl_plugin.h" -#include"well_sorted.h" -#include"used_symbols.h" -#include"model_v2_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/rewriter/var_subst.h" +#include "ast/array_decl_plugin.h" +#include "ast/well_sorted.h" +#include "ast/used_symbols.h" +#include "model/model_v2_pp.h" proto_model::proto_model(ast_manager & m, params_ref const & p): model_core(m), @@ -441,8 +441,8 @@ model * proto_model::mk_model() { #if 0 -#include"simplifier.h" -#include"basic_simplifier_plugin.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" // Auxiliary function for computing fi(args[0], ..., args[fi.get_arity() - 1]). // The result is stored in result. diff --git a/src/smt/proto_model/proto_model.h b/src/smt/proto_model/proto_model.h index 78dc457f5..1cee04650 100644 --- a/src/smt/proto_model/proto_model.h +++ b/src/smt/proto_model/proto_model.h @@ -28,15 +28,15 @@ Revision History: #ifndef PROTO_MODEL_H_ #define PROTO_MODEL_H_ -#include"model_core.h" -#include"model_evaluator.h" -#include"value_factory.h" -#include"plugin_manager.h" -#include"arith_decl_plugin.h" -#include"func_decl_dependencies.h" -#include"model.h" -#include"params.h" -#include"th_rewriter.h" +#include "model/model_core.h" +#include "model/model_evaluator.h" +#include "smt/proto_model/value_factory.h" +#include "util/plugin_manager.h" +#include "ast/arith_decl_plugin.h" +#include "ast/func_decl_dependencies.h" +#include "model/model.h" +#include "util/params.h" +#include "ast/rewriter/th_rewriter.h" class proto_model : public model_core { plugin_manager m_factories; diff --git a/src/smt/proto_model/struct_factory.cpp b/src/smt/proto_model/struct_factory.cpp index 173554b83..8d85c6485 100644 --- a/src/smt/proto_model/struct_factory.cpp +++ b/src/smt/proto_model/struct_factory.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"struct_factory.h" -#include"proto_model.h" +#include "smt/proto_model/struct_factory.h" +#include "smt/proto_model/proto_model.h" struct_factory::value_set * struct_factory::get_value_set(sort * s) { value_set * set = 0; diff --git a/src/smt/proto_model/struct_factory.h b/src/smt/proto_model/struct_factory.h index f18121af8..bfbd90ede 100644 --- a/src/smt/proto_model/struct_factory.h +++ b/src/smt/proto_model/struct_factory.h @@ -19,8 +19,8 @@ Revision History: #ifndef STRUCT_FACTORY_H_ #define STRUCT_FACTORY_H_ -#include"value_factory.h" -#include"obj_hashtable.h" +#include "smt/proto_model/value_factory.h" +#include "util/obj_hashtable.h" class proto_model; diff --git a/src/smt/proto_model/value_factory.cpp b/src/smt/proto_model/value_factory.cpp index 93294d898..e41696165 100644 --- a/src/smt/proto_model/value_factory.cpp +++ b/src/smt/proto_model/value_factory.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"value_factory.h" +#include "smt/proto_model/value_factory.h" value_factory::value_factory(ast_manager & m, family_id fid): m_manager(m), diff --git a/src/smt/proto_model/value_factory.h b/src/smt/proto_model/value_factory.h index f841e18ea..e81c63306 100644 --- a/src/smt/proto_model/value_factory.h +++ b/src/smt/proto_model/value_factory.h @@ -19,8 +19,8 @@ Revision History: #ifndef VALUE_FACTORY_H_ #define VALUE_FACTORY_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" /** \brief Auxiliary object used during model construction. diff --git a/src/smt/qi_queue.cpp b/src/smt/qi_queue.cpp index 70a3041d2..36a2ce834 100644 --- a/src/smt/qi_queue.cpp +++ b/src/smt/qi_queue.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"qi_queue.h" -#include"warning.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"var_subst.h" -#include"stats.h" +#include "smt/smt_context.h" +#include "smt/qi_queue.h" +#include "util/warning.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/rewriter/var_subst.h" +#include "util/stats.h" namespace smt { diff --git a/src/smt/qi_queue.h b/src/smt/qi_queue.h index 0db12d537..171466e42 100644 --- a/src/smt/qi_queue.h +++ b/src/smt/qi_queue.h @@ -19,16 +19,16 @@ Revision History: #ifndef QI_QUEUE_H_ #define QI_QUEUE_H_ -#include"ast.h" -#include"smt_quantifier_stat.h" -#include"smt_checker.h" -#include"smt_quantifier.h" -#include"qi_params.h" -#include"fingerprints.h" -#include"cost_parser.h" -#include"cost_evaluator.h" -#include"cached_var_subst.h" -#include"statistics.h" +#include "ast/ast.h" +#include "smt/smt_quantifier_stat.h" +#include "smt/smt_checker.h" +#include "smt/smt_quantifier.h" +#include "smt/params/qi_params.h" +#include "smt/fingerprints.h" +#include "parsers/util/cost_parser.h" +#include "smt/cost_evaluator.h" +#include "smt/cached_var_subst.h" +#include "util/statistics.h" namespace smt { class context; diff --git a/src/smt/smt2_extra_cmds.cpp b/src/smt/smt2_extra_cmds.cpp index 61b247207..136805e43 100644 --- a/src/smt/smt2_extra_cmds.cpp +++ b/src/smt/smt2_extra_cmds.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"smt2parser.h" -#include"smt2_extra_cmds.h" +#include "cmd_context/cmd_context.h" +#include "parsers/smt2/smt2parser.h" +#include "smt/smt2_extra_cmds.h" class include_cmd : public cmd { char const * m_filename; diff --git a/src/smt/smt_almost_cg_table.cpp b/src/smt/smt_almost_cg_table.cpp index 66eb8c533..4d24ea0d0 100644 --- a/src/smt/smt_almost_cg_table.cpp +++ b/src/smt/smt_almost_cg_table.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"smt_almost_cg_table.h" +#include "smt/smt_almost_cg_table.h" namespace smt { diff --git a/src/smt/smt_almost_cg_table.h b/src/smt/smt_almost_cg_table.h index aee36c2a0..7807f705a 100644 --- a/src/smt/smt_almost_cg_table.h +++ b/src/smt/smt_almost_cg_table.h @@ -19,8 +19,8 @@ Revision History: #ifndef SMT_ALMOST_CG_TABLE_H_ #define SMT_ALMOST_CG_TABLE_H_ -#include"smt_enode.h" -#include"map.h" +#include "smt/smt_enode.h" +#include "util/map.h" namespace smt { diff --git a/src/smt/smt_b_justification.h b/src/smt/smt_b_justification.h index 7e77d301b..700c41807 100644 --- a/src/smt/smt_b_justification.h +++ b/src/smt/smt_b_justification.h @@ -19,8 +19,8 @@ Revision History: #ifndef SMT_B_JUSTIFICATION_H_ #define SMT_B_JUSTIFICATION_H_ -#include"smt_literal.h" -#include"smt_clause.h" +#include "smt/smt_literal.h" +#include "smt/smt_clause.h" namespace smt { diff --git a/src/smt/smt_bool_var_data.h b/src/smt/smt_bool_var_data.h index af0b7f9d2..4f83ece49 100644 --- a/src/smt/smt_bool_var_data.h +++ b/src/smt/smt_bool_var_data.h @@ -19,7 +19,7 @@ Revision History: #ifndef SMT_BOOL_VAR_DATA_H_ #define SMT_BOOL_VAR_DATA_H_ -#include"smt_b_justification.h" +#include "smt/smt_b_justification.h" namespace smt { diff --git a/src/smt/smt_case_split_queue.cpp b/src/smt/smt_case_split_queue.cpp index c461b130b..6aef5f0a9 100644 --- a/src/smt/smt_case_split_queue.cpp +++ b/src/smt/smt_case_split_queue.cpp @@ -16,14 +16,14 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_case_split_queue.h" -#include"warning.h" -#include"stopwatch.h" -#include"for_each_expr.h" -#include"ast_pp.h" -#include"map.h" -#include"hashtable.h" +#include "smt/smt_context.h" +#include "smt/smt_case_split_queue.h" +#include "util/warning.h" +#include "util/stopwatch.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" +#include "util/map.h" +#include "util/hashtable.h" namespace smt { diff --git a/src/smt/smt_case_split_queue.h b/src/smt/smt_case_split_queue.h index 9a3a93cc6..cfa33bfe2 100644 --- a/src/smt/smt_case_split_queue.h +++ b/src/smt/smt_case_split_queue.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_CASE_SPLIT_QUEUE_H_ #define SMT_CASE_SPLIT_QUEUE_H_ -#include"smt_types.h" -#include"heap.h" -#include"smt_params.h" +#include "smt/smt_types.h" +#include "util/heap.h" +#include "smt/params/smt_params.h" namespace smt { class context; diff --git a/src/smt/smt_cg_table.cpp b/src/smt/smt_cg_table.cpp index 83d137ff0..ad15fd819 100644 --- a/src/smt/smt_cg_table.cpp +++ b/src/smt/smt_cg_table.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_cg_table.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "smt/smt_cg_table.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_cg_table.h b/src/smt/smt_cg_table.h index c4674034a..1e3fd8b83 100644 --- a/src/smt/smt_cg_table.h +++ b/src/smt/smt_cg_table.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_CG_TABLE_H_ #define SMT_CG_TABLE_H_ -#include"smt_enode.h" -#include"hashtable.h" -#include"chashtable.h" +#include "smt/smt_enode.h" +#include "util/hashtable.h" +#include "util/chashtable.h" namespace smt { diff --git a/src/smt/smt_checker.cpp b/src/smt/smt_checker.cpp index 176769d77..a7a25037c 100644 --- a/src/smt/smt_checker.cpp +++ b/src/smt/smt_checker.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_checker.h" -#include"ast_ll_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_checker.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_checker.h b/src/smt/smt_checker.h index f6df63c59..5e841f572 100644 --- a/src/smt/smt_checker.h +++ b/src/smt/smt_checker.h @@ -19,8 +19,8 @@ Revision History: #ifndef SMT_CHECKER_H_ #define SMT_CHECKER_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" namespace smt { diff --git a/src/smt/smt_clause.cpp b/src/smt/smt_clause.cpp index d0f6bdeaa..ccb336941 100644 --- a/src/smt/smt_clause.cpp +++ b/src/smt/smt_clause.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_clause.h" -#include"smt_justification.h" -#include"ast_ll_pp.h" +#include "smt/smt_clause.h" +#include "smt/smt_justification.h" +#include "ast/ast_ll_pp.h" namespace smt { /** diff --git a/src/smt/smt_clause.h b/src/smt/smt_clause.h index 17d13a1dc..d4b9ee02f 100644 --- a/src/smt/smt_clause.h +++ b/src/smt/smt_clause.h @@ -19,11 +19,11 @@ Revision History: #ifndef SMT_CLAUSE_H_ #define SMT_CLAUSE_H_ -#include"ast.h" -#include"smt_literal.h" -#include"tptr.h" -#include"obj_hashtable.h" -#include"smt_justification.h" +#include "ast/ast.h" +#include "smt/smt_literal.h" +#include "util/tptr.h" +#include "util/obj_hashtable.h" +#include "smt/smt_justification.h" namespace smt { diff --git a/src/smt/smt_conflict_resolution.cpp b/src/smt/smt_conflict_resolution.cpp index ade667e34..79a1f0416 100644 --- a/src/smt/smt_conflict_resolution.cpp +++ b/src/smt/smt_conflict_resolution.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_conflict_resolution.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_conflict_resolution.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_conflict_resolution.h b/src/smt/smt_conflict_resolution.h index fad3ab50d..b5b857184 100644 --- a/src/smt/smt_conflict_resolution.h +++ b/src/smt/smt_conflict_resolution.h @@ -19,17 +19,17 @@ Revision History: #ifndef SMT_CONFLICT_RESOLUTION_H_ #define SMT_CONFLICT_RESOLUTION_H_ -#include"smt_literal.h" -#include"smt_bool_var_data.h" -#include"smt_justification.h" -#include"smt_enode.h" -#include"dyn_ack.h" -#include"obj_pair_hashtable.h" -#include"smt_params.h" -#include"obj_pair_hashtable.h" -#include"map.h" -#include"watch_list.h" -#include"obj_pair_set.h" +#include "smt/smt_literal.h" +#include "smt/smt_bool_var_data.h" +#include "smt/smt_justification.h" +#include "smt/smt_enode.h" +#include "smt/dyn_ack.h" +#include "util/obj_pair_hashtable.h" +#include "smt/params/smt_params.h" +#include "util/obj_pair_hashtable.h" +#include "util/map.h" +#include "smt/watch_list.h" +#include "util/obj_pair_set.h" typedef approx_set_tpl level_approx_set; diff --git a/src/smt/smt_consequences.cpp b/src/smt/smt_consequences.cpp index 20813602e..65af3c0bd 100644 --- a/src/smt/smt_consequences.cpp +++ b/src/smt/smt_consequences.cpp @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include "smt_context.h" -#include "ast_util.h" -#include "datatype_decl_plugin.h" -#include "model_pp.h" -#include "max_cliques.h" -#include "stopwatch.h" +#include "smt/smt_context.h" +#include "ast/ast_util.h" +#include "ast/datatype_decl_plugin.h" +#include "model/model_pp.h" +#include "util/max_cliques.h" +#include "util/stopwatch.h" namespace smt { diff --git a/src/smt/smt_context.cpp b/src/smt/smt_context.cpp index 1b428520e..ff64be64b 100644 --- a/src/smt/smt_context.cpp +++ b/src/smt/smt_context.cpp @@ -17,26 +17,26 @@ Revision History: --*/ #include -#include"smt_context.h" -#include"luby.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"warning.h" -#include"smt_quick_checker.h" -#include"proof_checker.h" -#include"ast_util.h" -#include"uses_theory.h" -#include"model.h" -#include"smt_for_each_relevant_expr.h" -#include"timeit.h" -#include"well_sorted.h" -#include"union_find.h" -#include"smt_model_generator.h" -#include"smt_model_checker.h" -#include"smt_model_finder.h" -#include"model_pp.h" -#include"ast_smt2_pp.h" -#include"ast_translation.h" +#include "smt/smt_context.h" +#include "util/luby.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "util/warning.h" +#include "smt/smt_quick_checker.h" +#include "ast/proof_checker/proof_checker.h" +#include "ast/ast_util.h" +#include "smt/uses_theory.h" +#include "model/model.h" +#include "smt/smt_for_each_relevant_expr.h" +#include "util/timeit.h" +#include "ast/well_sorted.h" +#include "util/union_find.h" +#include "smt/smt_model_generator.h" +#include "smt/smt_model_checker.h" +#include "smt/smt_model_finder.h" +#include "model/model_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_translation.h" namespace smt { diff --git a/src/smt/smt_context.h b/src/smt/smt_context.h index 6b3129d91..84bf9f62a 100644 --- a/src/smt/smt_context.h +++ b/src/smt/smt_context.h @@ -19,36 +19,36 @@ Revision History: #ifndef SMT_CONTEXT_H_ #define SMT_CONTEXT_H_ -#include"smt_clause.h" -#include"smt_setup.h" -#include"smt_enode.h" -#include"smt_cg_table.h" -#include"smt_b_justification.h" -#include"smt_eq_justification.h" -#include"smt_justification.h" -#include"smt_bool_var_data.h" -#include"smt_theory.h" -#include"smt_quantifier.h" -#include"smt_quantifier_stat.h" -#include"smt_statistics.h" -#include"smt_conflict_resolution.h" -#include"smt_relevancy.h" -#include"smt_case_split_queue.h" -#include"smt_almost_cg_table.h" -#include"smt_failure.h" -#include"asserted_formulas.h" -#include"smt_types.h" -#include"dyn_ack.h" -#include"ast_smt_pp.h" -#include"watch_list.h" -#include"trail.h" -#include"fingerprints.h" -#include"ref.h" -#include"proto_model.h" -#include"model.h" -#include"timer.h" -#include"statistics.h" -#include"progress_callback.h" +#include "smt/smt_clause.h" +#include "smt/smt_setup.h" +#include "smt/smt_enode.h" +#include "smt/smt_cg_table.h" +#include "smt/smt_b_justification.h" +#include "smt/smt_eq_justification.h" +#include "smt/smt_justification.h" +#include "smt/smt_bool_var_data.h" +#include "smt/smt_theory.h" +#include "smt/smt_quantifier.h" +#include "smt/smt_quantifier_stat.h" +#include "smt/smt_statistics.h" +#include "smt/smt_conflict_resolution.h" +#include "smt/smt_relevancy.h" +#include "smt/smt_case_split_queue.h" +#include "smt/smt_almost_cg_table.h" +#include "smt/smt_failure.h" +#include "smt/asserted_formulas.h" +#include "smt/smt_types.h" +#include "smt/dyn_ack.h" +#include "ast/ast_smt_pp.h" +#include "smt/watch_list.h" +#include "util/trail.h" +#include "smt/fingerprints.h" +#include "util/ref.h" +#include "smt/proto_model/proto_model.h" +#include "model/model.h" +#include "util/timer.h" +#include "util/statistics.h" +#include "solver/progress_callback.h" // there is a significant space overhead with allocating 1000+ contexts in // the case that each context only references a few expressions. diff --git a/src/smt/smt_context_inv.cpp b/src/smt/smt_context_inv.cpp index e6551b8da..cf09c996a 100644 --- a/src/smt/smt_context_inv.cpp +++ b/src/smt/smt_context_inv.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/smt_context_pp.cpp b/src/smt/smt_context_pp.cpp index 73d822fb4..6d66368ff 100644 --- a/src/smt/smt_context_pp.cpp +++ b/src/smt/smt_context_pp.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"ast_smt_pp.h" -#include"stats.h" +#include "smt/smt_context.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt_pp.h" +#include "util/stats.h" namespace smt { diff --git a/src/smt/smt_context_stat.cpp b/src/smt/smt_context_stat.cpp index 3838a88b5..968d84b73 100644 --- a/src/smt/smt_context_stat.cpp +++ b/src/smt/smt_context_stat.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"ast_pp.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" namespace smt { diff --git a/src/smt/smt_enode.cpp b/src/smt/smt_enode.cpp index 679c46720..1452dc610 100644 --- a/src/smt/smt_enode.cpp +++ b/src/smt/smt_enode.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_enode.h" +#include "smt/smt_context.h" +#include "smt/smt_enode.h" namespace smt { diff --git a/src/smt/smt_enode.h b/src/smt/smt_enode.h index 69a882c99..4b3a64d90 100644 --- a/src/smt/smt_enode.h +++ b/src/smt/smt_enode.h @@ -19,11 +19,11 @@ Revision History: #ifndef SMT_ENODE_H_ #define SMT_ENODE_H_ -#include"ast.h" -#include"smt_types.h" -#include"smt_eq_justification.h" -#include"smt_theory_var_list.h" -#include"approx_set.h" +#include "ast/ast.h" +#include "smt/smt_types.h" +#include "smt/smt_eq_justification.h" +#include "smt/smt_theory_var_list.h" +#include "util/approx_set.h" namespace smt { /** diff --git a/src/smt/smt_eq_justification.h b/src/smt/smt_eq_justification.h index b12eda192..af538a130 100644 --- a/src/smt/smt_eq_justification.h +++ b/src/smt/smt_eq_justification.h @@ -19,8 +19,8 @@ Revision History: #ifndef SMT_EQ_JUSTIFICATION_H_ #define SMT_EQ_JUSTIFICATION_H_ -#include"smt_literal.h" -#include"tptr.h" +#include "smt/smt_literal.h" +#include "util/tptr.h" namespace smt { diff --git a/src/smt/smt_farkas_util.cpp b/src/smt/smt_farkas_util.cpp index c5ff42e3e..ff415ad0c 100644 --- a/src/smt/smt_farkas_util.cpp +++ b/src/smt/smt_farkas_util.cpp @@ -19,10 +19,10 @@ Revision History: --*/ -#include "smt_farkas_util.h" -#include "ast_pp.h" -#include "th_rewriter.h" -#include "bool_rewriter.h" +#include "smt/smt_farkas_util.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/rewriter/bool_rewriter.h" namespace smt { diff --git a/src/smt/smt_farkas_util.h b/src/smt/smt_farkas_util.h index 575df45ee..1fc6a3681 100644 --- a/src/smt/smt_farkas_util.h +++ b/src/smt/smt_farkas_util.h @@ -22,7 +22,7 @@ Revision History: #ifndef FARKAS_UTIL_H_ #define FARKAS_UTIL_H_ -#include "arith_decl_plugin.h" +#include "ast/arith_decl_plugin.h" namespace smt { diff --git a/src/smt/smt_for_each_relevant_expr.cpp b/src/smt/smt_for_each_relevant_expr.cpp index 84f93dd33..30b69a149 100644 --- a/src/smt/smt_for_each_relevant_expr.cpp +++ b/src/smt/smt_for_each_relevant_expr.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_for_each_relevant_expr.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_for_each_relevant_expr.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_for_each_relevant_expr.h b/src/smt/smt_for_each_relevant_expr.h index abbc1894d..b81023349 100644 --- a/src/smt/smt_for_each_relevant_expr.h +++ b/src/smt/smt_for_each_relevant_expr.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_FOR_EACH_RELEVANT_EXPR_H_ #define SMT_FOR_EACH_RELEVANT_EXPR_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"vector.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "util/vector.h" namespace smt { diff --git a/src/smt/smt_implied_equalities.cpp b/src/smt/smt_implied_equalities.cpp index 888827754..7d54e714e 100644 --- a/src/smt/smt_implied_equalities.cpp +++ b/src/smt/smt_implied_equalities.cpp @@ -19,16 +19,16 @@ Revision History: --*/ -#include "smt_implied_equalities.h" -#include "union_find.h" -#include "ast_pp.h" -#include "array_decl_plugin.h" -#include "uint_set.h" -#include "smt_value_sort.h" -#include "model_smt2_pp.h" -#include "stopwatch.h" -#include "model.h" -#include "solver.h" +#include "smt/smt_implied_equalities.h" +#include "util/union_find.h" +#include "ast/ast_pp.h" +#include "ast/array_decl_plugin.h" +#include "util/uint_set.h" +#include "smt/smt_value_sort.h" +#include "model/model_smt2_pp.h" +#include "util/stopwatch.h" +#include "model/model.h" +#include "solver/solver.h" namespace smt { diff --git a/src/smt/smt_implied_equalities.h b/src/smt/smt_implied_equalities.h index 0dd76e439..cc7acf22b 100644 --- a/src/smt/smt_implied_equalities.h +++ b/src/smt/smt_implied_equalities.h @@ -23,9 +23,9 @@ Revision History: #ifndef SMT_IMPLIED_EQUALITIES_H_ #define SMT_IMPLIED_EQUALITIES_H_ -#include"smt_solver.h" -#include"lbool.h" -#include"ast.h" +#include "smt/smt_solver.h" +#include "util/lbool.h" +#include "ast/ast.h" namespace smt { diff --git a/src/smt/smt_internalizer.cpp b/src/smt/smt_internalizer.cpp index 5fbdb2477..58b391ac2 100644 --- a/src/smt/smt_internalizer.cpp +++ b/src/smt/smt_internalizer.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"expr_stat.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" -#include"smt_model_finder.h" -#include"for_each_expr.h" +#include "smt/smt_context.h" +#include "ast/expr_stat.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" +#include "smt/smt_model_finder.h" +#include "ast/for_each_expr.h" namespace smt { diff --git a/src/smt/smt_justification.cpp b/src/smt/smt_justification.cpp index 7a9938cd0..c8de45644 100644 --- a/src/smt/smt_justification.cpp +++ b/src/smt/smt_justification.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_conflict_resolution.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_conflict_resolution.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_justification.h b/src/smt/smt_justification.h index f4b3ecb12..0af8e61ff 100644 --- a/src/smt/smt_justification.h +++ b/src/smt/smt_justification.h @@ -19,10 +19,10 @@ Revision History: #ifndef SMT_JUSTIFICATION_H_ #define SMT_JUSTIFICATION_H_ -#include"ast.h" -#include"smt_types.h" -#include"smt_literal.h" -#include"smt_eq_justification.h" +#include "ast/ast.h" +#include "smt/smt_types.h" +#include "smt/smt_literal.h" +#include "smt/smt_eq_justification.h" namespace smt { diff --git a/src/smt/smt_kernel.cpp b/src/smt/smt_kernel.cpp index 9bdf962ec..d870d9b9a 100644 --- a/src/smt/smt_kernel.cpp +++ b/src/smt/smt_kernel.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_kernel.h" -#include"smt_context.h" -#include"ast_smt2_pp.h" +#include "smt/smt_kernel.h" +#include "smt/smt_context.h" +#include "ast/ast_smt2_pp.h" #include"smt_params_helper.hpp" namespace smt { diff --git a/src/smt/smt_kernel.h b/src/smt/smt_kernel.h index 264fae011..6ebb8546f 100644 --- a/src/smt/smt_kernel.h +++ b/src/smt/smt_kernel.h @@ -27,12 +27,12 @@ Revision History: #ifndef SMT_KERNEL_H_ #define SMT_KERNEL_H_ -#include"ast.h" -#include"params.h" -#include"model.h" -#include"lbool.h" -#include"statistics.h" -#include"smt_failure.h" +#include "ast/ast.h" +#include "util/params.h" +#include "model/model.h" +#include "util/lbool.h" +#include "util/statistics.h" +#include "smt/smt_failure.h" struct smt_params; class progress_callback; diff --git a/src/smt/smt_literal.cpp b/src/smt/smt_literal.cpp index e6e795ed4..86a9f0b0c 100644 --- a/src/smt/smt_literal.cpp +++ b/src/smt/smt_literal.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_literal.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "smt/smt_literal.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_literal.h b/src/smt/smt_literal.h index 3dbd6911e..7f554d740 100644 --- a/src/smt/smt_literal.h +++ b/src/smt/smt_literal.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_LITERAL_H_ #define SMT_LITERAL_H_ -#include"ast.h" -#include"smt_types.h" -#include"approx_set.h" +#include "ast/ast.h" +#include "smt/smt_types.h" +#include "util/approx_set.h" namespace smt { /** diff --git a/src/smt/smt_model_checker.cpp b/src/smt/smt_model_checker.cpp index b50527acf..d5b8415c3 100644 --- a/src/smt/smt_model_checker.cpp +++ b/src/smt/smt_model_checker.cpp @@ -17,16 +17,16 @@ Revision History: --*/ -#include"smt_model_checker.h" -#include"smt_context.h" -#include"smt_model_finder.h" -#include"pull_quant.h" -#include"for_each_expr.h" -#include"var_subst.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"model_pp.h" -#include"ast_smt2_pp.h" +#include "smt/smt_model_checker.h" +#include "smt/smt_context.h" +#include "smt/smt_model_finder.h" +#include "ast/normal_forms/pull_quant.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "model/model_pp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/smt_model_checker.h b/src/smt/smt_model_checker.h index 1b7713d59..7f2ed8ca7 100644 --- a/src/smt/smt_model_checker.h +++ b/src/smt/smt_model_checker.h @@ -21,11 +21,11 @@ Revision History: #ifndef SMT_MODEL_CHECKER_H_ #define SMT_MODEL_CHECKER_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"qi_params.h" -#include"smt_params.h" -#include"region.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "smt/params/qi_params.h" +#include "smt/params/smt_params.h" +#include "util/region.h" class proto_model; class model; diff --git a/src/smt/smt_model_finder.cpp b/src/smt/smt_model_finder.cpp index eb113b484..35a98aa01 100644 --- a/src/smt/smt_model_finder.cpp +++ b/src/smt/smt_model_finder.cpp @@ -16,26 +16,26 @@ Author: Revision History: --*/ -#include"smt_model_finder.h" -#include"smt_context.h" -#include"ast_util.h" -#include"macro_util.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"arith_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" -#include"pull_quant.h" -#include"var_subst.h" -#include"backtrackable_set.h" -#include"for_each_expr.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"well_sorted.h" -#include"model_pp.h" -#include"ast_smt2_pp.h" -#include"cooperate.h" -#include"tactic_exception.h" +#include "smt/smt_model_finder.h" +#include "smt/smt_context.h" +#include "ast/ast_util.h" +#include "ast/macros/macro_util.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/normal_forms/pull_quant.h" +#include "ast/rewriter/var_subst.h" +#include "util/backtrackable_set.h" +#include "ast/for_each_expr.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/well_sorted.h" +#include "model/model_pp.h" +#include "ast/ast_smt2_pp.h" +#include "util/cooperate.h" +#include "tactic/tactic_exception.h" namespace smt { diff --git a/src/smt/smt_model_finder.h b/src/smt/smt_model_finder.h index 0694b008b..f02640659 100644 --- a/src/smt/smt_model_finder.h +++ b/src/smt/smt_model_finder.h @@ -46,12 +46,12 @@ Revision History: #ifndef SMT_MODEL_FINDER_H_ #define SMT_MODEL_FINDER_H_ -#include"ast.h" -#include"func_decl_dependencies.h" -#include"simplifier.h" -#include"proto_model.h" -#include"cooperate.h" -#include"tactic_exception.h" +#include "ast/ast.h" +#include "ast/func_decl_dependencies.h" +#include "ast/simplifier/simplifier.h" +#include "smt/proto_model/proto_model.h" +#include "util/cooperate.h" +#include "tactic/tactic_exception.h" namespace smt { class context; diff --git a/src/smt/smt_model_generator.cpp b/src/smt/smt_model_generator.cpp index b9c1ac453..49e9083f2 100644 --- a/src/smt/smt_model_generator.cpp +++ b/src/smt/smt_model_generator.cpp @@ -17,14 +17,14 @@ Revision History: --*/ -#include"smt_context.h" -#include"smt_model_generator.h" -#include"proto_model.h" -#include"ref_util.h" -#include"for_each_expr.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_model_generator.h" +#include "smt/proto_model/proto_model.h" +#include "util/ref_util.h" +#include "ast/for_each_expr.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/smt_model_generator.h b/src/smt/smt_model_generator.h index f360dbd7e..ee133482d 100644 --- a/src/smt/smt_model_generator.h +++ b/src/smt/smt_model_generator.h @@ -28,10 +28,10 @@ Revision History: #ifndef SMT_MODEL_GENERATOR_H_ #define SMT_MODEL_GENERATOR_H_ -#include"ast.h" -#include"smt_types.h" -#include"obj_hashtable.h" -#include"map.h" +#include "ast/ast.h" +#include "smt/smt_types.h" +#include "util/obj_hashtable.h" +#include "util/map.h" class value_factory; class proto_model; diff --git a/src/smt/smt_quantifier.cpp b/src/smt/smt_quantifier.cpp index 1c8f94edf..84ed7c8cd 100644 --- a/src/smt/smt_quantifier.cpp +++ b/src/smt/smt_quantifier.cpp @@ -16,15 +16,15 @@ Author: Revision History: --*/ -#include"smt_quantifier.h" -#include"smt_context.h" -#include"smt_quantifier_stat.h" -#include"smt_model_finder.h" -#include"smt_model_checker.h" -#include"smt_quick_checker.h" -#include"mam.h" -#include"qi_queue.h" -#include"ast_smt2_pp.h" +#include "smt/smt_quantifier.h" +#include "smt/smt_context.h" +#include "smt/smt_quantifier_stat.h" +#include "smt/smt_model_finder.h" +#include "smt/smt_model_checker.h" +#include "smt/smt_quick_checker.h" +#include "smt/mam.h" +#include "smt/qi_queue.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/smt_quantifier.h b/src/smt/smt_quantifier.h index 96af9909a..a55c895e6 100644 --- a/src/smt/smt_quantifier.h +++ b/src/smt/smt_quantifier.h @@ -19,10 +19,10 @@ Revision History: #ifndef SMT_QUANTIFIER_H_ #define SMT_QUANTIFIER_H_ -#include"ast.h" -#include"statistics.h" -#include"params.h" -#include"smt_types.h" +#include "ast/ast.h" +#include "util/statistics.h" +#include "util/params.h" +#include "smt/smt_types.h" class proto_model; struct smt_params; diff --git a/src/smt/smt_quantifier_stat.cpp b/src/smt/smt_quantifier_stat.cpp index d34a7c0ac..7d73ea27c 100644 --- a/src/smt/smt_quantifier_stat.cpp +++ b/src/smt/smt_quantifier_stat.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"smt_quantifier_stat.h" +#include "smt/smt_quantifier_stat.h" namespace smt { diff --git a/src/smt/smt_quantifier_stat.h b/src/smt/smt_quantifier_stat.h index 1d5919433..308534833 100644 --- a/src/smt/smt_quantifier_stat.h +++ b/src/smt/smt_quantifier_stat.h @@ -19,10 +19,10 @@ Revision History: #ifndef SMT_QUANTIFIER_STAT_H_ #define SMT_QUANTIFIER_STAT_H_ -#include"ast.h" -#include"obj_hashtable.h" -#include"approx_nat.h" -#include"region.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "util/approx_nat.h" +#include "util/region.h" namespace smt { diff --git a/src/smt/smt_quick_checker.cpp b/src/smt/smt_quick_checker.cpp index 462f784bd..f8744318a 100644 --- a/src/smt/smt_quick_checker.cpp +++ b/src/smt/smt_quick_checker.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_quick_checker.h" -#include"ast_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_quick_checker.h" +#include "ast/ast_pp.h" namespace smt { diff --git a/src/smt/smt_quick_checker.h b/src/smt/smt_quick_checker.h index 0963874a0..eb07880f1 100644 --- a/src/smt/smt_quick_checker.h +++ b/src/smt/smt_quick_checker.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_QUICK_CHECKER_H_ #define SMT_QUICK_CHECKER_H_ -#include"ast.h" -#include"simplifier.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "ast/simplifier/simplifier.h" +#include "util/obj_hashtable.h" namespace smt { class context; diff --git a/src/smt/smt_relevancy.cpp b/src/smt/smt_relevancy.cpp index 176314ae1..00457c643 100644 --- a/src/smt/smt_relevancy.cpp +++ b/src/smt/smt_relevancy.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_relevancy.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/smt_relevancy.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/smt_relevancy.h b/src/smt/smt_relevancy.h index e81989044..75019b110 100644 --- a/src/smt/smt_relevancy.h +++ b/src/smt/smt_relevancy.h @@ -19,7 +19,7 @@ Revision History: #ifndef SMT_RELEVANCY_H_ #define SMT_RELEVANCY_H_ -#include"ast.h" +#include "ast/ast.h" namespace smt { class context; diff --git a/src/smt/smt_setup.cpp b/src/smt/smt_setup.cpp index 4dd1e2510..361448316 100644 --- a/src/smt/smt_setup.cpp +++ b/src/smt/smt_setup.cpp @@ -16,25 +16,25 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"smt_setup.h" -#include"static_features.h" -#include"theory_arith.h" -#include"theory_lra.h" -#include"theory_dense_diff_logic.h" -#include"theory_diff_logic.h" -#include"theory_utvpi.h" -#include"theory_array.h" -#include"theory_array_full.h" -#include"theory_bv.h" -#include"theory_datatype.h" -#include"theory_dummy.h" -#include"theory_dl.h" -#include"theory_seq_empty.h" -#include"theory_seq.h" -#include"theory_pb.h" -#include"theory_fpa.h" -#include"theory_str.h" +#include "smt/smt_context.h" +#include "smt/smt_setup.h" +#include "ast/static_features.h" +#include "smt/theory_arith.h" +#include "smt/theory_lra.h" +#include "smt/theory_dense_diff_logic.h" +#include "smt/theory_diff_logic.h" +#include "smt/theory_utvpi.h" +#include "smt/theory_array.h" +#include "smt/theory_array_full.h" +#include "smt/theory_bv.h" +#include "smt/theory_datatype.h" +#include "smt/theory_dummy.h" +#include "smt/theory_dl.h" +#include "smt/theory_seq_empty.h" +#include "smt/theory_seq.h" +#include "smt/theory_pb.h" +#include "smt/theory_fpa.h" +#include "smt/theory_str.h" namespace smt { diff --git a/src/smt/smt_setup.h b/src/smt/smt_setup.h index f12cc5e09..a3bb29195 100644 --- a/src/smt/smt_setup.h +++ b/src/smt/smt_setup.h @@ -19,8 +19,8 @@ Revision History: #ifndef SMT_SETUP_H_ #define SMT_SETUP_H_ -#include"ast.h" -#include"smt_params.h" +#include "ast/ast.h" +#include "smt/params/smt_params.h" struct static_features; namespace smt { diff --git a/src/smt/smt_solver.cpp b/src/smt/smt_solver.cpp index cd912b72e..1a4cc00d1 100644 --- a/src/smt/smt_solver.cpp +++ b/src/smt/smt_solver.cpp @@ -16,16 +16,16 @@ Author: Notes: --*/ -#include"solver_na2as.h" -#include"smt_kernel.h" -#include"reg_decl_plugins.h" -#include"smt_params.h" +#include "solver/solver_na2as.h" +#include "smt/smt_kernel.h" +#include "ast/reg_decl_plugins.h" +#include "smt/params/smt_params.h" #include"smt_params_helper.hpp" -#include"mus.h" -#include"for_each_expr.h" -#include"ast_smt2_pp.h" -#include"func_decl_dependencies.h" -#include"dec_ref_util.h" +#include "solver/mus.h" +#include "ast/for_each_expr.h" +#include "ast/ast_smt2_pp.h" +#include "ast/func_decl_dependencies.h" +#include "util/dec_ref_util.h" namespace smt { diff --git a/src/smt/smt_solver.h b/src/smt/smt_solver.h index 6ec83810e..7d2677b35 100644 --- a/src/smt/smt_solver.h +++ b/src/smt/smt_solver.h @@ -21,8 +21,8 @@ Notes: #ifndef SMT_SOLVER_H_ #define SMT_SOLVER_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class solver; class solver_factory; diff --git a/src/smt/smt_statistics.cpp b/src/smt/smt_statistics.cpp index 5201e48b3..95acd4819 100644 --- a/src/smt/smt_statistics.cpp +++ b/src/smt/smt_statistics.cpp @@ -17,7 +17,7 @@ Revision History: --*/ #include -#include"smt_statistics.h" +#include "smt/smt_statistics.h" namespace smt { diff --git a/src/smt/smt_theory.cpp b/src/smt/smt_theory.cpp index 2263699f9..515503d41 100644 --- a/src/smt/smt_theory.cpp +++ b/src/smt/smt_theory.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"buffer.h" -#include"ast_ll_pp.h" +#include "smt/smt_context.h" +#include "util/buffer.h" +#include "ast/ast_ll_pp.h" namespace smt { diff --git a/src/smt/smt_theory.h b/src/smt/smt_theory.h index c943a85d8..71eedc1a7 100644 --- a/src/smt/smt_theory.h +++ b/src/smt/smt_theory.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_THEORY_H_ #define SMT_THEORY_H_ -#include"smt_enode.h" -#include"obj_hashtable.h" -#include"statistics.h" +#include "smt/smt_enode.h" +#include "util/obj_hashtable.h" +#include "util/statistics.h" #include namespace smt { diff --git a/src/smt/smt_theory_var_list.h b/src/smt/smt_theory_var_list.h index 5f963102b..d7e246824 100644 --- a/src/smt/smt_theory_var_list.h +++ b/src/smt/smt_theory_var_list.h @@ -19,7 +19,7 @@ Revision History: #ifndef SMT_THEORY_VAR_LIST_H_ #define SMT_THEORY_VAR_LIST_H_ -#include"smt_types.h" +#include "smt/smt_types.h" namespace smt { diff --git a/src/smt/smt_types.h b/src/smt/smt_types.h index 7f2076045..6300bd43c 100644 --- a/src/smt/smt_types.h +++ b/src/smt/smt_types.h @@ -19,9 +19,9 @@ Revision History: #ifndef SMT_TYPES_H_ #define SMT_TYPES_H_ -#include"list.h" -#include"vector.h" -#include"lbool.h" +#include "util/list.h" +#include "util/vector.h" +#include "util/lbool.h" class model; diff --git a/src/smt/smt_value_sort.cpp b/src/smt/smt_value_sort.cpp index a840b77b7..56768b91a 100644 --- a/src/smt/smt_value_sort.cpp +++ b/src/smt/smt_value_sort.cpp @@ -18,10 +18,10 @@ Revision History: --*/ -#include "smt_value_sort.h" -#include "bv_decl_plugin.h" -#include "arith_decl_plugin.h" -#include "datatype_decl_plugin.h" +#include "smt/smt_value_sort.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" namespace smt { diff --git a/src/smt/smt_value_sort.h b/src/smt/smt_value_sort.h index e9327fca6..d7228f21c 100644 --- a/src/smt/smt_value_sort.h +++ b/src/smt/smt_value_sort.h @@ -22,7 +22,7 @@ Revision History: #ifndef SMT_VALUE_SORT_H_ #define SMT_VALUE_SORT_H_ -#include "ast.h" +#include "ast/ast.h" namespace smt { diff --git a/src/smt/spanning_tree.h b/src/smt/spanning_tree.h index fd5e68d54..78b556130 100644 --- a/src/smt/spanning_tree.h +++ b/src/smt/spanning_tree.h @@ -19,8 +19,8 @@ Notes: #ifndef SPANNING_TREE_H_ #define SPANNING_TREE_H_ -#include "diff_logic.h" -#include "spanning_tree_base.h" +#include "smt/diff_logic.h" +#include "smt/spanning_tree_base.h" namespace smt { diff --git a/src/smt/spanning_tree_base.h b/src/smt/spanning_tree_base.h index b86e5caa2..1ad98b79c 100644 --- a/src/smt/spanning_tree_base.h +++ b/src/smt/spanning_tree_base.h @@ -20,8 +20,8 @@ Notes: #ifndef SPANNING_TREE_BASE_H_ #define SPANNING_TREE_BASE_H_ -#include "util.h" -#include "vector.h" +#include "util/util.h" +#include "util/vector.h" namespace smt { template diff --git a/src/smt/spanning_tree_def.h b/src/smt/spanning_tree_def.h index ca7607119..c49ffcd3c 100644 --- a/src/smt/spanning_tree_def.h +++ b/src/smt/spanning_tree_def.h @@ -19,7 +19,7 @@ Notes: #ifndef SPANNING_TREE_DEF_H_ #define SPANNING_TREE_DEF_H_ -#include "spanning_tree.h" +#include "smt/spanning_tree.h" namespace smt { diff --git a/src/smt/tactic/ctx_solver_simplify_tactic.cpp b/src/smt/tactic/ctx_solver_simplify_tactic.cpp index d59ef5254..edc4b4ff5 100644 --- a/src/smt/tactic/ctx_solver_simplify_tactic.cpp +++ b/src/smt/tactic/ctx_solver_simplify_tactic.cpp @@ -17,13 +17,13 @@ Notes: --*/ -#include"ctx_solver_simplify_tactic.h" -#include"arith_decl_plugin.h" -#include"smt_params.h" -#include"smt_kernel.h" -#include"ast_pp.h" -#include"mk_simplified_app.h" -#include"ast_util.h" +#include "smt/tactic/ctx_solver_simplify_tactic.h" +#include "ast/arith_decl_plugin.h" +#include "smt/params/smt_params.h" +#include "smt/smt_kernel.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/mk_simplified_app.h" +#include "ast/ast_util.h" class ctx_solver_simplify_tactic : public tactic { ast_manager& m; diff --git a/src/smt/tactic/ctx_solver_simplify_tactic.h b/src/smt/tactic/ctx_solver_simplify_tactic.h index 51b81603d..28006cefc 100644 --- a/src/smt/tactic/ctx_solver_simplify_tactic.h +++ b/src/smt/tactic/ctx_solver_simplify_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef CTX_SOLVER_SIMPLIFY_TACTIC_H_ #define CTX_SOLVER_SIMPLIFY_TACTIC_H_ -#include"tactical.h" +#include "tactic/tactical.h" tactic * mk_ctx_solver_simplify_tactic(ast_manager & m, params_ref const & p = params_ref()); /* diff --git a/src/smt/tactic/smt_tactic.cpp b/src/smt/tactic/smt_tactic.cpp index 64bae0a48..3328d6030 100644 --- a/src/smt/tactic/smt_tactic.cpp +++ b/src/smt/tactic/smt_tactic.cpp @@ -16,19 +16,19 @@ Author: Notes: --*/ -#include"tactic.h" -#include"tactical.h" -#include"smt_kernel.h" -#include"smt_params.h" +#include "tactic/tactic.h" +#include "tactic/tactical.h" +#include "smt/smt_kernel.h" +#include "smt/params/smt_params.h" #include"smt_params_helper.hpp" #include"lp_params.hpp" -#include"rewriter_types.h" -#include"filter_model_converter.h" -#include"ast_util.h" -#include"solver2tactic.h" -#include"smt_solver.h" -#include"solver.h" -#include"mus.h" +#include "ast/rewriter/rewriter_types.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_util.h" +#include "solver/solver2tactic.h" +#include "smt/smt_solver.h" +#include "solver/solver.h" +#include "solver/mus.h" typedef obj_map expr2expr_map; diff --git a/src/smt/tactic/smt_tactic.h b/src/smt/tactic/smt_tactic.h index a23695fd1..c7b91d032 100644 --- a/src/smt/tactic/smt_tactic.h +++ b/src/smt/tactic/smt_tactic.h @@ -19,10 +19,10 @@ Notes: #ifndef SMT_TACTIC_H_ #define SMT_TACTIC_H_ -#include"params.h" -#include"ast.h" -#include"obj_hashtable.h" -#include"goal.h" +#include "util/params.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" +#include "tactic/goal.h" class tactic; class filter_model_converter; diff --git a/src/smt/tactic/unit_subsumption_tactic.cpp b/src/smt/tactic/unit_subsumption_tactic.cpp index 745bfa2de..68a34cea8 100644 --- a/src/smt/tactic/unit_subsumption_tactic.cpp +++ b/src/smt/tactic/unit_subsumption_tactic.cpp @@ -15,8 +15,8 @@ Author: --*/ -#include "unit_subsumption_tactic.h" -#include "smt_context.h" +#include "smt/tactic/unit_subsumption_tactic.h" +#include "smt/smt_context.h" struct unit_subsumption_tactic : public tactic { ast_manager& m; diff --git a/src/smt/tactic/unit_subsumption_tactic.h b/src/smt/tactic/unit_subsumption_tactic.h index 499bb44c6..09db59295 100644 --- a/src/smt/tactic/unit_subsumption_tactic.h +++ b/src/smt/tactic/unit_subsumption_tactic.h @@ -23,7 +23,7 @@ Notes: --*/ #ifndef UNIT_SUBSUMPTION_TACTIC_H_ #define UNIT_SUBSUMPTION_TACTIC_H_ -#include "tactic.h" +#include "tactic/tactic.h" tactic * mk_unit_subsumption_tactic(ast_manager & m, params_ref const & p = params_ref()); /* diff --git a/src/smt/theory_arith.cpp b/src/smt/theory_arith.cpp index 9a7d08151..6aee87408 100644 --- a/src/smt/theory_arith.cpp +++ b/src/smt/theory_arith.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"theory_arith_def.h" +#include "smt/theory_arith_def.h" namespace smt { diff --git a/src/smt/theory_arith.h b/src/smt/theory_arith.h index cdc1a3933..26b970d30 100644 --- a/src/smt/theory_arith.h +++ b/src/smt/theory_arith.h @@ -20,24 +20,24 @@ Revision History: #ifndef THEORY_ARITH_H_ #define THEORY_ARITH_H_ -#include"smt_theory.h" -#include"map.h" -#include"heap.h" -#include"nat_set.h" -#include"inf_rational.h" -#include"s_integer.h" -#include"inf_s_integer.h" -#include"arith_decl_plugin.h" -#include"theory_arith_params.h" -#include"arith_eq_adapter.h" -#include"numeral_factory.h" -#include"obj_pair_hashtable.h" -#include"old_interval.h" -#include"grobner.h" -#include"arith_simplifier_plugin.h" -#include"arith_eq_solver.h" -#include"theory_opt.h" -#include"uint_set.h" +#include "smt/smt_theory.h" +#include "util/map.h" +#include "util/heap.h" +#include "util/nat_set.h" +#include "util/inf_rational.h" +#include "util/s_integer.h" +#include "util/inf_s_integer.h" +#include "ast/arith_decl_plugin.h" +#include "smt/params/theory_arith_params.h" +#include "smt/arith_eq_adapter.h" +#include "smt/proto_model/numeral_factory.h" +#include "util/obj_pair_hashtable.h" +#include "smt/old_interval.h" +#include "math/grobner/grobner.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "smt/arith_eq_solver.h" +#include "smt/theory_opt.h" +#include "util/uint_set.h" namespace smt { diff --git a/src/smt/theory_arith_aux.h b/src/smt/theory_arith_aux.h index f94de7eba..f0f80b4ec 100644 --- a/src/smt/theory_arith_aux.h +++ b/src/smt/theory_arith_aux.h @@ -19,11 +19,11 @@ Revision History: #ifndef THEORY_ARITH_AUX_H_ #define THEORY_ARITH_AUX_H_ -#include"inf_eps_rational.h" -#include"theory_arith.h" -#include"smt_farkas_util.h" -#include"th_rewriter.h" -#include"filter_model_converter.h" +#include "util/inf_eps_rational.h" +#include "smt/theory_arith.h" +#include "smt/smt_farkas_util.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/filter_model_converter.h" namespace smt { diff --git a/src/smt/theory_arith_core.h b/src/smt/theory_arith_core.h index bee744c34..6b8abcdbc 100644 --- a/src/smt/theory_arith_core.h +++ b/src/smt/theory_arith_core.h @@ -19,12 +19,12 @@ Revision History: #ifndef THEORY_ARITH_CORE_H_ #define THEORY_ARITH_CORE_H_ -#include"smt_context.h" -#include"theory_arith.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"smt_model_generator.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/theory_arith.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "smt/smt_model_generator.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/theory_arith_def.h b/src/smt/theory_arith_def.h index 531a03bd3..962f55f02 100644 --- a/src/smt/theory_arith_def.h +++ b/src/smt/theory_arith_def.h @@ -19,14 +19,14 @@ Revision History: #ifndef THEORY_ARITH_DEF_H_ #define THEORY_ARITH_DEF_H_ -#include"theory_arith.h" -#include"theory_arith_core.h" -#include"theory_arith_aux.h" -#include"theory_arith_inv.h" -#include"theory_arith_pp.h" -#include"theory_arith_int.h" -#include"theory_arith_eq.h" -#include"theory_arith_nl.h" +#include "smt/theory_arith.h" +#include "smt/theory_arith_core.h" +#include "smt/theory_arith_aux.h" +#include "smt/theory_arith_inv.h" +#include "smt/theory_arith_pp.h" +#include "smt/theory_arith_int.h" +#include "smt/theory_arith_eq.h" +#include "smt/theory_arith_nl.h" #endif /* THEORY_ARITH_DEF_H_ */ diff --git a/src/smt/theory_arith_eq.h b/src/smt/theory_arith_eq.h index ae0f17757..a7f7fae59 100644 --- a/src/smt/theory_arith_eq.h +++ b/src/smt/theory_arith_eq.h @@ -22,7 +22,7 @@ Revision History: // #define PROFILE_OFFSET_ROW #ifdef PROFILE_OFFSET_ROW -#include"stopwatch.h" +#include "util/stopwatch.h" #undef max #undef min #endif diff --git a/src/smt/theory_arith_int.h b/src/smt/theory_arith_int.h index e6e9e863c..4150ecc1c 100644 --- a/src/smt/theory_arith_int.h +++ b/src/smt/theory_arith_int.h @@ -19,12 +19,12 @@ Revision History: #ifndef THEORY_ARITH_INT_H_ #define THEORY_ARITH_INT_H_ -#include"ast_ll_pp.h" -#include"arith_simplifier_plugin.h" -#include"well_sorted.h" -#include"euclidean_solver.h" -#include"numeral_buffer.h" -#include"ast_smt2_pp.h" +#include "ast/ast_ll_pp.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/well_sorted.h" +#include "math/euclid/euclidean_solver.h" +#include "util/numeral_buffer.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/theory_arith_inv.h b/src/smt/theory_arith_inv.h index b547168e0..987d075c3 100644 --- a/src/smt/theory_arith_inv.h +++ b/src/smt/theory_arith_inv.h @@ -19,8 +19,8 @@ Revision History: #ifndef THEORY_ARITH_INV_H_ #define THEORY_ARITH_INV_H_ -#include"theory_arith.h" -#include"ast_pp.h" +#include "smt/theory_arith.h" +#include "ast/ast_pp.h" namespace smt { diff --git a/src/smt/theory_arith_nl.h b/src/smt/theory_arith_nl.h index 8a632cf48..b4d30d639 100644 --- a/src/smt/theory_arith_nl.h +++ b/src/smt/theory_arith_nl.h @@ -19,7 +19,7 @@ Revision History: #ifndef THEORY_ARITH_NL_H_ #define THEORY_ARITH_NL_H_ -#include"ast_smt2_pp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/theory_arith_pp.h b/src/smt/theory_arith_pp.h index 7b657d9c2..67fe5a572 100644 --- a/src/smt/theory_arith_pp.h +++ b/src/smt/theory_arith_pp.h @@ -19,9 +19,9 @@ Revision History: #ifndef THEORY_ARITH_PP_H_ #define THEORY_ARITH_PP_H_ -#include"theory_arith.h" -#include"ast_smt_pp.h" -#include"stats.h" +#include "smt/theory_arith.h" +#include "ast/ast_smt_pp.h" +#include "util/stats.h" namespace smt { template diff --git a/src/smt/theory_array.cpp b/src/smt/theory_array.cpp index b06e50d2a..17eefb361 100644 --- a/src/smt/theory_array.cpp +++ b/src/smt/theory_array.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"theory_array.h" -#include"ast_ll_pp.h" -#include"stats.h" +#include "smt/smt_context.h" +#include "smt/theory_array.h" +#include "ast/ast_ll_pp.h" +#include "util/stats.h" namespace smt { diff --git a/src/smt/theory_array.h b/src/smt/theory_array.h index 4e45f77f2..3a013cf73 100644 --- a/src/smt/theory_array.h +++ b/src/smt/theory_array.h @@ -19,9 +19,9 @@ Revision History: #ifndef THEORY_ARRAY_H_ #define THEORY_ARRAY_H_ -#include"theory_array_base.h" -#include"theory_array_params.h" -#include"union_find.h" +#include "smt/theory_array_base.h" +#include "smt/params/theory_array_params.h" +#include "util/union_find.h" namespace smt { diff --git a/src/smt/theory_array_base.cpp b/src/smt/theory_array_base.cpp index 6c47bf855..1f519dfda 100644 --- a/src/smt/theory_array_base.cpp +++ b/src/smt/theory_array_base.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"theory_array_base.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"smt_model_generator.h" -#include"func_interp.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/theory_array_base.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "smt/smt_model_generator.h" +#include "model/func_interp.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/theory_array_base.h b/src/smt/theory_array_base.h index e0d16f0f2..197ad9d2f 100644 --- a/src/smt/theory_array_base.h +++ b/src/smt/theory_array_base.h @@ -19,9 +19,9 @@ Revision History: #ifndef THEORY_ARRAY_BASE_H_ #define THEORY_ARRAY_BASE_H_ -#include"smt_theory.h" -#include"array_decl_plugin.h" -#include"array_factory.h" +#include "smt/smt_theory.h" +#include "ast/array_decl_plugin.h" +#include "smt/proto_model/array_factory.h" namespace smt { diff --git a/src/smt/theory_array_full.cpp b/src/smt/theory_array_full.cpp index a9dc657dd..d5660e325 100644 --- a/src/smt/theory_array_full.cpp +++ b/src/smt/theory_array_full.cpp @@ -17,12 +17,12 @@ Revision History: --*/ -#include "smt_context.h" -#include "theory_array_full.h" -#include "ast_ll_pp.h" -#include "ast_pp.h" -#include "ast_smt2_pp.h" -#include "stats.h" +#include "smt/smt_context.h" +#include "smt/theory_array_full.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "ast/ast_smt2_pp.h" +#include "util/stats.h" namespace smt { diff --git a/src/smt/theory_array_full.h b/src/smt/theory_array_full.h index 1200275a2..e22d1d0e2 100644 --- a/src/smt/theory_array_full.h +++ b/src/smt/theory_array_full.h @@ -19,9 +19,9 @@ Revision History: #ifndef THEORY_ARRAY_FULL_H_ #define THEORY_ARRAY_FULL_H_ -#include "theory_array.h" -#include "simplifier.h" -#include "ast_trail.h" +#include "smt/theory_array.h" +#include "ast/simplifier/simplifier.h" +#include "ast/ast_trail.h" namespace smt { diff --git a/src/smt/theory_bv.cpp b/src/smt/theory_bv.cpp index 255e2044f..0981ccdbf 100644 --- a/src/smt/theory_bv.cpp +++ b/src/smt/theory_bv.cpp @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include"smt_context.h" -#include"theory_bv.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" -#include"smt_model_generator.h" -#include"stats.h" +#include "smt/smt_context.h" +#include "smt/theory_bv.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" +#include "smt/smt_model_generator.h" +#include "util/stats.h" namespace smt { diff --git a/src/smt/theory_bv.h b/src/smt/theory_bv.h index 50e4f9c30..5d2ea8da5 100644 --- a/src/smt/theory_bv.h +++ b/src/smt/theory_bv.h @@ -19,16 +19,16 @@ Revision History: #ifndef THEORY_BV_H_ #define THEORY_BV_H_ -#include"smt_theory.h" -#include"theory_bv_params.h" -#include"bit_blaster.h" -#include"trail.h" -#include"union_find.h" -#include"simplifier.h" -#include"bv_simplifier_plugin.h" -#include"arith_decl_plugin.h" -#include"arith_simplifier_plugin.h" -#include"numeral_factory.h" +#include "smt/smt_theory.h" +#include "smt/params/theory_bv_params.h" +#include "ast/rewriter/bit_blaster/bit_blaster.h" +#include "util/trail.h" +#include "util/union_find.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "smt/proto_model/numeral_factory.h" namespace smt { diff --git a/src/smt/theory_datatype.cpp b/src/smt/theory_datatype.cpp index 8e140661b..806d6706b 100644 --- a/src/smt/theory_datatype.cpp +++ b/src/smt/theory_datatype.cpp @@ -17,13 +17,13 @@ Revision History: --*/ -#include"smt_context.h" -#include"theory_datatype.h" -#include"smt_model_generator.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" -#include"stats.h" -#include"ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/theory_datatype.h" +#include "smt/smt_model_generator.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" +#include "util/stats.h" +#include "ast/ast_smt2_pp.h" namespace smt { diff --git a/src/smt/theory_datatype.h b/src/smt/theory_datatype.h index b97adacfe..20fa371fa 100644 --- a/src/smt/theory_datatype.h +++ b/src/smt/theory_datatype.h @@ -19,11 +19,11 @@ Revision History: #ifndef THEORY_DATATYPE_H_ #define THEORY_DATATYPE_H_ -#include"smt_theory.h" -#include"union_find.h" -#include"theory_datatype_params.h" -#include"datatype_decl_plugin.h" -#include"datatype_factory.h" +#include "smt/smt_theory.h" +#include "util/union_find.h" +#include "smt/params/theory_datatype_params.h" +#include "ast/datatype_decl_plugin.h" +#include "smt/proto_model/datatype_factory.h" namespace smt { diff --git a/src/smt/theory_dense_diff_logic.cpp b/src/smt/theory_dense_diff_logic.cpp index db2ffd38b..3d352ee84 100644 --- a/src/smt/theory_dense_diff_logic.cpp +++ b/src/smt/theory_dense_diff_logic.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"theory_dense_diff_logic_def.h" +#include "smt/theory_dense_diff_logic_def.h" namespace smt { template class theory_dense_diff_logic; diff --git a/src/smt/theory_dense_diff_logic.h b/src/smt/theory_dense_diff_logic.h index c2be89bc3..980830447 100644 --- a/src/smt/theory_dense_diff_logic.h +++ b/src/smt/theory_dense_diff_logic.h @@ -21,11 +21,11 @@ TODO: eager equality propagation #ifndef THEORY_DENSE_DIFF_LOGIC_H_ #define THEORY_DENSE_DIFF_LOGIC_H_ -#include"theory_arith.h" -#include"theory_arith_params.h" -#include"arith_decl_plugin.h" -#include"arith_eq_adapter.h" -#include"theory_opt.h" +#include "smt/theory_arith.h" +#include "smt/params/theory_arith_params.h" +#include "ast/arith_decl_plugin.h" +#include "smt/arith_eq_adapter.h" +#include "smt/theory_opt.h" namespace smt { diff --git a/src/smt/theory_dense_diff_logic_def.h b/src/smt/theory_dense_diff_logic_def.h index addb5d92b..342766c04 100644 --- a/src/smt/theory_dense_diff_logic_def.h +++ b/src/smt/theory_dense_diff_logic_def.h @@ -19,12 +19,12 @@ Revision History: #ifndef THEORY_DENSE_DIFF_LOGIC_DEF_H_ #define THEORY_DENSE_DIFF_LOGIC_DEF_H_ -#include"smt_context.h" -#include"theory_dense_diff_logic.h" -#include"ast_pp.h" -#include"smt_model_generator.h" -#include"simplex.h" -#include"simplex_def.h" +#include "smt/smt_context.h" +#include "smt/theory_dense_diff_logic.h" +#include "ast/ast_pp.h" +#include "smt/smt_model_generator.h" +#include "math/simplex/simplex.h" +#include "math/simplex/simplex_def.h" namespace smt { diff --git a/src/smt/theory_diff_logic.cpp b/src/smt/theory_diff_logic.cpp index f1f00833b..1664dbfe2 100644 --- a/src/smt/theory_diff_logic.cpp +++ b/src/smt/theory_diff_logic.cpp @@ -17,11 +17,11 @@ Author: Revision History: --*/ -#include "theory_diff_logic.h" +#include "smt/theory_diff_logic.h" -#include"rational.h" -#include"theory_diff_logic_def.h" -#include"sparse_matrix_def.h" +#include "util/rational.h" +#include "smt/theory_diff_logic_def.h" +#include "math/simplex/sparse_matrix_def.h" namespace smt { diff --git a/src/smt/theory_diff_logic.h b/src/smt/theory_diff_logic.h index f47e61548..1ad239e58 100644 --- a/src/smt/theory_diff_logic.h +++ b/src/smt/theory_diff_logic.h @@ -22,24 +22,24 @@ Revision History: #ifndef THEORY_DIFF_LOGIC_H_ #define THEORY_DIFF_LOGIC_H_ -#include"rational.h" -#include"inf_rational.h" -#include"inf_int_rational.h" -#include"s_integer.h" -#include"inf_s_integer.h" -#include"smt_theory.h" -#include"diff_logic.h" -#include"arith_decl_plugin.h" -#include"smt_justification.h" -#include"map.h" -#include"smt_params.h" -#include"arith_eq_adapter.h" -#include"smt_model_generator.h" -#include"numeral_factory.h" -#include"smt_clause.h" -#include"theory_opt.h" -#include"simplex.h" -#include"simplex_def.h" +#include "util/rational.h" +#include "util/inf_rational.h" +#include "util/inf_int_rational.h" +#include "util/s_integer.h" +#include "util/inf_s_integer.h" +#include "smt/smt_theory.h" +#include "smt/diff_logic.h" +#include "ast/arith_decl_plugin.h" +#include "smt/smt_justification.h" +#include "util/map.h" +#include "smt/params/smt_params.h" +#include "smt/arith_eq_adapter.h" +#include "smt/smt_model_generator.h" +#include "smt/proto_model/numeral_factory.h" +#include "smt/smt_clause.h" +#include "smt/theory_opt.h" +#include "math/simplex/simplex.h" +#include "math/simplex/simplex_def.h" // The DL theory can represent term such as n + k, where n is an enode and k is a numeral. namespace smt { diff --git a/src/smt/theory_diff_logic_def.h b/src/smt/theory_diff_logic_def.h index 372786c01..02cc8860f 100644 --- a/src/smt/theory_diff_logic_def.h +++ b/src/smt/theory_diff_logic_def.h @@ -22,13 +22,13 @@ Revision History: #ifndef THEORY_DIFF_LOGIC_DEF_H_ #define THEORY_DIFF_LOGIC_DEF_H_ -#include"theory_diff_logic.h" -#include"smt_context.h" -#include"map.h" -#include"ast_pp.h" -#include"warning.h" -#include"smt_model_generator.h" -#include"model_implicant.h" +#include "smt/theory_diff_logic.h" +#include "smt/smt_context.h" +#include "util/map.h" +#include "ast/ast_pp.h" +#include "util/warning.h" +#include "smt/smt_model_generator.h" +#include "model/model_implicant.h" using namespace smt; diff --git a/src/smt/theory_dl.cpp b/src/smt/theory_dl.cpp index 588b134b7..ea02121d9 100644 --- a/src/smt/theory_dl.cpp +++ b/src/smt/theory_dl.cpp @@ -22,14 +22,14 @@ Revision History: --*/ -#include "smt_theory.h" -#include "dl_decl_plugin.h" -#include "value_factory.h" -#include "smt_model_generator.h" -#include "bv_decl_plugin.h" -#include "theory_bv.h" -#include "smt_context.h" -#include "ast_pp.h" +#include "smt/smt_theory.h" +#include "ast/dl_decl_plugin.h" +#include "smt/proto_model/value_factory.h" +#include "smt/smt_model_generator.h" +#include "ast/bv_decl_plugin.h" +#include "smt/theory_bv.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" // Basic approach: reduce theory to bit-vectors: // diff --git a/src/smt/theory_dummy.cpp b/src/smt/theory_dummy.cpp index c8b9c3b0a..d1695134e 100644 --- a/src/smt/theory_dummy.cpp +++ b/src/smt/theory_dummy.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"smt_context.h" -#include"theory_dummy.h" +#include "smt/smt_context.h" +#include "smt/theory_dummy.h" namespace smt { diff --git a/src/smt/theory_dummy.h b/src/smt/theory_dummy.h index fc25fc0b7..b20d86270 100644 --- a/src/smt/theory_dummy.h +++ b/src/smt/theory_dummy.h @@ -19,7 +19,7 @@ Revision History: #ifndef THEORY_DUMMY_H_ #define THEORY_DUMMY_H_ -#include"smt_theory.h" +#include "smt/smt_theory.h" namespace smt { diff --git a/src/smt/theory_fpa.cpp b/src/smt/theory_fpa.cpp index a3bf77180..17349ead6 100644 --- a/src/smt/theory_fpa.cpp +++ b/src/smt/theory_fpa.cpp @@ -16,12 +16,12 @@ Author: Revision History: --*/ -#include"ast_smt2_pp.h" -#include"smt_context.h" -#include"theory_fpa.h" -#include"theory_bv.h" -#include"smt_model_generator.h" -#include"bv2fpa_converter.h" +#include "ast/ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/theory_fpa.h" +#include "smt/theory_bv.h" +#include "smt/smt_model_generator.h" +#include "ast/fpa/bv2fpa_converter.h" namespace smt { diff --git a/src/smt/theory_fpa.h b/src/smt/theory_fpa.h index 998f2be3c..5fcb8637c 100644 --- a/src/smt/theory_fpa.h +++ b/src/smt/theory_fpa.h @@ -19,13 +19,13 @@ Revision History: #ifndef THEORY_FPA_H_ #define THEORY_FPA_H_ -#include"smt_theory.h" -#include"trail.h" -#include"fpa2bv_converter.h" -#include"fpa2bv_rewriter.h" -#include"th_rewriter.h" -#include"value_factory.h" -#include"smt_model_generator.h" +#include "smt/smt_theory.h" +#include "util/trail.h" +#include "ast/fpa/fpa2bv_converter.h" +#include "ast/fpa/fpa2bv_rewriter.h" +#include "ast/rewriter/th_rewriter.h" +#include "smt/proto_model/value_factory.h" +#include "smt/smt_model_generator.h" namespace smt { diff --git a/src/smt/theory_lra.h b/src/smt/theory_lra.h index beb5c8387..774ec15ad 100644 --- a/src/smt/theory_lra.h +++ b/src/smt/theory_lra.h @@ -20,7 +20,7 @@ Revision History: --*/ #pragma once -#include "theory_opt.h" +#include "smt/theory_opt.h" namespace smt { class theory_lra : public theory, public theory_opt { diff --git a/src/smt/theory_opt.cpp b/src/smt/theory_opt.cpp index 9e6fa452c..365315bf2 100644 --- a/src/smt/theory_opt.cpp +++ b/src/smt/theory_opt.cpp @@ -18,10 +18,10 @@ Notes: --*/ -#include "arith_decl_plugin.h" -#include "smt_types.h" -#include "smt_theory.h" -#include "theory_opt.h" +#include "ast/arith_decl_plugin.h" +#include "smt/smt_types.h" +#include "smt/smt_theory.h" +#include "smt/theory_opt.h" namespace smt { bool theory_opt::is_linear(ast_manager& m, expr* term) { diff --git a/src/smt/theory_opt.h b/src/smt/theory_opt.h index 421e6feca..49f436ea5 100644 --- a/src/smt/theory_opt.h +++ b/src/smt/theory_opt.h @@ -18,9 +18,9 @@ Notes: --*/ -#include "inf_rational.h" -#include "inf_eps_rational.h" -#include "arith_decl_plugin.h" +#include "util/inf_rational.h" +#include "util/inf_eps_rational.h" +#include "ast/arith_decl_plugin.h" #ifndef THEORY_OPT_H_ #define THEORY_OPT_H_ diff --git a/src/smt/theory_pb.cpp b/src/smt/theory_pb.cpp index 507cb6d43..4b52d7950 100644 --- a/src/smt/theory_pb.cpp +++ b/src/smt/theory_pb.cpp @@ -19,15 +19,15 @@ Notes: --*/ #include -#include "theory_pb.h" -#include "smt_context.h" -#include "ast_pp.h" -#include "sorting_network.h" -#include "uint_set.h" -#include "smt_model_generator.h" -#include "pb_rewriter_def.h" -#include "sparse_matrix_def.h" -#include "simplex_def.h" +#include "smt/theory_pb.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" +#include "util/sorting_network.h" +#include "util/uint_set.h" +#include "smt/smt_model_generator.h" +#include "ast/rewriter/pb_rewriter_def.h" +#include "math/simplex/sparse_matrix_def.h" +#include "math/simplex/simplex_def.h" namespace smt { diff --git a/src/smt/theory_pb.h b/src/smt/theory_pb.h index ee68bd26e..7f530e5b0 100644 --- a/src/smt/theory_pb.h +++ b/src/smt/theory_pb.h @@ -20,11 +20,11 @@ Notes: sorting circuits if it keeps having to propagate (create new clauses). --*/ -#include "smt_theory.h" -#include "pb_decl_plugin.h" -#include "smt_clause.h" -#include "theory_pb_params.h" -#include "simplex.h" +#include "smt/smt_theory.h" +#include "ast/pb_decl_plugin.h" +#include "smt/smt_clause.h" +#include "smt/params/theory_pb_params.h" +#include "math/simplex/simplex.h" namespace smt { class theory_pb : public theory { diff --git a/src/smt/theory_seq.cpp b/src/smt/theory_seq.cpp index e72cd3f6d..14ee3b073 100644 --- a/src/smt/theory_seq.cpp +++ b/src/smt/theory_seq.cpp @@ -18,13 +18,13 @@ Revision History: --*/ -#include "value_factory.h" -#include "smt_context.h" -#include "smt_model_generator.h" -#include "theory_seq.h" -#include "ast_trail.h" -#include "theory_arith.h" -#include "smt_kernel.h" +#include "smt/proto_model/value_factory.h" +#include "smt/smt_context.h" +#include "smt/smt_model_generator.h" +#include "smt/theory_seq.h" +#include "ast/ast_trail.h" +#include "smt/theory_arith.h" +#include "smt/smt_kernel.h" using namespace smt; diff --git a/src/smt/theory_seq.h b/src/smt/theory_seq.h index f7212e608..b5a53e8e4 100644 --- a/src/smt/theory_seq.h +++ b/src/smt/theory_seq.h @@ -19,16 +19,16 @@ Revision History: #ifndef THEORY_SEQ_H_ #define THEORY_SEQ_H_ -#include "smt_theory.h" -#include "seq_decl_plugin.h" -#include "theory_seq_empty.h" -#include "th_rewriter.h" -#include "ast_trail.h" -#include "scoped_vector.h" -#include "scoped_ptr_vector.h" -#include "automaton.h" -#include "seq_rewriter.h" -#include "union_find.h" +#include "smt/smt_theory.h" +#include "ast/seq_decl_plugin.h" +#include "smt/theory_seq_empty.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_trail.h" +#include "util/scoped_vector.h" +#include "util/scoped_ptr_vector.h" +#include "math/automata/automaton.h" +#include "ast/rewriter/seq_rewriter.h" +#include "util/union_find.h" namespace smt { diff --git a/src/smt/theory_seq_empty.h b/src/smt/theory_seq_empty.h index 3f6c7f3e2..85408f7e5 100644 --- a/src/smt/theory_seq_empty.h +++ b/src/smt/theory_seq_empty.h @@ -19,8 +19,8 @@ Revision History: #ifndef THEORY_SEQ_EMPTY_H_ #define THEORY_SEQ_EMPTY_H_ -#include "smt_theory.h" -#include "seq_decl_plugin.h" +#include "smt/smt_theory.h" +#include "ast/seq_decl_plugin.h" namespace smt { class seq_factory : public value_factory { diff --git a/src/smt/theory_str.cpp b/src/smt/theory_str.cpp index 13f8ab282..6f3dabe2e 100644 --- a/src/smt/theory_str.cpp +++ b/src/smt/theory_str.cpp @@ -14,17 +14,17 @@ Revision History: --*/ -#include"ast_smt2_pp.h" -#include"smt_context.h" -#include"theory_str.h" -#include"smt_model_generator.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" +#include "smt/smt_context.h" +#include "smt/theory_str.h" +#include "smt/smt_model_generator.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" #include #include -#include"theory_seq_empty.h" -#include"theory_arith.h" -#include"ast_util.h" +#include "smt/theory_seq_empty.h" +#include "smt/theory_arith.h" +#include "ast/ast_util.h" namespace smt { diff --git a/src/smt/theory_str.h b/src/smt/theory_str.h index 7f39efa70..5837980df 100644 --- a/src/smt/theory_str.h +++ b/src/smt/theory_str.h @@ -17,19 +17,19 @@ #ifndef _THEORY_STR_H_ #define _THEORY_STR_H_ -#include"smt_theory.h" -#include"theory_str_params.h" -#include"trail.h" -#include"th_rewriter.h" -#include"value_factory.h" -#include"smt_model_generator.h" -#include"arith_decl_plugin.h" +#include "smt/smt_theory.h" +#include "smt/params/theory_str_params.h" +#include "util/trail.h" +#include "ast/rewriter/th_rewriter.h" +#include "smt/proto_model/value_factory.h" +#include "smt/smt_model_generator.h" +#include "ast/arith_decl_plugin.h" #include #include #include #include -#include"seq_decl_plugin.h" -#include"union_find.h" +#include "ast/seq_decl_plugin.h" +#include "util/union_find.h" namespace smt { diff --git a/src/smt/theory_utvpi.cpp b/src/smt/theory_utvpi.cpp index 9da82c9e6..1f56b748b 100644 --- a/src/smt/theory_utvpi.cpp +++ b/src/smt/theory_utvpi.cpp @@ -14,8 +14,8 @@ Revision History: The implementaton is derived from theory_diff_logic. --*/ -#include "theory_utvpi.h" -#include "theory_utvpi_def.h" +#include "smt/theory_utvpi.h" +#include "smt/theory_utvpi_def.h" namespace smt { diff --git a/src/smt/theory_utvpi.h b/src/smt/theory_utvpi.h index 35ebd440b..55bbb9838 100644 --- a/src/smt/theory_utvpi.h +++ b/src/smt/theory_utvpi.h @@ -22,7 +22,7 @@ Revision History: #ifndef THEORY_UTVPI_H_ #define THEORY_UTVPI_H_ -#include"theory_diff_logic.h" +#include "smt/theory_diff_logic.h" namespace smt { diff --git a/src/smt/theory_utvpi_def.h b/src/smt/theory_utvpi_def.h index 5f370c29c..7c1edb585 100644 --- a/src/smt/theory_utvpi_def.h +++ b/src/smt/theory_utvpi_def.h @@ -49,10 +49,10 @@ Revision History: #ifndef THEORY_UTVPI_DEF_H_ #define THEORY_UTVPI_DEF_H_ -#include "theory_utvpi.h" -#include "heap.h" -#include "ast_pp.h" -#include "smt_context.h" +#include "smt/theory_utvpi.h" +#include "util/heap.h" +#include "ast/ast_pp.h" +#include "smt/smt_context.h" namespace smt { diff --git a/src/smt/theory_wmaxsat.cpp b/src/smt/theory_wmaxsat.cpp index 3f153f500..88ba89610 100644 --- a/src/smt/theory_wmaxsat.cpp +++ b/src/smt/theory_wmaxsat.cpp @@ -18,10 +18,10 @@ Notes: --*/ #include -#include "smt_context.h" -#include "ast_pp.h" -#include "theory_wmaxsat.h" -#include "smt_justification.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" +#include "smt/theory_wmaxsat.h" +#include "smt/smt_justification.h" namespace smt { diff --git a/src/smt/theory_wmaxsat.h b/src/smt/theory_wmaxsat.h index 0f711b9f8..739a22c71 100644 --- a/src/smt/theory_wmaxsat.h +++ b/src/smt/theory_wmaxsat.h @@ -20,9 +20,9 @@ Notes: #ifndef THEORY_WMAXSAT_H_ #define THEORY_WMAXSAT_H_ -#include "smt_theory.h" -#include "smt_clause.h" -#include "filter_model_converter.h" +#include "smt/smt_theory.h" +#include "smt/smt_clause.h" +#include "tactic/filter_model_converter.h" namespace smt { class theory_wmaxsat : public theory { diff --git a/src/smt/uses_theory.cpp b/src/smt/uses_theory.cpp index 5b736f75a..517951a7b 100644 --- a/src/smt/uses_theory.cpp +++ b/src/smt/uses_theory.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"uses_theory.h" -#include"for_each_expr.h" +#include "smt/uses_theory.h" +#include "ast/for_each_expr.h" bool uses_theory(expr * n, family_id fid) { expr_mark visited; diff --git a/src/smt/uses_theory.h b/src/smt/uses_theory.h index 8f3760e3e..948d05f77 100644 --- a/src/smt/uses_theory.h +++ b/src/smt/uses_theory.h @@ -19,7 +19,7 @@ Revision History: #ifndef USES_THEORY_H_ #define USES_THEORY_H_ -#include"ast.h" +#include "ast/ast.h" /** \brief Return true if the given expression contains a symbol of the given theory. diff --git a/src/smt/watch_list.cpp b/src/smt/watch_list.cpp index ed73b9ed5..2ff75c418 100644 --- a/src/smt/watch_list.cpp +++ b/src/smt/watch_list.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"watch_list.h" +#include "smt/watch_list.h" namespace smt { diff --git a/src/smt/watch_list.h b/src/smt/watch_list.h index 2af26695f..19d3f20a8 100644 --- a/src/smt/watch_list.h +++ b/src/smt/watch_list.h @@ -19,8 +19,8 @@ Revision History: #ifndef WATCH_LIST_H_ #define WATCH_LIST_H_ -#include"smt_clause.h" -#include"memory_manager.h" +#include "smt/smt_clause.h" +#include "util/memory_manager.h" namespace smt { diff --git a/src/solver/check_sat_result.cpp b/src/solver/check_sat_result.cpp index 7a248e8b1..5a7733071 100644 --- a/src/solver/check_sat_result.cpp +++ b/src/solver/check_sat_result.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"check_sat_result.h" +#include "solver/check_sat_result.h" simple_check_sat_result::simple_check_sat_result(ast_manager & m): m_core(m), diff --git a/src/solver/check_sat_result.h b/src/solver/check_sat_result.h index 36eadd97d..3079433b5 100644 --- a/src/solver/check_sat_result.h +++ b/src/solver/check_sat_result.h @@ -19,9 +19,9 @@ Notes: #ifndef CHECK_SAT_RESULT_H_ #define CHECK_SAT_RESULT_H_ -#include"model.h" -#include"lbool.h" -#include"statistics.h" +#include "model/model.h" +#include "util/lbool.h" +#include "util/statistics.h" /** \brief Abstract interface for the result of a (check-sat) like command. diff --git a/src/solver/combined_solver.cpp b/src/solver/combined_solver.cpp index d67643edf..cbe6373c2 100644 --- a/src/solver/combined_solver.cpp +++ b/src/solver/combined_solver.cpp @@ -18,10 +18,10 @@ Author: Notes: --*/ -#include"solver.h" -#include"scoped_timer.h" +#include "solver/solver.h" +#include "util/scoped_timer.h" #include"combined_solver_params.hpp" -#include"common_msgs.h" +#include "util/common_msgs.h" #define PS_VB_LVL 15 /** diff --git a/src/solver/combined_solver.h b/src/solver/combined_solver.h index a10bf343f..70637070c 100644 --- a/src/solver/combined_solver.h +++ b/src/solver/combined_solver.h @@ -21,7 +21,7 @@ Notes: #ifndef COMBINED_SOLVER_H_ #define COMBINED_SOLVER_H_ -#include"params.h" +#include "util/params.h" class solver; class solver_factory; diff --git a/src/solver/mus.cpp b/src/solver/mus.cpp index d536a191b..7eb692567 100644 --- a/src/solver/mus.cpp +++ b/src/solver/mus.cpp @@ -18,11 +18,11 @@ Notes: --*/ -#include "solver.h" -#include "mus.h" -#include "ast_pp.h" -#include "ast_util.h" -#include "model_evaluator.h" +#include "solver/solver.h" +#include "solver/mus.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" +#include "model/model_evaluator.h" struct mus::imp { diff --git a/src/solver/smt_logics.cpp b/src/solver/smt_logics.cpp index 2bb364b6a..75cd0f2bb 100644 --- a/src/solver/smt_logics.cpp +++ b/src/solver/smt_logics.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include "symbol.h" -#include "smt_logics.h" +#include "util/symbol.h" +#include "solver/smt_logics.h" diff --git a/src/solver/solver.cpp b/src/solver/solver.cpp index 9163cfeda..cb7864268 100644 --- a/src/solver/solver.cpp +++ b/src/solver/solver.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"solver.h" -#include"model_evaluator.h" -#include"ast_util.h" -#include"ast_pp.h" -#include"ast_pp_util.h" -#include "common_msgs.h" +#include "solver/solver.h" +#include "model/model_evaluator.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" +#include "ast/ast_pp_util.h" +#include "util/common_msgs.h" unsigned solver::get_num_assertions() const { diff --git a/src/solver/solver.h b/src/solver/solver.h index 6b9d38f29..00e3cf8e9 100644 --- a/src/solver/solver.h +++ b/src/solver/solver.h @@ -19,9 +19,9 @@ Notes: #ifndef SOLVER_H_ #define SOLVER_H_ -#include"check_sat_result.h" -#include"progress_callback.h" -#include"params.h" +#include "solver/check_sat_result.h" +#include "solver/progress_callback.h" +#include "util/params.h" class solver; diff --git a/src/solver/solver2tactic.cpp b/src/solver/solver2tactic.cpp index 1a02c97e6..fa0711d70 100644 --- a/src/solver/solver2tactic.cpp +++ b/src/solver/solver2tactic.cpp @@ -17,11 +17,11 @@ Notes: --*/ -#include "solver.h" -#include "tactic.h" -#include"filter_model_converter.h" -#include "solver2tactic.h" -#include "ast_util.h" +#include "solver/solver.h" +#include "tactic/tactic.h" +#include "tactic/filter_model_converter.h" +#include "solver/solver2tactic.h" +#include "ast/ast_util.h" typedef obj_map expr2expr_map; diff --git a/src/solver/solver2tactic.h b/src/solver/solver2tactic.h index 65fbd37b1..647a1cee4 100644 --- a/src/solver/solver2tactic.h +++ b/src/solver/solver2tactic.h @@ -19,8 +19,8 @@ Notes: #ifndef SOLVER2TACTIC_H_ #define SOLVER2TACTIC_H_ -#include "tactic.h" -#include "filter_model_converter.h" +#include "tactic/tactic.h" +#include "tactic/filter_model_converter.h" class solver; tactic * mk_solver2tactic(solver* s); diff --git a/src/solver/solver_na2as.cpp b/src/solver/solver_na2as.cpp index 31895b8ef..2628380c5 100644 --- a/src/solver/solver_na2as.cpp +++ b/src/solver/solver_na2as.cpp @@ -19,8 +19,8 @@ Author: Notes: --*/ -#include"solver_na2as.h" -#include"ast_smt2_pp.h" +#include "solver/solver_na2as.h" +#include "ast/ast_smt2_pp.h" solver_na2as::solver_na2as(ast_manager & m): diff --git a/src/solver/solver_na2as.h b/src/solver/solver_na2as.h index aaa48efe7..3e726be12 100644 --- a/src/solver/solver_na2as.h +++ b/src/solver/solver_na2as.h @@ -22,7 +22,7 @@ Notes: #ifndef SOLVER_NA2AS_H_ #define SOLVER_NA2AS_H_ -#include"solver.h" +#include "solver/solver.h" class solver_na2as : public solver { protected: diff --git a/src/solver/tactic2solver.cpp b/src/solver/tactic2solver.cpp index e451f57d4..d7e7fbb6e 100644 --- a/src/solver/tactic2solver.cpp +++ b/src/solver/tactic2solver.cpp @@ -19,10 +19,10 @@ Author: Notes: --*/ -#include"solver_na2as.h" -#include"tactic.h" -#include"ast_translation.h" -#include"mus.h" +#include "solver/solver_na2as.h" +#include "tactic/tactic.h" +#include "ast/ast_translation.h" +#include "solver/mus.h" /** \brief Simulates the incremental solver interface using a tactic. diff --git a/src/solver/tactic2solver.h b/src/solver/tactic2solver.h index 9158a00b7..2da0f69eb 100644 --- a/src/solver/tactic2solver.h +++ b/src/solver/tactic2solver.h @@ -22,7 +22,7 @@ Notes: #ifndef TACTIC2SOLVER_H_ #define TACTIC2SOLVER_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; class tactic_factory; diff --git a/src/tactic/aig/aig.cpp b/src/tactic/aig/aig.cpp index 6e289d969..e8226e159 100644 --- a/src/tactic/aig/aig.cpp +++ b/src/tactic/aig/aig.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"aig.h" -#include"goal.h" -#include"ast_smt2_pp.h" -#include"cooperate.h" +#include "tactic/aig/aig.h" +#include "tactic/goal.h" +#include "ast/ast_smt2_pp.h" +#include "util/cooperate.h" #define USE_TWO_LEVEL_RULES #define FIRST_NODE_ID (UINT_MAX/2) diff --git a/src/tactic/aig/aig.h b/src/tactic/aig/aig.h index fbbde7de6..5e0add752 100644 --- a/src/tactic/aig/aig.h +++ b/src/tactic/aig/aig.h @@ -19,8 +19,8 @@ Notes: #ifndef AIG_H_ #define AIG_H_ -#include"ast.h" -#include"tactic_exception.h" +#include "ast/ast.h" +#include "tactic/tactic_exception.h" class goal; class aig_lit; diff --git a/src/tactic/aig/aig_tactic.cpp b/src/tactic/aig/aig_tactic.cpp index 59d114ed6..37ffc6124 100644 --- a/src/tactic/aig/aig_tactic.cpp +++ b/src/tactic/aig/aig_tactic.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"tactical.h" -#include"aig.h" +#include "tactic/tactical.h" +#include "tactic/aig/aig.h" class aig_manager; diff --git a/src/tactic/aig/aig_tactic.h b/src/tactic/aig/aig_tactic.h index d9584ad02..2ba97e3b4 100644 --- a/src/tactic/aig/aig_tactic.h +++ b/src/tactic/aig/aig_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef AIG_TACTIC_H_ #define AIG_TACTIC_H_ -#include"params.h" +#include "util/params.h" class tactic; tactic * mk_aig_tactic(params_ref const & p = params_ref()); diff --git a/src/tactic/arith/add_bounds_tactic.cpp b/src/tactic/arith/add_bounds_tactic.cpp index 8ff82af17..ac105eb06 100644 --- a/src/tactic/arith/add_bounds_tactic.cpp +++ b/src/tactic/arith/add_bounds_tactic.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"arith_decl_plugin.h" -#include"ast_smt2_pp.h" -#include"bound_manager.h" +#include "tactic/tactical.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/arith/bound_manager.h" struct is_unbounded_proc { struct found {}; diff --git a/src/tactic/arith/add_bounds_tactic.h b/src/tactic/arith/add_bounds_tactic.h index 7cb146fc7..b7b8f419c 100644 --- a/src/tactic/arith/add_bounds_tactic.h +++ b/src/tactic/arith/add_bounds_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef ADD_BOUNDS_H_ #define ADD_BOUNDS_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class goal; diff --git a/src/tactic/arith/arith_bounds_tactic.cpp b/src/tactic/arith/arith_bounds_tactic.cpp index fe054aaea..b750689b1 100644 --- a/src/tactic/arith/arith_bounds_tactic.cpp +++ b/src/tactic/arith/arith_bounds_tactic.cpp @@ -6,8 +6,8 @@ Copyright (c) 2015 Microsoft Corporation -#include"arith_bounds_tactic.h" -#include"arith_decl_plugin.h" +#include "tactic/arith/arith_bounds_tactic.h" +#include "ast/arith_decl_plugin.h" struct arith_bounds_tactic : public tactic { diff --git a/src/tactic/arith/arith_bounds_tactic.h b/src/tactic/arith/arith_bounds_tactic.h index 78da93867..92bc85564 100644 --- a/src/tactic/arith/arith_bounds_tactic.h +++ b/src/tactic/arith/arith_bounds_tactic.h @@ -30,7 +30,7 @@ Notes: --*/ #ifndef ARITH_BOUNDS_TACTIC_H_ #define ARITH_BOUNDS_TACTIC_H_ -#include "tactic.h" +#include "tactic/tactic.h" tactic * mk_arith_bounds_tactic(ast_manager & m, params_ref const & p = params_ref()); diff --git a/src/tactic/arith/bound_manager.cpp b/src/tactic/arith/bound_manager.cpp index 97d93658c..da507ea10 100644 --- a/src/tactic/arith/bound_manager.cpp +++ b/src/tactic/arith/bound_manager.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"bound_manager.h" -#include"ast_smt2_pp.h" -#include"goal.h" +#include "tactic/arith/bound_manager.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/goal.h" bound_manager::bound_manager(ast_manager & m): m_util(m) { diff --git a/src/tactic/arith/bound_manager.h b/src/tactic/arith/bound_manager.h index 6a4dc2c96..a08a53614 100644 --- a/src/tactic/arith/bound_manager.h +++ b/src/tactic/arith/bound_manager.h @@ -19,8 +19,8 @@ Notes: #ifndef BOUND_MANAGER_H_ #define BOUND_MANAGER_H_ -#include"ast.h" -#include"arith_decl_plugin.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" class goal; diff --git a/src/tactic/arith/bound_propagator.cpp b/src/tactic/arith/bound_propagator.cpp index dbd7c5f69..51499674b 100644 --- a/src/tactic/arith/bound_propagator.cpp +++ b/src/tactic/arith/bound_propagator.cpp @@ -17,7 +17,7 @@ Author: Revision History: --*/ -#include"bound_propagator.h" +#include "tactic/arith/bound_propagator.h" #include // ------------------------------- diff --git a/src/tactic/arith/bound_propagator.h b/src/tactic/arith/bound_propagator.h index 2781bed55..042e39e5f 100644 --- a/src/tactic/arith/bound_propagator.h +++ b/src/tactic/arith/bound_propagator.h @@ -20,12 +20,12 @@ Revision History: #ifndef BOUND_PROPAGATOR_H_ #define BOUND_PROPAGATOR_H_ -#include"mpq.h" -#include"vector.h" -#include"params.h" -#include"statistics.h" -#include"numeral_buffer.h" -#include"linear_equation.h" +#include "util/mpq.h" +#include "util/vector.h" +#include "util/params.h" +#include "util/statistics.h" +#include "util/numeral_buffer.h" +#include "tactic/arith/linear_equation.h" class bound_propagator { public: diff --git a/src/tactic/arith/bv2int_rewriter.cpp b/src/tactic/arith/bv2int_rewriter.cpp index 098e04a8d..4315b0f5f 100644 --- a/src/tactic/arith/bv2int_rewriter.cpp +++ b/src/tactic/arith/bv2int_rewriter.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include "bv2int_rewriter.h" -#include "rewriter_def.h" -#include "ast_pp.h" -#include "ast_util.h" +#include "tactic/arith/bv2int_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/ast_util.h" void bv2int_rewriter_ctx::update_params(params_ref const& p) { m_max_size = p.get_uint("max_bv_size", UINT_MAX); diff --git a/src/tactic/arith/bv2int_rewriter.h b/src/tactic/arith/bv2int_rewriter.h index 15a425857..9ef256197 100644 --- a/src/tactic/arith/bv2int_rewriter.h +++ b/src/tactic/arith/bv2int_rewriter.h @@ -19,12 +19,12 @@ Notes: #ifndef BV2INT_REWRITER_H_ #define BV2INT_REWRITER_H_ -#include"ast.h" -#include"rewriter.h" -#include"bv_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"params.h" -#include"goal.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "util/params.h" +#include "tactic/goal.h" class bv2int_rewriter_ctx { unsigned m_max_size; diff --git a/src/tactic/arith/bv2real_rewriter.cpp b/src/tactic/arith/bv2real_rewriter.cpp index 4f952b697..5839ff7a2 100644 --- a/src/tactic/arith/bv2real_rewriter.cpp +++ b/src/tactic/arith/bv2real_rewriter.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"bv2real_rewriter.h" -#include"rewriter_def.h" -#include"ast_pp.h" -#include"for_each_expr.h" +#include "tactic/arith/bv2real_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "ast/for_each_expr.h" bv2real_util::bv2real_util(ast_manager& m, rational const& default_root, rational const& default_divisor, unsigned max_num_bits) : diff --git a/src/tactic/arith/bv2real_rewriter.h b/src/tactic/arith/bv2real_rewriter.h index 5f80db4a3..f020f9f1e 100644 --- a/src/tactic/arith/bv2real_rewriter.h +++ b/src/tactic/arith/bv2real_rewriter.h @@ -19,10 +19,10 @@ Notes: #ifndef BV2REAL_REWRITER_H_ #define BV2REAL_REWRITER_H_ -#include"ast.h" -#include"rewriter.h" -#include"bv_decl_plugin.h" -#include"arith_decl_plugin.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" // // bv2real[d,r](n,m) has interpretation: diff --git a/src/tactic/arith/card2bv_tactic.cpp b/src/tactic/arith/card2bv_tactic.cpp index 096e52981..d2453eba2 100644 --- a/src/tactic/arith/card2bv_tactic.cpp +++ b/src/tactic/arith/card2bv_tactic.cpp @@ -16,14 +16,14 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"ast_smt2_pp.h" -#include"card2bv_tactic.h" -#include"pb2bv_rewriter.h" -#include"ast_util.h" -#include"ast_pp.h" -#include"filter_model_converter.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "ast/ast_smt2_pp.h" +#include "tactic/arith/card2bv_tactic.h" +#include "ast/rewriter/pb2bv_rewriter.h" +#include "ast/ast_util.h" +#include "ast/ast_pp.h" +#include "tactic/filter_model_converter.h" class card2bv_tactic : public tactic { ast_manager & m; diff --git a/src/tactic/arith/card2bv_tactic.h b/src/tactic/arith/card2bv_tactic.h index 9bf21d2c3..287dfa27e 100644 --- a/src/tactic/arith/card2bv_tactic.h +++ b/src/tactic/arith/card2bv_tactic.h @@ -19,12 +19,12 @@ Notes: #ifndef CARD2BV_TACTIC_H_ #define CARD2BV_TACTIC_H_ -#include"params.h" -#include"pb_decl_plugin.h" -#include"th_rewriter.h" -#include"rewriter.h" +#include "util/params.h" +#include "ast/pb_decl_plugin.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/rewriter/rewriter.h" #include -#include"sorting_network.h" +#include "util/sorting_network.h" class ast_manager; diff --git a/src/tactic/arith/degree_shift_tactic.cpp b/src/tactic/arith/degree_shift_tactic.cpp index 6c5527d12..6344c4c51 100644 --- a/src/tactic/arith/degree_shift_tactic.cpp +++ b/src/tactic/arith/degree_shift_tactic.cpp @@ -19,14 +19,14 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"filter_model_converter.h" -#include"extension_model_converter.h" -#include"cooperate.h" -#include"arith_decl_plugin.h" -#include"simplify_tactic.h" -#include"ast_smt2_pp.h" -#include"rewriter_def.h" +#include "tactic/tactical.h" +#include "tactic/filter_model_converter.h" +#include "tactic/extension_model_converter.h" +#include "util/cooperate.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/core/simplify_tactic.h" +#include "ast/ast_smt2_pp.h" +#include "ast/rewriter/rewriter_def.h" class degree_shift_tactic : public tactic { struct imp { diff --git a/src/tactic/arith/degree_shift_tactic.h b/src/tactic/arith/degree_shift_tactic.h index efc0d442e..3456e19e5 100644 --- a/src/tactic/arith/degree_shift_tactic.h +++ b/src/tactic/arith/degree_shift_tactic.h @@ -22,7 +22,7 @@ Revision History: #ifndef DEGREE_SHIFT_TACTIC_H_ #define DEGREE_SHIFT_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/diff_neq_tactic.cpp b/src/tactic/arith/diff_neq_tactic.cpp index d63c2fcf4..651000297 100644 --- a/src/tactic/arith/diff_neq_tactic.cpp +++ b/src/tactic/arith/diff_neq_tactic.cpp @@ -20,10 +20,10 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"arith_decl_plugin.h" -#include"ast_smt2_pp.h" -#include"model.h" +#include "tactic/tactical.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_smt2_pp.h" +#include "model/model.h" class diff_neq_tactic : public tactic { struct imp { diff --git a/src/tactic/arith/diff_neq_tactic.h b/src/tactic/arith/diff_neq_tactic.h index 205fb7bb5..3fbe616dc 100644 --- a/src/tactic/arith/diff_neq_tactic.h +++ b/src/tactic/arith/diff_neq_tactic.h @@ -23,7 +23,7 @@ Revision History: #ifndef DIFF_NEQ_TACTIC_H_ #define DIFF_NEQ_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/elim01_tactic.cpp b/src/tactic/arith/elim01_tactic.cpp index e00b1e9c0..b6fd5eee7 100644 --- a/src/tactic/arith/elim01_tactic.cpp +++ b/src/tactic/arith/elim01_tactic.cpp @@ -16,15 +16,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"bound_manager.h" -#include"ast_pp.h" -#include"expr_safe_replace.h" // NB: should use proof-producing expr_substitute in polished version. -#include"arith_decl_plugin.h" -#include"elim01_tactic.h" -#include"model_smt2_pp.h" -#include"th_rewriter.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "tactic/arith/bound_manager.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/arith/elim01_tactic.h" +#include "model/model_smt2_pp.h" +#include "ast/rewriter/th_rewriter.h" class bool2int_model_converter : public model_converter { ast_manager& m; diff --git a/src/tactic/arith/elim01_tactic.h b/src/tactic/arith/elim01_tactic.h index 210f2b9fc..d9cd3a2ed 100644 --- a/src/tactic/arith/elim01_tactic.h +++ b/src/tactic/arith/elim01_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef ELIM01_TACTIC_H_ #define ELIM01_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/eq2bv_tactic.cpp b/src/tactic/arith/eq2bv_tactic.cpp index ac1ee9afd..255665b56 100644 --- a/src/tactic/arith/eq2bv_tactic.cpp +++ b/src/tactic/arith/eq2bv_tactic.cpp @@ -17,15 +17,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"bound_manager.h" -#include"ast_pp.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"rewriter_def.h" -#include"ast_util.h" -#include"ast_pp_util.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "tactic/arith/bound_manager.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_util.h" +#include "ast/ast_pp_util.h" class eq2bv_tactic : public tactic { struct eq_rewriter_cfg : public default_rewriter_cfg { diff --git a/src/tactic/arith/eq2bv_tactic.h b/src/tactic/arith/eq2bv_tactic.h index e336b1e0a..9441bfed3 100644 --- a/src/tactic/arith/eq2bv_tactic.h +++ b/src/tactic/arith/eq2bv_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef EQ2BV_TACTIC_H_ #define EQ2BV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/factor_tactic.cpp b/src/tactic/arith/factor_tactic.cpp index 70bff2610..d187c0078 100644 --- a/src/tactic/arith/factor_tactic.cpp +++ b/src/tactic/arith/factor_tactic.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"expr2polynomial.h" -#include"rewriter_def.h" +#include "tactic/tactical.h" +#include "ast/expr2polynomial.h" +#include "ast/rewriter/rewriter_def.h" class factor_tactic : public tactic { diff --git a/src/tactic/arith/factor_tactic.h b/src/tactic/arith/factor_tactic.h index 0948606e0..3b48f9f6d 100644 --- a/src/tactic/arith/factor_tactic.h +++ b/src/tactic/arith/factor_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef FACTOR_TACTIC_H_ #define FACTOR_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/fix_dl_var_tactic.cpp b/src/tactic/arith/fix_dl_var_tactic.cpp index 1a9a18c44..7ff7bd835 100644 --- a/src/tactic/arith/fix_dl_var_tactic.cpp +++ b/src/tactic/arith/fix_dl_var_tactic.cpp @@ -21,12 +21,12 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"th_rewriter.h" -#include"extension_model_converter.h" -#include"arith_decl_plugin.h" -#include"expr_substitution.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/extension_model_converter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/expr_substitution.h" +#include "ast/ast_smt2_pp.h" class fix_dl_var_tactic : public tactic { diff --git a/src/tactic/arith/fix_dl_var_tactic.h b/src/tactic/arith/fix_dl_var_tactic.h index 3cee418cb..9e204bf1b 100644 --- a/src/tactic/arith/fix_dl_var_tactic.h +++ b/src/tactic/arith/fix_dl_var_tactic.h @@ -24,7 +24,7 @@ Notes: #ifndef FIX_DL_VAR_TACTIC_H_ #define FIX_DL_VAR_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/fm_tactic.cpp b/src/tactic/arith/fm_tactic.cpp index 6db0f5ad3..48f584169 100644 --- a/src/tactic/arith/fm_tactic.cpp +++ b/src/tactic/arith/fm_tactic.cpp @@ -21,17 +21,17 @@ Author: Revision History: --*/ -#include"fm_tactic.h" -#include"tactical.h" -#include"arith_decl_plugin.h" -#include"for_each_expr.h" -#include"cooperate.h" -#include"ast_smt2_pp.h" -#include"ast_pp.h" -#include"id_gen.h" -#include"model_evaluator.h" -#include"model_v2_pp.h" -#include"simplify_tactic.h" +#include "tactic/arith/fm_tactic.h" +#include "tactic/tactical.h" +#include "ast/arith_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "util/cooperate.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_pp.h" +#include "util/id_gen.h" +#include "model/model_evaluator.h" +#include "model/model_v2_pp.h" +#include "tactic/core/simplify_tactic.h" class fm_tactic : public tactic { typedef ptr_vector clauses; diff --git a/src/tactic/arith/fm_tactic.h b/src/tactic/arith/fm_tactic.h index f45ab2475..0b59ab98f 100644 --- a/src/tactic/arith/fm_tactic.h +++ b/src/tactic/arith/fm_tactic.h @@ -24,7 +24,7 @@ Revision History: #ifndef FM_TACTIC_H_ #define FM_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/lia2card_tactic.cpp b/src/tactic/arith/lia2card_tactic.cpp index 8f37a8d5e..ec41f5845 100644 --- a/src/tactic/arith/lia2card_tactic.cpp +++ b/src/tactic/arith/lia2card_tactic.cpp @@ -34,15 +34,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"bound_manager.h" -#include"ast_pp.h" -#include"pb_decl_plugin.h" -#include"arith_decl_plugin.h" -#include"rewriter_def.h" -#include"ast_util.h" -#include"ast_pp_util.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "tactic/arith/bound_manager.h" +#include "ast/ast_pp.h" +#include "ast/pb_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_util.h" +#include "ast/ast_pp_util.h" class lia2card_tactic : public tactic { struct lia_rewriter_cfg : public default_rewriter_cfg { diff --git a/src/tactic/arith/lia2card_tactic.h b/src/tactic/arith/lia2card_tactic.h index 93adb6f46..4a8334f10 100644 --- a/src/tactic/arith/lia2card_tactic.h +++ b/src/tactic/arith/lia2card_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef LIA2CARD_TACTIC_H_ #define LIA2CARD_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/lia2pb_tactic.cpp b/src/tactic/arith/lia2pb_tactic.cpp index 2b54dd463..d303463db 100644 --- a/src/tactic/arith/lia2pb_tactic.cpp +++ b/src/tactic/arith/lia2pb_tactic.cpp @@ -16,15 +16,15 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"bound_manager.h" -#include"th_rewriter.h" -#include"for_each_expr.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"arith_decl_plugin.h" -#include"expr_substitution.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "tactic/arith/bound_manager.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/for_each_expr.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/expr_substitution.h" +#include "ast/ast_smt2_pp.h" class lia2pb_tactic : public tactic { struct imp { diff --git a/src/tactic/arith/lia2pb_tactic.h b/src/tactic/arith/lia2pb_tactic.h index 273949825..29c05d52a 100644 --- a/src/tactic/arith/lia2pb_tactic.h +++ b/src/tactic/arith/lia2pb_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef LIA2PB_TACTIC_H_ #define LIA2PB_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/linear_equation.cpp b/src/tactic/arith/linear_equation.cpp index 0b8828674..ed158b778 100644 --- a/src/tactic/arith/linear_equation.cpp +++ b/src/tactic/arith/linear_equation.cpp @@ -18,7 +18,7 @@ Author: Revision History: --*/ -#include"linear_equation.h" +#include "tactic/arith/linear_equation.h" /** \brief Return the position of variable x_i in the linear equation. diff --git a/src/tactic/arith/linear_equation.h b/src/tactic/arith/linear_equation.h index 1de3969ca..1bfa94d1a 100644 --- a/src/tactic/arith/linear_equation.h +++ b/src/tactic/arith/linear_equation.h @@ -21,10 +21,10 @@ Revision History: #ifndef LINEAR_EQUATION_H_ #define LINEAR_EQUATION_H_ -#include"mpq.h" -#include"small_object_allocator.h" -#include"numeral_buffer.h" -#include"double_manager.h" +#include "util/mpq.h" +#include "util/small_object_allocator.h" +#include "util/numeral_buffer.h" +#include "util/double_manager.h" class linear_equation { public: diff --git a/src/tactic/arith/nla2bv_tactic.cpp b/src/tactic/arith/nla2bv_tactic.cpp index 1399d6549..6f5f49aee 100644 --- a/src/tactic/arith/nla2bv_tactic.cpp +++ b/src/tactic/arith/nla2bv_tactic.cpp @@ -18,19 +18,19 @@ Notes: The original file was called qfnla2bv.cpp --*/ -#include "tactical.h" -#include "arith_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "for_each_expr.h" -#include "expr_replacer.h" -#include "optional.h" -#include "bv2int_rewriter.h" -#include "bv2real_rewriter.h" -#include "extension_model_converter.h" -#include "filter_model_converter.h" -#include "bound_manager.h" -#include "obj_pair_hashtable.h" -#include "ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/expr_replacer.h" +#include "util/optional.h" +#include "tactic/arith/bv2int_rewriter.h" +#include "tactic/arith/bv2real_rewriter.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "tactic/arith/bound_manager.h" +#include "util/obj_pair_hashtable.h" +#include "ast/ast_smt2_pp.h" // // diff --git a/src/tactic/arith/nla2bv_tactic.h b/src/tactic/arith/nla2bv_tactic.h index e2d207520..c6be722a3 100644 --- a/src/tactic/arith/nla2bv_tactic.h +++ b/src/tactic/arith/nla2bv_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef NLA2BV_TACTIC_H_ #define NLA2BV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/normalize_bounds_tactic.cpp b/src/tactic/arith/normalize_bounds_tactic.cpp index 06f1368a2..2b3ff5ab0 100644 --- a/src/tactic/arith/normalize_bounds_tactic.cpp +++ b/src/tactic/arith/normalize_bounds_tactic.cpp @@ -18,14 +18,14 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"bound_manager.h" -#include"th_rewriter.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"arith_decl_plugin.h" -#include"expr_substitution.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "tactic/arith/bound_manager.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/expr_substitution.h" +#include "ast/ast_smt2_pp.h" class normalize_bounds_tactic : public tactic { struct imp { diff --git a/src/tactic/arith/normalize_bounds_tactic.h b/src/tactic/arith/normalize_bounds_tactic.h index 1ecbf88d8..f8473842f 100644 --- a/src/tactic/arith/normalize_bounds_tactic.h +++ b/src/tactic/arith/normalize_bounds_tactic.h @@ -21,7 +21,7 @@ Revision History: #ifndef NORMALIZE_BOUNDS_TACTIC_H_ #define NORMALIZE_BOUNDS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/pb2bv_model_converter.cpp b/src/tactic/arith/pb2bv_model_converter.cpp index 8dbacc6cd..df5bd5745 100644 --- a/src/tactic/arith/pb2bv_model_converter.cpp +++ b/src/tactic/arith/pb2bv_model_converter.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"trace.h" -#include"arith_decl_plugin.h" -#include"model_v2_pp.h" -#include"pb2bv_model_converter.h" +#include "util/trace.h" +#include "ast/arith_decl_plugin.h" +#include "model/model_v2_pp.h" +#include "tactic/arith/pb2bv_model_converter.h" pb2bv_model_converter::pb2bv_model_converter(ast_manager & _m) : m(_m) { diff --git a/src/tactic/arith/pb2bv_model_converter.h b/src/tactic/arith/pb2bv_model_converter.h index 8b6256ccc..0c2826573 100644 --- a/src/tactic/arith/pb2bv_model_converter.h +++ b/src/tactic/arith/pb2bv_model_converter.h @@ -19,8 +19,8 @@ Notes: #ifndef PB2BV_MODEL_CONVERTER_H_ #define PB2BV_MODEL_CONVERTER_H_ -#include"model_converter.h" -#include"bound_manager.h" +#include "tactic/model_converter.h" +#include "tactic/arith/bound_manager.h" class pb2bv_model_converter : public model_converter { typedef std::pair func_decl_pair; diff --git a/src/tactic/arith/pb2bv_tactic.cpp b/src/tactic/arith/pb2bv_tactic.cpp index 3931a1ea4..259cbc0c8 100644 --- a/src/tactic/arith/pb2bv_tactic.cpp +++ b/src/tactic/arith/pb2bv_tactic.cpp @@ -16,20 +16,20 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"bound_manager.h" -#include"bool_rewriter.h" -#include"rewriter_def.h" -#include"ref_util.h" -#include"arith_decl_plugin.h" -#include"trace.h" -#include"ast_smt2_pp.h" -#include"expr_substitution.h" -#include"filter_model_converter.h" -#include"pb2bv_model_converter.h" -#include"pb2bv_tactic.h" -#include"ast_pp.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "tactic/arith/bound_manager.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/ref_util.h" +#include "ast/arith_decl_plugin.h" +#include "util/trace.h" +#include "ast/ast_smt2_pp.h" +#include "ast/expr_substitution.h" +#include "tactic/filter_model_converter.h" +#include "tactic/arith/pb2bv_model_converter.h" +#include "tactic/arith/pb2bv_tactic.h" +#include "ast/ast_pp.h" class pb2bv_tactic : public tactic { public: diff --git a/src/tactic/arith/pb2bv_tactic.h b/src/tactic/arith/pb2bv_tactic.h index 7d7e8919c..49e87a8f7 100644 --- a/src/tactic/arith/pb2bv_tactic.h +++ b/src/tactic/arith/pb2bv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef PB2BV_TACTIC_H_ #define PB2BV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/probe_arith.cpp b/src/tactic/arith/probe_arith.cpp index 5d5590263..c2de64484 100644 --- a/src/tactic/arith/probe_arith.cpp +++ b/src/tactic/arith/probe_arith.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"probe.h" -#include"expr2polynomial.h" -#include"for_each_expr.h" -#include"arith_decl_plugin.h" -#include"goal_util.h" +#include "tactic/probe.h" +#include "ast/expr2polynomial.h" +#include "ast/for_each_expr.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/goal_util.h" class arith_degree_probe : public probe { struct proc { diff --git a/src/tactic/arith/propagate_ineqs_tactic.cpp b/src/tactic/arith/propagate_ineqs_tactic.cpp index 1a3447f38..d7209740f 100644 --- a/src/tactic/arith/propagate_ineqs_tactic.cpp +++ b/src/tactic/arith/propagate_ineqs_tactic.cpp @@ -30,11 +30,11 @@ Author: Notes: --*/ -#include"tactical.h" -#include"bound_propagator.h" -#include"arith_decl_plugin.h" -#include"simplify_tactic.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "tactic/arith/bound_propagator.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/core/simplify_tactic.h" +#include "ast/ast_smt2_pp.h" class propagate_ineqs_tactic : public tactic { struct imp; diff --git a/src/tactic/arith/propagate_ineqs_tactic.h b/src/tactic/arith/propagate_ineqs_tactic.h index 1027bd09f..fb5e370c6 100644 --- a/src/tactic/arith/propagate_ineqs_tactic.h +++ b/src/tactic/arith/propagate_ineqs_tactic.h @@ -33,7 +33,7 @@ Notes: #ifndef PROPAGATE_INEQS_TACTIC_H_ #define PROPAGATE_INEQS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/purify_arith_tactic.cpp b/src/tactic/arith/purify_arith_tactic.cpp index 463e1a9e8..0443a51ed 100644 --- a/src/tactic/arith/purify_arith_tactic.cpp +++ b/src/tactic/arith/purify_arith_tactic.cpp @@ -20,17 +20,17 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"rewriter_def.h" -#include"arith_decl_plugin.h" -#include"algebraic_numbers.h" -#include"nnf_tactic.h" -#include"simplify_tactic.h" -#include"th_rewriter.h" -#include"filter_model_converter.h" -#include"extension_model_converter.h" -#include"ast_smt2_pp.h" -#include"expr_replacer.h" +#include "tactic/tactical.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/arith_decl_plugin.h" +#include "math/polynomial/algebraic_numbers.h" +#include "tactic/core/nnf_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/filter_model_converter.h" +#include "tactic/extension_model_converter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/rewriter/expr_replacer.h" /* ---- diff --git a/src/tactic/arith/purify_arith_tactic.h b/src/tactic/arith/purify_arith_tactic.h index 9d4c927ff..bbb62710c 100644 --- a/src/tactic/arith/purify_arith_tactic.h +++ b/src/tactic/arith/purify_arith_tactic.h @@ -48,7 +48,7 @@ Revision History: #ifndef PURIFY_ARITH_TACTIC_H_ #define PURIFY_ARITH_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/arith/recover_01_tactic.cpp b/src/tactic/arith/recover_01_tactic.cpp index 393d30b58..d3b9ecc3e 100644 --- a/src/tactic/arith/recover_01_tactic.cpp +++ b/src/tactic/arith/recover_01_tactic.cpp @@ -30,14 +30,14 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"th_rewriter.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"arith_decl_plugin.h" -#include"expr_substitution.h" -#include"dec_ref_util.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/arith_decl_plugin.h" +#include "ast/expr_substitution.h" +#include "util/dec_ref_util.h" +#include "ast/ast_smt2_pp.h" class recover_01_tactic : public tactic { struct imp { diff --git a/src/tactic/arith/recover_01_tactic.h b/src/tactic/arith/recover_01_tactic.h index baa8ae06f..898586481 100644 --- a/src/tactic/arith/recover_01_tactic.h +++ b/src/tactic/arith/recover_01_tactic.h @@ -33,7 +33,7 @@ Revision History: #ifndef RECOVER_01_TACTIC_H_ #define RECOVER_01_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/bit_blaster_model_converter.cpp b/src/tactic/bv/bit_blaster_model_converter.cpp index a18862ee8..373cf3113 100644 --- a/src/tactic/bv/bit_blaster_model_converter.cpp +++ b/src/tactic/bv/bit_blaster_model_converter.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"model.h" -#include"model_pp.h" -#include"model_converter.h" -#include"bv_decl_plugin.h" -#include"ast_smt2_pp.h" +#include "model/model.h" +#include "model/model_pp.h" +#include "tactic/model_converter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_smt2_pp.h" /** If TO_BOOL == true, then bit-vectors of size n were blasted into n-tuples of Booleans. diff --git a/src/tactic/bv/bit_blaster_model_converter.h b/src/tactic/bv/bit_blaster_model_converter.h index 87a12a89e..f7dd254b4 100644 --- a/src/tactic/bv/bit_blaster_model_converter.h +++ b/src/tactic/bv/bit_blaster_model_converter.h @@ -19,7 +19,7 @@ Notes: #ifndef BIT_BLASTER_MODEL_CONVERTER_H_ #define BIT_BLASTER_MODEL_CONVERTER_H_ -#include"model_converter.h" +#include "tactic/model_converter.h" model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map const & const2bits); model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map const & const2bits); diff --git a/src/tactic/bv/bit_blaster_tactic.cpp b/src/tactic/bv/bit_blaster_tactic.cpp index 7e19585d9..5c6c43778 100644 --- a/src/tactic/bv/bit_blaster_tactic.cpp +++ b/src/tactic/bv/bit_blaster_tactic.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"bit_blaster_model_converter.h" -#include"bit_blaster_rewriter.h" -#include"ast_pp.h" -#include"model_pp.h" -#include"rewriter_types.h" +#include "tactic/tactical.h" +#include "tactic/bv/bit_blaster_model_converter.h" +#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h" +#include "ast/ast_pp.h" +#include "model/model_pp.h" +#include "ast/rewriter/rewriter_types.h" class bit_blaster_tactic : public tactic { diff --git a/src/tactic/bv/bit_blaster_tactic.h b/src/tactic/bv/bit_blaster_tactic.h index d840154b9..2dccafb6d 100644 --- a/src/tactic/bv/bit_blaster_tactic.h +++ b/src/tactic/bv/bit_blaster_tactic.h @@ -19,8 +19,8 @@ Copyright (c) 2011 Microsoft Corporation #ifndef BIT_BLASTER_TACTIC_H_ #define BIT_BLASTER_TACTIC_H_ - #include"params.h" - #include"bit_blaster_rewriter.h" +#include "util/params.h" +#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/bv1_blaster_tactic.cpp b/src/tactic/bv/bv1_blaster_tactic.cpp index e7327e7a9..e7e374184 100644 --- a/src/tactic/bv/bv1_blaster_tactic.cpp +++ b/src/tactic/bv/bv1_blaster_tactic.cpp @@ -22,13 +22,13 @@ Author: Notes: --*/ -#include"tactical.h" -#include"bit_blaster_model_converter.h" -#include"bv_decl_plugin.h" -#include"rewriter_def.h" -#include"for_each_expr.h" -#include"cooperate.h" -#include"bv_rewriter.h" +#include "tactic/tactical.h" +#include "tactic/bv/bit_blaster_model_converter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/for_each_expr.h" +#include "util/cooperate.h" +#include "ast/rewriter/bv_rewriter.h" class bv1_blaster_tactic : public tactic { diff --git a/src/tactic/bv/bv1_blaster_tactic.h b/src/tactic/bv/bv1_blaster_tactic.h index cad1d59b6..5c8632fbc 100644 --- a/src/tactic/bv/bv1_blaster_tactic.h +++ b/src/tactic/bv/bv1_blaster_tactic.h @@ -25,7 +25,7 @@ Notes: #ifndef BV1_BLASTER_TACTIC_H_ #define BV1_BLASTER_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/bv_bound_chk_tactic.cpp b/src/tactic/bv/bv_bound_chk_tactic.cpp index 1b90e05b1..ee7cb1ded 100644 --- a/src/tactic/bv/bv_bound_chk_tactic.cpp +++ b/src/tactic/bv/bv_bound_chk_tactic.cpp @@ -14,14 +14,14 @@ Revision History: --*/ -#include"bv_bound_chk_tactic.h" -#include"ast.h" -#include"rewriter.h" -#include"rewriter_def.h" -#include"bv_bounds.h" +#include "tactic/bv/bv_bound_chk_tactic.h" +#include "ast/ast.h" +#include "ast/rewriter/rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/bv_bounds.h" #include"rewriter_params.hpp" -#include"bool_rewriter.h" -#include"cooperate.h" +#include "ast/rewriter/bool_rewriter.h" +#include "util/cooperate.h" struct bv_bound_chk_stats { unsigned m_unsats; diff --git a/src/tactic/bv/bv_bound_chk_tactic.h b/src/tactic/bv/bv_bound_chk_tactic.h index f134d42ab..0cdadb0de 100644 --- a/src/tactic/bv/bv_bound_chk_tactic.h +++ b/src/tactic/bv/bv_bound_chk_tactic.h @@ -17,9 +17,9 @@ #ifndef BV_BOUND_CHK_TACTIC_H_ #define BV_BOUND_CHK_TACTIC_H_ -#include"tactical.h" -#include"params.h" -#include"ast.h" +#include "tactic/tactical.h" +#include "util/params.h" +#include "ast/ast.h" tactic* mk_bv_bound_chk_tactic(ast_manager & m, params_ref const & p = params_ref()); diff --git a/src/tactic/bv/bv_bounds_tactic.cpp b/src/tactic/bv/bv_bounds_tactic.cpp index 94c9935b9..d2cd0d66c 100644 --- a/src/tactic/bv/bv_bounds_tactic.cpp +++ b/src/tactic/bv/bv_bounds_tactic.cpp @@ -16,10 +16,10 @@ Author: --*/ -#include "bv_bounds_tactic.h" -#include "ctx_simplify_tactic.h" -#include "bv_decl_plugin.h" -#include "ast_pp.h" +#include "tactic/bv/bv_bounds_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_pp.h" #include static uint64 uMaxInt(unsigned sz) { diff --git a/src/tactic/bv/bv_bounds_tactic.h b/src/tactic/bv/bv_bounds_tactic.h index 4793f474f..6c2ce60ed 100644 --- a/src/tactic/bv/bv_bounds_tactic.h +++ b/src/tactic/bv/bv_bounds_tactic.h @@ -17,7 +17,7 @@ Author: --*/ #ifndef BV_BOUNDS_TACTIC_H_ #define BV_BOUNDS_TACTIC_H_ -#include "tactic.h" +#include "tactic/tactic.h" tactic * mk_bv_bounds_tactic(ast_manager & m, params_ref const & p = params_ref()); diff --git a/src/tactic/bv/bv_size_reduction_tactic.cpp b/src/tactic/bv/bv_size_reduction_tactic.cpp index c010ed0af..9401f74c1 100644 --- a/src/tactic/bv/bv_size_reduction_tactic.cpp +++ b/src/tactic/bv/bv_size_reduction_tactic.cpp @@ -21,12 +21,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"bv_decl_plugin.h" -#include"expr_replacer.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/expr_replacer.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_smt2_pp.h" class bv_size_reduction_tactic : public tactic { struct imp; diff --git a/src/tactic/bv/bv_size_reduction_tactic.h b/src/tactic/bv/bv_size_reduction_tactic.h index 619794fc0..4a24a1d78 100644 --- a/src/tactic/bv/bv_size_reduction_tactic.h +++ b/src/tactic/bv/bv_size_reduction_tactic.h @@ -24,7 +24,7 @@ Notes: #ifndef BV_SIZE_REDUCTION_TACTIC_H_ #define BV_SIZE_REDUCTION_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/bvarray2uf_rewriter.cpp b/src/tactic/bv/bvarray2uf_rewriter.cpp index db60f3fcd..9b67e7011 100644 --- a/src/tactic/bv/bvarray2uf_rewriter.cpp +++ b/src/tactic/bv/bvarray2uf_rewriter.cpp @@ -18,14 +18,14 @@ Notes: --*/ -#include"cooperate.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"params.h" -#include"ast_pp.h" -#include"bvarray2uf_rewriter.h" -#include"rewriter_def.h" -#include"ref_util.h" +#include "util/cooperate.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "util/params.h" +#include "ast/ast_pp.h" +#include "tactic/bv/bvarray2uf_rewriter.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/ref_util.h" // [1] C. M. Wintersteiger, Y. Hamadi, and L. de Moura: Efficiently Solving // Quantified Bit-Vector Formulas, in Formal Methods in System Design, diff --git a/src/tactic/bv/bvarray2uf_rewriter.h b/src/tactic/bv/bvarray2uf_rewriter.h index 81b53ddd7..bc4014b5b 100644 --- a/src/tactic/bv/bvarray2uf_rewriter.h +++ b/src/tactic/bv/bvarray2uf_rewriter.h @@ -20,9 +20,9 @@ Notes: #ifndef BVARRAY2UF_REWRITER_H_ #define BVARRAY2UF_REWRITER_H_ -#include"rewriter.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" +#include "ast/rewriter/rewriter.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" class bvarray2uf_rewriter_cfg : public default_rewriter_cfg { ast_manager & m_manager; diff --git a/src/tactic/bv/bvarray2uf_tactic.cpp b/src/tactic/bv/bvarray2uf_tactic.cpp index ecf1889a2..87f43ae8d 100644 --- a/src/tactic/bv/bvarray2uf_tactic.cpp +++ b/src/tactic/bv/bvarray2uf_tactic.cpp @@ -17,15 +17,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"bv_decl_plugin.h" -#include"expr_replacer.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"ast_smt2_pp.h" +#include "tactic/tactical.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/expr_replacer.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_smt2_pp.h" -#include"bvarray2uf_tactic.h" -#include"bvarray2uf_rewriter.h" +#include "tactic/bv/bvarray2uf_tactic.h" +#include "tactic/bv/bvarray2uf_rewriter.h" class bvarray2uf_tactic : public tactic { diff --git a/src/tactic/bv/bvarray2uf_tactic.h b/src/tactic/bv/bvarray2uf_tactic.h index 336911bf7..84ad413f6 100644 --- a/src/tactic/bv/bvarray2uf_tactic.h +++ b/src/tactic/bv/bvarray2uf_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef BV_ARRAY2UF_TACTIC_H_ #define BV_ARRAY2UF_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/dt2bv_tactic.cpp b/src/tactic/bv/dt2bv_tactic.cpp index 3ae72215f..fe59480e7 100644 --- a/src/tactic/bv/dt2bv_tactic.cpp +++ b/src/tactic/bv/dt2bv_tactic.cpp @@ -19,18 +19,18 @@ Revision History: --*/ -#include "dt2bv_tactic.h" -#include "tactical.h" -#include "filter_model_converter.h" -#include "datatype_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "rewriter_def.h" -#include "filter_model_converter.h" -#include "extension_model_converter.h" -#include "var_subst.h" -#include "ast_util.h" -#include "enum2bv_rewriter.h" -#include "ast_pp.h" +#include "tactic/bv/dt2bv_tactic.h" +#include "tactic/tactical.h" +#include "tactic/filter_model_converter.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/filter_model_converter.h" +#include "tactic/extension_model_converter.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_util.h" +#include "ast/rewriter/enum2bv_rewriter.h" +#include "ast/ast_pp.h" class dt2bv_tactic : public tactic { diff --git a/src/tactic/bv/dt2bv_tactic.h b/src/tactic/bv/dt2bv_tactic.h index 10ce0724f..1e6567995 100644 --- a/src/tactic/bv/dt2bv_tactic.h +++ b/src/tactic/bv/dt2bv_tactic.h @@ -19,8 +19,8 @@ Revision History: #ifndef DT2BV_TACTIC_H_ #define DT2BV_TACTIC_H_ -#include"params.h" -#include"obj_hashtable.h" +#include "util/params.h" +#include "util/obj_hashtable.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/elim_small_bv_tactic.cpp b/src/tactic/bv/elim_small_bv_tactic.cpp index 8cfc27950..d24ae4f49 100644 --- a/src/tactic/bv/elim_small_bv_tactic.cpp +++ b/src/tactic/bv/elim_small_bv_tactic.cpp @@ -16,19 +16,19 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"rewriter_def.h" -#include"filter_model_converter.h" -#include"cooperate.h" -#include"bv_decl_plugin.h" -#include"used_vars.h" -#include"well_sorted.h" -#include"var_subst.h" -#include"simplifier.h" -#include"basic_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" +#include "tactic/tactical.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/filter_model_converter.h" +#include "util/cooperate.h" +#include "ast/bv_decl_plugin.h" +#include "ast/used_vars.h" +#include "ast/well_sorted.h" +#include "ast/rewriter/var_subst.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" -#include"elim_small_bv_tactic.h" +#include "tactic/bv/elim_small_bv_tactic.h" class elim_small_bv_tactic : public tactic { diff --git a/src/tactic/bv/elim_small_bv_tactic.h b/src/tactic/bv/elim_small_bv_tactic.h index bcdd8aad6..675ec3de7 100644 --- a/src/tactic/bv/elim_small_bv_tactic.h +++ b/src/tactic/bv/elim_small_bv_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef ELIM_SMALL_BV_H_ #define ELIM_SMALL_BV_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/bv/max_bv_sharing_tactic.cpp b/src/tactic/bv/max_bv_sharing_tactic.cpp index 675f26ace..b0affeb4b 100644 --- a/src/tactic/bv/max_bv_sharing_tactic.cpp +++ b/src/tactic/bv/max_bv_sharing_tactic.cpp @@ -19,12 +19,12 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"bv_decl_plugin.h" -#include"rewriter_def.h" -#include"obj_pair_hashtable.h" -#include"ast_lt.h" -#include"cooperate.h" +#include "tactic/tactical.h" +#include "ast/bv_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/obj_pair_hashtable.h" +#include "ast/ast_lt.h" +#include "util/cooperate.h" class max_bv_sharing_tactic : public tactic { diff --git a/src/tactic/bv/max_bv_sharing_tactic.h b/src/tactic/bv/max_bv_sharing_tactic.h index ffe5b025c..b8bc0753d 100644 --- a/src/tactic/bv/max_bv_sharing_tactic.h +++ b/src/tactic/bv/max_bv_sharing_tactic.h @@ -22,7 +22,7 @@ Revision History: #ifndef MAX_BV_SHARING_TACTIC_H_ #define MAX_BV_SHARING_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/converter.h b/src/tactic/converter.h index bed191bc2..9de8218c3 100644 --- a/src/tactic/converter.h +++ b/src/tactic/converter.h @@ -19,9 +19,9 @@ Notes: #ifndef CONVERTER_H_ #define CONVERTER_H_ -#include"vector.h" -#include"ref.h" -#include"ast_translation.h" +#include "util/vector.h" +#include "util/ref.h" +#include "ast/ast_translation.h" class converter { unsigned m_ref_count; diff --git a/src/tactic/core/blast_term_ite_tactic.cpp b/src/tactic/core/blast_term_ite_tactic.cpp index 483b59776..ae0ea019b 100644 --- a/src/tactic/core/blast_term_ite_tactic.cpp +++ b/src/tactic/core/blast_term_ite_tactic.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"defined_names.h" -#include"rewriter_def.h" -#include"filter_model_converter.h" -#include"cooperate.h" -#include"scoped_proof.h" +#include "tactic/tactical.h" +#include "ast/normal_forms/defined_names.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/filter_model_converter.h" +#include "util/cooperate.h" +#include "ast/scoped_proof.h" diff --git a/src/tactic/core/blast_term_ite_tactic.h b/src/tactic/core/blast_term_ite_tactic.h index ac94723d8..1ecab98be 100644 --- a/src/tactic/core/blast_term_ite_tactic.h +++ b/src/tactic/core/blast_term_ite_tactic.h @@ -23,7 +23,7 @@ Notes: #ifndef BLAST_TERM_ITE_TACTIC_H_ #define BLAST_TERM_ITE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/cofactor_elim_term_ite.cpp b/src/tactic/core/cofactor_elim_term_ite.cpp index 15f0e06ea..b90be82b5 100644 --- a/src/tactic/core/cofactor_elim_term_ite.cpp +++ b/src/tactic/core/cofactor_elim_term_ite.cpp @@ -16,14 +16,14 @@ Author: Revision History: --*/ -#include"cofactor_elim_term_ite.h" -#include"mk_simplified_app.h" -#include"rewriter_def.h" -#include"cooperate.h" -#include"for_each_expr.h" -#include"ast_smt2_pp.h" -#include"ast_ll_pp.h" -#include"tactic.h" +#include "tactic/core/cofactor_elim_term_ite.h" +#include "ast/rewriter/mk_simplified_app.h" +#include "ast/rewriter/rewriter_def.h" +#include "util/cooperate.h" +#include "ast/for_each_expr.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_ll_pp.h" +#include "tactic/tactic.h" struct cofactor_elim_term_ite::imp { ast_manager & m; diff --git a/src/tactic/core/cofactor_elim_term_ite.h b/src/tactic/core/cofactor_elim_term_ite.h index 98142837c..dfbb66a63 100644 --- a/src/tactic/core/cofactor_elim_term_ite.h +++ b/src/tactic/core/cofactor_elim_term_ite.h @@ -19,8 +19,8 @@ Revision History: #ifndef COFACTOR_ELIM_TERM_ITE_H_ #define COFACTOR_ELIM_TERM_ITE_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class cofactor_elim_term_ite { struct imp; diff --git a/src/tactic/core/cofactor_term_ite_tactic.cpp b/src/tactic/core/cofactor_term_ite_tactic.cpp index 2286281f4..65cdef147 100644 --- a/src/tactic/core/cofactor_term_ite_tactic.cpp +++ b/src/tactic/core/cofactor_term_ite_tactic.cpp @@ -17,8 +17,8 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"cofactor_elim_term_ite.h" +#include "tactic/tactical.h" +#include "tactic/core/cofactor_elim_term_ite.h" /** \brief Wrapper for applying cofactor_elim_term_ite in an assertion set. diff --git a/src/tactic/core/cofactor_term_ite_tactic.h b/src/tactic/core/cofactor_term_ite_tactic.h index 4e0342853..c6e2dfff2 100644 --- a/src/tactic/core/cofactor_term_ite_tactic.h +++ b/src/tactic/core/cofactor_term_ite_tactic.h @@ -20,7 +20,7 @@ Revision History: #ifndef COFACTOR_TERM_ITE_TACTIC_H_ #define COFACTOR_TERM_ITE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/collect_occs.cpp b/src/tactic/core/collect_occs.cpp index 69c538db6..27de476f7 100644 --- a/src/tactic/core/collect_occs.cpp +++ b/src/tactic/core/collect_occs.cpp @@ -17,10 +17,10 @@ Notes: --*/ -#include "ast.h" -#include "goal.h" -#include "hashtable.h" -#include "collect_occs.h" +#include "ast/ast.h" +#include "tactic/goal.h" +#include "util/hashtable.h" +#include "tactic/core/collect_occs.h" bool collect_occs::visit(expr * t) { if (m_visited.is_marked(t)) { diff --git a/src/tactic/core/collect_statistics_tactic.cpp b/src/tactic/core/collect_statistics_tactic.cpp index 3b820de7a..26f6842e3 100644 --- a/src/tactic/core/collect_statistics_tactic.cpp +++ b/src/tactic/core/collect_statistics_tactic.cpp @@ -20,17 +20,17 @@ Notes: #include #include -#include"ast.h" -#include"params.h" -#include"arith_decl_plugin.h" -#include"array_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"fpa_decl_plugin.h" -#include"tactical.h" -#include"stats.h" +#include "ast/ast.h" +#include "util/params.h" +#include "ast/arith_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/fpa_decl_plugin.h" +#include "tactic/tactical.h" +#include "util/stats.h" -#include"collect_statistics_tactic.h" +#include "tactic/core/collect_statistics_tactic.h" class collect_statistics_tactic : public tactic { ast_manager & m; diff --git a/src/tactic/core/collect_statistics_tactic.h b/src/tactic/core/collect_statistics_tactic.h index 5734af3c7..a71ddc376 100644 --- a/src/tactic/core/collect_statistics_tactic.h +++ b/src/tactic/core/collect_statistics_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef COLLECT_STATISTICS_H_ #define COLLECT_STATISTICS_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/ctx_simplify_tactic.cpp b/src/tactic/core/ctx_simplify_tactic.cpp index 3e2790fe3..5bb54073d 100644 --- a/src/tactic/core/ctx_simplify_tactic.cpp +++ b/src/tactic/core/ctx_simplify_tactic.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"ctx_simplify_tactic.h" -#include"mk_simplified_app.h" -#include"cooperate.h" -#include"ast_ll_pp.h" -#include"ast_pp.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "ast/rewriter/mk_simplified_app.h" +#include "util/cooperate.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_pp.h" class ctx_propagate_assertions : public ctx_simplify_tactic::simplifier { diff --git a/src/tactic/core/ctx_simplify_tactic.h b/src/tactic/core/ctx_simplify_tactic.h index d6ebf5cbd..9efa7e7db 100644 --- a/src/tactic/core/ctx_simplify_tactic.h +++ b/src/tactic/core/ctx_simplify_tactic.h @@ -19,8 +19,8 @@ Notes: #ifndef CTX_SIMPLIFY_TACTIC_H_ #define CTX_SIMPLIFY_TACTIC_H_ -#include"tactical.h" -#include"goal_num_occurs.h" +#include "tactic/tactical.h" +#include "tactic/goal_num_occurs.h" class ctx_simplify_tactic : public tactic { public: diff --git a/src/tactic/core/der_tactic.cpp b/src/tactic/core/der_tactic.cpp index ece1ec42f..5df009969 100644 --- a/src/tactic/core/der_tactic.cpp +++ b/src/tactic/core/der_tactic.cpp @@ -14,8 +14,8 @@ Author: Leonardo de Moura (leonardo) 2012-10-20 --*/ -#include"der.h" -#include"tactical.h" +#include "ast/rewriter/der.h" +#include "tactic/tactical.h" class der_tactic : public tactic { struct imp { diff --git a/src/tactic/core/distribute_forall_tactic.cpp b/src/tactic/core/distribute_forall_tactic.cpp index 5d525a836..3ee2697c4 100644 --- a/src/tactic/core/distribute_forall_tactic.cpp +++ b/src/tactic/core/distribute_forall_tactic.cpp @@ -14,9 +14,9 @@ Author: Leonardo de Moura (leonardo) 2012-02-18. --*/ -#include"tactical.h" -#include"rewriter_def.h" -#include"var_subst.h" +#include "tactic/tactical.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/rewriter/var_subst.h" class distribute_forall_tactic : public tactic { diff --git a/src/tactic/core/distribute_forall_tactic.h b/src/tactic/core/distribute_forall_tactic.h index 6c781c7df..a58a53d4e 100644 --- a/src/tactic/core/distribute_forall_tactic.h +++ b/src/tactic/core/distribute_forall_tactic.h @@ -17,7 +17,7 @@ Author: #ifndef DISTRIBUTE_FORALL_TACTIC_H_ #define DISTRIBUTE_FORALL_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/elim_term_ite_tactic.cpp b/src/tactic/core/elim_term_ite_tactic.cpp index 6cc989d0f..91f1d9020 100644 --- a/src/tactic/core/elim_term_ite_tactic.cpp +++ b/src/tactic/core/elim_term_ite_tactic.cpp @@ -17,11 +17,11 @@ Author: Notes: --*/ -#include"tactical.h" -#include"defined_names.h" -#include"rewriter_def.h" -#include"filter_model_converter.h" -#include"cooperate.h" +#include "tactic/tactical.h" +#include "ast/normal_forms/defined_names.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/filter_model_converter.h" +#include "util/cooperate.h" class elim_term_ite_tactic : public tactic { diff --git a/src/tactic/core/elim_term_ite_tactic.h b/src/tactic/core/elim_term_ite_tactic.h index 3a89edaa9..4a98947c9 100644 --- a/src/tactic/core/elim_term_ite_tactic.h +++ b/src/tactic/core/elim_term_ite_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef ELIM_TERM_ITE_TACTIC_H_ #define ELIM_TERM_ITE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/elim_uncnstr_tactic.cpp b/src/tactic/core/elim_uncnstr_tactic.cpp index df3b9f0f5..73adabb6f 100644 --- a/src/tactic/core/elim_uncnstr_tactic.cpp +++ b/src/tactic/core/elim_uncnstr_tactic.cpp @@ -16,18 +16,18 @@ Author: Notes: --*/ -#include"tactical.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" -#include"rewriter_def.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"datatype_decl_plugin.h" -#include"collect_occs.h" -#include"cooperate.h" -#include"ast_smt2_pp.h" -#include"ast_ll_pp.h" +#include "tactic/tactical.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/rewriter/rewriter_def.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 "tactic/core/collect_occs.h" +#include "util/cooperate.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_ll_pp.h" class elim_uncnstr_tactic : public tactic { diff --git a/src/tactic/core/elim_uncnstr_tactic.h b/src/tactic/core/elim_uncnstr_tactic.h index 46bcdca16..19f9021ac 100644 --- a/src/tactic/core/elim_uncnstr_tactic.h +++ b/src/tactic/core/elim_uncnstr_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef ELIM_UNCNSTR_TACTIC_H_ #define ELIM_UNCNSTR_TACTIC_H_ -#include"params.h" +#include "util/params.h" class tactic; class ast_manager; diff --git a/src/tactic/core/nnf_tactic.cpp b/src/tactic/core/nnf_tactic.cpp index f9244f8e7..6b360e711 100644 --- a/src/tactic/core/nnf_tactic.cpp +++ b/src/tactic/core/nnf_tactic.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"nnf.h" -#include"tactical.h" -#include"filter_model_converter.h" +#include "ast/normal_forms/nnf.h" +#include "tactic/tactical.h" +#include "tactic/filter_model_converter.h" class nnf_tactic : public tactic { params_ref m_params; diff --git a/src/tactic/core/nnf_tactic.h b/src/tactic/core/nnf_tactic.h index b5363f830..2070db32e 100644 --- a/src/tactic/core/nnf_tactic.h +++ b/src/tactic/core/nnf_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef NNF_TACTIC_H_ #define NNF_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/occf_tactic.cpp b/src/tactic/core/occf_tactic.cpp index c080ee915..6d9d63971 100644 --- a/src/tactic/core/occf_tactic.cpp +++ b/src/tactic/core/occf_tactic.cpp @@ -21,10 +21,10 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"occf_tactic.h" -#include"filter_model_converter.h" -#include"cooperate.h" +#include "tactic/tactical.h" +#include "tactic/core/occf_tactic.h" +#include "tactic/filter_model_converter.h" +#include "util/cooperate.h" class occf_tactic : public tactic { struct imp { diff --git a/src/tactic/core/occf_tactic.h b/src/tactic/core/occf_tactic.h index f876f638f..80f8f6042 100644 --- a/src/tactic/core/occf_tactic.h +++ b/src/tactic/core/occf_tactic.h @@ -24,7 +24,7 @@ Revision History: #ifndef OCCF_TACTIC_H_ #define OCCF_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/pb_preprocess_tactic.cpp b/src/tactic/core/pb_preprocess_tactic.cpp index a7e381576..6a0d7205b 100644 --- a/src/tactic/core/pb_preprocess_tactic.cpp +++ b/src/tactic/core/pb_preprocess_tactic.cpp @@ -31,13 +31,13 @@ Notes: --*/ -#include "pb_preprocess_tactic.h" -#include "tactical.h" -#include "for_each_expr.h" -#include "pb_decl_plugin.h" -#include "th_rewriter.h" -#include "expr_substitution.h" -#include "ast_pp.h" +#include "tactic/core/pb_preprocess_tactic.h" +#include "tactic/tactical.h" +#include "ast/for_each_expr.h" +#include "ast/pb_decl_plugin.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/expr_substitution.h" +#include "ast/ast_pp.h" class pb_preproc_model_converter : public model_converter { ast_manager& m; diff --git a/src/tactic/core/pb_preprocess_tactic.h b/src/tactic/core/pb_preprocess_tactic.h index 8b70437a4..765fc1545 100644 --- a/src/tactic/core/pb_preprocess_tactic.h +++ b/src/tactic/core/pb_preprocess_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef PB_PREPROCESS_TACTIC_H_ #define PB_PREPROCESS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/propagate_values_tactic.cpp b/src/tactic/core/propagate_values_tactic.cpp index 90beabf24..7baac0b99 100644 --- a/src/tactic/core/propagate_values_tactic.cpp +++ b/src/tactic/core/propagate_values_tactic.cpp @@ -17,12 +17,12 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"propagate_values_tactic.h" -#include"th_rewriter.h" -#include"ast_smt2_pp.h" -#include"expr_substitution.h" -#include"goal_shared_occs.h" +#include "tactic/tactical.h" +#include "tactic/core/propagate_values_tactic.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/expr_substitution.h" +#include "tactic/goal_shared_occs.h" class propagate_values_tactic : public tactic { struct imp { diff --git a/src/tactic/core/propagate_values_tactic.h b/src/tactic/core/propagate_values_tactic.h index 2d1d311b2..635b0a36f 100644 --- a/src/tactic/core/propagate_values_tactic.h +++ b/src/tactic/core/propagate_values_tactic.h @@ -20,7 +20,7 @@ Revision History: #ifndef PROPAGATE_VALUES_TACTIC_H_ #define PROPAGATE_VALUES_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/reduce_args_tactic.cpp b/src/tactic/core/reduce_args_tactic.cpp index ec7353044..a4b9825cc 100644 --- a/src/tactic/core/reduce_args_tactic.cpp +++ b/src/tactic/core/reduce_args_tactic.cpp @@ -16,14 +16,14 @@ Author: Notes: --*/ -#include"tactical.h" -#include"cooperate.h" -#include"ast_smt2_pp.h" -#include"has_free_vars.h" -#include"map.h" -#include"rewriter_def.h" -#include"extension_model_converter.h" -#include"filter_model_converter.h" +#include "tactic/tactical.h" +#include "util/cooperate.h" +#include "ast/ast_smt2_pp.h" +#include "ast/has_free_vars.h" +#include "util/map.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" /** \brief Reduce the number of arguments in function applications. diff --git a/src/tactic/core/reduce_args_tactic.h b/src/tactic/core/reduce_args_tactic.h index c22e0c675..394d7d4ab 100644 --- a/src/tactic/core/reduce_args_tactic.h +++ b/src/tactic/core/reduce_args_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef REDUCE_ARGS_TACTIC_H_ #define REDUCE_ARGS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/simplify_tactic.cpp b/src/tactic/core/simplify_tactic.cpp index be89d356a..9deff968e 100644 --- a/src/tactic/core/simplify_tactic.cpp +++ b/src/tactic/core/simplify_tactic.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"simplify_tactic.h" -#include"th_rewriter.h" -#include"ast_pp.h" +#include "tactic/core/simplify_tactic.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/ast_pp.h" struct simplify_tactic::imp { ast_manager & m_manager; diff --git a/src/tactic/core/simplify_tactic.h b/src/tactic/core/simplify_tactic.h index ec72404dd..1e8420c62 100644 --- a/src/tactic/core/simplify_tactic.h +++ b/src/tactic/core/simplify_tactic.h @@ -19,8 +19,8 @@ Notes: #ifndef SIMPLIFY_TACTIC_H_ #define SIMPLIFY_TACTIC_H_ -#include"tactic.h" -#include"tactical.h" +#include "tactic/tactic.h" +#include "tactic/tactical.h" class simplify_tactic : public tactic { struct imp; diff --git a/src/tactic/core/solve_eqs_tactic.cpp b/src/tactic/core/solve_eqs_tactic.cpp index f23d874a6..65d474182 100644 --- a/src/tactic/core/solve_eqs_tactic.cpp +++ b/src/tactic/core/solve_eqs_tactic.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"expr_replacer.h" -#include"extension_model_converter.h" -#include"occurs.h" -#include"cooperate.h" -#include"goal_shared_occs.h" -#include"ast_pp.h" +#include "tactic/tactical.h" +#include "ast/rewriter/expr_replacer.h" +#include "tactic/extension_model_converter.h" +#include "ast/occurs.h" +#include "util/cooperate.h" +#include "tactic/goal_shared_occs.h" +#include "ast/ast_pp.h" class solve_eqs_tactic : public tactic { struct imp { diff --git a/src/tactic/core/solve_eqs_tactic.h b/src/tactic/core/solve_eqs_tactic.h index 8d543da42..084942ed2 100644 --- a/src/tactic/core/solve_eqs_tactic.h +++ b/src/tactic/core/solve_eqs_tactic.h @@ -19,7 +19,7 @@ Revision History: #ifndef SOLVE_EQS_TACTIC_H_ #define SOLVE_EQS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; class expr_replacer; diff --git a/src/tactic/core/split_clause_tactic.cpp b/src/tactic/core/split_clause_tactic.cpp index 5699aa178..7a2df81b5 100644 --- a/src/tactic/core/split_clause_tactic.cpp +++ b/src/tactic/core/split_clause_tactic.cpp @@ -17,8 +17,8 @@ Author: Notes: --*/ -#include"tactical.h" -#include"split_clause_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/split_clause_tactic.h" class split_clause_tactic : public tactic { bool m_largest_clause; diff --git a/src/tactic/core/split_clause_tactic.h b/src/tactic/core/split_clause_tactic.h index 34d1eb497..fcbdbf857 100644 --- a/src/tactic/core/split_clause_tactic.h +++ b/src/tactic/core/split_clause_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef SPLIT_CLAUSE_TACTIC_H_ #define SPLIT_CLAUSE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class tactic; tactic * mk_split_clause_tactic(params_ref const & p = params_ref()); diff --git a/src/tactic/core/symmetry_reduce_tactic.cpp b/src/tactic/core/symmetry_reduce_tactic.cpp index 873dc55bc..8e87a6741 100644 --- a/src/tactic/core/symmetry_reduce_tactic.cpp +++ b/src/tactic/core/symmetry_reduce_tactic.cpp @@ -19,12 +19,12 @@ Notes: adaption of the algorithms proposed for veriT. --*/ -#include"tactical.h" -#include"for_each_expr.h" -#include"map.h" -#include"expr_replacer.h" -#include"rewriter_def.h" -#include"ast_pp.h" +#include "tactic/tactical.h" +#include "ast/for_each_expr.h" +#include "util/map.h" +#include "ast/rewriter/expr_replacer.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" class symmetry_reduce_tactic : public tactic { class imp; diff --git a/src/tactic/core/symmetry_reduce_tactic.h b/src/tactic/core/symmetry_reduce_tactic.h index 552baa7f1..0e92b5e29 100644 --- a/src/tactic/core/symmetry_reduce_tactic.h +++ b/src/tactic/core/symmetry_reduce_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef SYMMETRY_REDUCE_TACTIC_H_ #define SYMMETRY_REDUCE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/core/tseitin_cnf_tactic.cpp b/src/tactic/core/tseitin_cnf_tactic.cpp index 03e9ce7fa..dbfc748b0 100644 --- a/src/tactic/core/tseitin_cnf_tactic.cpp +++ b/src/tactic/core/tseitin_cnf_tactic.cpp @@ -49,12 +49,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"goal_shared_occs.h" -#include"filter_model_converter.h" -#include"bool_rewriter.h" -#include"simplify_tactic.h" -#include"cooperate.h" +#include "tactic/tactical.h" +#include "tactic/goal_shared_occs.h" +#include "tactic/filter_model_converter.h" +#include "ast/rewriter/bool_rewriter.h" +#include "tactic/core/simplify_tactic.h" +#include "util/cooperate.h" static void swap_if_gt(expr * & n1, expr * & n2) { if (n1->get_id() > n2->get_id()) diff --git a/src/tactic/core/tseitin_cnf_tactic.h b/src/tactic/core/tseitin_cnf_tactic.h index 76eeae283..5dd4f6c02 100644 --- a/src/tactic/core/tseitin_cnf_tactic.h +++ b/src/tactic/core/tseitin_cnf_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef TSEITIN_CNF_TACTIC_H_ #define TSEITIN_CNF_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/equiv_proof_converter.cpp b/src/tactic/equiv_proof_converter.cpp index 13b759f7e..8bec082d3 100644 --- a/src/tactic/equiv_proof_converter.cpp +++ b/src/tactic/equiv_proof_converter.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include "equiv_proof_converter.h" -#include "ast_pp.h" -#include "scoped_proof.h" +#include "tactic/equiv_proof_converter.h" +#include "ast/ast_pp.h" +#include "ast/scoped_proof.h" void equiv_proof_converter::insert(expr* fml1, expr* fml2) { if (fml1 != fml2) { diff --git a/src/tactic/equiv_proof_converter.h b/src/tactic/equiv_proof_converter.h index 7571ae9d4..79f5142b2 100644 --- a/src/tactic/equiv_proof_converter.h +++ b/src/tactic/equiv_proof_converter.h @@ -24,7 +24,7 @@ Revision History: #ifndef EQUIV_PROOF_CONVERTER_H_ #define EQUIV_PROOF_CONVERTER_H_ -#include "replace_proof_converter.h" +#include "tactic/replace_proof_converter.h" class equiv_proof_converter : public proof_converter { ast_manager& m; diff --git a/src/tactic/extension_model_converter.cpp b/src/tactic/extension_model_converter.cpp index 18b5b6288..38f0100ee 100644 --- a/src/tactic/extension_model_converter.cpp +++ b/src/tactic/extension_model_converter.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"extension_model_converter.h" -#include"model_evaluator.h" -#include"ast_smt2_pp.h" -#include"model_v2_pp.h" -#include"ast_pp.h" +#include "tactic/extension_model_converter.h" +#include "model/model_evaluator.h" +#include "ast/ast_smt2_pp.h" +#include "model/model_v2_pp.h" +#include "ast/ast_pp.h" extension_model_converter::~extension_model_converter() { } diff --git a/src/tactic/extension_model_converter.h b/src/tactic/extension_model_converter.h index 46644eec2..dbd7a7e3b 100644 --- a/src/tactic/extension_model_converter.h +++ b/src/tactic/extension_model_converter.h @@ -20,8 +20,8 @@ Notes: #ifndef EXTENSION_MODEL_CONVERTER_H_ #define EXTENSION_MODEL_CONVERTER_H_ -#include"ast.h" -#include"model_converter.h" +#include "ast/ast.h" +#include "tactic/model_converter.h" class extension_model_converter : public model_converter { diff --git a/src/tactic/filter_model_converter.cpp b/src/tactic/filter_model_converter.cpp index 247f2e91d..46328186d 100644 --- a/src/tactic/filter_model_converter.cpp +++ b/src/tactic/filter_model_converter.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"filter_model_converter.h" -#include"model_v2_pp.h" +#include "tactic/filter_model_converter.h" +#include "model/model_v2_pp.h" filter_model_converter::~filter_model_converter() { } diff --git a/src/tactic/filter_model_converter.h b/src/tactic/filter_model_converter.h index 0b67a6c5a..b5d6b86f4 100644 --- a/src/tactic/filter_model_converter.h +++ b/src/tactic/filter_model_converter.h @@ -19,7 +19,7 @@ Notes: #ifndef FILTER_MODEL_CONVERTER_H_ #define FILTER_MODEL_CONVERTER_H_ -#include"model_converter.h" +#include "tactic/model_converter.h" class filter_model_converter : public model_converter { func_decl_ref_vector m_decls; diff --git a/src/tactic/fpa/fpa2bv_model_converter.cpp b/src/tactic/fpa/fpa2bv_model_converter.cpp index 88224d2f2..8ebb3375d 100644 --- a/src/tactic/fpa/fpa2bv_model_converter.cpp +++ b/src/tactic/fpa/fpa2bv_model_converter.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"ast_smt2_pp.h" -#include"fpa_rewriter.h" -#include"fpa2bv_model_converter.h" +#include "ast/ast_smt2_pp.h" +#include "ast/rewriter/fpa_rewriter.h" +#include "tactic/fpa/fpa2bv_model_converter.h" void fpa2bv_model_converter::display(std::ostream & out) { out << "(fpa2bv-model-converter"; diff --git a/src/tactic/fpa/fpa2bv_model_converter.h b/src/tactic/fpa/fpa2bv_model_converter.h index 1f482478b..465aaa1e4 100644 --- a/src/tactic/fpa/fpa2bv_model_converter.h +++ b/src/tactic/fpa/fpa2bv_model_converter.h @@ -19,9 +19,9 @@ Notes: #ifndef FPA2BV_MODEL_CONVERTER_H_ #define FPA2BV_MODEL_CONVERTER_H_ -#include"fpa2bv_converter.h" -#include"model_converter.h" -#include"bv2fpa_converter.h" +#include "ast/fpa/fpa2bv_converter.h" +#include "tactic/model_converter.h" +#include "ast/fpa/bv2fpa_converter.h" class fpa2bv_model_converter : public model_converter { ast_manager & m; diff --git a/src/tactic/fpa/fpa2bv_tactic.cpp b/src/tactic/fpa/fpa2bv_tactic.cpp index d55a2e25c..6d90b46ea 100644 --- a/src/tactic/fpa/fpa2bv_tactic.cpp +++ b/src/tactic/fpa/fpa2bv_tactic.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"tactical.h" -#include"fpa2bv_rewriter.h" -#include"simplify_tactic.h" -#include"fpa2bv_tactic.h" -#include"fpa2bv_model_converter.h" +#include "tactic/tactical.h" +#include "ast/fpa/fpa2bv_rewriter.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/fpa/fpa2bv_tactic.h" +#include "tactic/fpa/fpa2bv_model_converter.h" class fpa2bv_tactic : public tactic { struct imp { diff --git a/src/tactic/fpa/fpa2bv_tactic.h b/src/tactic/fpa/fpa2bv_tactic.h index 633009d59..e7e472d8d 100644 --- a/src/tactic/fpa/fpa2bv_tactic.h +++ b/src/tactic/fpa/fpa2bv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef FPA2BV_TACTIC_H_ #define FPA2BV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/fpa/qffp_tactic.cpp b/src/tactic/fpa/qffp_tactic.cpp index f839110f0..cdc363453 100644 --- a/src/tactic/fpa/qffp_tactic.cpp +++ b/src/tactic/fpa/qffp_tactic.cpp @@ -16,18 +16,18 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"bit_blaster_tactic.h" -#include"sat_tactic.h" -#include"fpa2bv_tactic.h" -#include"smt_tactic.h" -#include"propagate_values_tactic.h" -#include"ackermannize_bv_tactic.h" -#include"probe_arith.h" -#include"qfnra_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "sat/tactic/sat_tactic.h" +#include "tactic/fpa/fpa2bv_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "ackermannization/ackermannize_bv_tactic.h" +#include "tactic/arith/probe_arith.h" +#include "tactic/smtlogics/qfnra_tactic.h" -#include"qffp_tactic.h" +#include "tactic/fpa/qffp_tactic.h" struct is_non_fp_qfnra_predicate { diff --git a/src/tactic/fpa/qffp_tactic.h b/src/tactic/fpa/qffp_tactic.h index 42e4f94e7..f696ba2d6 100644 --- a/src/tactic/fpa/qffp_tactic.h +++ b/src/tactic/fpa/qffp_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef QFFP_TACTIC_H_ #define QFFP_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/goal.cpp b/src/tactic/goal.cpp index a3cac9e2e..ea8d14bd0 100644 --- a/src/tactic/goal.cpp +++ b/src/tactic/goal.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"goal.h" -#include"ast_ll_pp.h" -#include"ast_smt2_pp.h" -#include"for_each_expr.h" -#include"well_sorted.h" +#include "tactic/goal.h" +#include "ast/ast_ll_pp.h" +#include "ast/ast_smt2_pp.h" +#include "ast/for_each_expr.h" +#include "ast/well_sorted.h" goal::precision goal::mk_union(precision p1, precision p2) { if (p1 == PRECISE) return p2; diff --git a/src/tactic/goal.h b/src/tactic/goal.h index ea02dfa17..c9de9c037 100644 --- a/src/tactic/goal.h +++ b/src/tactic/goal.h @@ -28,13 +28,13 @@ Revision History: #ifndef GOAL_H_ #define GOAL_H_ -#include"ast.h" -#include"ast_translation.h" -#include"ast_printer.h" -#include"for_each_expr.h" -#include"ref.h" -#include"ref_vector.h" -#include"ref_buffer.h" +#include "ast/ast.h" +#include "ast/ast_translation.h" +#include "ast/ast_printer.h" +#include "ast/for_each_expr.h" +#include "util/ref.h" +#include "util/ref_vector.h" +#include "util/ref_buffer.h" class goal { public: diff --git a/src/tactic/goal_num_occurs.cpp b/src/tactic/goal_num_occurs.cpp index 6c94e307c..4c7006d75 100644 --- a/src/tactic/goal_num_occurs.cpp +++ b/src/tactic/goal_num_occurs.cpp @@ -15,8 +15,8 @@ Author: Revision History: --*/ -#include"goal_num_occurs.h" -#include"goal.h" +#include "tactic/goal_num_occurs.h" +#include "tactic/goal.h" void goal_num_occurs::operator()(goal const & g) { expr_fast_mark1 visited; diff --git a/src/tactic/goal_num_occurs.h b/src/tactic/goal_num_occurs.h index e5f97f8cd..14c92e468 100644 --- a/src/tactic/goal_num_occurs.h +++ b/src/tactic/goal_num_occurs.h @@ -18,7 +18,7 @@ Revision History: #ifndef GOAL_NUM_OCCURS_H_ #define GOAL_NUM_OCCURS_H_ -#include"num_occurs.h" +#include "ast/num_occurs.h" class goal; diff --git a/src/tactic/goal_shared_occs.cpp b/src/tactic/goal_shared_occs.cpp index 48c79f739..0048e642a 100644 --- a/src/tactic/goal_shared_occs.cpp +++ b/src/tactic/goal_shared_occs.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"goal_shared_occs.h" +#include "tactic/goal_shared_occs.h" void goal_shared_occs::operator()(goal const & g) { m_occs.reset(); diff --git a/src/tactic/goal_shared_occs.h b/src/tactic/goal_shared_occs.h index 902d1d027..8280cef43 100644 --- a/src/tactic/goal_shared_occs.h +++ b/src/tactic/goal_shared_occs.h @@ -19,8 +19,8 @@ Revision History: #ifndef GOAL_SHARED_OCCS_H_ #define GOAL_SHARED_OCCS_H_ -#include"goal.h" -#include"shared_occs.h" +#include "tactic/goal.h" +#include "ast/shared_occs.h" /** \brief Functor for computing the set of shared occurrences in a goal. diff --git a/src/tactic/goal_util.cpp b/src/tactic/goal_util.cpp index d0dfc11f6..965860cf9 100644 --- a/src/tactic/goal_util.cpp +++ b/src/tactic/goal_util.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"goal_util.h" -#include"goal.h" +#include "tactic/goal_util.h" +#include "tactic/goal.h" struct has_term_ite_functor { struct found {}; diff --git a/src/tactic/horn_subsume_model_converter.cpp b/src/tactic/horn_subsume_model_converter.cpp index 25da094fa..cb56f9b7b 100644 --- a/src/tactic/horn_subsume_model_converter.cpp +++ b/src/tactic/horn_subsume_model_converter.cpp @@ -18,14 +18,14 @@ Revision History: --*/ -#include "horn_subsume_model_converter.h" -#include "var_subst.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "bool_rewriter.h" -#include "th_rewriter.h" -#include "for_each_expr.h" -#include "well_sorted.h" +#include "tactic/horn_subsume_model_converter.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "ast/rewriter/bool_rewriter.h" +#include "ast/rewriter/th_rewriter.h" +#include "ast/for_each_expr.h" +#include "ast/well_sorted.h" void horn_subsume_model_converter::insert(app* head, expr* body) { m_delay_head.push_back(head); diff --git a/src/tactic/horn_subsume_model_converter.h b/src/tactic/horn_subsume_model_converter.h index d56802349..1c1ae9feb 100644 --- a/src/tactic/horn_subsume_model_converter.h +++ b/src/tactic/horn_subsume_model_converter.h @@ -35,8 +35,8 @@ Subsumption transformation (remove Horn clause): #ifndef HORN_SUBSUME_MODEL_CONVERTER_H_ #define HORN_SUBSUME_MODEL_CONVERTER_H_ -#include "model_converter.h" -#include "th_rewriter.h" +#include "tactic/model_converter.h" +#include "ast/rewriter/th_rewriter.h" class horn_subsume_model_converter : public model_converter { ast_manager& m; diff --git a/src/tactic/model_converter.cpp b/src/tactic/model_converter.cpp index 6f6dd3da1..4269946a1 100644 --- a/src/tactic/model_converter.cpp +++ b/src/tactic/model_converter.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"model_converter.h" -#include"model_v2_pp.h" +#include "tactic/model_converter.h" +#include "model/model_v2_pp.h" class concat_model_converter : public concat_converter { public: diff --git a/src/tactic/model_converter.h b/src/tactic/model_converter.h index e2bc3cf83..5e549344e 100644 --- a/src/tactic/model_converter.h +++ b/src/tactic/model_converter.h @@ -19,9 +19,9 @@ Notes: #ifndef MODEL_CONVERTER_H_ #define MODEL_CONVERTER_H_ -#include"model.h" -#include"converter.h" -#include"ref.h" +#include "model/model.h" +#include "tactic/converter.h" +#include "util/ref.h" class labels_vec : public svector {}; diff --git a/src/tactic/nlsat_smt/nl_purify_tactic.cpp b/src/tactic/nlsat_smt/nl_purify_tactic.cpp index 46b5a51b0..c99ea545a 100644 --- a/src/tactic/nlsat_smt/nl_purify_tactic.cpp +++ b/src/tactic/nlsat_smt/nl_purify_tactic.cpp @@ -44,22 +44,22 @@ Author: Revision History: --*/ -#include "tactical.h" -#include "nl_purify_tactic.h" -#include "smt_tactic.h" -#include "rewriter.h" -#include "nlsat_tactic.h" -#include "filter_model_converter.h" -#include "obj_pair_hashtable.h" -#include "rewriter_def.h" -#include "ast_pp.h" -#include "trace.h" -#include "smt_solver.h" -#include "solver.h" -#include "model_smt2_pp.h" -#include "expr_safe_replace.h" -#include "ast_util.h" -#include "solver2tactic.h" +#include "tactic/tactical.h" +#include "tactic/nlsat_smt/nl_purify_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "ast/rewriter/rewriter.h" +#include "nlsat/tactic/nlsat_tactic.h" +#include "tactic/filter_model_converter.h" +#include "util/obj_pair_hashtable.h" +#include "ast/rewriter/rewriter_def.h" +#include "ast/ast_pp.h" +#include "util/trace.h" +#include "smt/smt_solver.h" +#include "solver/solver.h" +#include "model/model_smt2_pp.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/ast_util.h" +#include "solver/solver2tactic.h" class nl_purify_tactic : public tactic { diff --git a/src/tactic/nlsat_smt/nl_purify_tactic.h b/src/tactic/nlsat_smt/nl_purify_tactic.h index 87e37b4ad..85d033921 100644 --- a/src/tactic/nlsat_smt/nl_purify_tactic.h +++ b/src/tactic/nlsat_smt/nl_purify_tactic.h @@ -21,7 +21,7 @@ Revision History: #ifndef NL_PURIFY_TACTIC_H_ #define NL_PURIFY_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/portfolio/bounded_int2bv_solver.cpp b/src/tactic/portfolio/bounded_int2bv_solver.cpp index e293ade17..2f66d7a53 100644 --- a/src/tactic/portfolio/bounded_int2bv_solver.cpp +++ b/src/tactic/portfolio/bounded_int2bv_solver.cpp @@ -17,19 +17,19 @@ Notes: --*/ -#include "bounded_int2bv_solver.h" -#include "solver_na2as.h" -#include "tactic.h" -#include "pb2bv_rewriter.h" -#include "filter_model_converter.h" -#include "extension_model_converter.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "bound_manager.h" -#include "bv2int_rewriter.h" -#include "expr_safe_replace.h" -#include "bv_decl_plugin.h" -#include "arith_decl_plugin.h" +#include "tactic/portfolio/bounded_int2bv_solver.h" +#include "solver/solver_na2as.h" +#include "tactic/tactic.h" +#include "ast/rewriter/pb2bv_rewriter.h" +#include "tactic/filter_model_converter.h" +#include "tactic/extension_model_converter.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "tactic/arith/bound_manager.h" +#include "tactic/arith/bv2int_rewriter.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/bv_decl_plugin.h" +#include "ast/arith_decl_plugin.h" class bounded_int2bv_solver : public solver_na2as { ast_manager& m; diff --git a/src/tactic/portfolio/bounded_int2bv_solver.h b/src/tactic/portfolio/bounded_int2bv_solver.h index 5fcf2cd65..1d048d54e 100644 --- a/src/tactic/portfolio/bounded_int2bv_solver.h +++ b/src/tactic/portfolio/bounded_int2bv_solver.h @@ -19,8 +19,8 @@ Notes: #ifndef BOUNDED_INT2BV_SOLVER_H_ #define BOUNDED_INT2BV_SOLVER_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class solver; diff --git a/src/tactic/portfolio/default_tactic.cpp b/src/tactic/portfolio/default_tactic.cpp index 4f5eb5ed0..420cb961a 100644 --- a/src/tactic/portfolio/default_tactic.cpp +++ b/src/tactic/portfolio/default_tactic.cpp @@ -16,21 +16,21 @@ Author: Notes: --*/ -#include"default_tactic.h" -#include"simplify_tactic.h" -#include"qfbv_tactic.h" -#include"smt_tactic.h" -#include"qflia_tactic.h" -#include"qflra_tactic.h" -#include"qfnia_tactic.h" -#include"qfnra_tactic.h" -#include"nra_tactic.h" -#include"probe_arith.h" -#include"quant_tactics.h" -#include"qffp_tactic.h" -#include"qfaufbv_tactic.h" -#include"qfauflia_tactic.h" -#include"qfufnra_tactic.h" +#include "tactic/portfolio/default_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/smtlogics/qfbv_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/smtlogics/qflia_tactic.h" +#include "tactic/smtlogics/qflra_tactic.h" +#include "tactic/smtlogics/qfnia_tactic.h" +#include "tactic/smtlogics/qfnra_tactic.h" +#include "tactic/smtlogics/nra_tactic.h" +#include "tactic/arith/probe_arith.h" +#include "tactic/smtlogics/quant_tactics.h" +#include "tactic/fpa/qffp_tactic.h" +#include "tactic/smtlogics/qfaufbv_tactic.h" +#include "tactic/smtlogics/qfauflia_tactic.h" +#include "tactic/smtlogics/qfufnra_tactic.h" tactic * mk_default_tactic(ast_manager & m, params_ref const & p) { tactic * st = using_params(and_then(mk_simplify_tactic(m), diff --git a/src/tactic/portfolio/default_tactic.h b/src/tactic/portfolio/default_tactic.h index 2f40fa145..8992cfee3 100644 --- a/src/tactic/portfolio/default_tactic.h +++ b/src/tactic/portfolio/default_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef DEFAULT_TACTIC_H_ #define DEFAULT_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/portfolio/enum2bv_solver.cpp b/src/tactic/portfolio/enum2bv_solver.cpp index 8c9ff122d..36a178c41 100644 --- a/src/tactic/portfolio/enum2bv_solver.cpp +++ b/src/tactic/portfolio/enum2bv_solver.cpp @@ -20,16 +20,16 @@ Notes: --*/ -#include "solver_na2as.h" -#include "tactic.h" -#include "bv_decl_plugin.h" -#include "datatype_decl_plugin.h" -#include "enum2bv_rewriter.h" -#include "extension_model_converter.h" -#include "filter_model_converter.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" -#include "enum2bv_solver.h" +#include "solver/solver_na2as.h" +#include "tactic/tactic.h" +#include "ast/bv_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/enum2bv_rewriter.h" +#include "tactic/extension_model_converter.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" +#include "tactic/portfolio/enum2bv_solver.h" class enum2bv_solver : public solver_na2as { ast_manager& m; diff --git a/src/tactic/portfolio/enum2bv_solver.h b/src/tactic/portfolio/enum2bv_solver.h index b113c6747..08f753cc5 100644 --- a/src/tactic/portfolio/enum2bv_solver.h +++ b/src/tactic/portfolio/enum2bv_solver.h @@ -19,8 +19,8 @@ Notes: #ifndef ENUM2BV_SOLVER_H_ #define ENUM2BV_SOLVER_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class solver; diff --git a/src/tactic/portfolio/fd_solver.cpp b/src/tactic/portfolio/fd_solver.cpp index a534337bc..b29fb20c1 100644 --- a/src/tactic/portfolio/fd_solver.cpp +++ b/src/tactic/portfolio/fd_solver.cpp @@ -17,12 +17,12 @@ Notes: --*/ -#include "fd_solver.h" -#include "tactic.h" -#include "inc_sat_solver.h" -#include "enum2bv_solver.h" -#include "pb2bv_solver.h" -#include "bounded_int2bv_solver.h" +#include "tactic/portfolio/fd_solver.h" +#include "tactic/tactic.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "tactic/portfolio/enum2bv_solver.h" +#include "tactic/portfolio/pb2bv_solver.h" +#include "tactic/portfolio/bounded_int2bv_solver.h" solver * mk_fd_solver(ast_manager & m, params_ref const & p) { solver* s = mk_inc_sat_solver(m, p); diff --git a/src/tactic/portfolio/fd_solver.h b/src/tactic/portfolio/fd_solver.h index 51abb087f..53cae16d1 100644 --- a/src/tactic/portfolio/fd_solver.h +++ b/src/tactic/portfolio/fd_solver.h @@ -19,8 +19,8 @@ Notes: #ifndef FD_SOLVER_H_ #define FD_SOLVER_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class solver; diff --git a/src/tactic/portfolio/pb2bv_solver.cpp b/src/tactic/portfolio/pb2bv_solver.cpp index 090ea9f76..81cc43685 100644 --- a/src/tactic/portfolio/pb2bv_solver.cpp +++ b/src/tactic/portfolio/pb2bv_solver.cpp @@ -16,13 +16,13 @@ Notes: --*/ -#include "pb2bv_solver.h" -#include "solver_na2as.h" -#include "tactic.h" -#include "pb2bv_rewriter.h" -#include "filter_model_converter.h" -#include "ast_pp.h" -#include "model_smt2_pp.h" +#include "tactic/portfolio/pb2bv_solver.h" +#include "solver/solver_na2as.h" +#include "tactic/tactic.h" +#include "ast/rewriter/pb2bv_rewriter.h" +#include "tactic/filter_model_converter.h" +#include "ast/ast_pp.h" +#include "model/model_smt2_pp.h" class pb2bv_solver : public solver_na2as { ast_manager& m; diff --git a/src/tactic/portfolio/pb2bv_solver.h b/src/tactic/portfolio/pb2bv_solver.h index e861e769b..ea53d8d89 100644 --- a/src/tactic/portfolio/pb2bv_solver.h +++ b/src/tactic/portfolio/pb2bv_solver.h @@ -19,8 +19,8 @@ Notes: #ifndef PB2BV_SOLVER_H_ #define PB2BV_SOLVER_H_ -#include"ast.h" -#include"params.h" +#include "ast/ast.h" +#include "util/params.h" class solver; diff --git a/src/tactic/portfolio/smt_strategic_solver.cpp b/src/tactic/portfolio/smt_strategic_solver.cpp index a4a579ddd..fe1cf5260 100644 --- a/src/tactic/portfolio/smt_strategic_solver.cpp +++ b/src/tactic/portfolio/smt_strategic_solver.cpp @@ -17,30 +17,30 @@ Author: Notes: --*/ -#include"cmd_context.h" -#include"combined_solver.h" -#include"tactic2solver.h" -#include"qfbv_tactic.h" -#include"qflia_tactic.h" -#include"qfnia_tactic.h" -#include"qfnra_tactic.h" -#include"qfuf_tactic.h" -#include"qflra_tactic.h" -#include"quant_tactics.h" -#include"qfauflia_tactic.h" -#include"qfaufbv_tactic.h" -#include"qfufbv_tactic.h" -#include"qfidl_tactic.h" -#include"default_tactic.h" -#include"ufbv_tactic.h" -#include"qffp_tactic.h" -#include"qfufnra_tactic.h" -#include"horn_tactic.h" -#include"smt_solver.h" -#include"inc_sat_solver.h" -#include"fd_solver.h" -#include"bv_rewriter.h" -#include"solver2tactic.h" +#include "cmd_context/cmd_context.h" +#include "solver/combined_solver.h" +#include "solver/tactic2solver.h" +#include "tactic/smtlogics/qfbv_tactic.h" +#include "tactic/smtlogics/qflia_tactic.h" +#include "tactic/smtlogics/qfnia_tactic.h" +#include "tactic/smtlogics/qfnra_tactic.h" +#include "tactic/smtlogics/qfuf_tactic.h" +#include "tactic/smtlogics/qflra_tactic.h" +#include "tactic/smtlogics/quant_tactics.h" +#include "tactic/smtlogics/qfauflia_tactic.h" +#include "tactic/smtlogics/qfaufbv_tactic.h" +#include "tactic/smtlogics/qfufbv_tactic.h" +#include "tactic/smtlogics/qfidl_tactic.h" +#include "tactic/portfolio/default_tactic.h" +#include "tactic/ufbv/ufbv_tactic.h" +#include "tactic/fpa/qffp_tactic.h" +#include "tactic/smtlogics/qfufnra_tactic.h" +#include "muz/fp/horn_tactic.h" +#include "smt/smt_solver.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "tactic/portfolio/fd_solver.h" +#include "ast/rewriter/bv_rewriter.h" +#include "solver/solver2tactic.h" tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const & logic) { diff --git a/src/tactic/probe.cpp b/src/tactic/probe.cpp index 677438cdf..072b866b1 100644 --- a/src/tactic/probe.cpp +++ b/src/tactic/probe.cpp @@ -19,11 +19,11 @@ Author: Revision History: --*/ -#include"probe.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"goal_util.h" -#include"bv_rewriter.h" +#include "tactic/probe.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "tactic/goal_util.h" +#include "ast/rewriter/bv_rewriter.h" class memory_probe : public probe { public: diff --git a/src/tactic/probe.h b/src/tactic/probe.h index 3f7229d36..294a6cbd0 100644 --- a/src/tactic/probe.h +++ b/src/tactic/probe.h @@ -24,7 +24,7 @@ Revision History: #ifndef PROBE_H_ #define PROBE_H_ -#include"goal.h" +#include "tactic/goal.h" class probe { public: diff --git a/src/tactic/proof_converter.cpp b/src/tactic/proof_converter.cpp index fa58d5208..095488415 100644 --- a/src/tactic/proof_converter.cpp +++ b/src/tactic/proof_converter.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"proof_converter.h" -#include"ast_smt2_pp.h" +#include "tactic/proof_converter.h" +#include "ast/ast_smt2_pp.h" class concat_proof_converter : public concat_converter { public: diff --git a/src/tactic/proof_converter.h b/src/tactic/proof_converter.h index 44928e046..e925436d2 100644 --- a/src/tactic/proof_converter.h +++ b/src/tactic/proof_converter.h @@ -19,9 +19,9 @@ Notes: #ifndef PROOF_CONVERTER_H_ #define PROOF_CONVERTER_H_ -#include"ast.h" -#include"converter.h" -#include"ref.h" +#include "ast/ast.h" +#include "tactic/converter.h" +#include "util/ref.h" class proof_converter : public converter { public: diff --git a/src/tactic/replace_proof_converter.cpp b/src/tactic/replace_proof_converter.cpp index 45ec6fc2e..98f28bb1b 100644 --- a/src/tactic/replace_proof_converter.cpp +++ b/src/tactic/replace_proof_converter.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include "replace_proof_converter.h" -#include "expr_functors.h" -#include "ast_pp.h" -#include "for_each_expr.h" +#include "tactic/replace_proof_converter.h" +#include "ast/expr_functors.h" +#include "ast/ast_pp.h" +#include "ast/for_each_expr.h" /** \brief Replace expressions by other expressions. diff --git a/src/tactic/replace_proof_converter.h b/src/tactic/replace_proof_converter.h index 96f25aab4..b768a18a0 100644 --- a/src/tactic/replace_proof_converter.h +++ b/src/tactic/replace_proof_converter.h @@ -23,7 +23,7 @@ Revision History: #ifndef REPLACE_PROOF_CONVERTER_H_ #define REPLACE_PROOF_CONVERTER_H_ -#include "proof_converter.h" +#include "tactic/proof_converter.h" class replace_proof_converter : public proof_converter { ast_manager& m; diff --git a/src/tactic/sine_filter.cpp b/src/tactic/sine_filter.cpp index f2d6a9653..ba35bac84 100644 --- a/src/tactic/sine_filter.cpp +++ b/src/tactic/sine_filter.cpp @@ -16,17 +16,17 @@ Author: Revision History: --*/ -#include "sine_filter.h" -#include "tactical.h" -#include "filter_model_converter.h" -#include "datatype_decl_plugin.h" -#include "rewriter_def.h" -#include "filter_model_converter.h" -#include "extension_model_converter.h" -#include "var_subst.h" -#include "ast_util.h" -#include "obj_pair_hashtable.h" -#include "ast_pp.h" +#include "tactic/sine_filter.h" +#include "tactic/tactical.h" +#include "tactic/filter_model_converter.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/rewriter/rewriter_def.h" +#include "tactic/filter_model_converter.h" +#include "tactic/extension_model_converter.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_util.h" +#include "util/obj_pair_hashtable.h" +#include "ast/ast_pp.h" class sine_tactic : public tactic { diff --git a/src/tactic/sine_filter.h b/src/tactic/sine_filter.h index 769ef474f..72964219e 100644 --- a/src/tactic/sine_filter.h +++ b/src/tactic/sine_filter.h @@ -19,7 +19,7 @@ Revision History: #ifndef SINE_TACTIC_H_ #define SINE_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/sls/bvsls_opt_engine.cpp b/src/tactic/sls/bvsls_opt_engine.cpp index 96fad9a5a..e8547fdfd 100644 --- a/src/tactic/sls/bvsls_opt_engine.cpp +++ b/src/tactic/sls/bvsls_opt_engine.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include "nnf.h" -#include "bvsls_opt_engine.h" +#include "ast/normal_forms/nnf.h" +#include "tactic/sls/bvsls_opt_engine.h" bvsls_opt_engine::bvsls_opt_engine(ast_manager & m, params_ref const & p) : sls_engine(m, p), diff --git a/src/tactic/sls/bvsls_opt_engine.h b/src/tactic/sls/bvsls_opt_engine.h index 8ea666ed0..67d9a5d02 100644 --- a/src/tactic/sls/bvsls_opt_engine.h +++ b/src/tactic/sls/bvsls_opt_engine.h @@ -19,7 +19,7 @@ Notes: #ifndef BVSLS_OPT_ENGINE_H_ #define BVSLS_OPT_ENGINE_H_ -#include "sls_engine.h" +#include "tactic/sls/sls_engine.h" class bvsls_opt_engine : public sls_engine { sls_tracker & m_hard_tracker; diff --git a/src/tactic/sls/sls_engine.cpp b/src/tactic/sls/sls_engine.cpp index 4418808dd..b89a05231 100644 --- a/src/tactic/sls/sls_engine.cpp +++ b/src/tactic/sls/sls_engine.cpp @@ -18,17 +18,17 @@ Notes: --*/ #include // Need DBL_MAX -#include"map.h" -#include"ast_smt2_pp.h" -#include"ast_pp.h" -#include"var_subst.h" -#include"model_pp.h" -#include"tactic.h" -#include"cooperate.h" -#include"luby.h" +#include "util/map.h" +#include "ast/ast_smt2_pp.h" +#include "ast/ast_pp.h" +#include "ast/rewriter/var_subst.h" +#include "model/model_pp.h" +#include "tactic/tactic.h" +#include "util/cooperate.h" +#include "util/luby.h" #include"sls_params.hpp" -#include"sls_engine.h" +#include "tactic/sls/sls_engine.h" sls_engine::sls_engine(ast_manager & m, params_ref const & p) : diff --git a/src/tactic/sls/sls_engine.h b/src/tactic/sls/sls_engine.h index ccd4f5b5a..0c4fb4d39 100644 --- a/src/tactic/sls/sls_engine.h +++ b/src/tactic/sls/sls_engine.h @@ -19,14 +19,14 @@ Notes: #ifndef SLS_ENGINE_H_ #define SLS_ENGINE_H_ -#include"stopwatch.h" -#include"lbool.h" -#include"model_converter.h" -#include"goal.h" +#include "util/stopwatch.h" +#include "util/lbool.h" +#include "tactic/model_converter.h" +#include "tactic/goal.h" -#include"sls_tracker.h" -#include"sls_evaluator.h" -#include"statistics.h" +#include "tactic/sls/sls_tracker.h" +#include "tactic/sls/sls_evaluator.h" +#include "util/statistics.h" class sls_engine { public: diff --git a/src/tactic/sls/sls_evaluator.h b/src/tactic/sls/sls_evaluator.h index 59b9fd7a5..4e006d219 100644 --- a/src/tactic/sls/sls_evaluator.h +++ b/src/tactic/sls/sls_evaluator.h @@ -20,10 +20,10 @@ Notes: #ifndef SLS_EVALUATOR_H_ #define SLS_EVALUATOR_H_ -#include"model_evaluator.h" +#include "model/model_evaluator.h" -#include"sls_powers.h" -#include"sls_tracker.h" +#include "tactic/sls/sls_powers.h" +#include "tactic/sls/sls_tracker.h" class sls_evaluator { ast_manager & m_manager; diff --git a/src/tactic/sls/sls_powers.h b/src/tactic/sls/sls_powers.h index b632e7100..81e9540a0 100644 --- a/src/tactic/sls/sls_powers.h +++ b/src/tactic/sls/sls_powers.h @@ -20,7 +20,7 @@ Notes: #ifndef SLS_POWERS_H_ #define SLS_POWERS_H_ -#include"mpz.h" +#include "util/mpz.h" class powers : public u_map { unsynch_mpz_manager & m; diff --git a/src/tactic/sls/sls_tactic.cpp b/src/tactic/sls/sls_tactic.cpp index f4ef300e4..2bbef288e 100644 --- a/src/tactic/sls/sls_tactic.cpp +++ b/src/tactic/sls/sls_tactic.cpp @@ -16,19 +16,19 @@ Author: Notes: --*/ -#include"nnf.h" -#include"solve_eqs_tactic.h" -#include"bv_size_reduction_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"ctx_simplify_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"nnf_tactic.h" -#include"stopwatch.h" -#include"sls_tactic.h" +#include "ast/normal_forms/nnf.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/bv/bv_size_reduction_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/core/nnf_tactic.h" +#include "util/stopwatch.h" +#include "tactic/sls/sls_tactic.h" #include"sls_params.hpp" -#include"sls_engine.h" +#include "tactic/sls/sls_engine.h" class sls_tactic : public tactic { ast_manager & m; diff --git a/src/tactic/sls/sls_tactic.h b/src/tactic/sls/sls_tactic.h index ba415d547..ab79bfc0f 100644 --- a/src/tactic/sls/sls_tactic.h +++ b/src/tactic/sls/sls_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef SLS_TACTIC_H_ #define SLS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/sls/sls_tracker.h b/src/tactic/sls/sls_tracker.h index dfdbd4685..d5ce8ee3c 100644 --- a/src/tactic/sls/sls_tracker.h +++ b/src/tactic/sls/sls_tracker.h @@ -21,13 +21,13 @@ Notes: #define SLS_TRACKER_H_ #include -#include"for_each_expr.h" -#include"ast_smt2_pp.h" -#include"bv_decl_plugin.h" -#include"model.h" +#include "ast/for_each_expr.h" +#include "ast/ast_smt2_pp.h" +#include "ast/bv_decl_plugin.h" +#include "model/model.h" #include"sls_params.hpp" -#include"sls_powers.h" +#include "tactic/sls/sls_powers.h" class sls_tracker { ast_manager & m_manager; diff --git a/src/tactic/smtlogics/nra_tactic.cpp b/src/tactic/smtlogics/nra_tactic.cpp index 063e0775a..381bc4bb6 100644 --- a/src/tactic/smtlogics/nra_tactic.cpp +++ b/src/tactic/smtlogics/nra_tactic.cpp @@ -16,16 +16,16 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"smt_tactic.h" -#include"nnf_tactic.h" -#include"qe_tactic.h" -#include"nlqsat.h" -#include"qfnra_nlsat_tactic.h" -#include"qe_lite.h" -#include"probe_arith.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/core/nnf_tactic.h" +#include "qe/qe_tactic.h" +#include "qe/nlqsat.h" +#include "nlsat/tactic/qfnra_nlsat_tactic.h" +#include "qe/qe_lite.h" +#include "tactic/arith/probe_arith.h" tactic * mk_nra_tactic(ast_manager & m, params_ref const& p) { params_ref p1 = p; diff --git a/src/tactic/smtlogics/qfaufbv_tactic.cpp b/src/tactic/smtlogics/qfaufbv_tactic.cpp index cb14fa778..601f872aa 100644 --- a/src/tactic/smtlogics/qfaufbv_tactic.cpp +++ b/src/tactic/smtlogics/qfaufbv_tactic.cpp @@ -16,16 +16,16 @@ Author: Notes: --*/ -#include"solve_eqs_tactic.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"bit_blaster_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"bv_size_reduction_tactic.h" -#include"ctx_simplify_tactic.h" -#include"sat_tactic.h" -#include"smt_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/bv/bv_size_reduction_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "sat/tactic/sat_tactic.h" +#include "smt/tactic/smt_tactic.h" tactic * mk_qfaufbv_tactic(ast_manager & m, params_ref const & p) { params_ref main_p; diff --git a/src/tactic/smtlogics/qfaufbv_tactic.h b/src/tactic/smtlogics/qfaufbv_tactic.h index 1e4a7419f..06b046bd3 100644 --- a/src/tactic/smtlogics/qfaufbv_tactic.h +++ b/src/tactic/smtlogics/qfaufbv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFAUFBV_TACTIC_H_ #define QFAUFBV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfauflia_tactic.cpp b/src/tactic/smtlogics/qfauflia_tactic.cpp index 89f96d354..4a0e9eb34 100644 --- a/src/tactic/smtlogics/qfauflia_tactic.cpp +++ b/src/tactic/smtlogics/qfauflia_tactic.cpp @@ -16,13 +16,13 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"propagate_ineqs_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/arith/propagate_ineqs_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" tactic * mk_qfauflia_tactic(ast_manager & m, params_ref const & p) { params_ref main_p; diff --git a/src/tactic/smtlogics/qfauflia_tactic.h b/src/tactic/smtlogics/qfauflia_tactic.h index fbf19fec0..f1b3c74e0 100644 --- a/src/tactic/smtlogics/qfauflia_tactic.h +++ b/src/tactic/smtlogics/qfauflia_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFAUFLIA_TACTIC_H_ #define QFAUFLIA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfbv_tactic.cpp b/src/tactic/smtlogics/qfbv_tactic.cpp index ca6390c9c..b69069864 100644 --- a/src/tactic/smtlogics/qfbv_tactic.cpp +++ b/src/tactic/smtlogics/qfbv_tactic.cpp @@ -16,19 +16,19 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" -#include"bit_blaster_tactic.h" -#include"bv1_blaster_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"bv_size_reduction_tactic.h" -#include"aig_tactic.h" -#include"sat_tactic.h" -#include"ackermannize_bv_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/bv/bv1_blaster_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/bv/bv_size_reduction_tactic.h" +#include "tactic/aig/aig_tactic.h" +#include "sat/tactic/sat_tactic.h" +#include "ackermannization/ackermannize_bv_tactic.h" #define MEMLIMIT 300 diff --git a/src/tactic/smtlogics/qfbv_tactic.h b/src/tactic/smtlogics/qfbv_tactic.h index 4de623e0f..52f07f2a6 100644 --- a/src/tactic/smtlogics/qfbv_tactic.h +++ b/src/tactic/smtlogics/qfbv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFBV_TACTIC_H_ #define QFBV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfidl_tactic.cpp b/src/tactic/smtlogics/qfidl_tactic.cpp index de05797e8..a34a25e67 100644 --- a/src/tactic/smtlogics/qfidl_tactic.cpp +++ b/src/tactic/smtlogics/qfidl_tactic.cpp @@ -16,22 +16,22 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"propagate_ineqs_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"normalize_bounds_tactic.h" -#include"fix_dl_var_tactic.h" -#include"smt_tactic.h" -#include"lia2pb_tactic.h" -#include"pb2bv_tactic.h" -#include"diff_neq_tactic.h" -#include"bit_blaster_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"aig_tactic.h" -#include"sat_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/arith/propagate_ineqs_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/arith/normalize_bounds_tactic.h" +#include "tactic/arith/fix_dl_var_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/arith/lia2pb_tactic.h" +#include "tactic/arith/pb2bv_tactic.h" +#include "tactic/arith/diff_neq_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/aig/aig_tactic.h" +#include "sat/tactic/sat_tactic.h" #define BIG_PROBLEM 5000 diff --git a/src/tactic/smtlogics/qfidl_tactic.h b/src/tactic/smtlogics/qfidl_tactic.h index f892bb8a5..c36b857d4 100644 --- a/src/tactic/smtlogics/qfidl_tactic.h +++ b/src/tactic/smtlogics/qfidl_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFIDL_TACTIC_H_ #define QFIDL_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qflia_tactic.cpp b/src/tactic/smtlogics/qflia_tactic.cpp index fd10d8ecb..248829c49 100644 --- a/src/tactic/smtlogics/qflia_tactic.cpp +++ b/src/tactic/smtlogics/qflia_tactic.cpp @@ -16,25 +16,25 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"propagate_ineqs_tactic.h" -#include"normalize_bounds_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/arith/propagate_ineqs_tactic.h" +#include "tactic/arith/normalize_bounds_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" // include"mip_tactic.h" -#include"add_bounds_tactic.h" -#include"pb2bv_tactic.h" -#include"lia2pb_tactic.h" -#include"ctx_simplify_tactic.h" -#include"bit_blaster_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"aig_tactic.h" -#include"sat_tactic.h" -#include"bound_manager.h" -#include"probe_arith.h" +#include "tactic/arith/add_bounds_tactic.h" +#include "tactic/arith/pb2bv_tactic.h" +#include "tactic/arith/lia2pb_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/aig/aig_tactic.h" +#include "sat/tactic/sat_tactic.h" +#include "tactic/arith/bound_manager.h" +#include "tactic/arith/probe_arith.h" struct quasi_pb_probe : public probe { virtual result operator()(goal const & g) { diff --git a/src/tactic/smtlogics/qflia_tactic.h b/src/tactic/smtlogics/qflia_tactic.h index 36e7cf9f9..ee9b859ae 100644 --- a/src/tactic/smtlogics/qflia_tactic.h +++ b/src/tactic/smtlogics/qflia_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFLIA_TACTIC_H_ #define QFLIA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qflra_tactic.cpp b/src/tactic/smtlogics/qflra_tactic.cpp index 0865f3b47..b44ace7b1 100644 --- a/src/tactic/smtlogics/qflra_tactic.cpp +++ b/src/tactic/smtlogics/qflra_tactic.cpp @@ -16,15 +16,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" -#include"recover_01_tactic.h" -#include"ctx_simplify_tactic.h" -#include"probe_arith.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/arith/recover_01_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "tactic/arith/probe_arith.h" tactic * mk_qflra_tactic(ast_manager & m, params_ref const & p) { params_ref pivot_p; diff --git a/src/tactic/smtlogics/qflra_tactic.h b/src/tactic/smtlogics/qflra_tactic.h index f8b311aba..42829e390 100644 --- a/src/tactic/smtlogics/qflra_tactic.h +++ b/src/tactic/smtlogics/qflra_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFLRA_TACTIC_H_ #define QFLRA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfnia_tactic.cpp b/src/tactic/smtlogics/qfnia_tactic.cpp index 5a71281fb..3fb733ca4 100644 --- a/src/tactic/smtlogics/qfnia_tactic.cpp +++ b/src/tactic/smtlogics/qfnia_tactic.cpp @@ -16,18 +16,18 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" -#include"bit_blaster_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"sat_tactic.h" -#include"nla2bv_tactic.h" -#include"ctx_simplify_tactic.h" -#include"cofactor_term_ite_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/bv/bit_blaster_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "sat/tactic/sat_tactic.h" +#include "tactic/arith/nla2bv_tactic.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "tactic/core/cofactor_term_ite_tactic.h" static tactic * mk_qfnia_bv_solver(ast_manager & m, params_ref const & p_ref) { params_ref p = p_ref; diff --git a/src/tactic/smtlogics/qfnia_tactic.h b/src/tactic/smtlogics/qfnia_tactic.h index 0770b4eee..84a35e6ec 100644 --- a/src/tactic/smtlogics/qfnia_tactic.h +++ b/src/tactic/smtlogics/qfnia_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFNIA_TACTIC_H_ #define QFNIA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfnra_tactic.cpp b/src/tactic/smtlogics/qfnra_tactic.cpp index 716b4868b..63c09c19c 100644 --- a/src/tactic/smtlogics/qfnra_tactic.cpp +++ b/src/tactic/smtlogics/qfnra_tactic.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"nla2bv_tactic.h" -#include"smt_tactic.h" -#include"qfnra_nlsat_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/arith/nla2bv_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "nlsat/tactic/qfnra_nlsat_tactic.h" static tactic * mk_qfnra_sat_solver(ast_manager& m, params_ref const& p, unsigned bv_size) { params_ref nra2sat_p = p; diff --git a/src/tactic/smtlogics/qfnra_tactic.h b/src/tactic/smtlogics/qfnra_tactic.h index cae314553..34381d47a 100644 --- a/src/tactic/smtlogics/qfnra_tactic.h +++ b/src/tactic/smtlogics/qfnra_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFNRA_TACTIC_H_ #define QFNRA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfuf_tactic.cpp b/src/tactic/smtlogics/qfuf_tactic.cpp index 7648e20fe..2de9612c6 100644 --- a/src/tactic/smtlogics/qfuf_tactic.cpp +++ b/src/tactic/smtlogics/qfuf_tactic.cpp @@ -17,12 +17,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"symmetry_reduce_tactic.h" -#include"solve_eqs_tactic.h" -#include"propagate_values_tactic.h" -#include"smt_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/symmetry_reduce_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "smt/tactic/smt_tactic.h" tactic * mk_qfuf_tactic(ast_manager & m, params_ref const & p) { params_ref s2_p; diff --git a/src/tactic/smtlogics/qfuf_tactic.h b/src/tactic/smtlogics/qfuf_tactic.h index 0c81ad57b..98ddd3422 100644 --- a/src/tactic/smtlogics/qfuf_tactic.h +++ b/src/tactic/smtlogics/qfuf_tactic.h @@ -20,7 +20,7 @@ Notes: #ifndef QFUF_TACTIC_H_ #define QFUF_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfufbv_ackr_model_converter.cpp b/src/tactic/smtlogics/qfufbv_ackr_model_converter.cpp index 4d20631b1..50c9b6a46 100644 --- a/src/tactic/smtlogics/qfufbv_ackr_model_converter.cpp +++ b/src/tactic/smtlogics/qfufbv_ackr_model_converter.cpp @@ -14,8 +14,8 @@ Revision History: --*/ -#include"qfufbv_ackr_model_converter.h" -#include"ackr_model_converter.h" +#include "tactic/smtlogics/qfufbv_ackr_model_converter.h" +#include "ackermannization/ackr_model_converter.h" model_converter * mk_qfufbv_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model) { return mk_ackr_model_converter(m, info, abstr_model); diff --git a/src/tactic/smtlogics/qfufbv_ackr_model_converter.h b/src/tactic/smtlogics/qfufbv_ackr_model_converter.h index a361a78e0..efc039560 100644 --- a/src/tactic/smtlogics/qfufbv_ackr_model_converter.h +++ b/src/tactic/smtlogics/qfufbv_ackr_model_converter.h @@ -17,8 +17,8 @@ #ifndef QFUFBV_ACKR_MODEL_CONVERTER_H_ #define QFUFBV_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_qfufbv_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model); diff --git a/src/tactic/smtlogics/qfufbv_tactic.cpp b/src/tactic/smtlogics/qfufbv_tactic.cpp index e0e1a60e4..2e64d1e0a 100644 --- a/src/tactic/smtlogics/qfufbv_tactic.cpp +++ b/src/tactic/smtlogics/qfufbv_tactic.cpp @@ -17,29 +17,29 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"smt_tactic.h" -#include"max_bv_sharing_tactic.h" -#include"bv_size_reduction_tactic.h" -#include"reduce_args_tactic.h" -#include"qfbv_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/bv/max_bv_sharing_tactic.h" +#include "tactic/bv/bv_size_reduction_tactic.h" +#include "tactic/core/reduce_args_tactic.h" +#include "tactic/smtlogics/qfbv_tactic.h" #include"qfufbv_tactic_params.hpp" /////////////// -#include"model_smt2_pp.h" -#include"cooperate.h" -#include"lackr.h" +#include "model/model_smt2_pp.h" +#include "util/cooperate.h" +#include "ackermannization/lackr.h" #include"ackermannization_params.hpp" -#include"qfufbv_ackr_model_converter.h" +#include "tactic/smtlogics/qfufbv_ackr_model_converter.h" /////////////// -#include"inc_sat_solver.h" -#include"qfaufbv_tactic.h" -#include"qfbv_tactic.h" -#include"tactic2solver.h" -#include"bv_bound_chk_tactic.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "tactic/smtlogics/qfaufbv_tactic.h" +#include "tactic/smtlogics/qfbv_tactic.h" +#include "solver/tactic2solver.h" +#include "tactic/bv/bv_bound_chk_tactic.h" /////////////// class qfufbv_ackr_tactic : public tactic { diff --git a/src/tactic/smtlogics/qfufbv_tactic.h b/src/tactic/smtlogics/qfufbv_tactic.h index 1f1431d70..3e6d9d817 100644 --- a/src/tactic/smtlogics/qfufbv_tactic.h +++ b/src/tactic/smtlogics/qfufbv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFUFBV_TACTIC_H_ #define QFUFBV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/qfufnra_tactic.cpp b/src/tactic/smtlogics/qfufnra_tactic.cpp index 4ca241e19..e031b0f52 100644 --- a/src/tactic/smtlogics/qfufnra_tactic.cpp +++ b/src/tactic/smtlogics/qfufnra_tactic.cpp @@ -16,18 +16,18 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"nl_purify_tactic.h" -#include"qfufnra_tactic.h" -#include"purify_arith_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_term_ite_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"simplify_tactic.h" -#include"nnf_tactic.h" -#include"tseitin_cnf_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/nlsat_smt/nl_purify_tactic.h" +#include "tactic/smtlogics/qfufnra_tactic.h" +#include "tactic/arith/purify_arith_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_term_ite_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/nnf_tactic.h" +#include "tactic/core/tseitin_cnf_tactic.h" tactic * mk_qfufnra_tactic(ast_manager & m, params_ref const& p) { params_ref main_p = p; diff --git a/src/tactic/smtlogics/qfufnra_tactic.h b/src/tactic/smtlogics/qfufnra_tactic.h index 4cc2b372d..026ab5c5c 100644 --- a/src/tactic/smtlogics/qfufnra_tactic.h +++ b/src/tactic/smtlogics/qfufnra_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QFUFNRA_TACTIC_H_ #define QFUFNRA_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/smtlogics/quant_tactics.cpp b/src/tactic/smtlogics/quant_tactics.cpp index 7d428b369..400089a0c 100644 --- a/src/tactic/smtlogics/quant_tactics.cpp +++ b/src/tactic/smtlogics/quant_tactics.cpp @@ -16,19 +16,19 @@ Author: Revision History: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"elim_uncnstr_tactic.h" -#include"qe_tactic.h" -#include"qe_lite.h" -#include"qsat.h" -#include"nlqsat.h" -#include"ctx_simplify_tactic.h" -#include"smt_tactic.h" -#include"elim_term_ite_tactic.h" -#include"probe_arith.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/elim_uncnstr_tactic.h" +#include "qe/qe_tactic.h" +#include "qe/qe_lite.h" +#include "qe/qsat.h" +#include "qe/nlqsat.h" +#include "tactic/core/ctx_simplify_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/core/elim_term_ite_tactic.h" +#include "tactic/arith/probe_arith.h" static tactic * mk_quant_preprocessor(ast_manager & m, bool disable_gaussian = false) { params_ref pull_ite_p; diff --git a/src/tactic/smtlogics/quant_tactics.h b/src/tactic/smtlogics/quant_tactics.h index b78730236..da3594500 100644 --- a/src/tactic/smtlogics/quant_tactics.h +++ b/src/tactic/smtlogics/quant_tactics.h @@ -19,7 +19,7 @@ Revision History: #ifndef QUANT_TACTICS_H_ #define QUANT_TACTICS_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/tactic.cpp b/src/tactic/tactic.cpp index ac63a2d24..6c4ca7476 100644 --- a/src/tactic/tactic.cpp +++ b/src/tactic/tactic.cpp @@ -17,10 +17,10 @@ Notes: --*/ #include -#include"tactic.h" -#include"probe.h" -#include"stopwatch.h" -#include"model_v2_pp.h" +#include "tactic/tactic.h" +#include "tactic/probe.h" +#include "util/stopwatch.h" +#include "model/model_v2_pp.h" struct tactic_report::imp { diff --git a/src/tactic/tactic.h b/src/tactic/tactic.h index 645b53681..0e4c61611 100644 --- a/src/tactic/tactic.h +++ b/src/tactic/tactic.h @@ -21,13 +21,13 @@ Notes: #ifndef TACTIC_H_ #define TACTIC_H_ -#include"goal.h" -#include"params.h" -#include"statistics.h" -#include"model_converter.h" -#include"proof_converter.h" -#include"tactic_exception.h" -#include"lbool.h" +#include "tactic/goal.h" +#include "util/params.h" +#include "util/statistics.h" +#include "tactic/model_converter.h" +#include "tactic/proof_converter.h" +#include "tactic/tactic_exception.h" +#include "util/lbool.h" class progress_callback; diff --git a/src/tactic/tactic_exception.h b/src/tactic/tactic_exception.h index 6dbd39ff9..e989ed2bf 100644 --- a/src/tactic/tactic_exception.h +++ b/src/tactic/tactic_exception.h @@ -19,8 +19,8 @@ Notes: #ifndef TACTIC_EXCEPTION_H_ #define TACTIC_EXCEPTION_H_ -#include"z3_exception.h" -#include"common_msgs.h" +#include "util/z3_exception.h" +#include "util/common_msgs.h" class tactic_exception : public z3_exception { protected: diff --git a/src/tactic/tactical.cpp b/src/tactic/tactical.cpp index 33f8325fb..c5a70c0db 100644 --- a/src/tactic/tactical.cpp +++ b/src/tactic/tactical.cpp @@ -16,12 +16,12 @@ Author: Notes: --*/ -#include"tactical.h" -#include"scoped_timer.h" -#include"cancel_eh.h" -#include"cooperate.h" -#include"scoped_ptr_vector.h" -#include"z3_omp.h" +#include "tactic/tactical.h" +#include "util/scoped_timer.h" +#include "util/cancel_eh.h" +#include "util/cooperate.h" +#include "util/scoped_ptr_vector.h" +#include "util/z3_omp.h" class binary_tactical : public tactic { protected: diff --git a/src/tactic/tactical.h b/src/tactic/tactical.h index 4b4274b0c..169566f39 100644 --- a/src/tactic/tactical.h +++ b/src/tactic/tactical.h @@ -19,8 +19,8 @@ Notes: #ifndef TACTICAL_H_ #define TACTICAL_H_ -#include"tactic.h" -#include"probe.h" +#include "tactic/tactic.h" +#include "tactic/probe.h" tactic * and_then(unsigned num, tactic * const * ts); tactic * and_then(tactic * t1, tactic * t2); diff --git a/src/tactic/ufbv/macro_finder_tactic.cpp b/src/tactic/ufbv/macro_finder_tactic.cpp index e31682cd0..9b1835ff3 100644 --- a/src/tactic/ufbv/macro_finder_tactic.cpp +++ b/src/tactic/ufbv/macro_finder_tactic.cpp @@ -16,15 +16,15 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplifier.h" -#include"basic_simplifier_plugin.h" -#include"arith_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" -#include"macro_manager.h" -#include"macro_finder.h" -#include"extension_model_converter.h" -#include"macro_finder_tactic.h" +#include "tactic/tactical.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/macros/macro_manager.h" +#include "ast/macros/macro_finder.h" +#include "tactic/extension_model_converter.h" +#include "tactic/ufbv/macro_finder_tactic.h" class macro_finder_tactic : public tactic { diff --git a/src/tactic/ufbv/macro_finder_tactic.h b/src/tactic/ufbv/macro_finder_tactic.h index d763d4567..659748dec 100644 --- a/src/tactic/ufbv/macro_finder_tactic.h +++ b/src/tactic/ufbv/macro_finder_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef MACRO_FINDER_TACTIC_H_ #define MACRO_FINDER_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/ufbv/quasi_macros_tactic.cpp b/src/tactic/ufbv/quasi_macros_tactic.cpp index d1320bc0d..ab68a2b63 100644 --- a/src/tactic/ufbv/quasi_macros_tactic.cpp +++ b/src/tactic/ufbv/quasi_macros_tactic.cpp @@ -16,16 +16,16 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplifier.h" -#include"basic_simplifier_plugin.h" -#include"arith_simplifier_plugin.h" -#include"bv_simplifier_plugin.h" -#include"macro_manager.h" -#include"macro_finder.h" -#include"extension_model_converter.h" -#include"quasi_macros.h" -#include"quasi_macros_tactic.h" +#include "tactic/tactical.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/macros/macro_manager.h" +#include "ast/macros/macro_finder.h" +#include "tactic/extension_model_converter.h" +#include "ast/macros/quasi_macros.h" +#include "tactic/ufbv/quasi_macros_tactic.h" class quasi_macros_tactic : public tactic { diff --git a/src/tactic/ufbv/quasi_macros_tactic.h b/src/tactic/ufbv/quasi_macros_tactic.h index 2dff246a1..55fc5fcfb 100644 --- a/src/tactic/ufbv/quasi_macros_tactic.h +++ b/src/tactic/ufbv/quasi_macros_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef QUASI_MACROS_TACTIC_H_ #define QUASI_MACROS_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/ufbv/ufbv_rewriter.cpp b/src/tactic/ufbv/ufbv_rewriter.cpp index f5f18d234..4f0f5e548 100644 --- a/src/tactic/ufbv/ufbv_rewriter.cpp +++ b/src/tactic/ufbv/ufbv_rewriter.cpp @@ -20,11 +20,11 @@ Revision History: --*/ -#include"ast_pp.h" -#include"ufbv_rewriter.h" -#include"for_each_expr.h" -#include"var_subst.h" -#include"uint_set.h" +#include "ast/ast_pp.h" +#include "tactic/ufbv/ufbv_rewriter.h" +#include "ast/for_each_expr.h" +#include "ast/rewriter/var_subst.h" +#include "util/uint_set.h" ufbv_rewriter::ufbv_rewriter(ast_manager & m, basic_simplifier_plugin & p): m_manager(m), diff --git a/src/tactic/ufbv/ufbv_rewriter.h b/src/tactic/ufbv/ufbv_rewriter.h index 13234799e..d11453836 100644 --- a/src/tactic/ufbv/ufbv_rewriter.h +++ b/src/tactic/ufbv/ufbv_rewriter.h @@ -21,12 +21,12 @@ Revision History: #ifndef UFBV_REWRITER_H_ #define UFBV_REWRITER_H_ -#include"ast.h" -#include"substitution.h" -#include"obj_hashtable.h" -#include"obj_pair_hashtable.h" -#include"array_map.h" -#include"basic_simplifier_plugin.h" +#include "ast/ast.h" +#include "ast/substitution/substitution.h" +#include "util/obj_hashtable.h" +#include "util/obj_pair_hashtable.h" +#include "util/array_map.h" +#include "ast/simplifier/basic_simplifier_plugin.h" /** \brief Apply demodulators as a preprocessing technique. diff --git a/src/tactic/ufbv/ufbv_rewriter_tactic.cpp b/src/tactic/ufbv/ufbv_rewriter_tactic.cpp index 37ad9c73c..b4bfabf65 100644 --- a/src/tactic/ufbv/ufbv_rewriter_tactic.cpp +++ b/src/tactic/ufbv/ufbv_rewriter_tactic.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplifier.h" -#include"basic_simplifier_plugin.h" -#include"ufbv_rewriter.h" -#include"ufbv_rewriter_tactic.h" +#include "tactic/tactical.h" +#include "ast/simplifier/simplifier.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "tactic/ufbv/ufbv_rewriter.h" +#include "tactic/ufbv/ufbv_rewriter_tactic.h" class ufbv_rewriter_tactic : public tactic { diff --git a/src/tactic/ufbv/ufbv_rewriter_tactic.h b/src/tactic/ufbv/ufbv_rewriter_tactic.h index 78e34bae2..d0bdcd021 100644 --- a/src/tactic/ufbv/ufbv_rewriter_tactic.h +++ b/src/tactic/ufbv/ufbv_rewriter_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef UFBV_REWRITER_TACTIC_H_ #define UFBV_REWRITER_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/tactic/ufbv/ufbv_tactic.cpp b/src/tactic/ufbv/ufbv_tactic.cpp index 19d41be68..1fb4486ec 100644 --- a/src/tactic/ufbv/ufbv_tactic.cpp +++ b/src/tactic/ufbv/ufbv_tactic.cpp @@ -16,19 +16,19 @@ Author: Notes: --*/ -#include"tactical.h" -#include"simplify_tactic.h" -#include"propagate_values_tactic.h" -#include"solve_eqs_tactic.h" -#include"distribute_forall_tactic.h" -#include"der_tactic.h" -#include"reduce_args_tactic.h" -#include"smt_tactic.h" -#include"nnf_tactic.h" -#include"macro_finder_tactic.h" -#include"ufbv_rewriter_tactic.h" -#include"quasi_macros_tactic.h" -#include"ufbv_tactic.h" +#include "tactic/tactical.h" +#include "tactic/core/simplify_tactic.h" +#include "tactic/core/propagate_values_tactic.h" +#include "tactic/core/solve_eqs_tactic.h" +#include "tactic/core/distribute_forall_tactic.h" +#include "tactic/core/der_tactic.h" +#include "tactic/core/reduce_args_tactic.h" +#include "smt/tactic/smt_tactic.h" +#include "tactic/core/nnf_tactic.h" +#include "tactic/ufbv/macro_finder_tactic.h" +#include "tactic/ufbv/ufbv_rewriter_tactic.h" +#include "tactic/ufbv/quasi_macros_tactic.h" +#include "tactic/ufbv/ufbv_tactic.h" static tactic * mk_der_fp_tactic(ast_manager & m, params_ref const & p) { diff --git a/src/tactic/ufbv/ufbv_tactic.h b/src/tactic/ufbv/ufbv_tactic.h index 300fdd84a..ee97cd35e 100644 --- a/src/tactic/ufbv/ufbv_tactic.h +++ b/src/tactic/ufbv/ufbv_tactic.h @@ -19,7 +19,7 @@ Notes: #ifndef UFBV_TACTIC_H_ #define UFBV_TACTIC_H_ -#include"params.h" +#include "util/params.h" class ast_manager; class tactic; diff --git a/src/test/algebraic.cpp b/src/test/algebraic.cpp index 076d7ec73..b893b5ee2 100644 --- a/src/test/algebraic.cpp +++ b/src/test/algebraic.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"algebraic_numbers.h" -#include"polynomial_var2value.h" -#include"mpbq.h" -#include"rlimit.h" +#include "math/polynomial/algebraic_numbers.h" +#include "math/polynomial/polynomial_var2value.h" +#include "util/mpbq.h" +#include "util/rlimit.h" static void display_anums(std::ostream & out, scoped_anum_vector const & rs) { out << "numbers in decimal:\n"; diff --git a/src/test/api.cpp b/src/test/api.cpp index f691a8701..2b6cda0ea 100644 --- a/src/test/api.cpp +++ b/src/test/api.cpp @@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation --*/ #ifdef _WINDOWS -#include "z3.h" -#include "z3_private.h" +#include "api/z3.h" +#include "api/z3_private.h" #include -#include "util.h" -#include "trace.h" +#include "util/util.h" +#include "util/trace.h" #include -#include "trace.h" +#include "util/trace.h" void test_apps() { Z3_config cfg = Z3_mk_config(); diff --git a/src/test/api_bug.cpp b/src/test/api_bug.cpp index cd7feec56..44721700b 100644 --- a/src/test/api_bug.cpp +++ b/src/test/api_bug.cpp @@ -5,7 +5,7 @@ Copyright (c) 2015 Microsoft Corporation --*/ #include -#include"z3.h" +#include "api/z3.h" void tst_api_bug() { unsigned vmajor, vminor, vbuild, vrevision; diff --git a/src/test/arith_rewriter.cpp b/src/test/arith_rewriter.cpp index 6bdb11d48..a279d58b2 100644 --- a/src/test/arith_rewriter.cpp +++ b/src/test/arith_rewriter.cpp @@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "arith_rewriter.h" -#include "bv_decl_plugin.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" -#include "th_rewriter.h" -#include "model.h" -#include "pdr_util.h" -#include "smt2parser.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" +#include "ast/rewriter/th_rewriter.h" +#include "model/model.h" +#include "muz/pdr/pdr_util.h" +#include "parsers/smt2/smt2parser.h" static expr_ref parse_fml(ast_manager& m, char const* str) { diff --git a/src/test/arith_simplifier_plugin.cpp b/src/test/arith_simplifier_plugin.cpp index 8464fd830..63a6838d4 100644 --- a/src/test/arith_simplifier_plugin.cpp +++ b/src/test/arith_simplifier_plugin.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "arith_eq_solver.h" -#include "smt_params.h" +#include "smt/arith_eq_solver.h" +#include "smt/params/smt_params.h" typedef rational numeral; typedef vector row; diff --git a/src/test/ast.cpp b/src/test/ast.cpp index 20a1007a4..59bdfc8e4 100644 --- a/src/test/ast.cpp +++ b/src/test/ast.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include "ast.h" +#include "ast/ast.h" static void tst1() { ast_manager m; diff --git a/src/test/bit_blaster.cpp b/src/test/bit_blaster.cpp index d864032f5..c6853ae1e 100644 --- a/src/test/bit_blaster.cpp +++ b/src/test/bit_blaster.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include"bit_blaster.h" -#include"ast_pp.h" -#include"ast_ll_pp.h" +#include "ast/rewriter/bit_blaster/bit_blaster.h" +#include "ast/ast_pp.h" +#include "ast/ast_ll_pp.h" void mk_bits(ast_manager & m, char const * prefix, unsigned sz, expr_ref_vector & r) { sort_ref b(m); diff --git a/src/test/bit_vector.cpp b/src/test/bit_vector.cpp index 46a39747d..e920fadee 100644 --- a/src/test/bit_vector.cpp +++ b/src/test/bit_vector.cpp @@ -18,8 +18,8 @@ Revision History: --*/ #include #include -#include"bit_vector.h" -#include"vector.h" +#include "util/bit_vector.h" +#include "util/vector.h" static void tst1() { bit_vector v1; diff --git a/src/test/bits.cpp b/src/test/bits.cpp index ba75ea0b4..f0f04f661 100644 --- a/src/test/bits.cpp +++ b/src/test/bits.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ // Test some bit hacks -#include"util.h" -#include"debug.h" -#include"vector.h" -#include"mpz.h" -#include"bit_util.h" +#include "util/util.h" +#include "util/debug.h" +#include "util/vector.h" +#include "util/mpz.h" +#include "util/bit_util.h" static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, unsigned const * dst, bool trace = true) { diff --git a/src/test/buffer.cpp b/src/test/buffer.cpp index f4b7f0c99..4ab9754c2 100644 --- a/src/test/buffer.cpp +++ b/src/test/buffer.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"ptr_scoped_buffer.h" +#include "util/ptr_scoped_buffer.h" typedef std::pair point; diff --git a/src/test/bv_simplifier_plugin.cpp b/src/test/bv_simplifier_plugin.cpp index 42952706b..15ca9fac5 100644 --- a/src/test/bv_simplifier_plugin.cpp +++ b/src/test/bv_simplifier_plugin.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "bv_simplifier_plugin.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" class tst_bv_simplifier_plugin_cls { class mgr { diff --git a/src/test/chashtable.cpp b/src/test/chashtable.cpp index c9750b95e..0ccf2c177 100644 --- a/src/test/chashtable.cpp +++ b/src/test/chashtable.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"chashtable.h" -#include"hashtable.h" -#include"hash.h" -#include"util.h" +#include "util/chashtable.h" +#include "util/hashtable.h" +#include "util/hash.h" +#include "util/util.h" typedef chashtable > int_table; typedef cmap > int_map; diff --git a/src/test/check_assumptions.cpp b/src/test/check_assumptions.cpp index 918513ca0..020b3e277 100644 --- a/src/test/check_assumptions.cpp +++ b/src/test/check_assumptions.cpp @@ -4,13 +4,13 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "memory_manager.h" -#include "smt_params.h" -#include "ast.h" -#include "arith_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "smt_context.h" -#include "reg_decl_plugins.h" +#include "util/memory_manager.h" +#include "smt/params/smt_params.h" +#include "ast/ast.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "smt/smt_context.h" +#include "ast/reg_decl_plugins.h" void tst_check_assumptions() { diff --git a/src/test/cnf_backbones.cpp b/src/test/cnf_backbones.cpp index 3fdf96f87..3e9a106b5 100644 --- a/src/test/cnf_backbones.cpp +++ b/src/test/cnf_backbones.cpp @@ -5,11 +5,11 @@ Copyright (c) 2017 Microsoft Corporation #include #include #include -#include"timeout.h" -#include"rlimit.h" -#include"dimacs.h" -#include"sat_solver.h" -#include"gparams.h" +#include "util/timeout.h" +#include "util/rlimit.h" +#include "sat/dimacs.h" +#include "sat/sat_solver.h" +#include "util/gparams.h" static sat::solver * g_solver = 0; static clock_t g_start_time; diff --git a/src/test/datalog_parser.cpp b/src/test/datalog_parser.cpp index 800f21717..ca5e94f75 100644 --- a/src/test/datalog_parser.cpp +++ b/src/test/datalog_parser.cpp @@ -4,13 +4,13 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "datalog_parser.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" -#include "dl_context.h" -#include "dl_register_engine.h" -#include "smt_params.h" -#include "reg_decl_plugins.h" +#include "muz/fp/datalog_parser.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "smt/params/smt_params.h" +#include "ast/reg_decl_plugins.h" using namespace datalog; diff --git a/src/test/ddnf.cpp b/src/test/ddnf.cpp index 31503842d..3f8e748be 100644 --- a/src/test/ddnf.cpp +++ b/src/test/ddnf.cpp @@ -3,8 +3,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "ddnf.h" -#include "tbv.h" +#include "muz/ddnf/ddnf.h" +#include "muz/rel/tbv.h" #include #include #include diff --git a/src/test/diff_logic.cpp b/src/test/diff_logic.cpp index 3a1ec198d..e79c93cf2 100644 --- a/src/test/diff_logic.cpp +++ b/src/test/diff_logic.cpp @@ -17,11 +17,11 @@ Revision History: --*/ #ifdef _WINDOWS -#include"rational.h" -#include"diff_logic.h" -#include"smt_literal.h" -#include"util.h" -#include"debug.h" +#include "util/rational.h" +#include "smt/diff_logic.h" +#include "smt/smt_literal.h" +#include "util/util.h" +#include "util/debug.h" struct diff_logic_ext { typedef rational numeral; diff --git a/src/test/dl_context.cpp b/src/test/dl_context.cpp index 8d60cd883..e44c92f30 100644 --- a/src/test/dl_context.cpp +++ b/src/test/dl_context.cpp @@ -4,12 +4,12 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "datalog_parser.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" -#include "dl_context.h" -#include "smt_params.h" -#include "dl_register_engine.h" +#include "muz/fp/datalog_parser.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "muz/base/dl_context.h" +#include "smt/params/smt_params.h" +#include "muz/fp/dl_register_engine.h" using namespace datalog; diff --git a/src/test/dl_product_relation.cpp b/src/test/dl_product_relation.cpp index 84ffd548a..7cbbde450 100644 --- a/src/test/dl_product_relation.cpp +++ b/src/test/dl_product_relation.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ #ifdef _WINDOWS -#include "dl_context.h" -#include "dl_register_engine.h" -#include "dl_finite_product_relation.h" -#include "dl_sparse_table.h" -#include "rel_context.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/rel/dl_finite_product_relation.h" +#include "muz/rel/dl_sparse_table.h" +#include "muz/rel/rel_context.h" namespace datalog { diff --git a/src/test/dl_query.cpp b/src/test/dl_query.cpp index eaa26cdbb..c5765bd6b 100644 --- a/src/test/dl_query.cpp +++ b/src/test/dl_query.cpp @@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "datalog_parser.h" -#include "ast_pp.h" -#include "dl_table_relation.h" -#include "dl_context.h" -#include "dl_register_engine.h" -#include "smt_params.h" -#include "stopwatch.h" -#include "reg_decl_plugins.h" -#include "dl_relation_manager.h" +#include "muz/fp/datalog_parser.h" +#include "ast/ast_pp.h" +#include "muz/rel/dl_table_relation.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "smt/params/smt_params.h" +#include "util/stopwatch.h" +#include "ast/reg_decl_plugins.h" +#include "muz/rel/dl_relation_manager.h" using namespace datalog; diff --git a/src/test/dl_relation.cpp b/src/test/dl_relation.cpp index f0feed3a9..3abd60ce2 100644 --- a/src/test/dl_relation.cpp +++ b/src/test/dl_relation.cpp @@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation --*/ #ifdef _WINDOWS -#include "dl_context.h" -#include "dl_register_engine.h" -#include "dl_relation_manager.h" -#include "dl_interval_relation.h" -#include "dl_bound_relation.h" -#include "dl_product_relation.h" -#include "util.h" +#include "muz/base/dl_context.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/rel/dl_interval_relation.h" +#include "muz/rel/dl_bound_relation.h" +#include "muz/rel/dl_product_relation.h" +#include "util/util.h" namespace datalog { diff --git a/src/test/dl_table.cpp b/src/test/dl_table.cpp index f9ccb3116..326be5d04 100644 --- a/src/test/dl_table.cpp +++ b/src/test/dl_table.cpp @@ -3,10 +3,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ #if defined(_WINDOWS) || defined(_CYGWIN) -#include "dl_context.h" -#include "dl_table.h" -#include "dl_register_engine.h" -#include "dl_relation_manager.h" +#include "muz/base/dl_context.h" +#include "muz/rel/dl_table.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/rel/dl_relation_manager.h" typedef datalog::table_base* (*mk_table_fn)(datalog::relation_manager& m, datalog::table_signature& sig); diff --git a/src/test/dl_util.cpp b/src/test/dl_util.cpp index 44b95934e..d30b23e47 100644 --- a/src/test/dl_util.cpp +++ b/src/test/dl_util.cpp @@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "dl_util.h" +#include "muz/base/dl_util.h" using namespace datalog; diff --git a/src/test/doc.cpp b/src/test/doc.cpp index 4d9b9b7e6..aaa69fa92 100644 --- a/src/test/doc.cpp +++ b/src/test/doc.cpp @@ -4,19 +4,19 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "doc.h" -#include "trace.h" -#include "vector.h" -#include "ast.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" -#include "sorting_network.h" -#include "smt_kernel.h" -#include "model_smt2_pp.h" -#include "smt_params.h" -#include "ast_util.h" -#include "expr_safe_replace.h" -#include "th_rewriter.h" +#include "muz/rel/doc.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" +#include "util/sorting_network.h" +#include "smt/smt_kernel.h" +#include "model/model_smt2_pp.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/rewriter/th_rewriter.h" static void tst_doc1(unsigned n) { diff --git a/src/test/escaped.cpp b/src/test/escaped.cpp index c776bd600..fe8f733bf 100644 --- a/src/test/escaped.cpp +++ b/src/test/escaped.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"util.h" +#include "util/util.h" void tst_escaped() { std::cout << "[" << escaped("\"hello\"\"world\"\n\n") << "]\n"; diff --git a/src/test/ex.cpp b/src/test/ex.cpp index e9243dd5b..591813814 100644 --- a/src/test/ex.cpp +++ b/src/test/ex.cpp @@ -17,7 +17,7 @@ Revision History: --*/ #include -#include"z3_exception.h" +#include "util/z3_exception.h" class ex { public: diff --git a/src/test/expr_rand.cpp b/src/test/expr_rand.cpp index 96d21a44c..388a178f4 100644 --- a/src/test/expr_rand.cpp +++ b/src/test/expr_rand.cpp @@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "expr_rand.h" -#include "ast_pp.h" -#include "bv_decl_plugin.h" -#include "array_decl_plugin.h" -#include "arith_decl_plugin.h" -#include "ast_smt_pp.h" +#include "test/fuzzing/expr_rand.h" +#include "ast/ast_pp.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_smt_pp.h" #include #include -#include "reg_decl_plugins.h" +#include "ast/reg_decl_plugins.h" static unsigned rand_seed = 1; diff --git a/src/test/expr_substitution.cpp b/src/test/expr_substitution.cpp index fdf1d6dc2..3b74535e7 100644 --- a/src/test/expr_substitution.cpp +++ b/src/test/expr_substitution.cpp @@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "expr_substitution.h" -#include "smt_params.h" -#include "substitution.h" -#include "unifier.h" -#include "bv_decl_plugin.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" -#include "reg_decl_plugins.h" -#include "th_rewriter.h" +#include "ast/expr_substitution.h" +#include "smt/params/smt_params.h" +#include "ast/substitution/substitution.h" +#include "ast/substitution/unifier.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/reg_decl_plugins.h" +#include "ast/rewriter/th_rewriter.h" expr* mk_bv_xor(bv_util& bv, expr* a, expr* b) { expr* args[2]; diff --git a/src/test/ext_numeral.cpp b/src/test/ext_numeral.cpp index a35af1ba6..4c82617c9 100644 --- a/src/test/ext_numeral.cpp +++ b/src/test/ext_numeral.cpp @@ -17,8 +17,8 @@ Notes: --*/ #include -#include"mpq.h" -#include"ext_numeral.h" +#include "util/mpq.h" +#include "util/ext_numeral.h" #define MK_TST_UNARY(NAME) \ static void tst_ ## NAME(int a, ext_numeral_kind ak, int expected_c, ext_numeral_kind expected_ck) { \ diff --git a/src/test/f2n.cpp b/src/test/f2n.cpp index 0ae9ea1dd..7831a31cf 100644 --- a/src/test/f2n.cpp +++ b/src/test/f2n.cpp @@ -15,9 +15,9 @@ Author: Revision History: --*/ -#include"f2n.h" -#include"hwf.h" -#include"mpf.h" +#include "util/f2n.h" +#include "util/hwf.h" +#include "util/mpf.h" static void tst1() { hwf_manager hm; diff --git a/src/test/factor_rewriter.cpp b/src/test/factor_rewriter.cpp index 3bcdcd9e9..486221e5b 100644 --- a/src/test/factor_rewriter.cpp +++ b/src/test/factor_rewriter.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "factor_rewriter.h" -#include "bv_decl_plugin.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" +#include "ast/rewriter/factor_rewriter.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" void tst_factor_rewriter() { ast_manager m; diff --git a/src/test/fixed_bit_vector.cpp b/src/test/fixed_bit_vector.cpp index 0160fe574..f1c52a6a8 100644 --- a/src/test/fixed_bit_vector.cpp +++ b/src/test/fixed_bit_vector.cpp @@ -20,8 +20,8 @@ Revision History: --*/ #include #include -#include"fixed_bit_vector.h" -#include"vector.h" +#include "util/fixed_bit_vector.h" +#include "util/vector.h" static void tst1() { diff --git a/src/test/for_each_file.cpp b/src/test/for_each_file.cpp index d217aa5f1..eeec69156 100644 --- a/src/test/for_each_file.cpp +++ b/src/test/for_each_file.cpp @@ -21,7 +21,7 @@ Revision History: #include #include #include -#include "for_each_file.h" +#include "test/for_each_file.h" bool for_each_file(for_each_file_proc& proc, const char* base, const char* suffix) { diff --git a/src/test/fuzzing/expr_delta.cpp b/src/test/fuzzing/expr_delta.cpp index fd5117a74..8e94a84ce 100644 --- a/src/test/fuzzing/expr_delta.cpp +++ b/src/test/fuzzing/expr_delta.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "expr_delta.h" -#include "ast_pp.h" +#include "test/fuzzing/expr_delta.h" +#include "ast/ast_pp.h" expr_delta::expr_delta(ast_manager& m) : m_manager(m), m_exprs(m) {} diff --git a/src/test/fuzzing/expr_delta.h b/src/test/fuzzing/expr_delta.h index 2c68efb40..d69ed33f1 100644 --- a/src/test/fuzzing/expr_delta.h +++ b/src/test/fuzzing/expr_delta.h @@ -20,7 +20,7 @@ Revision History: #ifndef EXPR_DELTA_H_ #define EXPR_DELTA_H_ -#include "ast.h" +#include "ast/ast.h" class expr_delta { ast_manager& m_manager; diff --git a/src/test/fuzzing/expr_rand.cpp b/src/test/fuzzing/expr_rand.cpp index ccc4a9e5c..1d425e9e1 100644 --- a/src/test/fuzzing/expr_rand.cpp +++ b/src/test/fuzzing/expr_rand.cpp @@ -4,11 +4,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "expr_rand.h" -#include "bv_decl_plugin.h" -#include "array_decl_plugin.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" +#include "test/fuzzing/expr_rand.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" expr_rand::expr_rand(ast_manager& m): diff --git a/src/test/fuzzing/expr_rand.h b/src/test/fuzzing/expr_rand.h index bbadd587e..4cdee81fd 100644 --- a/src/test/fuzzing/expr_rand.h +++ b/src/test/fuzzing/expr_rand.h @@ -19,8 +19,8 @@ Revision History: #ifndef EXPR_RAND_H_ #define EXPR_RAND_H_ -#include"ast.h" -#include"obj_hashtable.h" +#include "ast/ast.h" +#include "util/obj_hashtable.h" class expr_rand { ast_manager& m_manager; diff --git a/src/test/get_consequences.cpp b/src/test/get_consequences.cpp index 029a13881..9337dcee3 100644 --- a/src/test/get_consequences.cpp +++ b/src/test/get_consequences.cpp @@ -3,15 +3,15 @@ Copyright (c) 2016 Microsoft Corporation --*/ -#include "inc_sat_solver.h" -#include "bv_decl_plugin.h" -#include "datatype_decl_plugin.h" -#include "reg_decl_plugins.h" -#include "ast_pp.h" -#include "dt2bv_tactic.h" -#include "tactic.h" -#include "model_smt2_pp.h" -#include "fd_solver.h" +#include "sat/sat_solver/inc_sat_solver.h" +#include "ast/bv_decl_plugin.h" +#include "ast/datatype_decl_plugin.h" +#include "ast/reg_decl_plugins.h" +#include "ast/ast_pp.h" +#include "tactic/bv/dt2bv_tactic.h" +#include "tactic/tactic.h" +#include "model/model_smt2_pp.h" +#include "tactic/portfolio/fd_solver.h" static expr_ref mk_const(ast_manager& m, char const* name, sort* s) { return expr_ref(m.mk_const(symbol(name), s), m); diff --git a/src/test/get_implied_equalities.cpp b/src/test/get_implied_equalities.cpp index 8ddcdb1e9..952fb121a 100644 --- a/src/test/get_implied_equalities.cpp +++ b/src/test/get_implied_equalities.cpp @@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "z3.h" -#include "trace.h" -#include "debug.h" +#include "api/z3.h" +#include "util/trace.h" +#include "util/debug.h" static Z3_ast mk_var(Z3_context ctx, char const* name, Z3_sort s) { return Z3_mk_const(ctx, Z3_mk_string_symbol(ctx, name), s); diff --git a/src/test/hashtable.cpp b/src/test/hashtable.cpp index 0290ac161..befd0b8e9 100644 --- a/src/test/hashtable.cpp +++ b/src/test/hashtable.cpp @@ -21,7 +21,7 @@ Revision History: #include #include -#include"hashtable.h" +#include "util/hashtable.h" struct int_hash_proc { unsigned operator()(int x) const { return x * 3; } }; diff --git a/src/test/heap.cpp b/src/test/heap.cpp index 6f827b5e8..117b6abef 100644 --- a/src/test/heap.cpp +++ b/src/test/heap.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #include -#include"heap.h" -#include"hashtable.h" -#include"trace.h" +#include "util/heap.h" +#include "util/hashtable.h" +#include "util/trace.h" struct lt_proc { bool operator()(int v1, int v2) const { return v1 < v2; } }; typedef heap int_heap; diff --git a/src/test/heap_trie.cpp b/src/test/heap_trie.cpp index 5b0047e82..b6f651633 100644 --- a/src/test/heap_trie.cpp +++ b/src/test/heap_trie.cpp @@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "heap_trie.h" +#include "math/hilbert/heap_trie.h" struct unsigned_le { static bool le(unsigned i, unsigned j) { return i <= j; } diff --git a/src/test/hilbert_basis.cpp b/src/test/hilbert_basis.cpp index f2ca8a375..7329b1d3d 100644 --- a/src/test/hilbert_basis.cpp +++ b/src/test/hilbert_basis.cpp @@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "hilbert_basis.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" -#include "arith_decl_plugin.h" -#include "quant_tactics.h" -#include "tactic.h" -#include "tactic2solver.h" -#include "solver.h" -#include "rlimit.h" +#include "math/hilbert/hilbert_basis.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" +#include "ast/arith_decl_plugin.h" +#include "tactic/smtlogics/quant_tactics.h" +#include "tactic/tactic.h" +#include "solver/tactic2solver.h" +#include "solver/solver.h" +#include "util/rlimit.h" #include #include #include diff --git a/src/test/horn_subsume_model_converter.cpp b/src/test/horn_subsume_model_converter.cpp index 4b653e3a8..a361cfb2a 100644 --- a/src/test/horn_subsume_model_converter.cpp +++ b/src/test/horn_subsume_model_converter.cpp @@ -5,10 +5,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "horn_subsume_model_converter.h" -#include "arith_decl_plugin.h" -#include "model_smt2_pp.h" -#include "reg_decl_plugins.h" +#include "tactic/horn_subsume_model_converter.h" +#include "ast/arith_decl_plugin.h" +#include "model/model_smt2_pp.h" +#include "ast/reg_decl_plugins.h" void tst_horn_subsume_model_converter() { ast_manager m; diff --git a/src/test/hwf.cpp b/src/test/hwf.cpp index 310d69be2..697673473 100644 --- a/src/test/hwf.cpp +++ b/src/test/hwf.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"hwf.h" -#include"f2n.h" -#include"rational.h" +#include "util/hwf.h" +#include "util/f2n.h" +#include "util/rational.h" static void bug_set_double() { hwf_manager m; diff --git a/src/test/im_float_config.h b/src/test/im_float_config.h index 2f33172a1..436d9ecaf 100644 --- a/src/test/im_float_config.h +++ b/src/test/im_float_config.h @@ -19,9 +19,9 @@ Revision History: #ifndef IM_FLOAT_CONFIG_H_ #define IM_FLOAT_CONFIG_H_ -#include"f2n.h" -#include"mpf.h" -#include"hwf.h" +#include "util/f2n.h" +#include "util/mpf.h" +#include "util/hwf.h" template class im_float_config { diff --git a/src/test/inf_rational.cpp b/src/test/inf_rational.cpp index 64d2ab921..634bae7c1 100644 --- a/src/test/inf_rational.cpp +++ b/src/test/inf_rational.cpp @@ -18,7 +18,7 @@ Revision History: --*/ -#include"inf_rational.h" +#include "util/inf_rational.h" static void tst0() { inf_rational n(rational(0), false); diff --git a/src/test/interval.cpp b/src/test/interval.cpp index c22156988..ba218c010 100644 --- a/src/test/interval.cpp +++ b/src/test/interval.cpp @@ -17,12 +17,12 @@ Revision History: --*/ #include -#include"interval_def.h" -#include"dependency.h" -#include"mpq.h" -#include"ast.h" -#include"debug.h" -#include"rlimit.h" +#include "math/interval/interval_def.h" +#include "util/dependency.h" +#include "util/mpq.h" +#include "ast/ast.h" +#include "util/debug.h" +#include "util/rlimit.h" template class interval_manager; typedef im_default_config::interval interval; @@ -390,7 +390,7 @@ static void tst_div(unsigned N, unsigned magnitude) { del_interval(imc, a); del_interval(imc, b); del_interval(imc, r); } -#include"im_float_config.h" +#include "test/im_float_config.h" #if 0 static void tst_float() { diff --git a/src/test/karr.cpp b/src/test/karr.cpp index 11e7ae17f..dc18f7e19 100644 --- a/src/test/karr.cpp +++ b/src/test/karr.cpp @@ -3,8 +3,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include"rlimit.h" -#include "hilbert_basis.h" +#include "util/rlimit.h" +#include "math/hilbert/hilbert_basis.h" /* Test generation of linear congruences a la Karr. diff --git a/src/test/list.cpp b/src/test/list.cpp index e377e7bbf..4cfa16801 100644 --- a/src/test/list.cpp +++ b/src/test/list.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"trace.h" -#include"util.h" -#include"region.h" -#include"list.h" +#include "util/trace.h" +#include "util/util.h" +#include "util/region.h" +#include "util/list.h" static void tst1() { region r; diff --git a/src/test/lp.cpp b/src/test/lp.cpp index 9e05112f5..f76850e38 100644 --- a/src/test/lp.cpp +++ b/src/test/lp.cpp @@ -19,10 +19,10 @@ Author: Lev Nachmanson #include "util/lp/lp_utils.h" #include "util/lp/lp_primal_simplex.h" #include "util/lp/mps_reader.h" -#include "smt_reader.h" +#include "test/smt_reader.h" #include "util/lp/binary_heap_priority_queue.h" -#include "argument_parser.h" -#include "test_file_reader.h" +#include "test/argument_parser.h" +#include "test/test_file_reader.h" #include "util/lp/indexed_value.h" #include "util/lp/lar_solver.h" #include "util/lp/numeric_pair.h" diff --git a/src/test/main.cpp b/src/test/main.cpp index c05488370..17ac720dc 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -2,13 +2,13 @@ #include #include #include -#include"util.h" -#include"trace.h" -#include"debug.h" -#include"timeit.h" -#include"warning.h" -#include "memory_manager.h" -#include"gparams.h" +#include "util/util.h" +#include "util/trace.h" +#include "util/debug.h" +#include "util/timeit.h" +#include "util/warning.h" +#include "util/memory_manager.h" +#include "util/gparams.h" // // Unit tests fail by asserting. diff --git a/src/test/map.cpp b/src/test/map.cpp index c0b084b73..5d59e1e2f 100644 --- a/src/test/map.cpp +++ b/src/test/map.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"map.h" -#include"str_hashtable.h" +#include "util/map.h" +#include "util/str_hashtable.h" static void tst1() { map str2int; diff --git a/src/test/matcher.cpp b/src/test/matcher.cpp index 598a82ae3..cd220a9c6 100644 --- a/src/test/matcher.cpp +++ b/src/test/matcher.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #ifdef _WINDOWS -#include"matcher.h" -#include"ast_pp.h" -#include "reg_decl_plugins.h" +#include "ast/substitution/matcher.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" void tst_match(ast_manager & m, app * t, app * i) { diff --git a/src/test/memory.cpp b/src/test/memory.cpp index 340a1929c..48ba35b78 100644 --- a/src/test/memory.cpp +++ b/src/test/memory.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ #ifdef _WINDOWS -#include "z3.h" -#include "z3_private.h" +#include "api/z3.h" +#include "api/z3_private.h" #include -#include "util.h" -#include "trace.h" +#include "util/util.h" +#include "util/trace.h" static bool oom = false; diff --git a/src/test/model2expr.cpp b/src/test/model2expr.cpp index f96cee55f..457fc1751 100644 --- a/src/test/model2expr.cpp +++ b/src/test/model2expr.cpp @@ -4,11 +4,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "model2expr.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" -#include "model_smt2_pp.h" -#include "reg_decl_plugins.h" +#include "model/model2expr.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "model/model_smt2_pp.h" +#include "ast/reg_decl_plugins.h" void tst_model2expr() { ast_manager m; diff --git a/src/test/model_based_opt.cpp b/src/test/model_based_opt.cpp index 5ee671a4a..2f8cf9941 100644 --- a/src/test/model_based_opt.cpp +++ b/src/test/model_based_opt.cpp @@ -1,6 +1,6 @@ -#include "model_based_opt.h" -#include "util.h" -#include "uint_set.h" +#include "math/simplex/model_based_opt.h" +#include "util/util.h" +#include "util/uint_set.h" typedef opt::model_based_opt::var var; diff --git a/src/test/model_evaluator.cpp b/src/test/model_evaluator.cpp index 00048b230..68a24e792 100644 --- a/src/test/model_evaluator.cpp +++ b/src/test/model_evaluator.cpp @@ -1,9 +1,9 @@ -#include "model.h" -#include "model_evaluator.h" -#include "model_pp.h" -#include "arith_decl_plugin.h" -#include "reg_decl_plugins.h" -#include "ast_pp.h" +#include "model/model.h" +#include "model/model_evaluator.h" +#include "model/model_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/reg_decl_plugins.h" +#include "ast/ast_pp.h" void tst_model_evaluator() { diff --git a/src/test/model_retrieval.cpp b/src/test/model_retrieval.cpp index e42e22539..e0fd28088 100644 --- a/src/test/model_retrieval.cpp +++ b/src/test/model_retrieval.cpp @@ -5,14 +5,14 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "ast.h" -#include "smt_params.h" -#include "smt_context.h" -#include "arith_decl_plugin.h" -#include "bv_decl_plugin.h" -#include "array_decl_plugin.h" -#include "model_v2_pp.h" -#include "reg_decl_plugins.h" +#include "ast/ast.h" +#include "smt/params/smt_params.h" +#include "smt/smt_context.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "model/model_v2_pp.h" +#include "ast/reg_decl_plugins.h" void tst_model_retrieval() { diff --git a/src/test/mpbq.cpp b/src/test/mpbq.cpp index 97f8822a9..4dc92d80d 100644 --- a/src/test/mpbq.cpp +++ b/src/test/mpbq.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include "mpbq.h" +#include "util/mpbq.h" static void tst1() { unsynch_mpz_manager zm; diff --git a/src/test/mpf.cpp b/src/test/mpf.cpp index f00152b09..6e3dfb67f 100644 --- a/src/test/mpf.cpp +++ b/src/test/mpf.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"mpf.h" -#include"f2n.h" +#include "util/mpf.h" +#include "util/f2n.h" static void bug_set_int() { mpf_manager fm; diff --git a/src/test/mpff.cpp b/src/test/mpff.cpp index af67d9ff5..73ed114a7 100644 --- a/src/test/mpff.cpp +++ b/src/test/mpff.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #include -#include"mpff.h" -#include"mpz.h" -#include"mpq.h" +#include "util/mpff.h" +#include "util/mpz.h" +#include "util/mpq.h" static void tst1() { try { diff --git a/src/test/mpfx.cpp b/src/test/mpfx.cpp index c83f73bad..f9dc123f5 100644 --- a/src/test/mpfx.cpp +++ b/src/test/mpfx.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"mpfx.h" +#include "util/mpfx.h" static void tst1() { mpfx_manager m; diff --git a/src/test/mpq.cpp b/src/test/mpq.cpp index 0da7a584a..7b60d9dcb 100644 --- a/src/test/mpq.cpp +++ b/src/test/mpq.cpp @@ -17,9 +17,9 @@ Revision History: --*/ -#include"mpq.h" -#include"rational.h" -#include"timeit.h" +#include "util/mpq.h" +#include "util/rational.h" +#include "util/timeit.h" static void tst0() { synch_mpq_manager m; diff --git a/src/test/mpz.cpp b/src/test/mpz.cpp index 1c587f8e9..7926388df 100644 --- a/src/test/mpz.cpp +++ b/src/test/mpz.cpp @@ -17,10 +17,10 @@ Revision History: --*/ -#include"mpz.h" -#include"rational.h" -#include"timeit.h" -#include"scoped_numeral.h" +#include "util/mpz.h" +#include "util/rational.h" +#include "util/timeit.h" +#include "util/scoped_numeral.h" static void tst1() { synch_mpz_manager m; diff --git a/src/test/nlarith_util.cpp b/src/test/nlarith_util.cpp index 2def66b38..4769c1591 100644 --- a/src/test/nlarith_util.cpp +++ b/src/test/nlarith_util.cpp @@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "nlarith_util.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" +#include "qe/nlarith_util.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" void tst_nlarith_util() { ast_manager M; diff --git a/src/test/nlsat.cpp b/src/test/nlsat.cpp index ccb534214..4d9d4579e 100644 --- a/src/test/nlsat.cpp +++ b/src/test/nlsat.cpp @@ -16,14 +16,14 @@ Author: Notes: --*/ -#include"nlsat_assignment.h" -#include"nlsat_interval_set.h" -#include"nlsat_evaluator.h" -#include"nlsat_solver.h" -#include"util.h" -#include"nlsat_explain.h" -#include"polynomial_cache.h" -#include"rlimit.h" +#include "nlsat/nlsat_assignment.h" +#include "nlsat/nlsat_interval_set.h" +#include "nlsat/nlsat_evaluator.h" +#include "nlsat/nlsat_solver.h" +#include "util/util.h" +#include "nlsat/nlsat_explain.h" +#include "math/polynomial/polynomial_cache.h" +#include "util/rlimit.h" nlsat::interval_set_ref tst_interval(nlsat::interval_set_ref const & s1, nlsat::interval_set_ref const & s2, diff --git a/src/test/no_overflow.cpp b/src/test/no_overflow.cpp index c528b0dbe..bb87b1d30 100644 --- a/src/test/no_overflow.cpp +++ b/src/test/no_overflow.cpp @@ -18,9 +18,9 @@ Revision History: --*/ #ifdef _WINDOWS -#include "z3.h" -#include "trace.h" -#include "rational.h" +#include "api/z3.h" +#include "util/trace.h" +#include "util/rational.h" #define TEST(TEST_NAME, TEST_OUTCOME, NEG_TEST_OUTCOME) \ do { \ diff --git a/src/test/object_allocator.cpp b/src/test/object_allocator.cpp index 3ea646c0c..ce2ae124c 100644 --- a/src/test/object_allocator.cpp +++ b/src/test/object_allocator.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"rational.h" -#include"object_allocator.h" +#include "util/rational.h" +#include "util/object_allocator.h" struct cell { rational m_coeff; diff --git a/src/test/old_interval.cpp b/src/test/old_interval.cpp index da41d0d38..4ab8b0dd0 100644 --- a/src/test/old_interval.cpp +++ b/src/test/old_interval.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"old_interval.h" +#include "smt/old_interval.h" static void tst1() { ext_numeral inf(true); @@ -166,9 +166,9 @@ public: } }; -#include"basic_interval.h" -#include"mpz.h" -#include"scoped_numeral.h" +#include "util/basic_interval.h" +#include "util/mpz.h" +#include "util/scoped_numeral.h" static void tst2() { typedef basic_interval_manager mpzi_manager; diff --git a/src/test/optional.cpp b/src/test/optional.cpp index 40ca383a5..46dfef82c 100644 --- a/src/test/optional.cpp +++ b/src/test/optional.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"trace.h" -#include"debug.h" -#include"optional.h" +#include "util/trace.h" +#include "util/debug.h" +#include "util/optional.h" static void tst1() { optional v; diff --git a/src/test/parray.cpp b/src/test/parray.cpp index df0fde516..6aef4f359 100644 --- a/src/test/parray.cpp +++ b/src/test/parray.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"parray.h" -#include"small_object_allocator.h" -#include"ast.h" +#include "util/parray.h" +#include "util/small_object_allocator.h" +#include "ast/ast.h" template struct int_parray_config { diff --git a/src/test/pb2bv.cpp b/src/test/pb2bv.cpp index 07cb047b3..632b2d642 100644 --- a/src/test/pb2bv.cpp +++ b/src/test/pb2bv.cpp @@ -3,21 +3,21 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "trace.h" -#include "vector.h" -#include "ast.h" -#include "ast_pp.h" -#include "statistics.h" -#include "reg_decl_plugins.h" -#include "pb2bv_rewriter.h" -#include "smt_kernel.h" -#include "model_smt2_pp.h" -#include "smt_params.h" -#include "ast_util.h" -#include "pb_decl_plugin.h" -#include "th_rewriter.h" -#include "fd_solver.h" -#include "solver.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "util/statistics.h" +#include "ast/reg_decl_plugins.h" +#include "ast/rewriter/pb2bv_rewriter.h" +#include "smt/smt_kernel.h" +#include "model/model_smt2_pp.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" +#include "ast/pb_decl_plugin.h" +#include "ast/rewriter/th_rewriter.h" +#include "tactic/portfolio/fd_solver.h" +#include "solver/solver.h" static void test1() { ast_manager m; diff --git a/src/test/pdr.cpp b/src/test/pdr.cpp index d95a55a24..7e2f1a5ad 100644 --- a/src/test/pdr.cpp +++ b/src/test/pdr.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "pdr_context.h" -#include "reg_decl_plugins.h" +#include "muz/pdr/pdr_context.h" +#include "ast/reg_decl_plugins.h" using namespace pdr; diff --git a/src/test/permutation.cpp b/src/test/permutation.cpp index e0d208520..74b97a365 100644 --- a/src/test/permutation.cpp +++ b/src/test/permutation.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"permutation.h" -#include"util.h" -#include"vector.h" +#include "util/permutation.h" +#include "util/util.h" +#include "util/vector.h" void apply_permutation_copy(unsigned sz, unsigned const * src, unsigned const * p, unsigned * target) { for (unsigned i = 0; i < sz; i++) { diff --git a/src/test/polynomial.cpp b/src/test/polynomial.cpp index 0a6418a6c..00998a181 100644 --- a/src/test/polynomial.cpp +++ b/src/test/polynomial.cpp @@ -17,11 +17,11 @@ Notes: --*/ #if !defined(__clang__) -#include"polynomial.h" -#include"polynomial_var2value.h" -#include"polynomial_cache.h" -#include"linear_eq_solver.h" -#include"rlimit.h" +#include "math/polynomial/polynomial.h" +#include "math/polynomial/polynomial_var2value.h" +#include "math/polynomial/polynomial_cache.h" +#include "math/polynomial/linear_eq_solver.h" +#include "util/rlimit.h" static void tst1() { std::cout << "\n----- Basic testing -------\n"; diff --git a/src/test/polynorm.cpp b/src/test/polynorm.cpp index 03735fef9..22df91b45 100644 --- a/src/test/polynorm.cpp +++ b/src/test/polynorm.cpp @@ -4,12 +4,12 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "th_rewriter.h" -#include "smt2parser.h" -#include "arith_decl_plugin.h" -#include "reg_decl_plugins.h" -#include "arith_rewriter.h" -#include "ast_pp.h" +#include "ast/rewriter/th_rewriter.h" +#include "parsers/smt2/smt2parser.h" +#include "ast/arith_decl_plugin.h" +#include "ast/reg_decl_plugins.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/ast_pp.h" static expr_ref parse_fml(ast_manager& m, char const* str) { diff --git a/src/test/prime_generator.cpp b/src/test/prime_generator.cpp index 5af014e0a..12c38ef78 100644 --- a/src/test/prime_generator.cpp +++ b/src/test/prime_generator.cpp @@ -16,8 +16,8 @@ Author: Notes: --*/ -#include"mpz.h" -#include"prime_generator.h" +#include "util/mpz.h" +#include "util/prime_generator.h" void tst_prime_generator() { unsynch_mpz_manager m; diff --git a/src/test/proof_checker.cpp b/src/test/proof_checker.cpp index 035326b26..adf77e12e 100644 --- a/src/test/proof_checker.cpp +++ b/src/test/proof_checker.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "proof_checker.h" -#include "ast_ll_pp.h" +#include "ast/proof_checker/proof_checker.h" +#include "ast/ast_ll_pp.h" void tst_checker1() { ast_manager m(PGM_FINE); diff --git a/src/test/qe_arith.cpp b/src/test/qe_arith.cpp index 83b6e2620..d18e0f717 100644 --- a/src/test/qe_arith.cpp +++ b/src/test/qe_arith.cpp @@ -4,17 +4,17 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "qe_arith.h" -#include "qe.h" -#include "th_rewriter.h" -#include "smt2parser.h" -#include "arith_decl_plugin.h" -#include "reg_decl_plugins.h" -#include "arith_rewriter.h" -#include "ast_pp.h" -#include "smt_context.h" -#include "expr_abstract.h" -#include "expr_safe_replace.h" +#include "qe/qe_arith.h" +#include "qe/qe.h" +#include "ast/rewriter/th_rewriter.h" +#include "parsers/smt2/smt2parser.h" +#include "ast/arith_decl_plugin.h" +#include "ast/reg_decl_plugins.h" +#include "ast/rewriter/arith_rewriter.h" +#include "ast/ast_pp.h" +#include "smt/smt_context.h" +#include "ast/expr_abstract.h" +#include "ast/rewriter/expr_safe_replace.h" static expr_ref parse_fml(ast_manager& m, char const* str) { expr_ref result(m); diff --git a/src/test/quant_elim.cpp b/src/test/quant_elim.cpp index 0fe7f8eec..fec86d164 100644 --- a/src/test/quant_elim.cpp +++ b/src/test/quant_elim.cpp @@ -4,20 +4,20 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "ast.h" -#include "smt_params.h" -#include "simplifier.h" -#include "qe.h" -#include "basic_simplifier_plugin.h" -#include "arith_simplifier_plugin.h" -#include "array_simplifier_plugin.h" -#include "bv_simplifier_plugin.h" -#include "ast_pp.h" -#include "smtlib.h" -#include "smtparser.h" -#include "lbool.h" +#include "ast/ast.h" +#include "smt/params/smt_params.h" +#include "ast/simplifier/simplifier.h" +#include "qe/qe.h" +#include "ast/simplifier/basic_simplifier_plugin.h" +#include "ast/simplifier/arith_simplifier_plugin.h" +#include "ast/simplifier/array_simplifier_plugin.h" +#include "ast/simplifier/bv_simplifier_plugin.h" +#include "ast/ast_pp.h" +#include "parsers/smt/smtlib.h" +#include "parsers/smt/smtparser.h" +#include "util/lbool.h" #include -#include "reg_decl_plugins.h" +#include "ast/reg_decl_plugins.h" static void test_qe(ast_manager& m, lbool expected_outcome, expr* fml, char const* option) { diff --git a/src/test/quant_solve.cpp b/src/test/quant_solve.cpp index 2dc987d77..ac334c718 100644 --- a/src/test/quant_solve.cpp +++ b/src/test/quant_solve.cpp @@ -4,20 +4,20 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "ast.h" -#include "smt_params.h" -#include "qe.h" -#include "arith_decl_plugin.h" -#include "ast_pp.h" -#include "lbool.h" +#include "ast/ast.h" +#include "smt/params/smt_params.h" +#include "qe/qe.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "util/lbool.h" #include -#include "expr_replacer.h" -#include "smt_kernel.h" -#include "reg_decl_plugins.h" -#include "expr_abstract.h" -#include "model_smt2_pp.h" -#include "smt2parser.h" -#include "var_subst.h" +#include "ast/rewriter/expr_replacer.h" +#include "smt/smt_kernel.h" +#include "ast/reg_decl_plugins.h" +#include "ast/expr_abstract.h" +#include "model/model_smt2_pp.h" +#include "parsers/smt2/smt2parser.h" +#include "ast/rewriter/var_subst.h" static void validate_quant_solution(ast_manager& m, expr* fml, expr* guard, qe::def_vector const& defs) { // verify: diff --git a/src/test/random.cpp b/src/test/random.cpp index a813b0f08..89d5a24cf 100644 --- a/src/test/random.cpp +++ b/src/test/random.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"util.h" -#include"trace.h" +#include "util/util.h" +#include "util/trace.h" static void tst1() { random_gen r(0); diff --git a/src/test/rational.cpp b/src/test/rational.cpp index 6fa1005b0..7b5e474f0 100644 --- a/src/test/rational.cpp +++ b/src/test/rational.cpp @@ -17,11 +17,11 @@ Revision History: --*/ #include -#include"vector.h" -#include"rational.h" -#include"trace.h" -#include"ext_gcd.h" -#include"timeit.h" +#include "util/vector.h" +#include "util/rational.h" +#include "util/trace.h" +#include "util/ext_gcd.h" +#include "util/timeit.h" static void tst1() { rational r1(1); diff --git a/src/test/rcf.cpp b/src/test/rcf.cpp index 082147190..2f97d49d2 100644 --- a/src/test/rcf.cpp +++ b/src/test/rcf.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"realclosure.h" -#include"mpz_matrix.h" -#include"rlimit.h" +#include "math/realclosure/realclosure.h" +#include "math/realclosure/mpz_matrix.h" +#include "util/rlimit.h" static void tst1() { unsynch_mpq_manager qm; diff --git a/src/test/region.cpp b/src/test/region.cpp index 83127d552..9cd2e504d 100644 --- a/src/test/region.cpp +++ b/src/test/region.cpp @@ -17,7 +17,7 @@ Revision History: --*/ #include -#include"region.h" +#include "util/region.h" static void tst1() { // TODO diff --git a/src/test/sat_user_scope.cpp b/src/test/sat_user_scope.cpp index 7e3d50e8d..10abb44c3 100644 --- a/src/test/sat_user_scope.cpp +++ b/src/test/sat_user_scope.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "sat_solver.h" -#include "util.h" +#include "sat/sat_solver.h" +#include "util/util.h" typedef sat::literal_vector clause_t; typedef vector clauses_t; diff --git a/src/test/simple_parser.cpp b/src/test/simple_parser.cpp index 934552711..1ba0d4b62 100644 --- a/src/test/simple_parser.cpp +++ b/src/test/simple_parser.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"cost_parser.h" -#include"cost_evaluator.h" -#include"arith_decl_plugin.h" -#include"ast_pp.h" -#include"well_sorted.h" -#include"warning.h" -#include"reg_decl_plugins.h" +#include "parsers/util/cost_parser.h" +#include "smt/cost_evaluator.h" +#include "ast/arith_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/well_sorted.h" +#include "util/warning.h" +#include "ast/reg_decl_plugins.h" void tst_simple_parser() { ast_manager m; diff --git a/src/test/simplex.cpp b/src/test/simplex.cpp index 8e57f6110..6620dc83b 100644 --- a/src/test/simplex.cpp +++ b/src/test/simplex.cpp @@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "sparse_matrix.h" -#include "sparse_matrix_def.h" -#include "simplex.h" -#include "simplex_def.h" -#include "mpq_inf.h" -#include "vector.h" -#include "rational.h" -#include "rlimit.h" +#include "util/lp/sparse_matrix.h" +#include "math/simplex/sparse_matrix_def.h" +#include "math/simplex/simplex.h" +#include "math/simplex/simplex_def.h" +#include "util/mpq_inf.h" +#include "util/vector.h" +#include "util/rational.h" +#include "util/rlimit.h" #define R rational typedef simplex::simplex Simplex; diff --git a/src/test/simplifier.cpp b/src/test/simplifier.cpp index 5a05ab30f..a42ed86b1 100644 --- a/src/test/simplifier.cpp +++ b/src/test/simplifier.cpp @@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ #ifdef _WINDOWS -#include "z3.h" -#include "z3_private.h" +#include "api/z3.h" +#include "api/z3_private.h" #include -#include "util.h" -#include "trace.h" +#include "util/util.h" +#include "util/trace.h" static void ev_const(Z3_context ctx, Z3_ast e) { diff --git a/src/test/small_object_allocator.cpp b/src/test/small_object_allocator.cpp index 5ae2836d0..cdac0370d 100644 --- a/src/test/small_object_allocator.cpp +++ b/src/test/small_object_allocator.cpp @@ -5,9 +5,9 @@ Copyright (c) 2015 Microsoft Corporation --*/ #include -#include"util.h" -#include"trace.h" -#include"small_object_allocator.h" +#include "util/util.h" +#include "util/trace.h" +#include "util/small_object_allocator.h" void tst_small_object_allocator() { small_object_allocator soa; diff --git a/src/test/smt2print_parse.cpp b/src/test/smt2print_parse.cpp index c79a80ae5..80a57c7d5 100644 --- a/src/test/smt2print_parse.cpp +++ b/src/test/smt2print_parse.cpp @@ -7,7 +7,7 @@ Copyright (c) 2015 Microsoft Corporation // This is to test the print-parse facilities over the API // for SMT-LIB2. -#include "z3.h" +#include "api/z3.h" #include void test_print(Z3_context ctx, Z3_ast a) { diff --git a/src/test/smt_context.cpp b/src/test/smt_context.cpp index 6c44b8b1d..d2ee858e5 100644 --- a/src/test/smt_context.cpp +++ b/src/test/smt_context.cpp @@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "smt_context.h" -#include "reg_decl_plugins.h" +#include "smt/smt_context.h" +#include "ast/reg_decl_plugins.h" void tst_smt_context() { diff --git a/src/test/sorting_network.cpp b/src/test/sorting_network.cpp index 9836bc04d..909ea594e 100644 --- a/src/test/sorting_network.cpp +++ b/src/test/sorting_network.cpp @@ -4,16 +4,16 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "trace.h" -#include "vector.h" -#include "ast.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" -#include "sorting_network.h" -#include "smt_kernel.h" -#include "model_smt2_pp.h" -#include "smt_params.h" -#include "ast_util.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" +#include "util/sorting_network.h" +#include "smt/smt_kernel.h" +#include "model/model_smt2_pp.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" diff --git a/src/test/stack.cpp b/src/test/stack.cpp index c8f3d88a6..ddd2f85e9 100644 --- a/src/test/stack.cpp +++ b/src/test/stack.cpp @@ -16,8 +16,8 @@ Notes: --*/ #include -#include"stack.h" -#include"vector.h" +#include "util/stack.h" +#include "util/vector.h" typedef std::pair point; diff --git a/src/test/string_buffer.cpp b/src/test/string_buffer.cpp index 7d7854a9c..b3e3ce79d 100644 --- a/src/test/string_buffer.cpp +++ b/src/test/string_buffer.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #include -#include"debug.h" -#include"string_buffer.h" -#include"trace.h" +#include "util/debug.h" +#include "util/string_buffer.h" +#include "util/trace.h" static void tst1() { string_buffer<> b; diff --git a/src/test/substitution.cpp b/src/test/substitution.cpp index 5609225c6..b713dfcfe 100644 --- a/src/test/substitution.cpp +++ b/src/test/substitution.cpp @@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "expr_substitution.h" -#include "smt_params.h" -#include "substitution.h" -#include "unifier.h" -#include "bv_decl_plugin.h" -#include "ast_pp.h" -#include "arith_decl_plugin.h" -#include "reg_decl_plugins.h" +#include "ast/expr_substitution.h" +#include "smt/params/smt_params.h" +#include "ast/substitution/substitution.h" +#include "ast/substitution/unifier.h" +#include "ast/bv_decl_plugin.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/reg_decl_plugins.h" void tst_substitution() { diff --git a/src/test/symbol.cpp b/src/test/symbol.cpp index e91332285..88dd02d73 100644 --- a/src/test/symbol.cpp +++ b/src/test/symbol.cpp @@ -17,8 +17,8 @@ Revision History: --*/ #include -#include"symbol.h" -#include"debug.h" +#include "util/symbol.h" +#include "util/debug.h" static void tst1() { symbol s1("foo"); diff --git a/src/test/symbol_table.cpp b/src/test/symbol_table.cpp index 626e2a72f..da1830ceb 100644 --- a/src/test/symbol_table.cpp +++ b/src/test/symbol_table.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"symbol_table.h" +#include "util/symbol_table.h" static void tst1() { symbol_table t; diff --git a/src/test/tbv.cpp b/src/test/tbv.cpp index 00f7e0960..2bfd14047 100644 --- a/src/test/tbv.cpp +++ b/src/test/tbv.cpp @@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "tbv.h" +#include "muz/rel/tbv.h" static void tst1(unsigned num_bits) { tbv_manager m(num_bits); diff --git a/src/test/test_util.h b/src/test/test_util.h index c81524b0e..f04af761f 100644 --- a/src/test/test_util.h +++ b/src/test/test_util.h @@ -6,7 +6,7 @@ Copyright (c) 2015 Microsoft Corporation #pragma once -#include "stopwatch.h" +#include "util/stopwatch.h" struct test_context { bool test_ok; diff --git a/src/test/theory_dl.cpp b/src/test/theory_dl.cpp index 463625c88..9a28f3653 100644 --- a/src/test/theory_dl.cpp +++ b/src/test/theory_dl.cpp @@ -4,11 +4,11 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "smt_context.h" -#include "dl_decl_plugin.h" -#include "ast_pp.h" -#include "model_v2_pp.h" -#include "reg_decl_plugins.h" +#include "smt/smt_context.h" +#include "ast/dl_decl_plugin.h" +#include "ast/ast_pp.h" +#include "model/model_v2_pp.h" +#include "ast/reg_decl_plugins.h" void tst_theory_dl() { ast_manager m; diff --git a/src/test/theory_pb.cpp b/src/test/theory_pb.cpp index 42a03f619..8fcbde706 100644 --- a/src/test/theory_pb.cpp +++ b/src/test/theory_pb.cpp @@ -4,12 +4,12 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "smt_context.h" -#include "ast_pp.h" -#include "model_v2_pp.h" -#include "reg_decl_plugins.h" -#include "theory_pb.h" -#include "th_rewriter.h" +#include "smt/smt_context.h" +#include "ast/ast_pp.h" +#include "model/model_v2_pp.h" +#include "ast/reg_decl_plugins.h" +#include "smt/theory_pb.h" +#include "ast/rewriter/th_rewriter.h" unsigned populate_literals(unsigned k, smt::literal_vector& lits) { ENSURE(k < (1u << lits.size())); diff --git a/src/test/timeout.cpp b/src/test/timeout.cpp index 320006928..80b28a691 100644 --- a/src/test/timeout.cpp +++ b/src/test/timeout.cpp @@ -5,8 +5,8 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "timeout.h" -#include "trace.h" +#include "util/timeout.h" +#include "util/trace.h" #ifdef _WINDOWS diff --git a/src/test/total_order.cpp b/src/test/total_order.cpp index 12bb4d977..a2ee234db 100644 --- a/src/test/total_order.cpp +++ b/src/test/total_order.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"total_order.h" -#include"timeit.h" +#include "util/total_order.h" +#include "util/timeit.h" static void tst1() { uint_total_order to; diff --git a/src/test/trigo.cpp b/src/test/trigo.cpp index 809d94fc2..c1b73c423 100644 --- a/src/test/trigo.cpp +++ b/src/test/trigo.cpp @@ -17,13 +17,13 @@ Revision History: --*/ #include -#include"interval_def.h" -#include"dependency.h" -#include"mpq.h" -#include"ast.h" -#include"debug.h" -#include"im_float_config.h" -#include"rlimit.h" +#include "math/interval/interval_def.h" +#include "util/dependency.h" +#include "util/mpq.h" +#include "ast/ast.h" +#include "util/debug.h" +#include "test/im_float_config.h" +#include "util/rlimit.h" #define PREC 100000 diff --git a/src/test/udoc_relation.cpp b/src/test/udoc_relation.cpp index 57866c3ac..5f1bd7b36 100644 --- a/src/test/udoc_relation.cpp +++ b/src/test/udoc_relation.cpp @@ -4,24 +4,24 @@ Copyright (c) 2015 Microsoft Corporation --*/ -#include "udoc_relation.h" -#include "trace.h" -#include "vector.h" -#include "ast.h" -#include "ast_pp.h" -#include "reg_decl_plugins.h" -#include "sorting_network.h" -#include "smt_kernel.h" -#include "model_smt2_pp.h" -#include "smt_params.h" -#include "ast_util.h" -#include "expr_safe_replace.h" -#include "th_rewriter.h" -#include "dl_relation_manager.h" -#include "dl_register_engine.h" -#include "rel_context.h" -#include "bv_decl_plugin.h" -#include "check_relation.h" +#include "muz/rel/udoc_relation.h" +#include "util/trace.h" +#include "util/vector.h" +#include "ast/ast.h" +#include "ast/ast_pp.h" +#include "ast/reg_decl_plugins.h" +#include "util/sorting_network.h" +#include "smt/smt_kernel.h" +#include "model/model_smt2_pp.h" +#include "smt/params/smt_params.h" +#include "ast/ast_util.h" +#include "ast/rewriter/expr_safe_replace.h" +#include "ast/rewriter/th_rewriter.h" +#include "muz/rel/dl_relation_manager.h" +#include "muz/fp/dl_register_engine.h" +#include "muz/rel/rel_context.h" +#include "ast/bv_decl_plugin.h" +#include "muz/rel/check_relation.h" class udoc_tester { diff --git a/src/test/uint_set.cpp b/src/test/uint_set.cpp index 3134ada7b..bcab106cc 100644 --- a/src/test/uint_set.cpp +++ b/src/test/uint_set.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"uint_set.h" -#include"vector.h" +#include "util/uint_set.h" +#include "util/vector.h" static void tst1(unsigned n) { uint_set s1; @@ -131,7 +131,7 @@ static void tst4() { ENSURE(!s.contains(0)); } -#include "map.h" +#include "util/map.h" template struct uint_map : public map {}; diff --git a/src/test/upolynomial.cpp b/src/test/upolynomial.cpp index 4c8358b3a..fa106fe3f 100644 --- a/src/test/upolynomial.cpp +++ b/src/test/upolynomial.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"upolynomial.h" -#include"timeit.h" -#include"rlimit.h" +#include "math/polynomial/upolynomial.h" +#include "util/timeit.h" +#include "util/rlimit.h" static void tst1() { reslimit rl; diff --git a/src/test/var_subst.cpp b/src/test/var_subst.cpp index f90292d11..169b1e131 100644 --- a/src/test/var_subst.cpp +++ b/src/test/var_subst.cpp @@ -16,13 +16,13 @@ Author: Revision History: --*/ -#include"var_subst.h" -#include"ast_pp.h" -#include"arith_decl_plugin.h" -#include"bv_decl_plugin.h" -#include"array_decl_plugin.h" -#include"for_each_expr.h" -#include"reg_decl_plugins.h" +#include "ast/rewriter/var_subst.h" +#include "ast/ast_pp.h" +#include "ast/arith_decl_plugin.h" +#include "ast/bv_decl_plugin.h" +#include "ast/array_decl_plugin.h" +#include "ast/for_each_expr.h" +#include "ast/reg_decl_plugins.h" namespace find_q { struct proc { diff --git a/src/test/vector.cpp b/src/test/vector.cpp index f7d70a87b..4632a9c29 100644 --- a/src/test/vector.cpp +++ b/src/test/vector.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"vector.h" +#include "util/vector.h" static void tst1() { svector v1; diff --git a/src/util/approx_nat.cpp b/src/util/approx_nat.cpp index 0739a65aa..cf0c17029 100644 --- a/src/util/approx_nat.cpp +++ b/src/util/approx_nat.cpp @@ -17,7 +17,7 @@ Author: Notes: --*/ -#include"approx_nat.h" +#include "util/approx_nat.h" approx_nat::approx_nat(unsigned val) { m_value = val > m_limit ? UINT_MAX : val; diff --git a/src/util/approx_set.cpp b/src/util/approx_set.cpp index e6757cf05..521197137 100644 --- a/src/util/approx_set.cpp +++ b/src/util/approx_set.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"approx_set.h" +#include "util/approx_set.h" void approx_set::display(std::ostream & out) const { out << "{"; diff --git a/src/util/approx_set.h b/src/util/approx_set.h index c0f3d39dd..e696d52ee 100644 --- a/src/util/approx_set.h +++ b/src/util/approx_set.h @@ -19,7 +19,7 @@ Revision History: #ifndef APPROX_SET_H_ #define APPROX_SET_H_ #include -#include"debug.h" +#include "util/debug.h" template class approx_set_traits; diff --git a/src/util/array_map.h b/src/util/array_map.h index 14d404e9d..c5163715e 100644 --- a/src/util/array_map.h +++ b/src/util/array_map.h @@ -19,8 +19,8 @@ Revision History: #ifndef ARRAY_MAP_H_ #define ARRAY_MAP_H_ -#include"vector.h" -#include"optional.h" +#include "util/vector.h" +#include "util/optional.h" /** \brief Implements a mapping from Key to Data. diff --git a/src/util/backtrackable_set.h b/src/util/backtrackable_set.h index ea82a5c81..13a741cff 100644 --- a/src/util/backtrackable_set.h +++ b/src/util/backtrackable_set.h @@ -19,7 +19,7 @@ Revision History: #ifndef BACKTRACKABLE_SET_H_ #define BACKTRACKABLE_SET_H_ -#include"vector.h" +#include "util/vector.h" template struct default_eh { diff --git a/src/util/bit_util.cpp b/src/util/bit_util.cpp index fde66b054..a38f42fdd 100644 --- a/src/util/bit_util.cpp +++ b/src/util/bit_util.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"bit_util.h" -#include"util.h" -#include"debug.h" +#include "util/bit_util.h" +#include "util/util.h" +#include "util/debug.h" #include /** diff --git a/src/util/bit_vector.cpp b/src/util/bit_vector.cpp index c15a743a9..f9f0a0797 100644 --- a/src/util/bit_vector.cpp +++ b/src/util/bit_vector.cpp @@ -17,8 +17,8 @@ Revision History: --*/ #include -#include"bit_vector.h" -#include"trace.h" +#include "util/bit_vector.h" +#include "util/trace.h" #define DEFAULT_CAPACITY 2 diff --git a/src/util/bit_vector.h b/src/util/bit_vector.h index a8c348aeb..6a254e399 100644 --- a/src/util/bit_vector.h +++ b/src/util/bit_vector.h @@ -20,9 +20,9 @@ Revision History: #define BIT_VECTOR_H_ #include -#include"debug.h" -#include"vector.h" -#include"memory_manager.h" +#include "util/debug.h" +#include "util/vector.h" +#include "util/memory_manager.h" COMPILE_TIME_ASSERT(sizeof(unsigned) == 4); #define BV_DEFAULT_CAPACITY 2 diff --git a/src/util/buffer.h b/src/util/buffer.h index 422db07aa..503788fa0 100644 --- a/src/util/buffer.h +++ b/src/util/buffer.h @@ -20,7 +20,7 @@ Revision History: #define BUFFER_H_ #include -#include"memory_manager.h" +#include "util/memory_manager.h" template class buffer { diff --git a/src/util/cancel_eh.h b/src/util/cancel_eh.h index d23e5f544..4347a5b52 100644 --- a/src/util/cancel_eh.h +++ b/src/util/cancel_eh.h @@ -19,7 +19,7 @@ Revision History: #ifndef CANCEL_EH_H_ #define CANCEL_EH_H_ -#include"event_handler.h" +#include "util/event_handler.h" /** \brief Generic event handler for invoking cancel method. diff --git a/src/util/chashtable.h b/src/util/chashtable.h index cdc6e6295..69c48207a 100644 --- a/src/util/chashtable.h +++ b/src/util/chashtable.h @@ -28,11 +28,11 @@ Revision History: #ifndef CHASHTABLE_H_ #define CHASHTABLE_H_ -#include"memory_manager.h" -#include"debug.h" -#include"trace.h" +#include "util/memory_manager.h" +#include "util/debug.h" +#include "util/trace.h" #ifdef Z3DEBUG -#include"hashtable.h" +#include "util/hashtable.h" #endif #define CH_STATISTICS diff --git a/src/util/checked_int64.h b/src/util/checked_int64.h index db1dd2521..a9087e1c2 100644 --- a/src/util/checked_int64.h +++ b/src/util/checked_int64.h @@ -24,8 +24,8 @@ Revision History: #ifndef CHECKED_INT64_H_ #define CHECKED_INT64_H_ -#include"z3_exception.h" -#include"rational.h" +#include "util/z3_exception.h" +#include "util/rational.h" template class checked_int64 { diff --git a/src/util/cmd_context_types.cpp b/src/util/cmd_context_types.cpp index 3d631c28e..61a7bd755 100644 --- a/src/util/cmd_context_types.cpp +++ b/src/util/cmd_context_types.cpp @@ -15,7 +15,7 @@ Notes: --*/ #include -#include"cmd_context_types.h" +#include "util/cmd_context_types.h" std::ostream & operator<<(std::ostream & out, cmd_arg_kind k) { switch (k) { diff --git a/src/util/cmd_context_types.h b/src/util/cmd_context_types.h index 29ac56a49..ae64e2de6 100644 --- a/src/util/cmd_context_types.h +++ b/src/util/cmd_context_types.h @@ -17,8 +17,8 @@ Notes: #ifndef CMD_CONTEXT_TYPES_H_ #define CMD_CONTEXT_TYPES_H_ -#include"symbol.h" -#include"z3_exception.h" +#include "util/symbol.h" +#include "util/z3_exception.h" #include class rational; class expr; diff --git a/src/util/common_msgs.cpp b/src/util/common_msgs.cpp index 412116bb9..f55591b43 100644 --- a/src/util/common_msgs.cpp +++ b/src/util/common_msgs.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"common_msgs.h" +#include "util/common_msgs.h" char const * common_msgs::g_canceled_msg = "canceled"; char const * common_msgs::g_max_memory_msg = "max. memory exceeded"; diff --git a/src/util/cooperate.cpp b/src/util/cooperate.cpp index cdd91bfdd..2ae250206 100644 --- a/src/util/cooperate.cpp +++ b/src/util/cooperate.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"cooperate.h" -#include"trace.h" -#include"debug.h" -#include"z3_omp.h" +#include "util/cooperate.h" +#include "util/trace.h" +#include "util/debug.h" +#include "util/z3_omp.h" struct cooperation_lock { omp_nest_lock_t m_lock; diff --git a/src/util/debug.cpp b/src/util/debug.cpp index 66676c619..5d39e7c02 100644 --- a/src/util/debug.cpp +++ b/src/util/debug.cpp @@ -21,8 +21,8 @@ Revision History: #include #endif #include -#include"str_hashtable.h" -#include"z3_exception.h" +#include "util/str_hashtable.h" +#include "util/z3_exception.h" static volatile bool g_enable_assertions = true; diff --git a/src/util/debug.h b/src/util/debug.h index ec0f600b5..adc9fc6b7 100644 --- a/src/util/debug.h +++ b/src/util/debug.h @@ -35,8 +35,8 @@ bool assertions_enabled(); # define __has_builtin(x) 0 #endif -#include"error_codes.h" -#include"warning.h" +#include "util/error_codes.h" +#include "util/warning.h" #ifdef Z3DEBUG #define DEBUG_CODE(CODE) { CODE } ((void) 0) diff --git a/src/util/dependency.h b/src/util/dependency.h index 4c438e520..d6df6d7bf 100644 --- a/src/util/dependency.h +++ b/src/util/dependency.h @@ -19,8 +19,8 @@ Revision History: #ifndef DEPENDENCY_H_ #define DEPENDENCY_H_ -#include"vector.h" -#include"region.h" +#include "util/vector.h" +#include "util/region.h" template class dependency_manager { diff --git a/src/util/dictionary.h b/src/util/dictionary.h index e319e6a27..7dd55bc16 100644 --- a/src/util/dictionary.h +++ b/src/util/dictionary.h @@ -17,8 +17,8 @@ Notes: #ifndef DICTIONARY_H_ #define DICTIONARY_H_ -#include"map.h" -#include"symbol.h" +#include "util/map.h" +#include "util/symbol.h" template class dictionary : public map { diff --git a/src/util/double_manager.h b/src/util/double_manager.h index a426e9b1b..33cccf2af 100644 --- a/src/util/double_manager.h +++ b/src/util/double_manager.h @@ -23,10 +23,10 @@ Revision History: #include #include #include -#include"util.h" -#include"debug.h" -#include"hash.h" -#include"params.h" +#include "util/util.h" +#include "util/debug.h" +#include "util/hash.h" +#include "util/params.h" /** \brief Create an interface for manipulating double numbers compatible with the one for mpq. diff --git a/src/util/env_params.cpp b/src/util/env_params.cpp index 6748598bf..c2b5f7974 100644 --- a/src/util/env_params.cpp +++ b/src/util/env_params.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"env_params.h" -#include"params.h" -#include"gparams.h" -#include"util.h" -#include"memory_manager.h" +#include "util/env_params.h" +#include "util/params.h" +#include "util/gparams.h" +#include "util/util.h" +#include "util/memory_manager.h" void env_params::updt_params() { params_ref p = gparams::get(); diff --git a/src/util/ext_numeral.h b/src/util/ext_numeral.h index a37ec6aee..9cb5a1f09 100644 --- a/src/util/ext_numeral.h +++ b/src/util/ext_numeral.h @@ -21,7 +21,7 @@ Revision History: #define EXT_NUMERAL_H_ #include -#include"debug.h" +#include "util/debug.h" enum ext_numeral_kind { EN_MINUS_INFINITY, EN_NUMERAL, EN_PLUS_INFINITY }; diff --git a/src/util/f2n.h b/src/util/f2n.h index 0f453911d..e5e84f6f0 100644 --- a/src/util/f2n.h +++ b/src/util/f2n.h @@ -20,7 +20,7 @@ Revision History: #ifndef F2N_H_ #define F2N_H_ -#include"mpf.h" +#include "util/mpf.h" template class f2n { diff --git a/src/util/fixed_bit_vector.cpp b/src/util/fixed_bit_vector.cpp index 8843db736..aafc58404 100644 --- a/src/util/fixed_bit_vector.cpp +++ b/src/util/fixed_bit_vector.cpp @@ -20,9 +20,9 @@ Revision History: --*/ #include -#include"fixed_bit_vector.h" -#include"trace.h" -#include"hash.h" +#include "util/fixed_bit_vector.h" +#include "util/trace.h" +#include "util/hash.h" void fixed_bit_vector::set(fixed_bit_vector const& other, unsigned hi, unsigned lo) { if ((lo % 32) == 0) { diff --git a/src/util/fixed_bit_vector.h b/src/util/fixed_bit_vector.h index be840204c..3bbc73248 100644 --- a/src/util/fixed_bit_vector.h +++ b/src/util/fixed_bit_vector.h @@ -22,8 +22,8 @@ Revision History: #define FIXED_BIT_VECTOR_H_ #include -#include"debug.h" -#include"small_object_allocator.h" +#include "util/debug.h" +#include "util/small_object_allocator.h" class fixed_bit_vector { friend class fixed_bit_vector_manager; diff --git a/src/util/gparams.cpp b/src/util/gparams.cpp index 97f84af6a..e71594810 100644 --- a/src/util/gparams.cpp +++ b/src/util/gparams.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"gparams.h" -#include"dictionary.h" -#include"trace.h" +#include "util/gparams.h" +#include "util/dictionary.h" +#include "util/trace.h" extern void gparams_register_modules(); diff --git a/src/util/gparams.h b/src/util/gparams.h index 139640c78..894732890 100644 --- a/src/util/gparams.h +++ b/src/util/gparams.h @@ -19,7 +19,7 @@ Notes: #ifndef GPARAMS_H_ #define GPARAMS_H_ -#include"params.h" +#include "util/params.h" class gparams { struct imp; diff --git a/src/util/hash.cpp b/src/util/hash.cpp index a54f993af..cacf0a220 100644 --- a/src/util/hash.cpp +++ b/src/util/hash.cpp @@ -17,8 +17,8 @@ Revision History: --*/ -#include"debug.h" -#include"hash.h" +#include "util/debug.h" +#include "util/hash.h" #include static unsigned read_unsigned(const char *s) { diff --git a/src/util/hash.h b/src/util/hash.h index 82d343661..7fce04ca8 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -20,7 +20,7 @@ Revision History: #define HASH_H_ #include -#include"util.h" +#include "util/util.h" #define mix(a,b,c) \ { \ diff --git a/src/util/hashtable.h b/src/util/hashtable.h index 44e05319d..020c47b2b 100644 --- a/src/util/hashtable.h +++ b/src/util/hashtable.h @@ -18,12 +18,12 @@ Revision History: --*/ #ifndef HASHTABLE_H_ #define HASHTABLE_H_ -#include"debug.h" +#include "util/debug.h" #include -#include"util.h" +#include "util/util.h" #include -#include"memory_manager.h" -#include"hash.h" +#include "util/memory_manager.h" +#include "util/hash.h" #define DEFAULT_HASHTABLE_INITIAL_CAPACITY 8 #define SMALL_TABLE_CAPACITY 64 diff --git a/src/util/heap.h b/src/util/heap.h index 14e902648..02e30bf04 100644 --- a/src/util/heap.h +++ b/src/util/heap.h @@ -19,8 +19,8 @@ Revision History: #ifndef HEAP_H_ #define HEAP_H_ -#include"vector.h" -#include"debug.h" +#include "util/vector.h" +#include "util/debug.h" template class heap : private LT { diff --git a/src/util/hwf.cpp b/src/util/hwf.cpp index a522c9a41..014e62625 100644 --- a/src/util/hwf.cpp +++ b/src/util/hwf.cpp @@ -34,7 +34,7 @@ Revision History: #define USE_INTRINSICS #endif -#include"hwf.h" +#include "util/hwf.h" // Note: // Which FPU will be used is determined by compiler settings. On x64 it's always SSE2, diff --git a/src/util/hwf.h b/src/util/hwf.h index 8816e5b37..5f7692204 100644 --- a/src/util/hwf.h +++ b/src/util/hwf.h @@ -20,9 +20,9 @@ Revision History: #define HWF_H_ #include -#include"mpz.h" -#include"mpq.h" -#include"mpf.h" // we use the same rounding modes as mpf's +#include "util/mpz.h" +#include "util/mpq.h" +#include "util/mpf.h" class hwf { friend class hwf_manager; diff --git a/src/util/id_gen.h b/src/util/id_gen.h index b119a88ac..951ab3f52 100644 --- a/src/util/id_gen.h +++ b/src/util/id_gen.h @@ -19,8 +19,8 @@ Revision History: #ifndef ID_GEN_H_ #define ID_GEN_H_ -#include"vector.h" -#include"util.h" +#include "util/vector.h" +#include "util/util.h" class id_gen { unsigned m_next_id; diff --git a/src/util/inf_eps_rational.h b/src/util/inf_eps_rational.h index 048b6f383..72212d33c 100644 --- a/src/util/inf_eps_rational.h +++ b/src/util/inf_eps_rational.h @@ -20,10 +20,10 @@ Revision History: #define INF_EPS_RATIONAL_H_ #include #include -#include"debug.h" -#include"vector.h" -#include"rational.h" -#include"inf_rational.h" +#include "util/debug.h" +#include "util/vector.h" +#include "util/rational.h" +#include "util/inf_rational.h" template class inf_eps_rational { diff --git a/src/util/inf_int_rational.cpp b/src/util/inf_int_rational.cpp index 7bc68e641..c12c939fd 100644 --- a/src/util/inf_int_rational.cpp +++ b/src/util/inf_int_rational.cpp @@ -17,7 +17,7 @@ Revision History: --*/ #include -#include"inf_int_rational.h" +#include "util/inf_int_rational.h" inf_int_rational inf_int_rational::m_zero; inf_int_rational inf_int_rational::m_one; diff --git a/src/util/inf_int_rational.h b/src/util/inf_int_rational.h index a7c920295..ce871b0d5 100644 --- a/src/util/inf_int_rational.h +++ b/src/util/inf_int_rational.h @@ -21,9 +21,9 @@ Revision History: #define INF_INT_RATIONAL_H_ #include #include -#include"debug.h" -#include"vector.h" -#include"rational.h" +#include "util/debug.h" +#include "util/vector.h" +#include "util/rational.h" class inf_int_rational { diff --git a/src/util/inf_rational.cpp b/src/util/inf_rational.cpp index 0b043e94d..78bf61038 100644 --- a/src/util/inf_rational.cpp +++ b/src/util/inf_rational.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"inf_rational.h" +#include "util/inf_rational.h" inf_rational inf_rational::m_zero; inf_rational inf_rational::m_one; diff --git a/src/util/inf_rational.h b/src/util/inf_rational.h index 0488d5fd3..c17c4312b 100644 --- a/src/util/inf_rational.h +++ b/src/util/inf_rational.h @@ -21,9 +21,9 @@ Revision History: #define INF_RATIONAL_H_ #include #include -#include"debug.h" -#include"vector.h" -#include"rational.h" +#include "util/debug.h" +#include "util/vector.h" +#include "util/rational.h" class inf_rational { diff --git a/src/util/inf_s_integer.cpp b/src/util/inf_s_integer.cpp index 602dc14ac..26b226e15 100644 --- a/src/util/inf_s_integer.cpp +++ b/src/util/inf_s_integer.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"inf_s_integer.h" +#include "util/inf_s_integer.h" inf_s_integer inf_s_integer::m_zero(0); inf_s_integer inf_s_integer::m_one(1); diff --git a/src/util/inf_s_integer.h b/src/util/inf_s_integer.h index 80c81350f..6cf1d4225 100644 --- a/src/util/inf_s_integer.h +++ b/src/util/inf_s_integer.h @@ -19,8 +19,8 @@ Revision History: #ifndef INF_S_INTEGER_H_ #define INF_S_INTEGER_H_ -#include"s_integer.h" -#include"rational.h" +#include "util/s_integer.h" +#include "util/rational.h" class inf_s_integer { static inf_s_integer m_zero; diff --git a/src/util/lbool.cpp b/src/util/lbool.cpp index b77a9b892..08f08163a 100644 --- a/src/util/lbool.cpp +++ b/src/util/lbool.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"lbool.h" +#include "util/lbool.h" std::ostream & operator<<(std::ostream & out, lbool b) { switch(b) { diff --git a/src/util/lbool.h b/src/util/lbool.h index ff2466eca..dfc28926d 100644 --- a/src/util/lbool.h +++ b/src/util/lbool.h @@ -19,7 +19,7 @@ Revision History: #ifndef LBOOL_H_ #define LBOOL_H_ -#include"util.h" +#include "util/util.h" typedef enum { l_false = -1, l_undef, l_true } lbool; diff --git a/src/util/list.h b/src/util/list.h index 8d5ff40f2..efde5ada1 100644 --- a/src/util/list.h +++ b/src/util/list.h @@ -19,8 +19,8 @@ Revision History: #ifndef LIST_H_ #define LIST_H_ -#include"buffer.h" -#include"region.h" +#include "util/buffer.h" +#include "util/region.h" template class list { diff --git a/src/util/lp/bound_analyzer_on_row.h b/src/util/lp/bound_analyzer_on_row.h index 508692e5a..2a9dccb5f 100644 --- a/src/util/lp/bound_analyzer_on_row.h +++ b/src/util/lp/bound_analyzer_on_row.h @@ -5,8 +5,8 @@ #pragma once #include "util/vector.h" #include "util/lp/linear_combination_iterator.h" -#include "implied_bound.h" -#include "test_bound_analyzer.h" +#include "util/lp/implied_bound.h" +#include "util/lp/test_bound_analyzer.h" #include #include "util/lp/bound_propagator.h" // We have an equality : sum by j of row[j]*x[j] = rs diff --git a/src/util/map.h b/src/util/map.h index d9dc4463c..0d2acf11b 100644 --- a/src/util/map.h +++ b/src/util/map.h @@ -19,7 +19,7 @@ Revision History: #ifndef MAP_H_ #define MAP_H_ -#include"hashtable.h" +#include "util/hashtable.h" template struct _key_data { diff --git a/src/util/max_cliques.h b/src/util/max_cliques.h index ec888c84b..09e40dee1 100644 --- a/src/util/max_cliques.h +++ b/src/util/max_cliques.h @@ -18,8 +18,8 @@ Notes: --*/ -#include "vector.h" -#include "uint_set.h" +#include "util/vector.h" +#include "util/uint_set.h" template diff --git a/src/util/memory_manager.cpp b/src/util/memory_manager.cpp index 76069ce44..44157aa65 100644 --- a/src/util/memory_manager.cpp +++ b/src/util/memory_manager.cpp @@ -7,10 +7,10 @@ Copyright (c) 2015 Microsoft Corporation #include #include #include -#include"trace.h" -#include"memory_manager.h" -#include"error_codes.h" -#include"z3_omp.h" +#include "util/trace.h" +#include "util/memory_manager.h" +#include "util/error_codes.h" +#include "util/z3_omp.h" // The following two function are automatically generated by the mk_make.py script. // The script collects ADD_INITIALIZER and ADD_FINALIZER commands in the .h files. // For example, rational.h contains diff --git a/src/util/memory_manager.h b/src/util/memory_manager.h index aac61ea2a..5aa512018 100644 --- a/src/util/memory_manager.h +++ b/src/util/memory_manager.h @@ -21,7 +21,7 @@ Revision History: #include #include -#include"z3_exception.h" +#include "util/z3_exception.h" #ifndef __has_builtin # define __has_builtin(x) 0 diff --git a/src/util/mpbq.cpp b/src/util/mpbq.cpp index 1ff7fb04d..9fcd1b58f 100644 --- a/src/util/mpbq.cpp +++ b/src/util/mpbq.cpp @@ -25,7 +25,7 @@ Revision History: --*/ #include -#include"mpbq.h" +#include "util/mpbq.h" #ifdef Z3DEBUG #define MPBQ_DEBUG diff --git a/src/util/mpbq.h b/src/util/mpbq.h index a6c7ddbfa..61ef2b0e2 100644 --- a/src/util/mpbq.h +++ b/src/util/mpbq.h @@ -27,9 +27,9 @@ Revision History: #ifndef MPBQ_H_ #define MPBQ_H_ -#include"mpq.h" -#include"rational.h" -#include"vector.h" +#include "util/mpq.h" +#include "util/rational.h" +#include "util/vector.h" class mpbq { mpz m_num; diff --git a/src/util/mpbqi.h b/src/util/mpbqi.h index 0dc569525..924e1e121 100644 --- a/src/util/mpbqi.h +++ b/src/util/mpbqi.h @@ -19,8 +19,8 @@ Revision History: #ifndef MPBQI_H_ #define MPBQI_H_ -#include"mpbq.h" -#include"basic_interval.h" +#include "util/mpbq.h" +#include "util/basic_interval.h" class mpbqi_manager : public basic_interval_manager { typedef basic_interval_manager super; diff --git a/src/util/mpf.cpp b/src/util/mpf.cpp index 6f61a78e9..5bccd22aa 100644 --- a/src/util/mpf.cpp +++ b/src/util/mpf.cpp @@ -18,7 +18,7 @@ Revision History: --*/ #include #include -#include"mpf.h" +#include "util/mpf.h" mpf::mpf() : ebits(0), diff --git a/src/util/mpf.h b/src/util/mpf.h index 07755e314..8070768b2 100644 --- a/src/util/mpf.h +++ b/src/util/mpf.h @@ -20,12 +20,12 @@ Revision History: #define MPF_H_ #include -#include"mpz.h" -#include"mpq.h" -#include"map.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"hash.h" +#include "util/mpz.h" +#include "util/mpq.h" +#include "util/map.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/hash.h" typedef enum { MPF_ROUND_NEAREST_TEVEN, diff --git a/src/util/mpff.cpp b/src/util/mpff.cpp index d26b3743c..459b0691c 100644 --- a/src/util/mpff.cpp +++ b/src/util/mpff.cpp @@ -20,12 +20,12 @@ Revision History: --*/ #include #include -#include"mpff.h" -#include"mpn.h" -#include"mpz.h" -#include"mpq.h" -#include"bit_util.h" -#include"trace.h" +#include "util/mpff.h" +#include "util/mpn.h" +#include "util/mpz.h" +#include "util/mpq.h" +#include "util/bit_util.h" +#include "util/trace.h" COMPILE_TIME_ASSERT(sizeof(mpn_digit) == sizeof(unsigned)); COMPILE_TIME_ASSERT(sizeof(unsigned) == 4); diff --git a/src/util/mpff.h b/src/util/mpff.h index eadfa0390..4fdd0baef 100644 --- a/src/util/mpff.h +++ b/src/util/mpff.h @@ -23,13 +23,13 @@ Revision History: #ifndef MPFF_H_ #define MPFF_H_ -#include"id_gen.h" -#include"util.h" -#include"vector.h" -#include"z3_exception.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"mpn.h" +#include "util/id_gen.h" +#include "util/util.h" +#include "util/vector.h" +#include "util/z3_exception.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/mpn.h" class mpff_manager; diff --git a/src/util/mpfx.cpp b/src/util/mpfx.cpp index 41ed93617..24ef4dc73 100644 --- a/src/util/mpfx.cpp +++ b/src/util/mpfx.cpp @@ -18,12 +18,12 @@ Revision History: --*/ #include #include -#include"mpfx.h" -#include"mpn.h" -#include"mpz.h" -#include"mpq.h" -#include"bit_util.h" -#include"trace.h" +#include "util/mpfx.h" +#include "util/mpn.h" +#include "util/mpz.h" +#include "util/mpq.h" +#include "util/bit_util.h" +#include "util/trace.h" mpfx_manager::mpfx_manager(unsigned int_sz, unsigned frac_sz, unsigned initial_capacity) { SASSERT(initial_capacity > 0); diff --git a/src/util/mpfx.h b/src/util/mpfx.h index 55242bdf8..98f9bb322 100644 --- a/src/util/mpfx.h +++ b/src/util/mpfx.h @@ -19,13 +19,13 @@ Revision History: #ifndef MPFX_H_ #define MPFX_H_ -#include"id_gen.h" -#include"util.h" -#include"vector.h" -#include"z3_exception.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"mpn.h" +#include "util/id_gen.h" +#include "util/util.h" +#include "util/vector.h" +#include "util/z3_exception.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/mpn.h" class mpfx_manager; diff --git a/src/util/mpn.cpp b/src/util/mpn.cpp index df69ce76d..65223133f 100644 --- a/src/util/mpn.cpp +++ b/src/util/mpn.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"debug.h" -#include"trace.h" -#include"buffer.h" -#include"mpn.h" +#include "util/debug.h" +#include "util/trace.h" +#include "util/buffer.h" +#include "util/mpn.h" #define max(a,b) (((a) > (b)) ? (a) : (b)) diff --git a/src/util/mpn.h b/src/util/mpn.h index 1f0e2acab..a5d3c30d8 100644 --- a/src/util/mpn.h +++ b/src/util/mpn.h @@ -20,9 +20,9 @@ Revision History: #define MPN_H_ #include -#include"util.h" -#include"buffer.h" -#include"z3_omp.h" +#include "util/util.h" +#include "util/buffer.h" +#include "util/z3_omp.h" typedef unsigned int mpn_digit; diff --git a/src/util/mpq.cpp b/src/util/mpq.cpp index feb051033..bc6f99213 100644 --- a/src/util/mpq.cpp +++ b/src/util/mpq.cpp @@ -16,9 +16,9 @@ Author: Revision History: --*/ -#include"mpq.h" -#include"warning.h" -#include"z3_exception.h" +#include "util/mpq.h" +#include "util/warning.h" +#include "util/z3_exception.h" template mpq_manager::mpq_manager() { diff --git a/src/util/mpq.h b/src/util/mpq.h index 11e17bbf9..5aa3ca083 100644 --- a/src/util/mpq.h +++ b/src/util/mpq.h @@ -19,8 +19,8 @@ Revision History: #ifndef MPQ_H_ #define MPQ_H_ -#include"mpz.h" -#include"trace.h" +#include "util/mpz.h" +#include "util/trace.h" class mpq { mpz m_num; diff --git a/src/util/mpq_inf.cpp b/src/util/mpq_inf.cpp index 19289b737..c6c160941 100644 --- a/src/util/mpq_inf.cpp +++ b/src/util/mpq_inf.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"mpq_inf.h" +#include "util/mpq_inf.h" template std::string mpq_inf_manager::to_string(mpq_inf const & a) { diff --git a/src/util/mpq_inf.h b/src/util/mpq_inf.h index b041b6d4f..7b866994d 100644 --- a/src/util/mpq_inf.h +++ b/src/util/mpq_inf.h @@ -19,8 +19,8 @@ Revision History: #ifndef MPQ_INF_H_ #define MPQ_INF_H_ -#include"mpq.h" -#include"hash.h" +#include "util/mpq.h" +#include "util/hash.h" typedef std::pair mpq_inf; diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp index 7dca14bfa..9569ac280 100644 --- a/src/util/mpz.cpp +++ b/src/util/mpz.cpp @@ -17,14 +17,14 @@ Revision History: --*/ #include -#include"mpz.h" -#include"buffer.h" -#include"trace.h" -#include"hash.h" -#include"bit_util.h" +#include "util/mpz.h" +#include "util/buffer.h" +#include "util/trace.h" +#include "util/hash.h" +#include "util/bit_util.h" #if defined(_MP_INTERNAL) -#include"mpn.h" +#include "util/mpn.h" #elif defined(_MP_GMP) #include #else diff --git a/src/util/mpz.h b/src/util/mpz.h index c02ac7c36..7001b9a42 100644 --- a/src/util/mpz.h +++ b/src/util/mpz.h @@ -21,13 +21,13 @@ Revision History: #include #include -#include"util.h" -#include"small_object_allocator.h" -#include"trace.h" -#include"scoped_numeral.h" -#include"scoped_numeral_vector.h" -#include"z3_omp.h" -#include"mpn.h" +#include "util/util.h" +#include "util/small_object_allocator.h" +#include "util/trace.h" +#include "util/scoped_numeral.h" +#include "util/scoped_numeral_vector.h" +#include "util/z3_omp.h" +#include "util/mpn.h" unsigned u_gcd(unsigned u, unsigned v); uint64 u64_gcd(uint64 u, uint64 v); diff --git a/src/util/mpzzp.h b/src/util/mpzzp.h index 812b6e1bc..a30eff7b6 100644 --- a/src/util/mpzzp.h +++ b/src/util/mpzzp.h @@ -26,7 +26,7 @@ Revision History: #ifndef MPZZP_H_ #define MPZZP_H_ -#include "mpz.h" +#include "util/mpz.h" class mpzzp_manager { typedef unsynch_mpz_manager numeral_manager; diff --git a/src/util/nat_set.h b/src/util/nat_set.h index dcde26034..6e9ab1b6d 100644 --- a/src/util/nat_set.h +++ b/src/util/nat_set.h @@ -20,7 +20,7 @@ Revision History: #define NAT_SET_H_ #include -#include"vector.h" +#include "util/vector.h" class nat_set { unsigned m_curr_timestamp; diff --git a/src/util/numeral_buffer.h b/src/util/numeral_buffer.h index 3c2ea0f05..eee415efb 100644 --- a/src/util/numeral_buffer.h +++ b/src/util/numeral_buffer.h @@ -19,7 +19,7 @@ Revision History: #ifndef NUMERAL_BUFFER_H_ #define NUMERAL_BUFFER_H_ -#include"vector.h" +#include "util/vector.h" template class numeral_buffer { diff --git a/src/util/obj_hashtable.h b/src/util/obj_hashtable.h index 2720f1b00..9c3473e3d 100644 --- a/src/util/obj_hashtable.h +++ b/src/util/obj_hashtable.h @@ -19,8 +19,8 @@ Revision History: #ifndef OBJ_HASHTABLE_H_ #define OBJ_HASHTABLE_H_ -#include"hash.h" -#include"hashtable.h" +#include "util/hash.h" +#include "util/hashtable.h" /** diff --git a/src/util/obj_mark.h b/src/util/obj_mark.h index 749122b8f..d2fa65d32 100644 --- a/src/util/obj_mark.h +++ b/src/util/obj_mark.h @@ -19,7 +19,7 @@ Revision History: #ifndef OBJ_MARK_H_ #define OBJ_MARK_H_ -#include"bit_vector.h" +#include "util/bit_vector.h" template struct default_t2uint { diff --git a/src/util/obj_pair_hashtable.h b/src/util/obj_pair_hashtable.h index 8e7365909..2addc3902 100644 --- a/src/util/obj_pair_hashtable.h +++ b/src/util/obj_pair_hashtable.h @@ -19,8 +19,8 @@ Revision History: #ifndef OBJ_PAIR_HASHTABLE_H_ #define OBJ_PAIR_HASHTABLE_H_ -#include"hash.h" -#include"hashtable.h" +#include "util/hash.h" +#include "util/hashtable.h" /** \brief Special entry for a hashtable of pairs of obj pointers (i.e., diff --git a/src/util/obj_pair_set.h b/src/util/obj_pair_set.h index c4212977c..d565d31b9 100644 --- a/src/util/obj_pair_set.h +++ b/src/util/obj_pair_set.h @@ -19,7 +19,7 @@ Revision History: #ifndef OBJ_PAIR_SET_H_ #define OBJ_PAIR_SET_H_ -#include"chashtable.h" +#include "util/chashtable.h" template class obj_pair_set { diff --git a/src/util/obj_triple_hashtable.h b/src/util/obj_triple_hashtable.h index 4fda9e655..316b63b93 100644 --- a/src/util/obj_triple_hashtable.h +++ b/src/util/obj_triple_hashtable.h @@ -19,7 +19,7 @@ Revision History: #ifndef OBJ_TRIPLE_HASHTABLE_H_ #define OBJ_TRIPLE_HASHTABLE_H_ -#include"hashtable.h" +#include "util/hashtable.h" /** \brief Special entry for a hashtable of pairs of obj pointers (i.e., diff --git a/src/util/object_allocator.h b/src/util/object_allocator.h index 901ec46ec..e51f7a438 100644 --- a/src/util/object_allocator.h +++ b/src/util/object_allocator.h @@ -20,8 +20,8 @@ Revision History: #ifndef OBJECT_ALLOCATOR_H_ #define OBJECT_ALLOCATOR_H_ -#include"util.h" -#include"vector.h" +#include "util/util.h" +#include "util/vector.h" #define DEFAULT_NUM_WORKERS 8 #define NUM_OBJECTS_PER_PAGE 1024 diff --git a/src/util/page.cpp b/src/util/page.cpp index 8fddcc075..4f6cea83c 100644 --- a/src/util/page.cpp +++ b/src/util/page.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"page.h" -#include"debug.h" +#include "util/page.h" +#include "util/debug.h" inline void set_page_header(char * page, char * prev, bool default_page) { size_t header = reinterpret_cast(prev) | static_cast(default_page); diff --git a/src/util/page.h b/src/util/page.h index 4ccfb6cab..0f44d6794 100644 --- a/src/util/page.h +++ b/src/util/page.h @@ -19,7 +19,7 @@ Revision History: #ifndef PAGE_H_ #define PAGE_H_ -#include"memory_manager.h" +#include "util/memory_manager.h" #define PAGE_HEADER_SZ sizeof(size_t) #define DEFAULT_PAGE_SIZE (8192 - PAGE_HEADER_SZ) diff --git a/src/util/params.cpp b/src/util/params.cpp index b869f8e3d..ee6ce6627 100644 --- a/src/util/params.cpp +++ b/src/util/params.cpp @@ -16,10 +16,10 @@ Author: Notes: --*/ -#include"params.h" -#include"rational.h" -#include"symbol.h" -#include"dictionary.h" +#include "util/params.h" +#include "util/rational.h" +#include "util/symbol.h" +#include "util/dictionary.h" params_ref params_ref::g_empty_params_ref; diff --git a/src/util/params.h b/src/util/params.h index 8d95c200c..bad70a318 100644 --- a/src/util/params.h +++ b/src/util/params.h @@ -19,8 +19,8 @@ Notes: #ifndef PARAMS_H_ #define PARAMS_H_ -#include"cmd_context_types.h" -#include"vector.h" +#include "util/cmd_context_types.h" +#include "util/vector.h" std::string norm_param_name(char const * n); std::string norm_param_name(symbol const & n); diff --git a/src/util/parray.h b/src/util/parray.h index 1802f6ade..44b075db9 100644 --- a/src/util/parray.h +++ b/src/util/parray.h @@ -19,8 +19,8 @@ Revision History: #ifndef PARRAY_H_ #define PARRAY_H_ -#include"vector.h" -#include"trace.h" +#include "util/vector.h" +#include "util/trace.h" template class parray_manager { diff --git a/src/util/permutation.cpp b/src/util/permutation.cpp index a5c1b2e8b..5b20580eb 100644 --- a/src/util/permutation.cpp +++ b/src/util/permutation.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"permutation.h" +#include "util/permutation.h" permutation::permutation(unsigned size) { reset(size); diff --git a/src/util/permutation.h b/src/util/permutation.h index 45759fc01..77205bb1d 100644 --- a/src/util/permutation.h +++ b/src/util/permutation.h @@ -20,7 +20,7 @@ Revision History: #define PERMUTATION_H_ #include -#include"vector.h" +#include "util/vector.h" class permutation { unsigned_vector m_p; diff --git a/src/util/plugin_manager.h b/src/util/plugin_manager.h index 5e82c190c..da7017aa1 100644 --- a/src/util/plugin_manager.h +++ b/src/util/plugin_manager.h @@ -19,7 +19,7 @@ Revision History: #ifndef PLUGIN_MANAGER_H_ #define PLUGIN_MANAGER_H_ -#include"util.h" +#include "util/util.h" template class plugin_manager { diff --git a/src/util/pool.h b/src/util/pool.h index 3ea9dca9d..184f6470e 100644 --- a/src/util/pool.h +++ b/src/util/pool.h @@ -19,8 +19,8 @@ Revision History: #ifndef POOL_H_ #define POOL_H_ -#include"util.h" -#include"vector.h" +#include "util/util.h" +#include "util/vector.h" template class pool { diff --git a/src/util/prime_generator.cpp b/src/util/prime_generator.cpp index 6aef1305b..eac47f61b 100644 --- a/src/util/prime_generator.cpp +++ b/src/util/prime_generator.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"prime_generator.h" +#include "util/prime_generator.h" #define PRIME_LIST_MAX_SIZE 1<<20 diff --git a/src/util/prime_generator.h b/src/util/prime_generator.h index 44306cec5..6a284c57c 100644 --- a/src/util/prime_generator.h +++ b/src/util/prime_generator.h @@ -19,9 +19,9 @@ Notes: #ifndef PRIME_GENERATOR_H_ #define PRIME_GENERATOR_H_ -#include"vector.h" -#include"z3_exception.h" -#include"util.h" +#include "util/vector.h" +#include "util/z3_exception.h" +#include "util/util.h" class prime_generator_exception : public default_exception { public: diff --git a/src/util/ptr_scoped_buffer.h b/src/util/ptr_scoped_buffer.h index aa66a0398..d6b4c6563 100644 --- a/src/util/ptr_scoped_buffer.h +++ b/src/util/ptr_scoped_buffer.h @@ -19,9 +19,9 @@ Revision History: #ifndef PTR_SCOPED_BUFFER_H_ #define PTR_SCOPED_BUFFER_H_ -#include"util.h" -#include"debug.h" -#include"buffer.h" +#include "util/util.h" +#include "util/debug.h" +#include "util/buffer.h" template > class ptr_scoped_buffer : private ptr_buffer { diff --git a/src/util/rational.cpp b/src/util/rational.cpp index 43dc9110a..ce38bcaa7 100644 --- a/src/util/rational.cpp +++ b/src/util/rational.cpp @@ -17,8 +17,8 @@ Revision History: --*/ #include -#include"util.h" -#include"rational.h" +#include "util/util.h" +#include "util/rational.h" #ifdef _WINDOWS #include #endif diff --git a/src/util/rational.h b/src/util/rational.h index 26ef7dbb1..ca294e234 100644 --- a/src/util/rational.h +++ b/src/util/rational.h @@ -19,7 +19,7 @@ Revision History: #ifndef RATIONAL_H_ #define RATIONAL_H_ -#include"mpq.h" +#include "util/mpq.h" class rational { mpq m_val; diff --git a/src/util/ref_buffer.h b/src/util/ref_buffer.h index cd4e0c5ba..612dde2da 100644 --- a/src/util/ref_buffer.h +++ b/src/util/ref_buffer.h @@ -19,9 +19,9 @@ Revision History: #ifndef REF_BUFFER_H_ #define REF_BUFFER_H_ -#include"buffer.h" -#include"obj_ref.h" -#include"ref_vector.h" +#include "util/buffer.h" +#include "util/obj_ref.h" +#include "util/ref_vector.h" /** diff --git a/src/util/ref_vector.h b/src/util/ref_vector.h index fdfb94d93..469183b76 100644 --- a/src/util/ref_vector.h +++ b/src/util/ref_vector.h @@ -19,8 +19,8 @@ Revision History: #ifndef REF_VECTOR_H_ #define REF_VECTOR_H_ -#include"vector.h" -#include"obj_ref.h" +#include "util/vector.h" +#include "util/obj_ref.h" /** \brief Vector of smart pointers. diff --git a/src/util/region.cpp b/src/util/region.cpp index 0100c60f3..4e5b5f2f2 100644 --- a/src/util/region.cpp +++ b/src/util/region.cpp @@ -16,7 +16,7 @@ Author: Revision History: --*/ -#include"region.h" +#include "util/region.h" #ifdef Z3DEBUG @@ -26,10 +26,10 @@ void region::display_mem_stats(std::ostream & out) const { #else -#include"tptr.h" -#include"debug.h" -#include"memory_manager.h" -#include"page.h" +#include "util/tptr.h" +#include "util/debug.h" +#include "util/memory_manager.h" +#include "util/page.h" inline void region::allocate_page() { m_curr_page = allocate_default_page(m_curr_page, m_free_pages); diff --git a/src/util/region.h b/src/util/region.h index 2c43e26d4..60c5378e1 100644 --- a/src/util/region.h +++ b/src/util/region.h @@ -23,7 +23,7 @@ Revision History: #ifdef Z3DEBUG -#include"vector.h" +#include "util/vector.h" class region { ptr_vector m_chuncks; diff --git a/src/util/rlimit.cpp b/src/util/rlimit.cpp index bda06157d..f3f45c654 100644 --- a/src/util/rlimit.cpp +++ b/src/util/rlimit.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include "rlimit.h" -#include "common_msgs.h" +#include "util/rlimit.h" +#include "util/common_msgs.h" reslimit::reslimit(): m_cancel(0), diff --git a/src/util/rlimit.h b/src/util/rlimit.h index 283d7613d..3b278d132 100644 --- a/src/util/rlimit.h +++ b/src/util/rlimit.h @@ -19,7 +19,7 @@ Revision History: #ifndef RLIMIT_H_ #define RLIMIT_H_ -#include "vector.h" +#include "util/vector.h" class reslimit { volatile unsigned m_cancel; diff --git a/src/util/s_integer.cpp b/src/util/s_integer.cpp index f55e77487..cfaf34fff 100644 --- a/src/util/s_integer.cpp +++ b/src/util/s_integer.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"s_integer.h" +#include "util/s_integer.h" s_integer s_integer::m_zero(0); s_integer s_integer::m_one(1); diff --git a/src/util/s_integer.h b/src/util/s_integer.h index c215505ea..658ae8eea 100644 --- a/src/util/s_integer.h +++ b/src/util/s_integer.h @@ -19,7 +19,7 @@ Revision History: #ifndef S_INTEGER_H_ #define S_INTEGER_H_ -#include"rational.h" +#include "util/rational.h" class s_integer { int m_val; diff --git a/src/util/scoped_ctrl_c.cpp b/src/util/scoped_ctrl_c.cpp index feaceea8d..739eca295 100644 --- a/src/util/scoped_ctrl_c.cpp +++ b/src/util/scoped_ctrl_c.cpp @@ -18,7 +18,7 @@ Revision History: --*/ #include #include -#include"scoped_ctrl_c.h" +#include "util/scoped_ctrl_c.h" scoped_ctrl_c * scoped_ctrl_c::g_obj = 0; diff --git a/src/util/scoped_ctrl_c.h b/src/util/scoped_ctrl_c.h index b79db28fe..b3abf0e26 100644 --- a/src/util/scoped_ctrl_c.h +++ b/src/util/scoped_ctrl_c.h @@ -19,8 +19,8 @@ Revision History: #ifndef SCOPED_CTRL_C_H_ #define SCOPED_CTRL_C_H_ -#include"event_handler.h" -#include"util.h" +#include "util/event_handler.h" +#include "util/util.h" struct scoped_ctrl_c { event_handler & m_cancel_eh; diff --git a/src/util/scoped_numeral_buffer.h b/src/util/scoped_numeral_buffer.h index 6da287dd2..1f294cee0 100644 --- a/src/util/scoped_numeral_buffer.h +++ b/src/util/scoped_numeral_buffer.h @@ -19,7 +19,7 @@ Revision History: #ifndef SCOPED_NUMERAL_BUFFER_H_ #define SCOPED_NUMERAL_BUFFER_H_ -#include"buffer.h" +#include "util/buffer.h" template class _scoped_numeral_buffer : public sbuffer { diff --git a/src/util/scoped_numeral_vector.h b/src/util/scoped_numeral_vector.h index bbd06f898..fdf63bf35 100644 --- a/src/util/scoped_numeral_vector.h +++ b/src/util/scoped_numeral_vector.h @@ -19,7 +19,7 @@ Revision History: #ifndef SCOPED_NUMERAL_VECTOR_H_ #define SCOPED_NUMERAL_VECTOR_H_ -#include"vector.h" +#include "util/vector.h" template class _scoped_numeral_vector : public svector { diff --git a/src/util/scoped_ptr_vector.h b/src/util/scoped_ptr_vector.h index d1ff89733..a9ef92766 100644 --- a/src/util/scoped_ptr_vector.h +++ b/src/util/scoped_ptr_vector.h @@ -20,8 +20,8 @@ Notes: #ifndef SCOPED_PTR_VECTOR_H_ #define SCOPED_PTR_VECTOR_H_ -#include"vector.h" -#include"util.h" +#include "util/vector.h" +#include "util/util.h" template class scoped_ptr_vector { diff --git a/src/util/scoped_timer.cpp b/src/util/scoped_timer.cpp index f6b0429d9..741523291 100644 --- a/src/util/scoped_timer.cpp +++ b/src/util/scoped_timer.cpp @@ -21,8 +21,8 @@ Revision History: #define _WIN32_WINNT 0x0600 #endif -#include"z3_exception.h" -#include"z3_omp.h" +#include "util/z3_exception.h" +#include "util/z3_omp.h" #if defined(_WINDOWS) || defined(_CYGWIN) // Windows #include @@ -44,14 +44,14 @@ Revision History: // Other platforms #endif -#include"scoped_timer.h" +#include "util/scoped_timer.h" #ifdef _CYGWIN #undef min #undef max #endif -#include"util.h" +#include "util/util.h" #include -#include"z3_omp.h" +#include "util/z3_omp.h" struct scoped_timer::imp { event_handler * m_eh; diff --git a/src/util/scoped_timer.h b/src/util/scoped_timer.h index a3e2568f9..cfce957f3 100644 --- a/src/util/scoped_timer.h +++ b/src/util/scoped_timer.h @@ -19,7 +19,7 @@ Revision History: #ifndef SCOPED_TIMER_H_ #define SCOPED_TIMER_H_ -#include"event_handler.h" +#include "util/event_handler.h" class scoped_timer { struct imp; diff --git a/src/util/scoped_vector.h b/src/util/scoped_vector.h index f62fbc8a6..d4c5301e6 100644 --- a/src/util/scoped_vector.h +++ b/src/util/scoped_vector.h @@ -19,7 +19,7 @@ Revision History: #ifndef SCOPED_VECTOR_H_ #define SCOPED_VECTOR_H_ -#include"vector.h" +#include "util/vector.h" template class scoped_vector { diff --git a/src/util/sexpr.cpp b/src/util/sexpr.cpp index c5d4a976f..4757330c2 100644 --- a/src/util/sexpr.cpp +++ b/src/util/sexpr.cpp @@ -16,9 +16,9 @@ Author: Notes: --*/ -#include"sexpr.h" -#include"vector.h" -#include"buffer.h" +#include "util/sexpr.h" +#include "util/vector.h" +#include "util/buffer.h" #ifdef _MSC_VER #pragma warning(disable : 4200) diff --git a/src/util/sexpr.h b/src/util/sexpr.h index 350c1ffec..7f5fdc67d 100644 --- a/src/util/sexpr.h +++ b/src/util/sexpr.h @@ -19,10 +19,10 @@ Notes: #ifndef SEXPR_H_ #define SEXPR_H_ -#include"rational.h" -#include"symbol.h" -#include"obj_ref.h" -#include"ref_vector.h" +#include "util/rational.h" +#include "util/symbol.h" +#include "util/obj_ref.h" +#include "util/ref_vector.h" class sexpr_manager; diff --git a/src/util/small_object_allocator.cpp b/src/util/small_object_allocator.cpp index ac2f64482..0eb7b9ec3 100644 --- a/src/util/small_object_allocator.cpp +++ b/src/util/small_object_allocator.cpp @@ -18,11 +18,11 @@ Revision History: Rewrote/Simplified the allocator --*/ -#include"memory_manager.h" -#include"small_object_allocator.h" -#include"debug.h" -#include"util.h" -#include"vector.h" +#include "util/memory_manager.h" +#include "util/small_object_allocator.h" +#include "util/debug.h" +#include "util/util.h" +#include "util/vector.h" #include small_object_allocator::small_object_allocator(char const * id) { diff --git a/src/util/small_object_allocator.h b/src/util/small_object_allocator.h index 9433b093e..740218242 100644 --- a/src/util/small_object_allocator.h +++ b/src/util/small_object_allocator.h @@ -20,8 +20,8 @@ Revision History: #ifndef SMALL_OBJECT_ALLOCATOR_H_ #define SMALL_OBJECT_ALLOCATOR_H_ -#include"machine.h" -#include"debug.h" +#include "util/machine.h" +#include "util/debug.h" class small_object_allocator { static const unsigned CHUNK_SIZE = (8192 - sizeof(void*)*2); diff --git a/src/util/smt2_util.cpp b/src/util/smt2_util.cpp index 70979cc01..731c91848 100644 --- a/src/util/smt2_util.cpp +++ b/src/util/smt2_util.cpp @@ -16,7 +16,7 @@ Author: Notes: --*/ -#include"smt2_util.h" +#include "util/smt2_util.h" bool is_smt2_simple_symbol_char(char s) { return diff --git a/src/util/smt2_util.h b/src/util/smt2_util.h index bddef03fb..5338daed9 100644 --- a/src/util/smt2_util.h +++ b/src/util/smt2_util.h @@ -19,7 +19,7 @@ Notes: #ifndef SMT2_UTIL_H_ #define SMT2_UTIL_H_ -#include"symbol.h" +#include "util/symbol.h" bool is_smt2_simple_symbol_char(char c); bool is_smt2_quoted_symbol(char const * s); diff --git a/src/util/sorting_network.h b/src/util/sorting_network.h index b0efbd346..17808ea48 100644 --- a/src/util/sorting_network.h +++ b/src/util/sorting_network.h @@ -19,7 +19,7 @@ Notes: --*/ -#include "vector.h" +#include "util/vector.h" #ifndef SORTING_NETWORK_H_ #define SORTING_NETWORK_H_ diff --git a/src/util/stack.cpp b/src/util/stack.cpp index 3c442d74b..81383e2fe 100644 --- a/src/util/stack.cpp +++ b/src/util/stack.cpp @@ -15,9 +15,9 @@ Author: Notes: --*/ -#include"stack.h" -#include"page.h" -#include"tptr.h" +#include "util/stack.h" +#include "util/page.h" +#include "util/tptr.h" inline void stack::store_mark(size_t m) { reinterpret_cast(m_curr_ptr)[0] = m; diff --git a/src/util/stack.h b/src/util/stack.h index a2605edcc..e29a09fcd 100644 --- a/src/util/stack.h +++ b/src/util/stack.h @@ -18,8 +18,8 @@ Notes: #ifndef STACK_H_ #define STACK_H_ -#include"page.h" -#include"debug.h" +#include "util/page.h" +#include "util/debug.h" class stack { char * m_curr_page; diff --git a/src/util/statistics.cpp b/src/util/statistics.cpp index 99cc4f3a4..9c8d1fd99 100644 --- a/src/util/statistics.cpp +++ b/src/util/statistics.cpp @@ -16,11 +16,11 @@ Author: Notes: --*/ -#include"statistics.h" -#include"map.h" -#include"str_hashtable.h" -#include"buffer.h" -#include"smt2_util.h" +#include "util/statistics.h" +#include "util/map.h" +#include "util/str_hashtable.h" +#include "util/buffer.h" +#include "util/smt2_util.h" #include void statistics::update(char const * key, unsigned inc) { diff --git a/src/util/statistics.h b/src/util/statistics.h index 041c2cf99..249c0ccc3 100644 --- a/src/util/statistics.h +++ b/src/util/statistics.h @@ -20,8 +20,8 @@ Notes: #define STATISTICS_H_ #include -#include"vector.h" -#include"rlimit.h" +#include "util/vector.h" +#include "util/rlimit.h" class statistics { typedef std::pair key_val_pair; diff --git a/src/util/str_hashtable.h b/src/util/str_hashtable.h index 2cfc2856c..e12cdc7a7 100644 --- a/src/util/str_hashtable.h +++ b/src/util/str_hashtable.h @@ -21,8 +21,8 @@ Revision History: #include -#include"hashtable.h" -#include"hash.h" +#include "util/hashtable.h" +#include "util/hash.h" struct str_hash_proc { unsigned operator()(char const * s) const { return string_hash(s, static_cast(strlen(s)), 17); } diff --git a/src/util/string_buffer.h b/src/util/string_buffer.h index a1607f5c4..28ce84fc4 100644 --- a/src/util/string_buffer.h +++ b/src/util/string_buffer.h @@ -22,8 +22,8 @@ #include #include #include -#include"util.h" -#include"memory_manager.h" +#include "util/util.h" +#include "util/memory_manager.h" // This string buffer will not use the heap if the data consumes less than INITIAL_SIZE bytes. template diff --git a/src/util/symbol.cpp b/src/util/symbol.cpp index 895c26b67..8f46272f0 100644 --- a/src/util/symbol.cpp +++ b/src/util/symbol.cpp @@ -16,11 +16,11 @@ Author: Revision History: --*/ -#include"symbol.h" -#include"str_hashtable.h" -#include"region.h" -#include"string_buffer.h" -#include"z3_omp.h" +#include "util/symbol.h" +#include "util/str_hashtable.h" +#include "util/region.h" +#include "util/string_buffer.h" +#include "util/z3_omp.h" symbol symbol::m_dummy(TAG(void*, static_cast(0), 2)); const symbol symbol::null; diff --git a/src/util/symbol.h b/src/util/symbol.h index d0eef4f3b..874b258e9 100644 --- a/src/util/symbol.h +++ b/src/util/symbol.h @@ -21,9 +21,9 @@ Revision History: #include #include -#include"util.h" -#include"tptr.h" -#include"string_buffer.h" +#include "util/util.h" +#include "util/tptr.h" +#include "util/string_buffer.h" template class symbol_table; diff --git a/src/util/symbol_table.h b/src/util/symbol_table.h index d3be2cb9c..ea848d991 100644 --- a/src/util/symbol_table.h +++ b/src/util/symbol_table.h @@ -18,10 +18,10 @@ Revision History: --*/ #ifndef SYMBOL_TABLE_H_ #define SYMBOL_TABLE_H_ -#include"vector.h" -#include"hashtable.h" -#include"hash.h" -#include"symbol.h" +#include "util/vector.h" +#include "util/hashtable.h" +#include "util/hash.h" +#include "util/symbol.h" /** \brief Quick & Dirty symbol table. diff --git a/src/util/timeit.cpp b/src/util/timeit.cpp index 5246beced..97df87ecd 100644 --- a/src/util/timeit.cpp +++ b/src/util/timeit.cpp @@ -17,9 +17,9 @@ Revision History: --*/ #include -#include"timeit.h" -#include"memory_manager.h" -#include"stopwatch.h" +#include "util/timeit.h" +#include "util/memory_manager.h" +#include "util/stopwatch.h" #include struct timeit::imp { diff --git a/src/util/timeout.cpp b/src/util/timeout.cpp index 75621995c..a82d1ec25 100644 --- a/src/util/timeout.cpp +++ b/src/util/timeout.cpp @@ -19,13 +19,13 @@ Revision History: --*/ #include -#include"z3_omp.h" -#include"util.h" -#include"timeout.h" -#include"error_codes.h" +#include "util/z3_omp.h" +#include "util/util.h" +#include "util/timeout.h" +#include "util/error_codes.h" -#include"event_handler.h" -#include"scoped_timer.h" +#include "util/event_handler.h" +#include "util/scoped_timer.h" scoped_timer * g_timeout = 0; void (* g_on_timeout)() = 0; diff --git a/src/util/timer.cpp b/src/util/timer.cpp index ace67ead8..2d80b732c 100644 --- a/src/util/timer.cpp +++ b/src/util/timer.cpp @@ -16,10 +16,10 @@ Author: Revision History: --*/ -#include"util.h" -#include"memory_manager.h" -#include"stopwatch.h" -#include"timer.h" +#include "util/util.h" +#include "util/memory_manager.h" +#include "util/stopwatch.h" +#include "util/timer.h" timer::timer(){ m_watch = alloc(stopwatch); diff --git a/src/util/total_order.h b/src/util/total_order.h index 6fda88110..a309b63a1 100644 --- a/src/util/total_order.h +++ b/src/util/total_order.h @@ -19,11 +19,11 @@ Revision History: #ifndef TOTAL_ORDER_H_ #define TOTAL_ORDER_H_ -#include"util.h" -#include"small_object_allocator.h" -#include"map.h" -#include"uint_map.h" -#include"trace.h" +#include "util/util.h" +#include "util/small_object_allocator.h" +#include "util/map.h" +#include "util/uint_map.h" +#include "util/trace.h" /** \brief An object for maintaining a total-order on sets of T values. diff --git a/src/util/tptr.h b/src/util/tptr.h index 23c28078b..d7319954d 100644 --- a/src/util/tptr.h +++ b/src/util/tptr.h @@ -20,7 +20,7 @@ Revision History: #ifndef TPTR_H_ #define TPTR_H_ -#include"machine.h" +#include "util/machine.h" #define TAG_SHIFT PTR_ALIGNMENT #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT) diff --git a/src/util/trace.cpp b/src/util/trace.cpp index 05a3e49bd..d993ebd11 100644 --- a/src/util/trace.cpp +++ b/src/util/trace.cpp @@ -16,8 +16,8 @@ Author: Revision History: --*/ -#include"trace.h" -#include"str_hashtable.h" +#include "util/trace.h" +#include "util/str_hashtable.h" #ifdef _TRACE std::ofstream tout(".z3-trace"); diff --git a/src/util/trail.h b/src/util/trail.h index 56c3d805f..1b8f36206 100644 --- a/src/util/trail.h +++ b/src/util/trail.h @@ -19,9 +19,9 @@ Revision History: #ifndef TRAIL_H_ #define TRAIL_H_ -#include"obj_hashtable.h" -#include"region.h" -#include"obj_ref.h" +#include "util/obj_hashtable.h" +#include "util/region.h" +#include "util/obj_ref.h" template class trail { diff --git a/src/util/uint_map.h b/src/util/uint_map.h index 0344de322..b7dec8676 100644 --- a/src/util/uint_map.h +++ b/src/util/uint_map.h @@ -19,7 +19,7 @@ Revision History: #ifndef UINT_MAP_H_ #define UINT_MAP_H_ -#include"vector.h" +#include "util/vector.h" /** \brief Implement a map from unsigned to T * using vectors diff --git a/src/util/uint_set.h b/src/util/uint_set.h index e78a4b0b6..33c39eeb2 100644 --- a/src/util/uint_set.h +++ b/src/util/uint_set.h @@ -19,8 +19,8 @@ Revision History: #ifndef UINT_SET_H_ #define UINT_SET_H_ -#include"util.h" -#include"vector.h" +#include "util/util.h" +#include "util/vector.h" COMPILE_TIME_ASSERT(sizeof(unsigned) == 4); diff --git a/src/util/union_find.h b/src/util/union_find.h index 6f6cc7a3b..7a99b149e 100644 --- a/src/util/union_find.h +++ b/src/util/union_find.h @@ -19,8 +19,8 @@ Revision History: #ifndef UNION_FIND_H_ #define UNION_FIND_H_ -#include "trail.h" -#include "trace.h" +#include "util/trail.h" +#include "util/trace.h" class union_find_default_ctx { public: diff --git a/src/util/util.cpp b/src/util/util.cpp index bfd4923a8..b16dbe292 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -17,7 +17,7 @@ Revision History: --*/ -#include"util.h" +#include "util/util.h" static unsigned g_verbosity_level = 0; diff --git a/src/util/util.h b/src/util/util.h index a040a79ae..440877619 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -19,8 +19,8 @@ Revision History: #ifndef UTIL_H_ #define UTIL_H_ -#include"debug.h" -#include"memory_manager.h" +#include "util/debug.h" +#include "util/memory_manager.h" #include #include #include diff --git a/src/util/vector.h b/src/util/vector.h index 7e89a773c..2d499a900 100644 --- a/src/util/vector.h +++ b/src/util/vector.h @@ -24,12 +24,12 @@ Revision History: #ifndef VECTOR_H_ #define VECTOR_H_ -#include"debug.h" +#include "util/debug.h" #include #include -#include"memory_manager.h" -#include"hash.h" -#include"z3_exception.h" +#include "util/memory_manager.h" +#include "util/hash.h" +#include "util/z3_exception.h" // disable warning for constant 'if' expressions. // these are used heavily in templates. diff --git a/src/util/warning.cpp b/src/util/warning.cpp index 9c6a285b9..a794b064a 100644 --- a/src/util/warning.cpp +++ b/src/util/warning.cpp @@ -19,10 +19,10 @@ Revision History: #include #include -#include "error_codes.h" -#include "util.h" -#include "buffer.h" -#include "vector.h" +#include "util/error_codes.h" +#include "util/util.h" +#include "util/buffer.h" +#include "util/vector.h" #ifdef _WINDOWS #define PRF sprintf_s diff --git a/src/util/z3_exception.cpp b/src/util/z3_exception.cpp index ee225ba48..d028a688a 100644 --- a/src/util/z3_exception.cpp +++ b/src/util/z3_exception.cpp @@ -19,10 +19,10 @@ Notes: #include #include #include -#include"z3_exception.h" -#include"warning.h" -#include"error_codes.h" -#include"debug.h" +#include "util/z3_exception.h" +#include "util/warning.h" +#include "util/error_codes.h" +#include "util/debug.h" unsigned z3_exception::error_code() const { return ERR_OK;