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

fix #2031

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-12-09 08:21:48 +01:00
parent 2ca83d0095
commit 559f57470e
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -689,11 +689,10 @@ br_status seq_rewriter::mk_seq_extract(expr* a, expr* b, expr* c, expr_ref& resu
if (offset == 0) {
return BR_FAILED;
}
expr_ref len1(m()), pos1(m());
expr_ref pos1(m());
pos1 = m_autil.mk_sub(b, m_autil.mk_int(offset));
len1 = m_autil.mk_sub(c, m_autil.mk_int(offset));
result = m_util.str.mk_concat(as.size() - offset, as.c_ptr() + offset);
result = m_util.str.mk_substr(result, pos1, len1);
result = m_util.str.mk_substr(result, pos1, c);
return BR_REWRITE3;
}

8
src/smt/theory_seq.cpp
View file

@ -4735,7 +4735,6 @@ bool theory_seq::get_length(expr* e, rational& val) const {
}
/*
TBD: check semantics of extract.
let e = extract(s, i, l)
@ -4797,15 +4796,16 @@ void theory_seq::add_extract_axiom(expr* e) {
literal li_ge_ls = mk_simplified_literal(m_autil.mk_ge(ls_minus_i_l, zero));
literal l_ge_zero = mk_simplified_literal(m_autil.mk_ge(l, zero));
literal ls_le_0 = mk_simplified_literal(m_autil.mk_le(ls, zero));
literal le_is_0 = mk_eq(le, zero, false);
add_axiom(~i_ge_0, ~ls_le_i, mk_seq_eq(xey, s));
add_axiom(~i_ge_0, ~ls_le_i, mk_eq(lx, i, false));
add_axiom(~i_ge_0, ~ls_le_i, ~l_ge_zero, ~li_ge_ls, mk_eq(le, l, false));
add_axiom(~i_ge_0, ~ls_le_i, li_ge_ls, mk_eq(le, mk_sub(ls, i), false));
add_axiom(~i_ge_0, ~ls_le_i, l_ge_zero, mk_eq(le, zero, false));
add_axiom(i_ge_0, mk_eq(le, zero, false));
add_axiom(ls_le_i, mk_eq(le, zero, false));
add_axiom(~ls_le_0, mk_eq(le, zero, false));
add_axiom(i_ge_0, le_is_0);
add_axiom(ls_le_i, le_is_0);
add_axiom(~ls_le_0, le_is_0);
}
void theory_seq::add_tail_axiom(expr* e, expr* s) {