mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +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/muz/fp/horn_tactic.cpp
View file

@ -177,10 +177,8 @@ class horn_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());
core = 0;
tactic_report report("horn", *g);
bool produce_proofs = g->proofs_enabled();
@ -386,9 +384,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 collect_statistics(statistics & st) const {

3
src/muz/pdr/pdr_context.cpp
View file

@ -202,9 +202,8 @@ namespace pdr {
void pred_transformer::simplify_formulas(tactic& tac, expr_ref_vector& v) {
goal_ref g(alloc(goal, m, false, false, false));
for (unsigned j = 0; j < v.size(); ++j) g->assert_expr(v[j].get());
expr_dependency_ref core(m);
goal_ref_buffer result;
tac(g, result, core);
tac(g, result);
SASSERT(result.size() == 1);
goal* r = result[0];
v.reset();

3
src/muz/pdr/pdr_farkas_learner.cpp
View file

@ -520,10 +520,9 @@ namespace pdr {
g->assert_expr(lemmas[i].get());
}
expr_ref tmp(m);
expr_dependency_ref core(m);
goal_ref_buffer result;
tactic_ref simplifier = mk_arith_bounds_tactic(m);
(*simplifier)(g, result, core);
(*simplifier)(g, result);
lemmas.reset();
SASSERT(result.size() == 1);
goal* r = result[0];

3
src/muz/spacer/spacer_context.cpp
View file

@ -1367,7 +1367,6 @@ void pred_transformer::frames::simplify_formulas ()
// normalize level
unsigned level = i < m_size ? i : infty_level ();
expr_dependency_ref core(m);
goal_ref_buffer result;
// simplify lemmas of the current level
@ -1393,7 +1392,7 @@ void pred_transformer::frames::simplify_formulas ()
}
// more than one lemma at current level. simplify.
(*simplifier)(g, result, core);
(*simplifier)(g, result);
SASSERT(result.size () == 1);
goal *r = result[0];

3
src/muz/spacer/spacer_legacy_frames.cpp
View file

@ -46,9 +46,8 @@ void pred_transformer::legacy_frames::simplify_formulas(tactic& tac,
ast_manager &m = m_pt.get_ast_manager();
goal_ref g(alloc(goal, m, false, false, false));
for (unsigned j = 0; j < v.size(); ++j) { g->assert_expr(v[j].get()); }
expr_dependency_ref core(m);
goal_ref_buffer result;
tac(g, result, core);
tac(g, result);
SASSERT(result.size() == 1);
goal* r = result[0];
v.reset();

6
src/muz/spacer/spacer_util.cpp
View file

@ -929,10 +929,9 @@ void simplify_bounds_old(expr_ref_vector& cube) {
}
expr_ref tmp(m);
expr_dependency_ref core(m);
goal_ref_buffer result;
tactic_ref simplifier = mk_arith_bounds_tactic(m);
(*simplifier)(g, result, core);
(*simplifier)(g, result);
SASSERT(result.size() == 1);
goal* r = result[0];
@ -953,13 +952,12 @@ void simplify_bounds_new (expr_ref_vector &cube) {
g->assert_expr(cube.get(i));
}
expr_dependency_ref dep(m);
goal_ref_buffer goals;
tactic_ref prop_values = mk_propagate_values_tactic(m);
tactic_ref prop_bounds = mk_propagate_ineqs_tactic(m);
tactic_ref t = and_then(prop_values.get(), prop_bounds.get());
(*t)(g, goals, dep);
(*t)(g, goals);
SASSERT(goals.size() == 1);
g = goals[0];