Skip to content

Commit 02ebaee

Browse files
author
Daniel Kroening
committed
use ranged for over parameters
1 parent d54d101 commit 02ebaee

File tree

3 files changed

+14
-34
lines changed

3 files changed

+14
-34
lines changed

src/util/find_symbols.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,10 @@ void find_symbols(kindt kind, const typet &src, find_symbols_sett &dest)
151151
{
152152
const code_typet &code_type=to_code_type(src);
153153
find_symbols(kind, code_type.return_type(), dest);
154-
const code_typet::parameterst &parameters=code_type.parameters();
155154

156-
for(code_typet::parameterst::const_iterator
157-
it=parameters.begin();
158-
it!=parameters.end();
159-
it++)
155+
for(const auto &p : code_type.parameters())
160156
{
161-
find_symbols(kind, *it, dest);
157+
find_symbols(kind, p, dest);
162158

163159
// irep_idt identifier=it->get_identifier();
164160
// if(!identifier.empty() && (kind==F_TYPE || kind==F_BOTH))

src/util/rename_symbol.cpp

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,17 @@ bool rename_symbolt::rename(typet &dest) const
151151
{
152152
code_typet &code_type=to_code_type(dest);
153153
rename(code_type.return_type());
154-
code_typet::parameterst &parameters=code_type.parameters();
155154

156-
for(code_typet::parameterst::iterator it = parameters.begin();
157-
it!=parameters.end();
158-
it++)
155+
for(auto &p : code_type.parameters())
159156
{
160-
if(!rename(it->type()))
157+
if(!rename(p.type()))
161158
result=false;
162159

163-
expr_mapt::const_iterator e_it=
164-
expr_map.find(it->get_identifier());
160+
expr_mapt::const_iterator e_it = expr_map.find(p.get_identifier());
165161

166162
if(e_it!=expr_map.end())
167163
{
168-
it->set_identifier(e_it->second);
164+
p.set_identifier(e_it->second);
169165
result=false;
170166
}
171167
}
@@ -239,17 +235,12 @@ bool rename_symbolt::have_to_rename(const typet &dest) const
239235
if(have_to_rename(code_type.return_type()))
240236
return true;
241237

242-
const code_typet::parameterst &parameters=code_type.parameters();
243-
244-
for(code_typet::parameterst::const_iterator
245-
it=parameters.begin();
246-
it!=parameters.end();
247-
it++)
238+
for(const auto &p : code_type.parameters())
248239
{
249-
if(have_to_rename(it->type()))
240+
if(have_to_rename(p.type()))
250241
return true;
251242

252-
if(expr_map.find(it->get_identifier())!=expr_map.end())
243+
if(expr_map.find(p.get_identifier()) != expr_map.end())
253244
return true;
254245
}
255246
}

src/util/replace_symbol.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,9 @@ bool replace_symbolt::replace(typet &dest) const
180180
code_typet &code_type=to_code_type(dest);
181181
if(!replace(code_type.return_type()))
182182
result = false;
183-
code_typet::parameterst &parameters=code_type.parameters();
184-
for(code_typet::parameterst::iterator it = parameters.begin();
185-
it!=parameters.end();
186-
it++)
187-
if(!replace(*it))
183+
184+
for(auto &p : code_type.parameters())
185+
if(!replace(p))
188186
result=false;
189187
}
190188
else if(dest.id()==ID_array)
@@ -232,13 +230,8 @@ bool replace_symbolt::have_to_replace(const typet &dest) const
232230
if(have_to_replace(code_type.return_type()))
233231
return true;
234232

235-
const code_typet::parameterst &parameters=code_type.parameters();
236-
237-
for(code_typet::parameterst::const_iterator
238-
it=parameters.begin();
239-
it!=parameters.end();
240-
it++)
241-
if(have_to_replace(*it))
233+
for(const auto &p : code_type.parameters())
234+
if(have_to_replace(p))
242235
return true;
243236
}
244237
else if(dest.id()==ID_array)

0 commit comments

Comments
 (0)