mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-07 03:31:23 +00:00
Code Activity

update to make variables work with other theories

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-24 15:57:18 -07:00 • committed by Arie Gurfinkel
parent 5eacb8122d
commit 92bac11778
2 changed files with 51 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/qe/qe_bool_plugin.cpp
View file

@ -93,10 +93,8 @@ namespace qe {
bool solve_units(conj_enum& conjs, expr* _fml) {
expr_ref fml(_fml, m);
conj_enum::iterator it = conjs.begin(), end = conjs.end();
unsigned idx;
for (; it != end; ++it) {
expr* e = *it;
for (expr * e : conjs) {
if (!is_app(e)) {
continue;
}
@ -138,13 +136,11 @@ namespace qe {
return false;
}
else if (p && !n) {
atom_set::iterator it = m_ctx.pos_atoms().begin(), end = m_ctx.pos_atoms().end();
for (; it != end; ++it) {
if (x != *it && contains_x(*it)) return false;
for (expr* y : m_ctx.pos_atoms()) {
if (x != y && contains_x(y)) return false;
}
it = m_ctx.neg_atoms().begin(), end = m_ctx.neg_atoms().end();
for (; it != end; ++it) {
if (contains_x(*it)) return false;
for (expr* y : m_ctx.neg_atoms()) {
if (contains_x(y)) return false;
}
// only occurrences of 'x' must be in positive atoms
def = m.mk_true();
@ -152,13 +148,11 @@ namespace qe {
return true;
}
else if (!p && n) {
atom_set::iterator it = m_ctx.pos_atoms().begin(), end = m_ctx.pos_atoms().end();
for (; it != end; ++it) {
if (contains_x(*it)) return false;
for (expr* y : m_ctx.pos_atoms()) {
if (contains_x(y)) return false;
}
it = m_ctx.neg_atoms().begin(), end = m_ctx.neg_atoms().end();
for (; it != end; ++it) {
if (x != *it && contains_x(*it)) return false;
for (expr* y : m_ctx.neg_atoms()) {
if (x != y && contains_x(y)) return false;
}
def = m.mk_false();
m_replace.apply_substitution(x, def, fml);