From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 19/27] Convert explicit iterator uses to foreach
Date: Fri, 20 Jan 2023 14:46:10 -0700 [thread overview]
Message-ID: <20230120214618.3236224-20-tom@tromey.com> (raw)
In-Reply-To: <20230120214618.3236224-1-tom@tromey.com>
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(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 4d2873cfde4..b5e9f2ecff6 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -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)
{
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 678cbcd5c44..e7d565bcd77 100644
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -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,
diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c
index c9d847a4d60..02b7a48be37 100644
--- a/gdb/guile/scm-block.c
+++ b/gdb/guile/scm-block.c
@@ -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);
--
2.39.0
next prev parent reply other threads:[~2023-01-20 21:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 21:45 [PATCH 00/27] C++-ify struct block Tom Tromey
2023-01-20 21:45 ` [PATCH 01/27] Rearrange block.c to avoid a forward declaration Tom Tromey
2023-01-20 21:45 ` [PATCH 02/27] Avoid extra allocations in block Tom Tromey
2023-01-20 21:45 ` [PATCH 03/27] Don't allow NULL as an argument to block_scope Tom Tromey
2023-01-20 21:45 ` [PATCH 04/27] Don't allow NULL as an argument to block_using Tom Tromey
2023-01-20 21:45 ` [PATCH 05/27] Don't allow NULL as an argument to block_static_block Tom Tromey
2023-01-20 21:45 ` [PATCH 06/27] Don't allow NULL as an argument to block_global_block Tom Tromey
2023-01-20 21:45 ` [PATCH 07/27] Convert block_objfile to method Tom Tromey
2023-01-20 21:45 ` [PATCH 08/27] Convert block_gdbarch " Tom Tromey
2023-01-20 21:46 ` [PATCH 09/27] Convert block_inlined_p " Tom Tromey
2023-01-20 21:46 ` [PATCH 10/27] Convert more block functions to methods Tom Tromey
2023-01-20 21:46 ` [PATCH 11/27] Convert block_linkage_function to method Tom Tromey
2023-01-20 21:46 ` [PATCH 12/27] Convert block_containing_function " Tom Tromey
2023-01-20 21:46 ` [PATCH 13/27] Convert block_static_block and block_global_block to methods Tom Tromey
2023-01-20 21:46 ` [PATCH 14/27] Convert set_block_compunit_symtab to method Tom Tromey
2023-01-20 21:46 ` [PATCH 15/27] Convert block_static_link " Tom Tromey
2023-01-20 21:46 ` [PATCH 16/27] Store 'name' in block_iterator Tom Tromey
2023-01-20 21:46 ` [PATCH 17/27] Combine both styles of block iterator Tom Tromey
2023-01-20 21:46 ` [PATCH 18/27] Introduce a block iterator wrapper Tom Tromey
2023-01-20 21:46 ` Tom Tromey [this message]
2023-01-20 21:46 ` [PATCH 20/27] Remove ALL_BLOCK_SYMBOLS_WITH_NAME Tom Tromey
2023-01-20 21:46 ` [PATCH 21/27] Remove ALL_BLOCK_SYMBOLS Tom Tromey
2023-01-20 21:46 ` [PATCH 22/27] Fix memory leak in mdebugread.c Tom Tromey
2023-01-20 21:46 ` [PATCH 23/27] Use 'new' for block and global_block Tom Tromey
2023-01-20 21:46 ` [PATCH 24/27] Have global_block inherit from block Tom Tromey
2023-01-20 21:46 ` [PATCH 25/27] Remove allocate_block and allocate_global_block Tom Tromey
2023-01-20 21:46 ` [PATCH 26/27] Make block members 'private' Tom Tromey
2023-01-20 21:46 ` [PATCH 27/27] Convert contained_in to method Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120214618.3236224-20-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).