Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Convert explicit iterator uses to foreach

Browse Source 
This converts most existing explicit uses of block_iterator to use
foreach with the range iterator instead.
This commit is contained in:
Tom Tromey
2023-01-19 20:14:25 -07:00
parent 0f50815c89
commit 1c49bb455c
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ada-lang.c
View File

@@ -6070,18 +6070,14 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
const lookup_name_info &lookup_name, const lookup_name_info &lookup_name,
domain_enum domain, struct objfile *objfile) domain_enum domain, struct objfile *objfile)
{ {
struct block_iterator iter;
/* A matching argument symbol, if any. */ /* A matching argument symbol, if any. */
struct symbol *arg_sym; struct symbol *arg_sym;
/* Set true when we find a matching non-argument symbol. */ /* Set true when we find a matching non-argument symbol. */
bool found_sym; bool found_sym;
struct symbol *sym;
arg_sym = NULL; arg_sym = NULL;
found_sym = false; found_sym = false;
for (sym = block_iterator_first (block, &iter, &lookup_name); for (struct symbol *sym : block_iterator_range (block, &lookup_name))
sym != NULL;
sym = block_iterator_next (&iter))
{ {
if (symbol_matches_domain (sym->language (), sym->domain (), domain)) if (symbol_matches_domain (sym->language (), sym->domain (), domain))
{ {
@@ -6115,6 +6111,8 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
const std::string &ada_lookup_name = lookup_name.ada ().lookup_name (); const std::string &ada_lookup_name = lookup_name.ada ().lookup_name ();
const char *name = ada_lookup_name.c_str (); const char *name = ada_lookup_name.c_str ();
size_t name_len = ada_lookup_name.size (); size_t name_len = ada_lookup_name.size ();
struct symbol *sym;
struct block_iterator iter;
ALL_BLOCK_SYMBOLS (block, iter, sym) ALL_BLOCK_SYMBOLS (block, iter, sym)
{ {

7
gdb/compile/compile-c-symbols.c
View File

@@ -633,14 +633,9 @@ generate_c_for_variable_locations (compile_instance *compiler,
while (1) while (1)
{ {
struct symbol *sym;
struct block_iterator iter;
/* Iterate over symbols in this block, generating code to /* Iterate over symbols in this block, generating code to
compute the location of each local variable. */ compute the location of each local variable. */
for (sym = block_iterator_first (block, &iter); for (struct symbol *sym : block_iterator_range (block))
sym != NULL;
sym = block_iterator_next (&iter))
{ {
if (!symbol_seen (symhash.get (), sym)) if (!symbol_seen (symhash.get (), sym))
generate_c_for_for_one_variable (compiler, stream, gdbarch, generate_c_for_for_one_variable (compiler, stream, gdbarch,

7
gdb/guile/scm-block.c
View File

@@ -501,20 +501,15 @@ gdbscm_block_symbols (SCM self)
block_smob *b_smob block_smob *b_smob
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); = bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
const struct block *block = b_smob->block; const struct block *block = b_smob->block;
struct block_iterator iter;
struct symbol *sym;
SCM result; SCM result;
result = SCM_EOL; result = SCM_EOL;
sym = block_iterator_first (block, &iter); for (struct symbol *sym : block_iterator_range (block))
while (sym != NULL)
{ {
SCM s_scm = syscm_scm_from_symbol (sym); SCM s_scm = syscm_scm_from_symbol (sym);
result = scm_cons (s_scm, result); result = scm_cons (s_scm, result);
sym = block_iterator_next (&iter);
} }
return scm_reverse_x (result, SCM_EOL); return scm_reverse_x (result, SCM_EOL);