mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

fix #4949 - and/or get rewritten depending on parameters for rewriter

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-01-20 01:08:54 -08:00
parent 3a2ed691f8
commit fa4869e400
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/qe/qe.cpp
View file

@ -415,7 +415,7 @@ namespace qe {
expr_ref_vector m_trail; // trail for generated terms expr_ref_vector m_trail; // trail for generated terms
expr_ref_vector m_args; expr_ref_vector m_args;
ptr_vector<expr> m_todo; // stack of formulas to visit ptr_vector<expr> m_todo; // stack of formulas to visit
bool_vector m_pols; // stack of polarities bool_vector m_pols; // stack of polarities
bool_rewriter m_rewriter; bool_rewriter m_rewriter;
public: public:
@ -553,8 +553,7 @@ namespace qe {
unsigned num_args = a->get_num_args(); unsigned num_args = a->get_num_args();
expr_ref tmp(m); expr_ref tmp(m);
bool visited = true; bool visited = true;
for (unsigned i = 0; i < num_args; ++i) { for (expr* arg : *a) {
expr* arg = a->get_arg(i);
expr* r = lookup(arg, p); expr* r = lookup(arg, p);
if (r) { if (r) {
m_args.push_back(r); m_args.push_back(r);
@ -565,12 +564,10 @@ namespace qe {
} }
if (visited) { if (visited) {
pop(); pop();
if ((p && is_and) || (!p && !is_and)) { if (p == is_and)
m_rewriter.mk_and(num_args, m_args.c_ptr(), tmp); tmp = mk_and(m_args);
} else
else { tmp = mk_or(m_args);
m_rewriter.mk_or(num_args, m_args.c_ptr(), tmp);
}
insert(a, p, tmp); insert(a, p, tmp);
} }
} }
@ -693,13 +690,13 @@ namespace qe {
} }
else if (m.is_and(e) || m.is_or(e)) { else if (m.is_and(e) || m.is_or(e)) {
m_args.reset(); m_args.reset();
for (unsigned i = 0; i < e->get_num_args(); ++i) { for (expr* arg : *e) {
if (m_cache.find(e->get_arg(i), f)) { if (m_cache.find(arg, f)) {
m_args.push_back(f); m_args.push_back(f);
} }
else { else {
all_visit = false; all_visit = false;
m_todo.push_back(e->get_arg(i)); m_todo.push_back(arg);
} }
} }
if (all_visit) { if (all_visit) {
@ -817,18 +814,15 @@ namespace qe {
while (!m_todo.empty()) { while (!m_todo.empty()) {
expr* e = m_todo.back(); expr* e = m_todo.back();
m_todo.pop_back(); m_todo.pop_back();
if (m_visited.is_marked(e)) { if (m_visited.is_marked(e))
continue; continue;
}
m_visited.mark(e, true); m_visited.mark(e, true);
if (!is_app(e) || !m_is_relevant(e)) { if (!is_app(e) || !m_is_relevant(e))
continue; continue;
}
app* a = to_app(e); app* a = to_app(e);
if (m.is_and(a) || m.is_or(a)) { if (m.is_and(a) || m.is_or(a)) {
for (unsigned i = 0; i < a->get_num_args(); ++i) { for (expr* arg : *a)
m_todo.push_back(a->get_arg(i)); m_todo.push_back(arg);
}
} }
else if (m.is_not(a, e) && is_app(e)) { else if (m.is_not(a, e) && is_app(e)) {
neg.insert(to_app(e)); neg.insert(to_app(e));