mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-03-20 11:55:49 +00:00
Code Activity

create sub-class for tracked eq and mem relations to separate from seq_nielsen

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2026-03-18 09:46:49 -07:00
parent e7431400b4
commit 8ac8eb4ae7
6 changed files with 65 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/smt/theory_nseq.cpp
View file

@ -282,7 +282,7 @@ namespace smt {
if (m_regex.is_empty_regex(mem.m_regex)) {
enode_pair_vector eqs;
literal_vector lits;
lits.push_back(mem.m_lit);
lits.push_back(mem.lit);
set_conflict(eqs, lits);
return;
}
@ -291,7 +291,7 @@ namespace smt {
if (mem.m_str->is_empty() && !mem.m_regex->is_nullable()) {
enode_pair_vector eqs;
literal_vector lits;
lits.push_back(mem.m_lit);
lits.push_back(mem.lit);
set_conflict(eqs, lits);
return;
}
@ -330,18 +330,18 @@ namespace smt {
continue; // trivially satisfied, skip
if (triv < 0) {
// trivially unsat: add anyway so solve() detects conflict
m_nielsen.add_str_mem(mem.m_str, mem.m_regex, mem.m_lit);
m_nielsen.add_str_mem(mem.m_str, mem.m_regex, mem.lit);
continue;
}
// pre-process: consume ground prefix characters
vector<seq::str_mem> processed;
if (!m_regex.process_str_mem(mem, processed)) {
// conflict during ground prefix consumption
m_nielsen.add_str_mem(mem.m_str, mem.m_regex, mem.m_lit);
m_nielsen.add_str_mem(mem.m_str, mem.m_regex, mem.lit);
continue;
}
for (auto const& pm : processed) {
m_nielsen.add_str_mem(pm.m_str, pm.m_regex, pm.m_lit);
m_nielsen.add_str_mem(pm.m_str, pm.m_regex, mem.lit);
}
}
@ -839,9 +839,9 @@ namespace smt {
literal_vector lits;
for (unsigned i : mem_indices) {
auto const &src = m_state.str_mems()[i];
SASSERT(ctx.get_assignment(src.m_lit) == l_true); // we already stored the polarity of the literal
SASSERT(ctx.get_assignment(src.lit) == l_true); // we already stored the polarity of the literal
lits.push_back(
src.m_lit);
src.lit);
}
TRACE(seq, tout << "nseq regex precheck: empty intersection for var "
<< var_id << ", conflict with " << lits.size() << " lits\n";);