Skip to content

Commit 16dc278

Browse files
compiler warnings
Signed-off-by: Nikolaj Bjorner <[email protected]>
1 parent d716771 commit 16dc278

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/nlsat/nlsat_solver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@ namespace nlsat {
16221622
del_clauses(m_valids);
16231623
if (m_check_lemmas) {
16241624
for (clause* c : m_learned) {
1625-
//check_lemma(c->size(), c->c_ptr(), false, nullptr);
1625+
check_lemma(c->size(), c->c_ptr(), false, nullptr);
16261626
}
16271627
}
16281628

src/smt/theory_str.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,19 +1920,23 @@ namespace smt {
19201920
u.str.is_string(range2, range2val);
19211921
return zstring("[") + range1val + zstring("-") + range2val + zstring("]");
19221922
} else if (u.re.is_loop(a_regex)) {
1923-
expr * body;
1924-
unsigned lo, hi;
1925-
// There are two variants of loop: a 2-argument version and a 3-argument version.
1926-
if (u.re.is_loop(a_regex, body, lo, hi)) {
1927-
rational rLo(lo);
1928-
rational rHi(hi);
1929-
zstring bodyStr = get_std_regex_str(body);
1930-
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring(",") + zstring(rHi.to_string().c_str()) + zstring("})");
1931-
} else if (u.re.is_loop(a_regex, body, lo)) {
1932-
rational rLo(lo);
1933-
zstring bodyStr = get_std_regex_str(body);
1934-
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring("+") + zstring("})");
1935-
}
1923+
expr * body;
1924+
unsigned lo, hi;
1925+
// There are two variants of loop: a 2-argument version and a 3-argument version.
1926+
if (u.re.is_loop(a_regex, body, lo, hi)) {
1927+
rational rLo(lo);
1928+
rational rHi(hi);
1929+
zstring bodyStr = get_std_regex_str(body);
1930+
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring(",") + zstring(rHi.to_string().c_str()) + zstring("})");
1931+
} else if (u.re.is_loop(a_regex, body, lo)) {
1932+
rational rLo(lo);
1933+
zstring bodyStr = get_std_regex_str(body);
1934+
return zstring("(") + bodyStr + zstring("{") + zstring(rLo.to_string().c_str()) + zstring("+") + zstring("})");
1935+
}
1936+
else {
1937+
TRACE("str", tout << "BUG: unrecognized regex term " << mk_pp(regex, get_manager()) << std::endl;);
1938+
UNREACHABLE(); return zstring("");
1939+
}
19361940
} else if (u.re.is_full_seq(a_regex)) {
19371941
return zstring("(.*)");
19381942
} else if (u.re.is_full_char(a_regex)) {
@@ -1941,6 +1945,7 @@ namespace smt {
19411945
TRACE("str", tout << "BUG: unrecognized regex term " << mk_pp(regex, get_manager()) << std::endl;);
19421946
UNREACHABLE(); return zstring("");
19431947
}
1948+
19441949
}
19451950

19461951
void theory_str::instantiate_axiom_RegexIn(enode * e) {

0 commit comments

Comments
 (0)