New macro ALL_BLOCK_SYMBOLS_WITH_NAME.

gdb/ChangeLog:

	* block.h (ALL_BLOCK_SYMBOLS_WITH_NAME): New macro.
	* block.c (block_lookup_symbol): Use it.
	* cp-support.c (make_symbol_overload_list_block): Use it.
	* symtab.c (iterate_over_symbols): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc78a6a44ece285920125015d06a0b06d9a2429a..d6125d71c3d4dcdcc2075f425830dd157532ac95 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-06  Doug Evans  <xdje42@gmail.com>
+
+       * block.h (ALL_BLOCK_SYMBOLS_WITH_NAME): New macro.
+       * block.c (block_lookup_symbol): Use it.
+       * cp-support.c (make_symbol_overload_list_block): Use it.
+       * symtab.c (iterate_over_symbols): Use it.
+
 2014-11-06  Doug Evans  <xdje42@gmail.com>
 
        * symtab.c (lookup_block_symbol): Moved to ...

diff --git a/gdb/block.c b/gdb/block.c
index 3bb9de0cbaaa0139daec687d42f769e71321d7a6..1cb98751f6429f92b6c9db6af63f2d9d2b24e0cd 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -706,9 +706,7 @@ block_lookup_symbol (const struct block *block, const char *name,
 
   if (!BLOCK_FUNCTION (block))
     {
-      for (sym = block_iter_name_first (block, name, &iter);
-          sym != NULL;
-          sym = block_iter_name_next (name, &iter))
+      ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
        {
          if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
                                     SYMBOL_DOMAIN (sym), domain))
@@ -726,9 +724,7 @@ block_lookup_symbol (const struct block *block, const char *name,
 
       struct symbol *sym_found = NULL;
 
-      for (sym = block_iter_name_first (block, name, &iter);
-          sym != NULL;
-          sym = block_iter_name_next (name, &iter))
+      ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
        {
          if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
                                     SYMBOL_DOMAIN (sym), domain))

diff --git a/gdb/block.h b/gdb/block.h
index e8d34528ecdb0948f1baaac36f9a028b8d96c43c..50a79198969538ee6b957e2490d50701cc864570 100644 (file)
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -286,4 +286,13 @@ extern struct symbol *block_lookup_symbol (const struct block *block,
        (sym);                                          \
        (sym) = block_iterator_next (&(iter)))
 
+/* Macro to loop through all symbols with name NAME in BLOCK,
+   in no particular order.  ITER helps keep track of the iteration, and
+   must be a struct block_iterator.  SYM points to the current symbol.  */
+
+#define ALL_BLOCK_SYMBOLS_WITH_NAME(block, name, iter, sym)            \
+  for ((sym) = block_iter_name_first ((block), (name), &(iter));       \
+       (sym) != NULL;                                                  \
+       (sym) = block_iter_name_next ((name), &(iter)))
+
 #endif /* BLOCK_H */

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index d35920cf83c542dd7d4a5a7c1b3ffcc84152714f..72ffb5215988a5c7a6279be2ca91492c2d90fd72 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1218,9 +1218,7 @@ make_symbol_overload_list_block (const char *name,
   struct block_iterator iter;
   struct symbol *sym;
 
-  for (sym = block_iter_name_first (block, name, &iter);
-       sym != NULL;
-       sym = block_iter_name_next (name, &iter))
+  ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
     overload_list_add_symbol (sym, name);
 }
 

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 482a23dde68d7cadb707843216b7c440b32cccc9..9add71fdc760cf15738b1d51a7411785dc2d9aa8 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2031,9 +2031,7 @@ iterate_over_symbols (const struct block *block, const char *name,
   struct block_iterator iter;
   struct symbol *sym;
 
-  for (sym = block_iter_name_first (block, name, &iter);
-       sym != NULL;
-       sym = block_iter_name_next (name, &iter))
+  ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
     {
       if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
                                 SYMBOL_DOMAIN (sym), domain))