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

Merge pull request #1692 from NikolajBjorner/master

Browse source 
bug fix
This commit is contained in:
Nikolaj Bjorner 2018-06-19 20:46:40 -07:00 committed by GitHub
parent 0a54da55af 8241ba784d
commit a12af4a619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/smt/theory_seq.cpp
View file

@ -712,12 +712,30 @@ unsigned theory_seq::find_branch_start(unsigned k) {
return 0; return 0;
} }
bool theory_seq::find_branch_candidate(unsigned& start, dependency* dep, expr_ref_vector const& ls, expr_ref_vector const& rs) { expr_ref_vector theory_seq::expand_strings(expr_ref_vector const& es) {
expr_ref_vector ls(m);
for (expr* e : es) {
zstring s;
if (m_util.str.is_string(e, s)) {
for (unsigned i = 0; i < s.length(); ++i) {
ls.push_back(m_util.str.mk_unit(m_util.str.mk_char(s, i)));
}
}
else {
ls.push_back(e);
}
}
return ls;
}
bool theory_seq::find_branch_candidate(unsigned& start, dependency* dep, expr_ref_vector const& _ls, expr_ref_vector const& _rs) {
expr_ref_vector ls = expand_strings(_ls);
expr_ref_vector rs = expand_strings(_rs);
if (ls.empty()) { if (ls.empty()) {
return false; return false;
} }
expr* l = ls[0]; expr* l = ls.get(0);
if (!is_var(l)) { if (!is_var(l)) {
return false; return false;
@ -735,9 +753,9 @@ bool theory_seq::find_branch_candidate(unsigned& start, dependency* dep, expr_re
} }
for (; start < rs.size(); ++start) { for (; start < rs.size(); ++start) {
unsigned j = start; unsigned j = start;
SASSERT(!m_util.str.is_concat(rs[j])); SASSERT(!m_util.str.is_concat(rs.get(j)));
SASSERT(!m_util.str.is_string(rs[j])); SASSERT(!m_util.str.is_string(rs.get(j)));
if (l == rs[j]) { if (l == rs.get(j)) {
return false; return false;
} }
if (!can_be_equal(ls.size() - 1, ls.c_ptr() + 1, rs.size() - j - 1, rs.c_ptr() + j + 1)) { if (!can_be_equal(ls.size() - 1, ls.c_ptr() + 1, rs.size() - j - 1, rs.c_ptr() + j + 1)) {
@ -752,8 +770,11 @@ bool theory_seq::find_branch_candidate(unsigned& start, dependency* dep, expr_re
} }
bool all_units = true; bool all_units = true;
for (unsigned j = 0; all_units && j < rs.size(); ++j) { for (expr* r : rs) {
all_units &= m_util.str.is_unit(rs[j]); if (!m_util.str.is_unit(r)) {
all_units = false;
break;
}
} }
if (all_units) { if (all_units) {
context& ctx = get_context(); context& ctx = get_context();
@ -765,20 +786,20 @@ bool theory_seq::find_branch_candidate(unsigned& start, dependency* dep, expr_re
lits.push_back(~mk_eq(l, v0, false)); lits.push_back(~mk_eq(l, v0, false));
} }
} }
for (unsigned i = 0; i < lits.size(); ++i) { for (literal lit : lits) {
switch (ctx.get_assignment(lits[i])) { switch (ctx.get_assignment(lit)) {
case l_true: break; case l_true: break;
case l_false: start = 0; return true; case l_false: start = 0; return true;
case l_undef: ctx.force_phase(~lits[i]); start = 0; return true; case l_undef: ctx.force_phase(~lit); start = 0; return true;
} }
} }
set_conflict(dep, lits); set_conflict(dep, lits);
TRACE("seq", TRACE("seq",
tout << "start: " << start << "\n"; tout << "start: " << start << "\n";
for (unsigned i = 0; i < lits.size(); ++i) { for (literal lit : lits) {
ctx.display_literal_verbose(tout << lits[i] << ": ", lits[i]); ctx.display_literal_verbose(tout << lit << ": ", lit);
tout << "\n"; tout << "\n";
ctx.display(tout, ctx.get_justification(lits[i].var())); ctx.display(tout, ctx.get_justification(lit.var()));
tout << "\n"; tout << "\n";
}); });
return true; return true;

1
src/smt/theory_seq.h
View file

@ -447,6 +447,7 @@ namespace smt {
void insert_branch_start(unsigned k, unsigned s); void insert_branch_start(unsigned k, unsigned s);
unsigned find_branch_start(unsigned k); unsigned find_branch_start(unsigned k);
bool find_branch_candidate(unsigned& start, dependency* dep, expr_ref_vector const& ls, expr_ref_vector const& rs); bool find_branch_candidate(unsigned& start, dependency* dep, expr_ref_vector const& ls, expr_ref_vector const& rs);
expr_ref_vector expand_strings(expr_ref_vector const& es);
bool can_be_equal(unsigned szl, expr* const* ls, unsigned szr, expr* const* rs) const; bool can_be_equal(unsigned szl, expr* const* ls, unsigned szr, expr* const* rs) const;
lbool assume_equality(expr* l, expr* r); lbool assume_equality(expr* l, expr* r);