move pull/push files

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

src/ast/rewriter/CMakeLists.txt

@@ -19,6 +19,8 @@ z3_add_component(rewriter
     mk_simplified_app.cpp
     pb_rewriter.cpp
     pb2bv_rewriter.cpp
+    push_app_ite.cpp
+    pull_ite_tree.cpp
     quant_hoist.cpp
     rewriter.cpp
     seq_rewriter.cpp

src/ast/rewriter/pull_ite_tree.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "ast/simplifier/pull_ite_tree.h"
+#include "ast/rewriter/pull_ite_tree.h"
 #include "ast/recurse_expr_def.h"
 #include "ast/for_each_expr.h"
 #include "ast/ast_pp.h"

src/ast/rewriter/push_app_ite.cpp

@@ -17,7 +17,7 @@ Author:
 Revision History:
 
 --*/
-#include "ast/simplifier/push_app_ite.h"
+#include "ast/rewriter/push_app_ite.h"
 #include "ast/ast_pp.h"
 
 push_app_ite::push_app_ite(simplifier & s, bool conservative):

src/ast/simplifier/CMakeLists.txt

@@ -15,8 +15,6 @@ z3_add_component(simplifier
     inj_axiom.cpp
     maximise_ac_sharing.cpp
     poly_simplifier_plugin.cpp
-    pull_ite_tree.cpp
-    push_app_ite.cpp
     seq_simplifier_plugin.cpp
     simplifier.cpp
     simplifier_plugin.cpp

src/smt/asserted_formulas.cpp

@@ -22,14 +22,14 @@ Revision History:
 #include "ast/for_each_expr.h"
 #include "ast/well_sorted.h"
 #include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/pull_ite_tree.h"
+#include "ast/rewriter/push_app_ite.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/simplifier/pull_ite_tree.h"
-#include "ast/simplifier/push_app_ite.h"
 #include "ast/simplifier/bv_elim.h"
 #include "ast/simplifier/inj_axiom.h"
 #include "ast/simplifier/elim_bounds.h"