mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-03 18:00:23 +00:00
Code Activity

updated consequence finder to fix bug in processing enumeration types

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-08-31 16:15:36 +08:00
parent 237fde1f76
commit 4d9aadde35
5 changed files with 112 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/smt/theory_seq.cpp
View file

@ -249,6 +249,7 @@ final_check_status theory_seq::final_check_eh() {
}
m_new_propagation = false;
TRACE("seq", display(tout << "level: " << get_context().get_scope_level() << "\n"););
TRACE("seq_verbose", get_context().display(tout););
if (simplify_and_solve_eqs()) {
++m_stats.m_solve_eqs;
TRACE("seq", tout << ">>solve_eqs\n";);
@ -1009,6 +1010,17 @@ bool theory_seq::is_nth(expr* e) const {
return is_skolem(m_nth, e);
}
bool theory_seq::is_nth(expr* e, expr*& e1, expr*& e2) const {
if (is_nth(e)) {
e1 = to_app(e)->get_arg(0);
e2 = to_app(e)->get_arg(1);
return true;
}
else {
return false;
}
}
bool theory_seq::is_tail(expr* e, expr*& s, unsigned& idx) const {
rational r;
return
@ -1038,6 +1050,10 @@ expr_ref theory_seq::mk_nth(expr* s, expr* idx) {
return mk_skolem(m_nth, s, idx, 0, char_sort);
}
expr_ref theory_seq::mk_sk_ite(expr* c, expr* t, expr* e) {
return mk_skolem(symbol("seq.if"), c, t, e, m.get_sort(t));
}
expr_ref theory_seq::mk_last(expr* s) {
zstring str;
if (m_util.str.is_string(s, str) && str.length() > 0) {
@ -1133,7 +1149,7 @@ bool theory_seq::check_extensionality() {
continue;
}
TRACE("seq", tout << m_lhs << " = " << m_rhs << "\n";);
ctx.assume_eq(n1, n2);
ctx.assume_eq(n1, n2);
return false;
}
}
@ -2668,6 +2684,13 @@ expr_ref theory_seq::expand(expr* e0, dependency*& eqs) {
}
else if (m.is_ite(e, e1, e2, e3)) {
literal lit(mk_literal(e1));
#if 0
expr_ref sk_ite = mk_sk_ite(e1, e2, e3);
add_axiom(~lit, mk_eq(e2, sk_ite, false));
add_axiom( lit, mk_eq(e3, sk_ite, false));
result = sk_ite;
#else
switch (ctx.get_assignment(lit)) {
case l_true:
deps = m_dm.mk_join(deps, m_dm.mk_leaf(assumption(lit)));
@ -2684,6 +2707,7 @@ expr_ref theory_seq::expand(expr* e0, dependency*& eqs) {
tout << lit << "@ level: " << ctx.get_scope_level() << "\n";);
break;
}
#endif
}
else if (m_util.str.is_itos(e, e1)) {
rational val;