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

prepare for theory variables othe rthan seq/re

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-07-25 15:11:13 -07:00
parent f789573d12
commit 2133ba06a7
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/smt/theory_seq.cpp
View file

@ -2351,21 +2351,20 @@ void theory_seq::validate_fmls(enode_pair_vector const& eqs, literal_vector cons
} }
theory_var theory_seq::mk_var(enode* n) { theory_var theory_seq::mk_var(enode* n) {
if (!m_util.is_seq(n->get_owner()) && expr* o = n->get_owner();
!m_util.is_re(n->get_owner())) {
if (!m_util.is_seq(o) && !m_util.is_re(o))
return null_theory_var; return null_theory_var;
}
if (is_attached_to_var(n)) { if (is_attached_to_var(n))
return n->get_th_var(get_id()); return n->get_th_var(get_id());
}
else {
theory_var v = theory::mk_var(n); theory_var v = theory::mk_var(n);
m_find.mk_var(); m_find.mk_var();
ctx.attach_th_var(n, this, v); ctx.attach_th_var(n, this, v);
ctx.mark_as_relevant(n); ctx.mark_as_relevant(n);
return v; return v;
} }
}
bool theory_seq::can_propagate() { bool theory_seq::can_propagate() {
return m_axioms_head < m_axioms.size() || !m_replay.empty() || m_new_solution || m_unicode.can_propagate() || m_regex.can_propagate(); return m_axioms_head < m_axioms.size() || !m_replay.empty() || m_new_solution || m_unicode.can_propagate() || m_regex.can_propagate();
@ -3180,12 +3179,16 @@ void theory_seq::assign_eh(bool_var v, bool is_true) {
void theory_seq::new_eq_eh(theory_var v1, theory_var v2) { void theory_seq::new_eq_eh(theory_var v1, theory_var v2) {
enode* n1 = get_enode(v1); enode* n1 = get_enode(v1);
enode* n2 = get_enode(v2); enode* n2 = get_enode(v2);
if (ctx.get_fparams().m_seq_use_unicode && m_util.is_char(n1->get_owner())) { expr* o1 = n1->get_owner();
expr* o2 = n2->get_owner();
if (ctx.get_fparams().m_seq_use_unicode && m_util.is_char(o1)) {
m_unicode.new_eq_eh(v1, v2); m_unicode.new_eq_eh(v1, v2);
return; return;
} }
if (ctx.get_fparams().m_seq_use_derivatives && m_util.is_re(n1->get_owner())) { if (!m_util.is_seq(o1) && !m_util.is_re(o1))
m_regex.propagate_eq(n1->get_owner(), n2->get_owner()); return;
if (ctx.get_fparams().m_seq_use_derivatives && m_util.is_re(o1)) {
m_regex.propagate_eq(o1, o2);
return; return;
} }
@ -3290,6 +3293,8 @@ void theory_seq::new_diseq_eh(theory_var v1, theory_var v2) {
m_unicode.new_diseq_eh(v1, v2); m_unicode.new_diseq_eh(v1, v2);
return; return;
} }
if (!m_util.is_seq(e1))
return;
m_exclude.update(e1, e2); m_exclude.update(e1, e2);
expr_ref eq(m.mk_eq(e1, e2), m); expr_ref eq(m.mk_eq(e1, e2), m);
TRACE("seq", tout << "new disequality " << ctx.get_scope_level() << ": " << mk_bounded_pp(eq, m, 2) << "\n";); TRACE("seq", tout << "new disequality " << ctx.get_scope_level() << ": " << mk_bounded_pp(eq, m, 2) << "\n";);