mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-15 03:25:43 +00:00
Code Activity

Add constant-bound conflict shortcut for string lt constraints

Browse source
This commit is contained in:
copilot-swe-agent[bot] 2026-07-13 05:09:27 +00:00 • committed by GitHub
parent be7e8d7820
commit d8726d652e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/smt/theory_seq.cpp
View file

@ -696,9 +696,9 @@ bool theory_seq::check_lts() {
literal eq = (b == c) ? true_literal : mk_eq(b, c, false); literal eq = (b == c) ? true_literal : mk_eq(b, c, false);
bool is_strict = is_strict1 || is_strict2; bool is_strict = is_strict1 || is_strict2;
zstring sa, sd; zstring bound_a, bound_d;
if (m_util.str.is_string(a, sa) && m_util.str.is_string(d, sd)) { if (m_util.str.is_string(a, bound_a) && m_util.str.is_string(d, bound_d)) {
bool ok = is_strict ? sa < sd : !(sd < sa); bool ok = is_strict ? bound_a < bound_d : !(bound_d < bound_a);
if (!ok) { if (!ok) {
add_axiom(~r1, ~r2, ~eq); add_axiom(~r1, ~r2, ~eq);
} }
@ -3164,15 +3164,17 @@ void theory_seq::assign_eh(bool_var v, bool is_true) {
else if (m_util.str.is_lt(e) || m_util.str.is_le(e)) { else if (m_util.str.is_lt(e) || m_util.str.is_le(e)) {
m_lts.push_back(e); m_lts.push_back(e);
expr* a = nullptr, *b = nullptr; expr* a = nullptr, *b = nullptr;
zstring c; zstring bound;
bool is_lower = false; bool is_lower = false;
expr* x = nullptr; expr* x = nullptr;
if (is_true && m_util.str.is_lt(e, a, b)) { if (is_true && m_util.str.is_lt(e, a, b)) {
if (m_util.str.is_string(a, c) && !m_util.str.is_string(b)) { // is_lower=true encodes c < x (c is a lower bound on x)
// is_lower=false encodes x < c (c is an upper bound on x)
if (m_util.str.is_string(a, bound) && !m_util.str.is_string(b)) {
is_lower = true; is_lower = true;
x = b; x = b;
} }
else if (!m_util.str.is_string(a) && m_util.str.is_string(b, c)) { else if (!m_util.str.is_string(a) && m_util.str.is_string(b, bound)) {
is_lower = false; is_lower = false;
x = a; x = a;
} }
@ -3183,30 +3185,41 @@ void theory_seq::assign_eh(bool_var v, bool is_true) {
if (p == e) if (p == e)
continue; continue;
expr* pa = nullptr, *pb = nullptr; expr* pa = nullptr, *pb = nullptr;
zstring pc; zstring p_bound;
bool p_is_lower = false; bool p_is_lower = false;
expr* px = nullptr; expr* px = nullptr;
if (!m_util.str.is_lt(p, pa, pb)) if (!m_util.str.is_lt(p, pa, pb))
continue; continue;
literal p_lit = ctx.get_literal(p); literal p_lit = ctx.get_literal(p);
if (p_lit == true_literal || p_lit == false_literal || ctx.get_assignment(p_lit) != l_true) // Skip trivial literals: they are not tracked by a bool variable and
// cannot participate in a conflict justification as assumptions.
if (p_lit == true_literal || p_lit == false_literal)
continue; continue;
if (m_util.str.is_string(pa, pc) && !m_util.str.is_string(pb)) { if (ctx.get_assignment(p_lit) != l_true)
continue;
if (m_util.str.is_string(pa, p_bound) && !m_util.str.is_string(pb)) {
p_is_lower = true; p_is_lower = true;
px = pb; px = pb;
} }
else if (!m_util.str.is_string(pa) && m_util.str.is_string(pb, pc)) { else if (!m_util.str.is_string(pa) && m_util.str.is_string(pb, p_bound)) {
p_is_lower = false; p_is_lower = false;
px = pa; px = pa;
} }
if (!px || p_is_lower == is_lower || !ctx.get_enode(px)) if (!px)
continue;
if (p_is_lower == is_lower)
continue;
if (!ctx.get_enode(px))
continue; continue;
if (ctx.get_enode(px)->get_root() != x_root) if (ctx.get_enode(px)->get_root() != x_root)
continue; continue;
zstring const& lower = is_lower ? c : pc; zstring const& lower = is_lower ? bound : p_bound;
zstring const& upper = is_lower ? pc : c; zstring const& upper = is_lower ? p_bound : bound;
if (!(lower < upper)) { if (!(lower < upper)) {
literal_vector lits; literal_vector lits;
// set_conflict expects currently true assumptions.
// `lit` is true because assign_eh was invoked with is_true,
// and `p_lit` is filtered above to assignment l_true.
lits.push_back(lit); lits.push_back(lit);
lits.push_back(p_lit); lits.push_back(p_lit);
set_conflict(nullptr, lits); set_conflict(nullptr, lits);

1
src/test/seq_rewriter.cpp
View file

@ -257,6 +257,7 @@ void tst_seq_rewriter() {
// 20. unsat: contradictory constant lexical bounds. // 20. unsat: contradictory constant lexical bounds.
// "2024-01-01" < x < "2024-12-31" and x < "2023-01-01". // "2024-01-01" < x < "2024-12-31" and x < "2023-01-01".
// Since "2023-01-01" < "2024-01-01", no such x exists.
{ {
smt_params sp; smt_params sp;
smt::context ctx(m, sp); smt::context ctx(m, sp);