mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 01:07:52 +00:00
Use gdb::function_view in iterate_over_symtabs & co
I wanted to pass a lambda to iterate_over_symtabs (see following patch), so I converted it to function_view, and then the rest is cascaded from that. This gets rid of a bunch of single-use callback functions and corresponding manually managed callback capture types (add_partial_datum, search_symbols_data, etc.) in favor of letting the compiler generate them for us by using lambdas with a capture. In a couple cases, it was more natural to convert the existing function callbacks to function objects (i.e., operator(), e.g., decode_compound_collector). gdb/ChangeLog: 2017-02-23 Pedro Alves <palves@redhat.com> * ada-lang.c: Include "common/function-view.h". (ada_iterate_over_symbols): Adjust to use function_view as callback type. (struct add_partial_datum, ada_complete_symbol_matcher): Delete. (ada_make_symbol_completion_list): Use a lambda. (ada_exc_search_name_matches): Delete. (name_matches_regex): New. (ada_add_global_exceptions): Use a lambda and name_matches_regex. * compile/compile-c-support.c: Include "common/function-view.h". (print_one_macro): Change prototype to accept a ui_file pointer. (write_macro_definitions): Use a lambda. * dwarf2read.c: Include "common/function-view.h". (dw2_map_expand_apply, dw2_map_symtabs_matching_filename) (dw2_expand_symtabs_matching): Adjust to use function_view as callback type. * language.h: Include "common/function-view.h". (struct language_defn) <la_iterate_over_symbols>: Adjust to use function_view as callback type. (LA_ITERATE_OVER_SYMBOLS): Remove DATA parameter. * linespec.c: Include "common/function-view.h". (collect_info::add_symbol): New method. (struct symbol_and_data_callback, iterate_inline_only, struct symbol_matcher_data, iterate_name_matcher): Delete. (iterate_over_all_matching_symtabs): Adjust to use function_view as callback type and lambdas. (iterate_over_file_blocks): Adjust to use function_view as callback type. (decode_compound_collector): Now a class with private fields. (decode_compound_collector::release_symbols): New method. (collect_one_symbol): Rename to... (decode_compound_collector::operator()): ... this and adjust. (lookup_prefix_sym): decode_compound_collector construction bits move to decode_compound_collector ctor. Pass the decode_compound_collector object directly as callback. Remove cleanups and use decode_compound_collector::release_symbols instead. (symtab_collector): Now a class with private fields. (symtab_collector::release_symtabs): New method. (add_symtabs_to_list): Rename to... (symtab_collector::operator()): ... this and adjust. (collect_symtabs_from_filename): symtab_collector construction bits move to symtab_collector ctor. Pass the symtab_collector object directly as callback. Remove cleanups and use symtab_collector::release_symtabs instead. (collect_symbols): Delete. (add_matching_symbols_to_info): Use lambdas. * macrocmd.c (print_macro_callback): Delete. (info_macro_command): Use a lambda. (info_macros_command): Pass print_macro_definition as callable directly. (print_one_macro): Remove 'ignore' parameter. (macro_list_command): Adjust. * macrotab.c (macro_for_each_data::fn): Now a function_view. (macro_for_each_data::user_data): Delete field. (foreach_macro): Adjust to call the function_view. (macro_for_each): Adjust to use function_view as callback type. (foreach_macro_in_scope): Adjust to call the function_view. (macro_for_each_in_scope): Adjust to use function_view as callback type. * macrotab.h: Include "common/function-view.h". (macro_callback_fn): Declare a prototype instead of a pointer. Remove "user_data" parameter. (macro_for_each, macro_for_each_in_scope): Adjust to use function_view as callback type. * psymtab.c (partial_map_expand_apply) (psym_map_symtabs_matching_filename, recursively_search_psymtabs): Adjust to use function_view as callback type and to return bool. (psym_expand_symtabs_matching): Adjust to use function_view as callback types. * symfile-debug.c (debug_qf_map_symtabs_matching_filename): Adjust to use function_view as callback type and to return bool. (debug_qf_expand_symtabs_matching): Adjust to use function_view as callback types. * symfile.c (expand_symtabs_matching): Adjust to use function_view as callback types. * symfile.h: Include "common/function-view.h". (expand_symtabs_file_matcher_ftype) (expand_symtabs_symbol_matcher_ftype) (expand_symtabs_exp_notify_ftype): Remove "data" parameter and return bool. (quick_symbol_functions::map_symtabs_matching_filename) (quick_symbol_functions::expand_symtabs_matching): Adjust to use function_view as callback type and return bool. (expand_symtabs_matching): Adjust to use function_view as callback type. (maintenance_expand_name_matcher) (maintenance_expand_file_matcher): Delete. (maintenance_expand_symtabs): Use lambdas. * symtab.c (iterate_over_some_symtabs): Adjust to use function_view as callback types and return bool. (iterate_over_symtabs): Likewise. Use unique_xmalloc_ptr instead of a cleanup. (lookup_symtab_callback): Delete. (lookup_symtab): Use a lambda. (iterate_over_symbols): Adjust to use function_view as callback type. (struct search_symbols_data, search_symbols_file_matches) (search_symbols_name_matches): Delete. (search_symbols): Use a pair of lambdas. (struct add_name_data, add_macro_name, symbol_completion_matcher) (symtab_expansion_callback): Delete. (default_make_symbol_completion_list_break_on_1): Use lambdas. * symtab.h: Include "common/function-view.h". (iterate_over_some_symtabs): Adjust to use function_view as callback type and return bool. (iterate_over_symtabs): Adjust to use function_view as callback type. (symbol_found_callback_ftype): Remove 'data' parameter and return bool. (iterate_over_symbols): Adjust to use function_view as callback type.
This commit is contained in:
Pedro Alves
107
gdb/ada-lang.c
107
gdb/ada-lang.c
@@ -60,6 +60,7 @@
|
||||
#include "mi/mi-common.h"
|
||||
#include "arch-utils.h"
|
||||
#include "cli/cli-utils.h"
|
||||
#include "common/function-view.h"
|
||||
|
||||
/* Define whether or not the C operator '/' truncates towards zero for
|
||||
differently signed operands (truncation direction is undefined in C).
|
||||
@@ -5850,10 +5851,9 @@ ada_lookup_symbol_list (const char *name0, const struct block *block0,
|
||||
/* Implementation of the la_iterate_over_symbols method. */
|
||||
|
||||
static void
|
||||
ada_iterate_over_symbols (const struct block *block,
|
||||
const char *name, domain_enum domain,
|
||||
symbol_found_callback_ftype *callback,
|
||||
void *data)
|
||||
ada_iterate_over_symbols
|
||||
(const struct block *block, const char *name, domain_enum domain,
|
||||
gdb::function_view<symbol_found_callback_ftype> callback)
|
||||
{
|
||||
int ndefs, i;
|
||||
struct block_symbol *results;
|
||||
@@ -5861,7 +5861,7 @@ ada_iterate_over_symbols (const struct block *block,
|
||||
ndefs = ada_lookup_symbol_list_worker (name, block, domain, &results, 0);
|
||||
for (i = 0; i < ndefs; ++i)
|
||||
{
|
||||
if (! (*callback) (results[i].symbol, data))
|
||||
if (!callback (results[i].symbol))
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -6497,30 +6497,6 @@ symbol_completion_add (VEC(char_ptr) **sv,
|
||||
VEC_safe_push (char_ptr, *sv, completion);
|
||||
}
|
||||
|
||||
/* An object of this type is passed as the user_data argument to the
|
||||
expand_symtabs_matching method. */
|
||||
struct add_partial_datum
|
||||
{
|
||||
VEC(char_ptr) **completions;
|
||||
const char *text;
|
||||
int text_len;
|
||||
const char *text0;
|
||||
const char *word;
|
||||
int wild_match;
|
||||
int encoded;
|
||||
};
|
||||
|
||||
/* A callback for expand_symtabs_matching. */
|
||||
|
||||
static int
|
||||
ada_complete_symbol_matcher (const char *name, void *user_data)
|
||||
{
|
||||
struct add_partial_datum *data = (struct add_partial_datum *) user_data;
|
||||
|
||||
return symbol_completion_match (name, data->text, data->text_len,
|
||||
data->wild_match, data->encoded) != NULL;
|
||||
}
|
||||
|
||||
/* Return a list of possible symbol names completing TEXT0. WORD is
|
||||
the entire command on which completion is made. */
|
||||
|
||||
@@ -6569,19 +6545,16 @@ ada_make_symbol_completion_list (const char *text0, const char *word,
|
||||
}
|
||||
|
||||
/* First, look at the partial symtab symbols. */
|
||||
{
|
||||
struct add_partial_datum data;
|
||||
|
||||
data.completions = &completions;
|
||||
data.text = text;
|
||||
data.text_len = text_len;
|
||||
data.text0 = text0;
|
||||
data.word = word;
|
||||
data.wild_match = wild_match_p;
|
||||
data.encoded = encoded_p;
|
||||
expand_symtabs_matching (NULL, ada_complete_symbol_matcher, NULL,
|
||||
ALL_DOMAIN, &data);
|
||||
}
|
||||
expand_symtabs_matching (NULL,
|
||||
[&] (const char *symname)
|
||||
{
|
||||
return symbol_completion_match (symname,
|
||||
text, text_len,
|
||||
wild_match_p,
|
||||
encoded_p);
|
||||
},
|
||||
NULL,
|
||||
ALL_DOMAIN);
|
||||
|
||||
/* At this point scan through the misc symbol vectors and add each
|
||||
symbol you find to the list. Eventually we want to ignore
|
||||
@@ -13267,30 +13240,6 @@ sort_remove_dups_ada_exceptions_list (VEC(ada_exc_info) **exceptions,
|
||||
VEC_truncate(ada_exc_info, *exceptions, skip + to_sort_len);
|
||||
}
|
||||
|
||||
/* A function intended as the "name_matcher" callback in the struct
|
||||
quick_symbol_functions' expand_symtabs_matching method.
|
||||
|
||||
SEARCH_NAME is the symbol's search name.
|
||||
|
||||
If USER_DATA is not NULL, it is a pointer to a regext_t object
|
||||
used to match the symbol (by natural name). Otherwise, when USER_DATA
|
||||
is null, no filtering is performed, and all symbols are a positive
|
||||
match. */
|
||||
|
||||
static int
|
||||
ada_exc_search_name_matches (const char *search_name, void *user_data)
|
||||
{
|
||||
regex_t *preg = (regex_t *) user_data;
|
||||
|
||||
if (preg == NULL)
|
||||
return 1;
|
||||
|
||||
/* In Ada, the symbol "search name" is a linkage name, whereas
|
||||
the regular expression used to do the matching refers to
|
||||
the natural name. So match against the decoded name. */
|
||||
return (regexec (preg, ada_decode (search_name), 0, NULL, 0) == 0);
|
||||
}
|
||||
|
||||
/* Add all exceptions defined by the Ada standard whose name match
|
||||
a regular expression.
|
||||
|
||||
@@ -13370,6 +13319,15 @@ ada_add_exceptions_from_frame (regex_t *preg, struct frame_info *frame,
|
||||
}
|
||||
}
|
||||
|
||||
/* Return true if NAME matches PREG or if PREG is NULL. */
|
||||
|
||||
static bool
|
||||
name_matches_regex (const char *name, regex_t *preg)
|
||||
{
|
||||
return (preg == NULL
|
||||
|| regexec (preg, ada_decode (name), 0, NULL, 0) == 0);
|
||||
}
|
||||
|
||||
/* Add all exceptions defined globally whose name name match
|
||||
a regular expression, excluding standard exceptions.
|
||||
|
||||
@@ -13395,8 +13353,17 @@ ada_add_global_exceptions (regex_t *preg, VEC(ada_exc_info) **exceptions)
|
||||
struct objfile *objfile;
|
||||
struct compunit_symtab *s;
|
||||
|
||||
expand_symtabs_matching (NULL, ada_exc_search_name_matches, NULL,
|
||||
VARIABLES_DOMAIN, preg);
|
||||
/* In Ada, the symbol "search name" is a linkage name, whereas the
|
||||
regular expression used to do the matching refers to the natural
|
||||
name. So match against the decoded name. */
|
||||
expand_symtabs_matching (NULL,
|
||||
[&] (const char *search_name)
|
||||
{
|
||||
const char *decoded = ada_decode (search_name);
|
||||
return name_matches_regex (decoded, preg);
|
||||
},
|
||||
NULL,
|
||||
VARIABLES_DOMAIN);
|
||||
|
||||
ALL_COMPUNITS (objfile, s)
|
||||
{
|
||||
@@ -13411,9 +13378,7 @@ ada_add_global_exceptions (regex_t *preg, VEC(ada_exc_info) **exceptions)
|
||||
|
||||
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
||||
if (ada_is_non_standard_exception_sym (sym)
|
||||
&& (preg == NULL
|
||||
|| regexec (preg, SYMBOL_NATURAL_NAME (sym),
|
||||
0, NULL, 0) == 0))
|
||||
&& name_matches_regex (SYMBOL_NATURAL_NAME (sym), preg))
|
||||
{
|
||||
struct ada_exc_info info
|
||||
= {SYMBOL_PRINT_NAME (sym), SYMBOL_VALUE_ADDRESS (sym)};
|
||||
|
||||
Reference in New Issue
Block a user