mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-09 16:55:47 +00:00
Code Activity

remove also cores as arguments to tactics

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-19 12:18:50 -08:00
parent 4bbece6616
commit 2f218b0bdc
90 changed files with 326 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tactic/bv/bit_blaster_tactic.cpp
View file

@ -51,9 +51,7 @@ class bit_blaster_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
core = 0;
goal_ref_buffer & result) {
bool proofs_enabled = g->proofs_enabled();
if (proofs_enabled && m_blast_quant)
@ -131,10 +129,9 @@ public:
}
virtual void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
goal_ref_buffer & result) {
try {
(*m_imp)(g, result, core);
(*m_imp)(g, result);
}
catch (rewriter_exception & ex) {
throw tactic_exception(ex.msg());

9
src/tactic/bv/bv1_blaster_tactic.cpp
View file

@ -379,9 +379,7 @@ class bv1_blaster_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
core = 0;
goal_ref_buffer & result) {
if (!is_target(*g))
throw tactic_exception("bv1 blaster cannot be applied to goal");
@ -453,9 +451,8 @@ public:
Return a model_converter that converts any model for the updated set into a model for the old set.
*/
virtual void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
(*m_imp)(g, result, core);
goal_ref_buffer & result) {
(*m_imp)(g, result);
}
virtual void cleanup() {

10
src/tactic/bv/bv_bound_chk_tactic.cpp
View file

@ -136,9 +136,7 @@ class bv_bound_chk_tactic : public tactic {
public:
bv_bound_chk_tactic(ast_manager & m, params_ref const & p);
virtual ~bv_bound_chk_tactic();
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core);
void operator()(goal_ref const & g, goal_ref_buffer & result) override;
virtual tactic * translate(ast_manager & m);
virtual void updt_params(params_ref const & p);
void cleanup();
@ -195,14 +193,12 @@ bv_bound_chk_tactic::~bv_bound_chk_tactic() {
dealloc(m_imp);
}
void bv_bound_chk_tactic::operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
void bv_bound_chk_tactic::operator()(goal_ref const & g, goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("bv-bound-chk", g);
fail_if_unsat_core_generation("bv-bound-chk", g);
TRACE("bv-bound-chk", g->display(tout << "before:"); tout << std::endl;);
core = 0; result.reset();
result.reset();
m_imp->operator()(g);
g->inc_depth();
result.push_back(g.get());

7
src/tactic/bv/bv_size_reduction_tactic.cpp
View file

@ -39,7 +39,7 @@ public:
virtual ~bv_size_reduction_tactic();
virtual void operator()(goal_ref const & g, goal_ref_buffer & result, expr_dependency_ref & core);
virtual void operator()(goal_ref const & g, goal_ref_buffer & result);
virtual void cleanup();
};
@ -382,12 +382,11 @@ bv_size_reduction_tactic::~bv_size_reduction_tactic() {
}
void bv_size_reduction_tactic::operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("bv-size-reduction", g);
fail_if_unsat_core_generation("bv-size-reduction", g);
core = 0; result.reset();
result.reset();
model_converter_ref mc;
m_imp->operator()(*(g.get()), mc);
g->inc_depth();

10
src/tactic/bv/bvarray2uf_tactic.cpp
View file

@ -53,12 +53,11 @@ class bvarray2uf_tactic : public tactic {
}
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core)
goal_ref_buffer & result)
{
SASSERT(g->is_well_sorted());
tactic_report report("bvarray2uf", *g);
core = 0; result.reset();
result.reset();
fail_if_unsat_core_generation("bvarray2uf", g);
TRACE("bvarray2uf", tout << "Before: " << std::endl; g->display(tout); );
@ -129,9 +128,8 @@ public:
}
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result,
expr_dependency_ref & core) {
(*m_imp)(in, result, core);
goal_ref_buffer & result) {
(*m_imp)(in, result);
}
virtual void cleanup() {

5
src/tactic/bv/dt2bv_tactic.cpp
View file

@ -116,10 +116,7 @@ public:
virtual void collect_param_descrs(param_descrs & r) {
}
virtual void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
core = 0;
virtual void operator()(goal_ref const & g, goal_ref_buffer & result) {
bool produce_proofs = g->proofs_enabled();
tactic_report report("dt2bv", *g);
unsigned size = g->size();

10
src/tactic/bv/elim_small_bv_tactic.cpp
View file

@ -224,11 +224,8 @@ class elim_small_bv_tactic : public tactic {
m_rw.cfg().updt_params(p);
}
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
void operator()(goal_ref const & g, goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
core = 0;
tactic_report report("elim-small-bv", *g);
bool produce_proofs = g->proofs_enabled();
fail_if_proof_generation("elim-small-bv", g);
@ -286,9 +283,8 @@ public:
}
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result,
expr_dependency_ref & core) {
(*m_imp)(in, result, core);
goal_ref_buffer & result) {
(*m_imp)(in, result);
}
virtual void cleanup() {

9
src/tactic/bv/max_bv_sharing_tactic.cpp
View file

@ -237,10 +237,8 @@ class max_bv_sharing_tactic : public tactic {
ast_manager & m() const { return m_rw.m(); }
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
core = 0;
tactic_report report("max-bv-sharing", *g);
bool produce_proofs = g->proofs_enabled();
@ -297,9 +295,8 @@ public:
}
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result,
expr_dependency_ref & core) {
(*m_imp)(in, result, core);
goal_ref_buffer & result) {
(*m_imp)(in, result);
}
virtual void cleanup() {