This converts most existing explicit uses of block_iterator to use
foreach with the range iterator instead.
---
gdb/ada-lang.c | 8 +++-----
gdb/compile/compile-c-symbols.c | 7 +------
gdb/guile/scm-block.c | 7 +------
3 files changed, 5 insertions(+), 17 deletions(-)
@@ -6076,18 +6076,14 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
const lookup_name_info &lookup_name,
domain_enum domain, struct objfile *objfile)
{
- struct block_iterator iter;
/* A matching argument symbol, if any. */
struct symbol *arg_sym;
/* Set true when we find a matching non-argument symbol. */
bool found_sym;
- struct symbol *sym;
arg_sym = NULL;
found_sym = false;
- for (sym = block_iterator_first (block, &iter, &lookup_name);
- sym != NULL;
- sym = block_iterator_next (&iter))
+ for (struct symbol *sym : block_iterator_range (block, &lookup_name))
{
if (symbol_matches_domain (sym->language (), sym->domain (), domain))
{
@@ -6125,6 +6121,8 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
const std::string &ada_lookup_name = lookup_name.ada ().lookup_name ();
const char *name = ada_lookup_name.c_str ();
size_t name_len = ada_lookup_name.size ();
+ struct symbol *sym;
+ struct block_iterator iter;
ALL_BLOCK_SYMBOLS (block, iter, sym)
{
@@ -633,14 +633,9 @@ generate_c_for_variable_locations (compile_instance *compiler,
while (1)
{
- struct symbol *sym;
- struct block_iterator iter;
-
/* Iterate over symbols in this block, generating code to
compute the location of each local variable. */
- for (sym = block_iterator_first (block, &iter);
- sym != NULL;
- sym = block_iterator_next (&iter))
+ for (struct symbol *sym : block_iterator_range (block))
{
if (!symbol_seen (symhash.get (), sym))
generate_c_for_for_one_variable (compiler, stream, gdbarch,
@@ -501,20 +501,15 @@ gdbscm_block_symbols (SCM self)
block_smob *b_smob
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
const struct block *block = b_smob->block;
- struct block_iterator iter;
- struct symbol *sym;
SCM result;
result = SCM_EOL;
- sym = block_iterator_first (block, &iter);
-
- while (sym != NULL)
+ for (struct symbol *sym : block_iterator_range (block))
{
SCM s_scm = syscm_scm_from_symbol (sym);
result = scm_cons (s_scm, result);
- sym = block_iterator_next (&iter);
}
return scm_reverse_x (result, SCM_EOL);