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

fix #1937

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-11-14 11:31:39 -08:00
parent 9b4cf1559d
commit 52910fa465
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -561,6 +561,7 @@ br_status seq_rewriter::mk_seq_extract(expr* a, expr* b, expr* c, expr_ref& resu
zstring s; zstring s;
rational pos, len; rational pos, len;
TRACE("seq", tout << mk_pp(a, m()) << " " << mk_pp(b, m()) << " " << mk_pp(c, m()) << "\n";);
bool constantBase = m_util.str.is_string(a, s); bool constantBase = m_util.str.is_string(a, s);
bool constantPos = m_autil.is_numeral(b, pos); bool constantPos = m_autil.is_numeral(b, pos);
bool constantLen = m_autil.is_numeral(c, len); bool constantLen = m_autil.is_numeral(c, len);
@ -599,6 +600,10 @@ br_status seq_rewriter::mk_seq_extract(expr* a, expr* b, expr* c, expr_ref& resu
SASSERT(_len > 0); SASSERT(_len > 0);
expr_ref_vector as(m()), bs(m()); expr_ref_vector as(m()), bs(m());
m_util.str.get_concat(a, as); m_util.str.get_concat(a, as);
if (as.empty()) {
result = a;
return BR_DONE;
}
for (unsigned i = 0; i < as.size() && _len > 0; ++i) { for (unsigned i = 0; i < as.size() && _len > 0; ++i) {
if (m_util.str.is_unit(as[i].get())) { if (m_util.str.is_unit(as[i].get())) {
if (_pos == 0) { if (_pos == 0) {
@ -613,7 +618,12 @@ br_status seq_rewriter::mk_seq_extract(expr* a, expr* b, expr* c, expr_ref& resu
return BR_FAILED; return BR_FAILED;
} }
} }
result = m_util.str.mk_concat(bs); if (bs.empty()) {
result = m_util.str.mk_empty(m().get_sort(a));
}
else {
result = m_util.str.mk_concat(bs);
}
return BR_DONE; return BR_DONE;
} }

11
src/parsers/smt2/smt2parser.cpp
View file

@ -346,7 +346,8 @@ namespace smt2 {
// consume garbage // consume garbage
// return true if managed to recover from the error... // return true if managed to recover from the error...
bool sync_after_error() { bool sync_after_error() {
while (true) { unsigned num_errors = 0;
while (num_errors < 100) {
try { try {
while (curr_is_rparen()) while (curr_is_rparen())
next(); next();
@ -374,8 +375,10 @@ namespace smt2 {
catch (scanner_exception & ex) { catch (scanner_exception & ex) {
SASSERT(ex.has_pos()); SASSERT(ex.has_pos());
error(ex.line(), ex.pos(), ex.msg()); error(ex.line(), ex.pos(), ex.msg());
++num_errors;
} }
} }
return false;
} }
void check_next(scanner::token t, char const * msg) { void check_next(scanner::token t, char const * msg) {
@ -3117,7 +3120,7 @@ namespace smt2 {
bool operator()() { bool operator()() {
m_num_bindings = 0; m_num_bindings = 0;
bool found_errors = false; unsigned found_errors = 0;
try { try {
scan_core(); scan_core();
@ -3126,7 +3129,7 @@ namespace smt2 {
error(ex.msg()); error(ex.msg());
if (!sync_after_error()) if (!sync_after_error())
return false; return false;
found_errors = true; found_errors++;
} }
while (true) { while (true) {
@ -3138,7 +3141,7 @@ namespace smt2 {
parse_cmd(); parse_cmd();
break; break;
case scanner::EOF_TOKEN: case scanner::EOF_TOKEN:
return !found_errors; return found_errors == 0;
default: default:
throw parser_exception("invalid command, '(' expected"); throw parser_exception("invalid command, '(' expected");
break; break;