Skip to content

Commit 93cf989

Browse files
household chores - move to iterators
1 parent dee3cf8 commit 93cf989

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

src/tactic/arith/degree_shift_tactic.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,8 @@ class degree_shift_tactic : public tactic {
169169
void collect(goal const & g) {
170170
m_var2degree.reset();
171171
expr_fast_mark1 visited;
172-
unsigned sz = g.size();
173-
for (unsigned i = 0; i < sz; i++) {
174-
collect(g.form(i), visited);
175-
}
172+
for (auto [f, d, p] : g)
173+
collect(f, visited);
176174

177175
TRACE("degree_shift", display_candidates(tout););
178176
}

src/tactic/arith/fix_dl_var_tactic.cpp

+8-12
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,8 @@ class fix_dl_var_tactic : public tactic {
216216
try {
217217
expr_fast_mark1 visited;
218218
flet<expr_fast_mark1*> _visited(m_visited, &visited);
219-
unsigned sz = g.size();
220-
for (unsigned i = 0; i < sz; i++) {
221-
process(g.form(i));
222-
}
219+
for (auto [f, d, p] : g)
220+
process(f);
223221
return most_occs();
224222
}
225223
catch (const failed &) {
@@ -268,15 +266,13 @@ class fix_dl_var_tactic : public tactic {
268266

269267
expr_ref new_curr(m);
270268
proof_ref new_pr(m);
271-
unsigned size = g->size();
272-
for (unsigned idx = 0; !g->inconsistent() && idx < size; idx++) {
273-
expr * curr = g->form(idx);
269+
unsigned idx = 0;
270+
for (auto [curr, d, p] : *g) {
271+
if (g->inconsistent())
272+
break;
274273
m_rw(curr, new_curr, new_pr);
275-
if (produce_proofs) {
276-
proof * pr = g->pr(idx);
277-
new_pr = m.mk_modus_ponens(pr, new_pr);
278-
}
279-
g->update(idx, new_curr, new_pr, g->dep(idx));
274+
new_pr = m.mk_modus_ponens(p, new_pr);
275+
g->update(idx++, new_curr, new_pr, d);
280276
}
281277
g->inc_depth();
282278
}

0 commit comments

Comments
 (0)