mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

re.range with non-unit arguments is the empty language (#4360)

Browse source
This commit is contained in:
Murphy Berzish 2020-05-17 21:08:50 -05:00 • committed by GitHub
parent 152d6338f8
commit 1c760b04cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,8 @@ eautomaton* re2automaton::re2aut(expr* e) {
return a.detach(); return a.detach();
} }
else { else {
TRACE("seq", tout << "Range expression is not handled: " << mk_pp(e, m) << "\n";); // if e1/e2 are not unit, (re.range e1 e2) is defined to be the empty language
return alloc(eautomaton, sm);
} }
} }
else if (u.re.is_complement(e, e0) && (a = re2aut(e0)) && m_sa) { else if (u.re.is_complement(e, e0) && (a = re2aut(e0)) && m_sa) {

18
src/smt/theory_str_regex.cpp
View file

@ -812,9 +812,11 @@ namespace smt {
zstring str1, str2; zstring str1, str2;
u.str.is_string(sub1, str1); u.str.is_string(sub1, str1);
u.str.is_string(sub2, str2); u.str.is_string(sub2, str2);
SASSERT(str1.length() == 1); if (str1.length() == 1 && str2.length() == 1) {
SASSERT(str2.length() == 1); return 1 + str2[0] - str1[0];
return 1 + str2[0] - str1[0]; } else {
return 1;
}
} else if (u.re.is_full_char(re) || u.re.is_full_seq(re)) { } else if (u.re.is_full_char(re) || u.re.is_full_seq(re)) {
return 1; return 1;
} else { } else {
@ -964,9 +966,13 @@ namespace smt {
zstring str1, str2; zstring str1, str2;
u.str.is_string(sub1, str1); u.str.is_string(sub1, str1);
u.str.is_string(sub2, str2); u.str.is_string(sub2, str2);
SASSERT(str1.length() == 1); // re.range is a language of singleton strings if both of its arguments are;
SASSERT(str2.length() == 1); // otherwise it is the empty language
lens.insert(1); if (str1.length() == 1 && str2.length() == 1) {
lens.insert(1);
} else {
lens.insert(0);
}
} else if (u.re.is_full_char(re)) { } else if (u.re.is_full_char(re)) {
lens.insert(1); lens.insert(1);
} else if (u.re.is_full_seq(re)) { } else if (u.re.is_full_seq(re)) {