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

na

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-12-16 20:13:29 -08:00
parent 5974200444
commit 6963451704
1 changed files with 73 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/ast/rewriter/seq_rewriter.cpp
View file

@ -3380,21 +3380,20 @@ expr_ref seq_rewriter::merge_regex_sets(expr* r1, expr* r2, expr* unit,
sort* seq_sort; sort* seq_sort;
expr_ref result(unit, m()); expr_ref result(unit, m());
expr_ref_vector prefix(m()); expr_ref_vector prefix(m());
expr* a, * ar, * ar1, * b, * br, * br1; expr* a, * ar1, * b, * br1;
VERIFY(m_util.is_re(r1, seq_sort)); VERIFY(m_util.is_re(r1, seq_sort));
SASSERT(m_util.is_re(r2)); SASSERT(m_util.is_re(r2));
SASSERT(r2->get_sort() == r1->get_sort()); SASSERT(r2->get_sort() == r1->get_sort());
// Ordering of expressions used by merging, 0 means unordered, -1 means e1 < e2, 1 means e2 < e1 // Ordering of expressions used by merging, 0 means unordered, -1 means e1 < e2, 1 means e2 < e1
auto compare = [&](expr* x, expr* y) { auto compare = [&](expr* x, expr* y) {
expr* z; expr* z = nullptr;
unsigned int xid, yid;
// TODO: consider also the case of A{0,l}++B having the same id as A*++B // TODO: consider also the case of A{0,l}++B having the same id as A*++B
// in which case return 0 // in which case return 0
if (x == y) if (x == y)
return 0; return 0;
xid = (re().is_complement(x, z) ? z->get_id() : x->get_id()); unsigned xid = (re().is_complement(x, z) ? z->get_id() : x->get_id());
yid = (re().is_complement(y, z) ? z->get_id() : y->get_id()); unsigned yid = (re().is_complement(y, z) ? z->get_id() : y->get_id());
SASSERT(xid != yid); SASSERT(xid != yid);
return (xid < yid ? -1 : 1); return (xid < yid ? -1 : 1);
}; };
@ -3406,15 +3405,9 @@ expr_ref seq_rewriter::merge_regex_sets(expr* r1, expr* r2, expr* unit,
} }
return result; return result;
}; };
if (r1 == r2) expr* ar = r1;
result = r1; expr* br = r2;
else if (are_complements(r1, r2)) while (true) {
// TODO: loops
return expr_ref(unit, m());
else {
ar = r1;
br = r2;
while (true) {;
if (ar == br) if (ar == br)
return composeresult(ar); return composeresult(ar);
@ -3424,6 +3417,7 @@ expr_ref seq_rewriter::merge_regex_sets(expr* r1, expr* r2, expr* unit,
if (test(br, b, br1) && !test(ar, a, ar1)) if (test(br, b, br1) && !test(ar, a, ar1))
std::swap(ar, br); std::swap(ar, br);
// both ar, br are decomposable
if (test(br, b, br1)) { if (test(br, b, br1)) {
VERIFY(test(ar, a, ar1)); VERIFY(test(ar, a, ar1));
if (are_complements(a, b)) if (are_complements(a, b))
@ -3440,17 +3434,19 @@ expr_ref seq_rewriter::merge_regex_sets(expr* r1, expr* r2, expr* unit,
prefix.push_back(a); prefix.push_back(a);
ar = ar1; ar = ar1;
break; break;
default: case 1:
// b < a // b < a
prefix.push_back(b); prefix.push_back(b);
br = br1; br = br1;
break; break;
default:
UNREACHABLE();
} }
continue; continue;
} }
// ar is decomposable, br is not decomposable
if (test(ar, a, ar1)) { if (test(ar, a, ar1)) {
// br is not decomposable
if (are_complements(a, br)) if (are_complements(a, br))
return expr_ref(unit, m()); return expr_ref(unit, m());
switch (compare(a, br)) { switch (compare(a, br)) {
@ -3479,11 +3475,8 @@ expr_ref seq_rewriter::merge_regex_sets(expr* r1, expr* r2, expr* unit,
prefix.push_back(br); prefix.push_back(br);
return composeresult(ar); return composeresult(ar);
} }
}
return result;
} }
expr_ref seq_rewriter::mk_regex_reverse(expr* r) { expr_ref seq_rewriter::mk_regex_reverse(expr* r) {
expr* r1 = nullptr, * r2 = nullptr, * c = nullptr; expr* r1 = nullptr, * r2 = nullptr, * c = nullptr;
unsigned lo = 0, hi = 0; unsigned lo = 0, hi = 0;