From 6969f124b987494df069b032e2e0f36485d3d8bb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 12 Jul 2019 10:47:21 -0600 Subject: [PATCH] Change iterate_over_symbols to return bool This changes iterate_over_symbols to return a bool. This allows it to be reused in another context in a subsequent patch. gdb/ChangeLog 2019-09-10 Tom Tromey * ada-lang.c (ada_iterate_over_symbols): Return bool. * language.h (struct language_defn) : Return bool. * symtab.c (iterate_over_symbols): Return bool. * symtab.h (iterate_over_symbols): Return bool. --- gdb/ChangeLog | 8 ++++++++ gdb/ada-lang.c | 6 ++++-- gdb/language.h | 2 +- gdb/symtab.c | 13 ++++--------- gdb/symtab.h | 11 ++++++++++- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1865eeddbb..e2ebafe714 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-09-10 Tom Tromey + + * ada-lang.c (ada_iterate_over_symbols): Return bool. + * language.h (struct language_defn) : + Return bool. + * symtab.c (iterate_over_symbols): Return bool. + * symtab.h (iterate_over_symbols): Return bool. + 2019-09-10 Tom Tromey * ada-lang.c (aux_add_nonlocal_symbols): Change type. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d677acdb60..21d40c7aad 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5740,7 +5740,7 @@ ada_lookup_symbol_list (const char *name, const struct block *block, /* Implementation of the la_iterate_over_symbols method. */ -static void +static bool ada_iterate_over_symbols (const struct block *block, const lookup_name_info &name, domain_enum domain, @@ -5754,8 +5754,10 @@ ada_iterate_over_symbols for (i = 0; i < ndefs; ++i) { if (!callback (&results[i])) - break; + return false; } + + return true; } /* The result is as for ada_lookup_symbol_list with FULL_SEARCH set diff --git a/gdb/language.h b/gdb/language.h index 2a100b0491..0088e5de2d 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -407,7 +407,7 @@ struct language_defn This field may not be NULL. If the language does not need any special processing here, 'iterate_over_symbols' should be used as the definition. */ - void (*la_iterate_over_symbols) + bool (*la_iterate_over_symbols) (const struct block *block, const lookup_name_info &name, domain_enum domain, gdb::function_view callback); diff --git a/gdb/symtab.c b/gdb/symtab.c index 88e34de05b..5f184454bd 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2822,15 +2822,9 @@ basic_lookup_transparent_type (const char *name) return (struct type *) 0; } -/* Iterate over the symbols named NAME, matching DOMAIN, in BLOCK. - - For each symbol that matches, CALLBACK is called. The symbol is - passed to the callback. - - If CALLBACK returns false, the iteration ends. Otherwise, the - search continues. */ +/* See symtab.h. */ -void +bool iterate_over_symbols (const struct block *block, const lookup_name_info &name, const domain_enum domain, @@ -2847,9 +2841,10 @@ iterate_over_symbols (const struct block *block, struct block_symbol block_sym = {sym, block}; if (!callback (&block_sym)) - return; + return false; } } + return true; } /* Find the compunit symtab associated with PC and SECTION. diff --git a/gdb/symtab.h b/gdb/symtab.h index f38e544cdb..49feea62e2 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2092,7 +2092,16 @@ std::vector find_pcs_for_symtab_line typedef bool (symbol_found_callback_ftype) (struct block_symbol *bsym); -void iterate_over_symbols (const struct block *block, +/* Iterate over the symbols named NAME, matching DOMAIN, in BLOCK. + + For each symbol that matches, CALLBACK is called. The symbol is + passed to the callback. + + If CALLBACK returns false, the iteration ends and this function + returns false. Otherwise, the search continues, and the function + eventually returns true. */ + +bool iterate_over_symbols (const struct block *block, const lookup_name_info &name, const domain_enum domain, gdb::function_view callback); -- 2.34.1