mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

fixed failures with regression tests

Browse source
This commit is contained in:
Thai Trinh 2018-06-30 15:52:20 +08:00
parent 54a9482716
commit cd62017afd
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/smt/params/CMakeLists.txt
View file

@ -8,6 +8,7 @@ z3_add_component(smt_params
theory_array_params.cpp theory_array_params.cpp
theory_bv_params.cpp theory_bv_params.cpp
theory_pb_params.cpp theory_pb_params.cpp
theory_seq_params.cpp
theory_str_params.cpp theory_str_params.cpp
COMPONENT_DEPENDENCIES COMPONENT_DEPENDENCIES
ast ast

48
src/smt/theory_seq.cpp
View file

@ -954,32 +954,29 @@ void theory_seq::prop_arith_to_len_offset() {
} }
} }
int theory_seq::find_fst_non_empty_idx(expr_ref_vector const& x) const { int theory_seq::find_fst_non_empty_idx(expr_ref_vector const& xs) const {
context & ctx = get_context(); context & ctx = get_context();
int i = 0; for (unsigned i = 0; i < xs.size(); ++i) {
for (; i < x.size(); ++i) { expr* x = xs[i];
if (!is_var(x[i])) return -1; if (!is_var(x)) return -1;
expr_ref e(m_util.str.mk_length(x[i]), m); expr_ref e(m_util.str.mk_length(x), m);
if (ctx.e_internalized(e)) { if (ctx.e_internalized(e)) {
enode* root = ctx.get_enode(e)->get_root(); enode* root = ctx.get_enode(e)->get_root();
rational val; rational val;
if (m_autil.is_numeral(root->get_owner(), val) && val.is_zero()) if (m_autil.is_numeral(root->get_owner(), val) && val.is_zero()) {
continue; continue;
}
} }
break;
}
if (i == x.size())
return -1;
else {
return i; return i;
} }
return -1;
} }
expr* theory_seq::find_fst_non_empty_var(expr_ref_vector const& x) const { expr* theory_seq::find_fst_non_empty_var(expr_ref_vector const& x) const {
int i = find_fst_non_empty_idx(x); int i = find_fst_non_empty_idx(x);
if (i >= 0) if (i >= 0)
return x[i]; return x[i];
return NULL; return nullptr;
} }
void theory_seq::find_max_eq_len(expr_ref_vector const& ls, expr_ref_vector const& rs) { void theory_seq::find_max_eq_len(expr_ref_vector const& ls, expr_ref_vector const& rs) {
@ -1094,7 +1091,7 @@ bool theory_seq::find_better_rep(expr_ref_vector const& ls, expr_ref_vector cons
dependency*& deps, expr_ref_vector & res) { dependency*& deps, expr_ref_vector & res) {
context& ctx = get_context(); context& ctx = get_context();
if (ls.size() == 0 || rs.size() == 0) if (ls.empty() || rs.empty())
return false; return false;
expr* l_fst = find_fst_non_empty_var(ls); expr* l_fst = find_fst_non_empty_var(ls);
expr* r_fst = find_fst_non_empty_var(rs); expr* r_fst = find_fst_non_empty_var(rs);
@ -2338,10 +2335,10 @@ bool theory_seq::solve_unit_eq(expr* l, expr* r, dependency* deps) {
if (is_var(r) && !occurs(r, l) && add_solution(r, l, deps)) { if (is_var(r) && !occurs(r, l) && add_solution(r, l, deps)) {
return true; return true;
} }
if (is_nth(l) && !occurs(l, r) && add_solution(l, r, deps)) // if (is_nth(l) && !occurs(l, r) && add_solution(l, r, deps))
return true; // return true;
if (is_nth(r) && !occurs(r, l) && add_solution(r, l, deps)) // if (is_nth(r) && !occurs(r, l) && add_solution(r, l, deps))
return true; // return true;
return false; return false;
} }
@ -2731,10 +2728,12 @@ bool theory_seq::reduce_length(unsigned i, unsigned j, bool front, expr_ref_vect
expr_ref r = mk_concat(r1, rs1); expr_ref r = mk_concat(r1, rs1);
expr_ref lenl(m_util.str.mk_length(l), m); expr_ref lenl(m_util.str.mk_length(l), m);
expr_ref lenr(m_util.str.mk_length(r), m); expr_ref lenr(m_util.str.mk_length(r), m);
expr_ref len_eq(m.mk_eq(lenl, lenr), m); literal lit = mk_eq(lenl, lenr, false);
if (ctx.find_assignment(len_eq) == l_true) { if (ctx.get_assignment(lit) == l_true) {
literal lit = mk_eq(lenl, lenr, false); // expr_ref len_eq(m.mk_eq(lenl, lenr), m);
literal_vector lits; // if (ctx.find_assignment(len_eq) == l_true) {
// literal lit = mk_eq(lenl, lenr, false);
// literal_vector lits;
expr_ref_vector lhs(m), rhs(m); expr_ref_vector lhs(m), rhs(m);
lhs.append(l2, ls2); lhs.append(l2, ls2);
rhs.append(r2, rs2); rhs.append(r2, rs2);
@ -4978,6 +4977,7 @@ void theory_seq::add_axiom(literal l1, literal l2, literal l3, literal l4, liter
} }
expr* theory_seq::coalesce_chars(expr* const& e) { expr* theory_seq::coalesce_chars(expr* const& e) {
context& ctx = get_context();
expr* s; expr* s;
if (m_util.str.is_concat(e)) { if (m_util.str.is_concat(e)) {
expr_ref_vector concats(m); expr_ref_vector concats(m);
@ -5020,7 +5020,9 @@ expr* theory_seq::coalesce_chars(expr* const& e) {
if (bvu.is_bv(s)) { if (bvu.is_bv(s)) {
expr_ref result(m); expr_ref result(m);
expr * args[1] = {s}; expr * args[1] = {s};
if (m_seq_rewrite.mk_app_core(to_app(s)->get_decl(), 1, args, result)) { if (m_seq_rewrite.mk_app_core(to_app(e)->get_decl(), 1, args, result)) {
if (!ctx.e_internalized(result))
ctx.internalize(result, false);
return result; return result;
} }
} }