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

revert fix to #1677

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-06-18 21:23:13 -07:00
parent c15eca66d6
commit b4aac1ab55
2 changed files with 27 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/smt/smt_context_inv.cpp
View file

@ -43,13 +43,9 @@ namespace smt {
} }
bool context::check_clauses(clause_vector const & v) const { bool context::check_clauses(clause_vector const & v) const {
clause_vector::const_iterator it = v.begin(); for (clause* cls : v)
clause_vector::const_iterator end = v.end();
for (; it != end; ++it) {
clause * cls = *it;
if (!cls->deleted()) if (!cls->deleted())
check_clause(cls); check_clause(cls);
}
return true; return true;
} }
@ -92,10 +88,7 @@ namespace smt {
bool context::check_lit_occs(literal l) const { bool context::check_lit_occs(literal l) const {
clause_set const & v = m_lit_occs[l.index()]; clause_set const & v = m_lit_occs[l.index()];
clause_set::iterator it = v.begin(); for (clause * cls : v) {
clause_set::iterator end = v.end();
for (; it != end; ++it) {
clause * cls = *it;
unsigned num = cls->get_num_literals(); unsigned num = cls->get_num_literals();
unsigned i = 0; unsigned i = 0;
for (; i < num; i++) for (; i < num; i++)
@ -138,10 +131,8 @@ namespace smt {
} }
bool context::check_enodes() const { bool context::check_enodes() const {
ptr_vector<enode>::const_iterator it = m_enodes.begin(); for (enode* n : m_enodes) {
ptr_vector<enode>::const_iterator end = m_enodes.end(); check_enode(n);
for (; it != end; ++it) {
check_enode(*it);
} }
return true; return true;
} }
@ -157,11 +148,9 @@ namespace smt {
} }
bool context::check_missing_clause_propagation(clause_vector const & v) const { bool context::check_missing_clause_propagation(clause_vector const & v) const {
clause_vector::const_iterator it = v.begin(); for (clause * cls : v) {
clause_vector::const_iterator end = v.end(); CTRACE("missing_propagation", is_unit_clause(cls), display_clause_detail(tout, cls); tout << "\n";);
for (; it != end; ++it) { SASSERT(!is_unit_clause(cls));
CTRACE("missing_propagation", is_unit_clause(*it), display_clause_detail(tout, *it); tout << "\n";);
SASSERT(!is_unit_clause(*it));
} }
return true; return true;
} }
@ -188,10 +177,7 @@ namespace smt {
} }
bool context::check_missing_eq_propagation() const { bool context::check_missing_eq_propagation() const {
ptr_vector<enode>::const_iterator it = m_enodes.begin(); for (enode* n : m_enodes) {
ptr_vector<enode>::const_iterator end = m_enodes.end();
for (; it != end; ++it) {
enode * n = *it;
SASSERT(!n->is_true_eq() || get_assignment(n) == l_true); SASSERT(!n->is_true_eq() || get_assignment(n) == l_true);
if (n->is_eq() && get_assignment(n) == l_true) { if (n->is_eq() && get_assignment(n) == l_true) {
SASSERT(n->is_true_eq()); SASSERT(n->is_true_eq());
@ -201,13 +187,8 @@ namespace smt {
} }
bool context::check_missing_congruence() const { bool context::check_missing_congruence() const {
ptr_vector<enode>::const_iterator it = m_enodes.begin(); for (enode* n : m_enodes) {
ptr_vector<enode>::const_iterator end = m_enodes.end(); for (enode* n2 : m_enodes) {
for (; it != end; ++it) {
enode * n = *it;
ptr_vector<enode>::const_iterator it2 = m_enodes.begin();
for (; it2 != end; ++it2) {
enode * n2 = *it2;
if (n->get_root() != n2->get_root()) { if (n->get_root() != n2->get_root()) {
if (n->is_true_eq() && n2->is_true_eq()) if (n->is_true_eq() && n2->is_true_eq())
continue; continue;
@ -222,10 +203,7 @@ namespace smt {
} }
bool context::check_missing_bool_enode_propagation() const { bool context::check_missing_bool_enode_propagation() const {
ptr_vector<enode>::const_iterator it = m_enodes.begin(); for (enode* n : m_enodes) {
ptr_vector<enode>::const_iterator end = m_enodes.end();
for (; it != end; ++it) {
enode * n = *it;
if (m_manager.is_bool(n->get_owner()) && get_assignment(n) == l_undef) { if (m_manager.is_bool(n->get_owner()) && get_assignment(n) == l_undef) {
enode * first = n; enode * first = n;
do { do {
@ -286,10 +264,7 @@ namespace smt {
For all a, b. root(a) == root(b) ==> get_assignment(a) == get_assignment(b) For all a, b. root(a) == root(b) ==> get_assignment(a) == get_assignment(b)
*/ */
bool context::check_eqc_bool_assignment() const { bool context::check_eqc_bool_assignment() const {
ptr_vector<enode>::const_iterator it = m_enodes.begin(); for (enode* e : m_enodes) {
ptr_vector<enode>::const_iterator end = m_enodes.end();
for (; it != end; ++it) {
enode * e = *it;
if (m_manager.is_bool(e->get_owner())) { if (m_manager.is_bool(e->get_owner())) {
enode * r = e->get_root(); enode * r = e->get_root();
CTRACE("eqc_bool", get_assignment(e) != get_assignment(r), CTRACE("eqc_bool", get_assignment(e) != get_assignment(r),
@ -343,24 +318,24 @@ namespace smt {
TRACE("check_th_diseq_propagation", tout << "checking theory: " << m_manager.get_family_name(th_id) << "\n";); TRACE("check_th_diseq_propagation", tout << "checking theory: " << m_manager.get_family_name(th_id) << "\n";);
// if the theory doesn't use diseqs, then the diseqs are not propagated. // if the theory doesn't use diseqs, then the diseqs are not propagated.
if (th->use_diseqs() && rhs->get_th_var(th_id) != null_theory_var) { if (th->use_diseqs() && rhs->get_th_var(th_id) != null_theory_var) {
bool found = false;
// lhs and rhs are attached to theory th_id // lhs and rhs are attached to theory th_id
svector<new_th_eq>::const_iterator it = m_propagated_th_diseqs.begin(); for (new_th_eq const& eq : m_propagated_th_diseqs) {
svector<new_th_eq>::const_iterator end = m_propagated_th_diseqs.end(); if (eq.m_th_id == th_id) {
for (; it != end; ++it) { enode * lhs_prime = th->get_enode(eq.m_lhs)->get_root();
if (it->m_th_id == th_id) { enode * rhs_prime = th->get_enode(eq.m_rhs)->get_root();
enode * lhs_prime = th->get_enode(it->m_lhs)->get_root();
enode * rhs_prime = th->get_enode(it->m_rhs)->get_root();
TRACE("check_th_diseq_propagation", TRACE("check_th_diseq_propagation",
tout << m_manager.get_family_name(it->m_th_id) << "\n";); tout << m_manager.get_family_name(eq.m_th_id) << "\n";);
if ((lhs == lhs_prime && rhs == rhs_prime) || if ((lhs == lhs_prime && rhs == rhs_prime) ||
(rhs == lhs_prime && lhs == rhs_prime)) { (rhs == lhs_prime && lhs == rhs_prime)) {
TRACE("check_th_diseq_propagation", tout << "ok v" << v << " " << get_assignment(v) << "\n";); TRACE("check_th_diseq_propagation", tout << "ok v" << v << " " << get_assignment(v) << "\n";);
found = true;
break; break;
} }
} }
} }
if (it == end) { if (!found) {
// missed theory diseq propagation // missed theory diseq propagation
display(std::cout); display(std::cout);
std::cout << "checking theory: " << m_manager.get_family_name(th_id) << "\n"; std::cout << "checking theory: " << m_manager.get_family_name(th_id) << "\n";
@ -369,8 +344,7 @@ namespace smt {
std::cout << "lhs: #" << lhs->get_owner_id() << ", rhs: #" << rhs->get_owner_id() << "\n"; std::cout << "lhs: #" << lhs->get_owner_id() << ", rhs: #" << rhs->get_owner_id() << "\n";
std::cout << mk_bounded_pp(lhs->get_owner(), m_manager) << " " << mk_bounded_pp(rhs->get_owner(), m_manager) << "\n"; std::cout << mk_bounded_pp(lhs->get_owner(), m_manager) << " " << mk_bounded_pp(rhs->get_owner(), m_manager) << "\n";
} }
VERIFY(found);
SASSERT(it != end);
} }
l = l->get_next(); l = l->get_next();
} }
@ -381,11 +355,9 @@ namespace smt {
} }
bool context::check_missing_diseq_conflict() const { bool context::check_missing_diseq_conflict() const {
svector<enode_pair>::const_iterator it = m_diseq_vector.begin(); for (enode_pair const& p : m_diseq_vector) {
svector<enode_pair>::const_iterator end = m_diseq_vector.end(); enode * n1 = p.first;
for (; it != end; ++it) { enode * n2 = p.second;
enode * n1 = it->first;
enode * n2 = it->second;
if (n1->get_root() == n2->get_root()) { if (n1->get_root() == n2->get_root()) {
TRACE("diseq_bug", TRACE("diseq_bug",
tout << "n1: #" << n1->get_owner_id() << ", n2: #" << n2->get_owner_id() << tout << "n1: #" << n1->get_owner_id() << ", n2: #" << n2->get_owner_id() <<
@ -420,10 +392,7 @@ namespace smt {
return true; return true;
} }
ast_manager& m = m_manager; ast_manager& m = m_manager;
literal_vector::const_iterator it = m_assigned_literals.begin(); for (literal lit : m_assigned_literals) {
literal_vector::const_iterator end = m_assigned_literals.end();
for (; it != end; ++it) {
literal lit = *it;
if (!is_relevant(lit)) { if (!is_relevant(lit)) {
continue; continue;
} }
@ -435,7 +404,7 @@ namespace smt {
if (is_quantifier(n) && m.is_rec_fun_def(to_quantifier(n))) { if (is_quantifier(n) && m.is_rec_fun_def(to_quantifier(n))) {
continue; continue;
} }
switch (get_assignment(*it)) { switch (get_assignment(lit)) {
case l_undef: case l_undef:
break; break;
case l_true: case l_true:

2
src/smt/theory_seq.cpp
View file

@ -2904,7 +2904,7 @@ expr_ref theory_seq::try_expand(expr* e, dependency*& eqs){
} }
result = ed.first; result = ed.first;
} }
else if (m_util.str.is_string(e)) { else if (false && m_util.str.is_string(e)) {
result = add_elim_string_axiom(e); result = add_elim_string_axiom(e);
} }
else { else {