diff mbox series

[18/27] Introduce a block iterator wrapper

Message ID	20230120214618.3236224-19-tom@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B38903858017 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 18/27] Introduce a block iterator wrapper Date: Fri, 20 Jan 2023 14:46:09 -0700 Message-Id: <20230120214618.3236224-19-tom@tromey.com> In-Reply-To: <20230120214618.3236224-1-tom@tromey.com> References: <20230120214618.3236224-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	C++-ify struct block \| [00/27] C++-ify struct block [01/27] Rearrange block.c to avoid a forward declaration [02/27] Avoid extra allocations in block [03/27] Don't allow NULL as an argument to block_scope [04/27] Don't allow NULL as an argument to block_using [05/27] Don't allow NULL as an argument to block_static_block [06/27] Don't allow NULL as an argument to block_global_block [07/27] Convert block_objfile to method [08/27] Convert block_gdbarch to method [09/27] Convert block_inlined_p to method [10/27] Convert more block functions to methods [11/27] Convert block_linkage_function to method [12/27] Convert block_containing_function to method [13/27] Convert block_static_block and block_global_block to methods [14/27] Convert set_block_compunit_symtab to method [15/27] Convert block_static_link to method [16/27] Store 'name' in block_iterator [17/27] Combine both styles of block iterator [18/27] Introduce a block iterator wrapper [19/27] Convert explicit iterator uses to foreach [20/27] Remove ALL_BLOCK_SYMBOLS_WITH_NAME [21/27] Remove ALL_BLOCK_SYMBOLS [22/27] Fix memory leak in mdebugread.c [23/27] Use 'new' for block and global_block [24/27] Have global_block inherit from block [25/27] Remove allocate_block and allocate_global_block [26/27] Make block members 'private' [27/27] Convert contained_in to method

Commit Message

Tom Tromey Jan. 20, 2023, 9:46 p.m. UTC

  This introduces a C++-style iterator that wraps the existing
block_iterator.  It also adds a range adapter.  These will be used in
a later patch.
---
 gdb/block.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff mbox series

Patch

diff --git a/gdb/block.h b/gdb/block.h
index 03aeebddc6b..7341d03a07e 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -486,6 +486,56 @@  extern struct symbol *block_iterator_first
 
 extern struct symbol *block_iterator_next (struct block_iterator *iterator);
 
+/* An iterator that wraps a block_iterator.  The naming here is
+   unfortunate, but block_iterator was named before gdb switched to
+   C++.  */
+struct block_iterator_wrapper
+{
+  typedef block_iterator_wrapper self_type;
+  typedef struct symbol *value_type;
+
+  explicit block_iterator_wrapper (const struct block *block,
+				   const lookup_name_info *name = nullptr)
+    : m_sym (block_iterator_first (block, &m_iter, name))
+  {
+  }
+
+  block_iterator_wrapper ()
+    : m_sym (nullptr)
+  {
+  }
+
+  value_type operator* () const
+  {
+    return m_sym;
+  }
+
+  bool operator== (const self_type &other) const
+  {
+    return m_sym == other.m_sym;
+  }
+
+  bool operator!= (const self_type &other) const
+  {
+    return m_sym != other.m_sym;
+  }
+
+  self_type &operator++ ()
+  {
+    m_sym = block_iterator_next (&m_iter);
+    return *this;
+  }
+
+private:
+
+  struct symbol *m_sym;
+  struct block_iterator m_iter;
+};
+
+/* An iterator range for block_iterator_wrapper.  */
+
+typedef iterator_range<block_iterator_wrapper> block_iterator_range;
+
 /* Return true if symbol A is the best match possible for DOMAIN.  */
 
 extern bool best_symbol (struct symbol *a, const domain_enum domain);