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

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

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)

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;

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;
 

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());

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 {};

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;

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 {
 

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());
 

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) {

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;
 

src/tactic/arith/bound_propagator.cpp

@@ -17,7 +17,7 @@ Author:
 Revision History:
 
 --*/
-#include"bound_propagator.h"
+#include "tactic/arith/bound_propagator.h"
 #include<cmath>
 
 // -------------------------------

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:

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);

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;

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) : 

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: 

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;

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<typeinfo>
-#include"sorting_network.h"
+#include "util/sorting_network.h"
 
 
 class ast_manager;

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 {

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;
 

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 {

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;
 

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;

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;
 

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 {

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;
 

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 {
 

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;
 

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 {
 

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;
 

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<app> clauses;

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;
 

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 {

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;
 

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 {

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;
 

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.

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:

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"
 
 //
 // 

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;
 

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 {

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;
 

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) {
 

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 *, func_decl *> func_decl_pair;

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:

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;
 

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 {

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;

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;
 

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"
 
 /*
 ----

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;
 

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 {

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;
 

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.

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<func_decl, expr*> const & const2bits);
 model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits);

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 {
 

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;
  

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 {
 

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;
 

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;

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());
 

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 <climits>
 
 static uint64 uMaxInt(unsigned sz) {

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());
 

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;

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;
 

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,

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;

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 {
 

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;
 

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 {

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;
 

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 {
 

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;
 

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 {
     

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;
 

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;

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"
 
 
 

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;
 

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;

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;

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.

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;
 

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)) {

src/tactic/core/collect_statistics_tactic.cpp

@@ -20,17 +20,17 @@ Notes:
 #include<string>
 #include<map>
 
-#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;

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;
 

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 {

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:

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 {

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 {
 

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;
 

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 {
 

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;
 

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 {
 

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;

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;

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;
 

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 {

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;
 

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;

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;