From 9efb0e079456414a60cc40d0f9f7f10589e97ad1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Feb 2026 01:27:08 +0000 Subject: [PATCH] Add initializer_list overloads and update all call sites Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com> --- src/ast/ast.h | 12 ++++++++++++ src/smt/dyn_ack.cpp | 6 ++---- src/smt/smt_conflict_resolution.cpp | 4 +--- src/smt/smt_internalizer.cpp | 3 +-- src/tactic/goal.cpp | 12 ++++-------- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/ast/ast.h b/src/ast/ast.h index 6e5ce8c78..0f3bcc022 100644 --- a/src/ast/ast.h +++ b/src/ast/ast.h @@ -2361,6 +2361,12 @@ public: proof * mk_transitivity(proof * p1, proof * p2, proof * p3, proof * p4); proof * mk_transitivity(unsigned num_proofs, proof * const * proofs); proof * mk_transitivity(unsigned num_proofs, proof * const * proofs, expr * n1, expr * n2); + proof * mk_transitivity(std::initializer_list const& proofs) { + return mk_transitivity(proofs.size(), proofs.begin()); + } + proof * mk_transitivity(std::initializer_list const& proofs, expr * n1, expr * n2) { + return mk_transitivity(proofs.size(), proofs.begin(), n1, n2); + } proof * mk_monotonicity(func_decl * R, app * f1, app * f2, unsigned num_proofs, proof * const * proofs); proof * mk_congruence(app * f1, app * f2, unsigned num_proofs, proof * const * proofs); proof * mk_oeq_congruence(app * f1, app * f2, unsigned num_proofs, proof * const * proofs); @@ -2391,6 +2397,12 @@ public: proof * mk_def_axiom(expr * ax); proof * mk_unit_resolution(unsigned num_proofs, proof * const * proofs); proof * mk_unit_resolution(unsigned num_proofs, proof * const * proofs, expr * new_fact); + proof * mk_unit_resolution(std::initializer_list const& proofs) { + return mk_unit_resolution(proofs.size(), proofs.begin()); + } + proof * mk_unit_resolution(std::initializer_list const& proofs, expr * new_fact) { + return mk_unit_resolution(proofs.size(), proofs.begin(), new_fact); + } proof * mk_hypothesis(expr * h); proof * mk_lemma(proof * p, expr * lemma); diff --git a/src/smt/dyn_ack.cpp b/src/smt/dyn_ack.cpp index 3779911cd..a2a96e8a4 100644 --- a/src/smt/dyn_ack.cpp +++ b/src/smt/dyn_ack.cpp @@ -89,8 +89,7 @@ namespace smt { app_ref eq(m.mk_eq(m_app1, m_app2), m); proof_ref a1(m.mk_congruence(m_app1, m_app2, prs.size(), prs.data()), m); proof_ref a2(mk_hypothesis(m, eq, true, m_app1, m_app2), m); - proof * antecedents[2] = { a1.get(), a2.get() }; - proof_ref false_pr(m.mk_unit_resolution(2, antecedents), m); + proof_ref false_pr(m.mk_unit_resolution({ a1.get(), a2.get() }), m); lits.push_back(eq); SASSERT(lits.size() >= 2); app_ref lemma(m.mk_or(lits), m); @@ -152,8 +151,7 @@ namespace smt { if (m.get_fact(p3) != m_eq3) p3 = m.mk_symmetry(p3); SASSERT(m.get_fact(p3) == m_eq3); p4 = m.mk_hypothesis(m.mk_not(m_eq3)); - proof* ps[2] = { p3, p4 }; - p5 = m.mk_unit_resolution(2, ps); + p5 = m.mk_unit_resolution({ p3, p4 }); SASSERT(m.get_fact(p5) == m.mk_false()); expr_ref conclusion(m.mk_or(m.mk_not(m_eq1), m.mk_not(m_eq2), m_eq3), m); p6 = m.mk_lemma(p5, conclusion); diff --git a/src/smt/smt_conflict_resolution.cpp b/src/smt/smt_conflict_resolution.cpp index a578b553d..88f6ceedc 100644 --- a/src/smt/smt_conflict_resolution.cpp +++ b/src/smt/smt_conflict_resolution.cpp @@ -1333,9 +1333,7 @@ namespace smt { } else { pr = get_proof(consequent, conflict); - proof * prs[2] = { m_lit2proof[not_l], pr}; - SASSERT(prs[0] && prs[1]); - pr = m.mk_unit_resolution(2, prs); + pr = m.mk_unit_resolution({ m_lit2proof[not_l], pr }); } expr_ref_buffer lits(m); for (literal lit : m_lemma) { diff --git a/src/smt/smt_internalizer.cpp b/src/smt/smt_internalizer.cpp index dce34a366..8889409c2 100644 --- a/src/smt/smt_internalizer.cpp +++ b/src/smt/smt_internalizer.cpp @@ -1656,8 +1656,7 @@ namespace smt { proof * def = mk_clause_def_axiom(num_lits, lits, m.get_fact(pr)); TRACE(gate_clause, tout << mk_ll_pp(def, m) << "\n"; tout << mk_ll_pp(pr, m);); - proof * prs[2] = { def, pr }; - pr = m.mk_unit_resolution(2, prs); + pr = m.mk_unit_resolution({ def, pr }); } mk_clause(num_lits, lits, mk_justification(justification_proof_wrapper(*this, pr))); } diff --git a/src/tactic/goal.cpp b/src/tactic/goal.cpp index 63d5e2ddc..a15298ac8 100644 --- a/src/tactic/goal.cpp +++ b/src/tactic/goal.cpp @@ -549,10 +549,8 @@ void goal::elim_redundancies() { continue; if (pos_lits.is_marked(atom)) { proof * p = nullptr; - if (proofs_enabled()) { - proof * prs[2] = { pr(get_idx(atom)), pr(i) }; - p = m().mk_unit_resolution(2, prs); - } + if (proofs_enabled()) + p = m().mk_unit_resolution({ pr(get_idx(atom)), pr(i) }); expr_dependency_ref d(m()); if (unsat_core_enabled()) d = m().mk_join(dep(get_idx(atom)), dep(i)); @@ -566,10 +564,8 @@ void goal::elim_redundancies() { continue; if (neg_lits.is_marked(f)) { proof * p = nullptr; - if (proofs_enabled()) { - proof * prs[2] = { pr(get_not_idx(f)), pr(i) }; - p = m().mk_unit_resolution(2, prs); - } + if (proofs_enabled()) + p = m().mk_unit_resolution({ pr(get_not_idx(f)), pr(i) }); expr_dependency_ref d(m()); if (unsat_core_enabled()) d = m().mk_join(dep(get_not_idx(f)), dep(i));