move model and proof converters to self-contained module

src/tactic/core/elim_term_ite_tactic.cpp

@@ -20,7 +20,7 @@ Notes:
 #include "tactic/tactical.h"
 #include "ast/normal_forms/defined_names.h"
 #include "ast/rewriter/rewriter_def.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 class elim_term_ite_tactic : public tactic {
 

src/tactic/core/elim_uncnstr_tactic.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/bv_decl_plugin.h"

src/tactic/core/nnf_tactic.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include "ast/normal_forms/nnf.h"
 #include "tactic/tactical.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 class nnf_tactic : public tactic {
     params_ref    m_params;

src/tactic/core/occf_tactic.cpp

@@ -23,7 +23,7 @@ Revision History:
 --*/
 #include "tactic/tactical.h"
 #include "tactic/core/occf_tactic.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 class occf_tactic : public tactic {
     struct     imp {

src/tactic/core/pb_preprocess_tactic.cpp

@@ -33,7 +33,7 @@ Notes:
 --*/
 #include "tactic/core/pb_preprocess_tactic.h"
 #include "tactic/tactical.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/for_each_expr.h"
 #include "ast/pb_decl_plugin.h"
 #include "ast/rewriter/th_rewriter.h"

src/tactic/core/reduce_args_tactic.cpp

@@ -22,7 +22,7 @@ Notes:
 #include "ast/has_free_vars.h"
 #include "util/map.h"
 #include "ast/rewriter/rewriter_def.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 /**
    \brief Reduce the number of arguments in function applications.

src/tactic/core/reduce_invertible_tactic.cpp

@@ -29,7 +29,7 @@ Notes:
 #include "tactic/tactic.h"
 #include "tactic/core/reduce_invertible_tactic.h"
 #include "tactic/core/collect_occs.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include <cstdint>
 
 namespace {

src/tactic/core/solve_eqs_tactic.cpp

@@ -27,7 +27,7 @@ Revision History:
 #include "ast/rewriter/hoist_rewriter.h"
 #include "tactic/goal_shared_occs.h"
 #include "tactic/tactical.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "tactic/tactic_params.hpp"
 
 class solve_eqs_tactic : public tactic {

src/tactic/core/split_clause_tactic.cpp

@@ -18,6 +18,7 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
+#include "tactic/goal_proof_converter.h"
 #include "tactic/core/split_clause_tactic.h"
 
 class split_clause_tactic : public tactic {

src/tactic/core/tseitin_cnf_tactic.cpp

@@ -52,7 +52,7 @@ Notes:
 #include "ast/ast_pp.h"
 #include "tactic/tactical.h"
 #include "tactic/goal_shared_occs.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/rewriter/bool_rewriter.h"
 #include "tactic/core/simplify_tactic.h"