mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 02:45:51 +00:00
Code Activity

compiler warnings

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-10-08 12:43:17 -07:00
parent d716771541
commit 16dc2788a7
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nlsat/nlsat_solver.cpp
View file

@ -1622,7 +1622,7 @@ namespace nlsat {
del_clauses(m_valids);
if (m_check_lemmas) {
for (clause* c : m_learned) {
//check_lemma(c->size(), c->c_ptr(), false, nullptr);
check_lemma(c->size(), c->c_ptr(), false, nullptr);
}
}

31
src/smt/theory_str.cpp
View file

@ -1920,19 +1920,23 @@ namespace smt {
u.str.is_string(range2, range2val);
return zstring("[") + range1val + zstring("-") + range2val + zstring("]");
} else if (u.re.is_loop(a_regex)) {
expr * body;
unsigned lo, hi;
// There are two variants of loop: a 2-argument version and a 3-argument version.
if (u.re.is_loop(a_regex, body, lo, hi)) {
rational rLo(lo);
rational rHi(hi);
zstring bodyStr = get_std_regex_str(body);
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring(",") + zstring(rHi.to_string().c_str()) + zstring("})");
} else if (u.re.is_loop(a_regex, body, lo)) {
rational rLo(lo);
zstring bodyStr = get_std_regex_str(body);
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring("+") + zstring("})");
}
expr * body;
unsigned lo, hi;
// There are two variants of loop: a 2-argument version and a 3-argument version.
if (u.re.is_loop(a_regex, body, lo, hi)) {
rational rLo(lo);
rational rHi(hi);
zstring bodyStr = get_std_regex_str(body);
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring(",") + zstring(rHi.to_string().c_str()) + zstring("})");
} else if (u.re.is_loop(a_regex, body, lo)) {
rational rLo(lo);
zstring bodyStr = get_std_regex_str(body);
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring("+") + zstring("})");
}
else {
TRACE("str", tout << "BUG: unrecognized regex term " << mk_pp(regex, get_manager()) << std::endl;);
UNREACHABLE(); return zstring("");
}
} else if (u.re.is_full_seq(a_regex)) {
return zstring("(.*)");
} else if (u.re.is_full_char(a_regex)) {
@ -1941,6 +1945,7 @@ namespace smt {
TRACE("str", tout << "BUG: unrecognized regex term " << mk_pp(regex, get_manager()) << std::endl;);
UNREACHABLE(); return zstring("");
}
}
void theory_str::instantiate_axiom_RegexIn(enode * e) {