mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-24 19:06:21 +00:00
Code Activity

Refactor smt_context to use structured bindings for pair decomposition (#8385)

Browse source 
* Initial plan

* Refactor smt_context.cpp to use C++17 structured bindings for pair patterns

- Replace .first/.second access with structured bindings in reset_tmp_clauses()
- Replace .first/.second access with structured bindings in decide_clause()
- Replace .first/.second access with structured bindings in init_assumptions()
- Eliminate 3 intermediate variable assignments
- 4 refactoring sites across 3 functions
- Verified successful compilation and all tests pass

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
Copilot 2026-01-27 11:47:31 -08:00 • committed by GitHub
parent ffa8ef4cee
commit ea1ebdeae0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/smt/smt_context.cpp
View file

@ -3336,16 +3336,15 @@ namespace smt {
} }
void context::reset_tmp_clauses() { void context::reset_tmp_clauses() {
for (auto& p : m_tmp_clauses) { for (auto& [clausep, lits] : m_tmp_clauses) {
if (p.first) del_clause(false, p.first); if (clausep) del_clause(false, clausep);
} }
m_tmp_clauses.reset(); m_tmp_clauses.reset();
} }
lbool context::decide_clause() { lbool context::decide_clause() {
if (m_tmp_clauses.empty()) return l_true; if (m_tmp_clauses.empty()) return l_true;
for (auto & tmp_clause : m_tmp_clauses) { for (auto & [clausep, lits] : m_tmp_clauses) {
literal_vector& lits = tmp_clause.second;
literal unassigned = null_literal; literal unassigned = null_literal;
for (literal l : lits) { for (literal l : lits) {
switch (get_assignment(l)) { switch (get_assignment(l)) {
@ -3369,7 +3368,7 @@ namespace smt {
set_conflict(b_justification(), ~lits[0]); set_conflict(b_justification(), ~lits[0]);
} }
else { else {
set_conflict(b_justification(tmp_clause.first), null_literal); set_conflict(b_justification(clausep), null_literal);
} }
VERIFY(!resolve_conflict()); VERIFY(!resolve_conflict());
return l_false; return l_false;
@ -3397,11 +3396,9 @@ namespace smt {
push_scope(); push_scope();
vector<std::pair<expr*,expr_ref>> asm2proxy; vector<std::pair<expr*,expr_ref>> asm2proxy;
internalize_proxies(asms, asm2proxy); internalize_proxies(asms, asm2proxy);
for (auto const& p: asm2proxy) { for (auto const& [orig_assumption, curr_assumption] : asm2proxy) {
if (inconsistent()) if (inconsistent())
break; break;
expr_ref curr_assumption = p.second;
expr* orig_assumption = p.first;
if (m.is_true(curr_assumption)) continue; if (m.is_true(curr_assumption)) continue;
SASSERT(is_valid_assumption(m, curr_assumption)); SASSERT(is_valid_assumption(m, curr_assumption));
proof * pr = m.mk_asserted(curr_assumption); proof * pr = m.mk_asserted(curr_assumption);