* [PATCH 3/3] psymtab.c cleanup: remove "partial" from function names @ 2013-12-06 22:35 Doug Evans 2013-12-06 23:57 ` Doug Evans 0 siblings, 1 reply; 3+ messages in thread From: Doug Evans @ 2013-12-06 22:35 UTC (permalink / raw) To: gdb-patches Hi. This last patch removes "partial" from the names of expand_partial_symbol_names and map_partial_symbol_filenames. It also renames expand_partial_symbol_names to match the struct quick_symbol_functions "method" that it wraps: expand_symtabs_matching. This patch also adds two parameters to expand_symtabs_matching so that it can fully wrap the underlying quick_symbol_functions method. This makes it usable in more places. I thought of having a cover function that still had the same signature as the old expand_partial_symbol_names function, but I couldn't think of a good name, and it wasn't clear it was worth it anyway. 2013-12-06 Doug Evans <dje@google.com> * symfile.h (expand_symtabs_matching): Renamed from expand_partial_symbol_names. Update prototype. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * symfile.c (expand_symtabs_matching): Renamed from expand_partial_symbol_names. New args file_matcher, kind. Rename arg fun to symbol_matcher. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * ada-lang.c (ada_make_symbol_completion_list): Update to call expand_symtabs_matching. (ada_add_global_exceptions): Call expand_symtabs_matching. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to call map_symbol_filenames. * symtab.c (sources_info): Update to call map_symbol_filenames. (search_symbols): Call expand_symtabs_matching. (default_make_symbol_completion_list_break_on): Update to call expand_symtabs_matching. (make_source_files_completion_list): Update to call map_symbol_filenames. diff --git a/gdb/symfile.h b/gdb/symfile.h index 9780320..3829803 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -566,11 +566,12 @@ void free_symfile_segment_data (struct symfile_segment_data *data); extern struct cleanup *increment_reading_symtab (void); -void expand_partial_symbol_names (int (*fun) (const char *, void *), - void *data); +void expand_symtabs_matching (expand_symtabs_file_matcher_ftype *, + expand_symtabs_symbol_matcher_ftype *, + enum search_domain kind, void *data); -void map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, - int need_fullname); +void map_symbol_filenames (symbol_filename_ftype *fun, void *data, + int need_fullname); /* From dwarf2read.c */ diff --git a/gdb/symfile.c b/gdb/symfile.c index a67b398..8c39dd6 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3844,16 +3844,19 @@ symfile_free_objfile (struct objfile *objfile) See quick_symbol_functions.expand_symtabs_matching for details. */ void -expand_partial_symbol_names (expand_symtabs_symbol_matcher_ftype *fun, - void *data) +expand_symtabs_matching (expand_symtabs_file_matcher_ftype *file_matcher, + expand_symtabs_symbol_matcher_ftype *symbol_matcher, + enum search_domain kind, + void *data) { struct objfile *objfile; ALL_OBJFILES (objfile) { if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, NULL, fun, - ALL_DOMAIN, data); + objfile->sf->qf->expand_symtabs_matching (objfile, file_matcher, + symbol_matcher, kind, + data); } } @@ -3862,8 +3865,8 @@ expand_partial_symbol_names (expand_symtabs_symbol_matcher_ftype *fun, See quick_symbol_functions.map_symbol_filenames for details. */ void -map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, - int need_fullname) +map_symbol_filenames (symbol_filename_ftype *fun, void *data, + int need_fullname) { struct objfile *objfile; diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 786ca7a..259c489 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5944,7 +5944,8 @@ ada_make_symbol_completion_list (const char *text0, const char *word, data.word = word; data.wild_match = wild_match_p; data.encoded = encoded_p; - expand_partial_symbol_names (ada_expand_partial_symbol_name, &data); + expand_symtabs_matching (NULL, ada_expand_partial_symbol_name, ALL_DOMAIN, + &data); } /* At this point scan through the misc symbol vectors and add each @@ -12511,11 +12512,8 @@ ada_add_global_exceptions (regex_t *preg, VEC(ada_exc_info) **exceptions) struct objfile *objfile; struct symtab *s; - ALL_OBJFILES (objfile) - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching - (objfile, NULL, ada_exc_search_name_matches, - VARIABLES_DOMAIN, preg); + expand_symtabs_matching (NULL, ada_exc_search_name_matches, + VARIABLES_DOMAIN, preg); ALL_PRIMARY_SYMTABS (objfile, s) { diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c index 07d9722..81c887f 100644 --- a/gdb/mi/mi-cmd-file.c +++ b/gdb/mi/mi-cmd-file.c @@ -100,8 +100,8 @@ mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc) ui_out_end (uiout, ui_out_type_tuple); } - map_partial_symbol_filenames (print_partial_file_name, NULL, - 1 /*need_fullname*/); + map_symbol_filenames (print_partial_file_name, NULL, + 1 /*need_fullname*/); ui_out_end (uiout, ui_out_type_list); } diff --git a/gdb/symtab.c b/gdb/symtab.c index d554c67..35214e7 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3283,8 +3283,8 @@ sources_info (char *ignore, int from_tty) clear_filename_seen_cache (data.filename_seen_cache); data.first = 1; - map_partial_symbol_filenames (output_partial_symbol_filename, &data, - 1 /*need_fullname*/); + map_symbol_filenames (output_partial_symbol_filename, &data, + 1 /*need_fullname*/); printf_filtered ("\n"); do_cleanups (cleanups); @@ -3566,17 +3566,11 @@ search_symbols (char *regexp, enum search_domain kind, datum.nfiles = nfiles; datum.files = files; - ALL_OBJFILES (objfile) - { - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, - (nfiles == 0 - ? NULL - : search_symbols_file_matches), - search_symbols_name_matches, - kind, - &datum); - } + expand_symtabs_matching ((nfiles == 0 + ? NULL + : search_symbols_file_matches), + search_symbols_name_matches, + kind, &datum); /* Here, we search through the minimal symbol tables for functions and variables that match, and force their symbols to be read. @@ -4356,7 +4350,8 @@ default_make_symbol_completion_list_break_on (const char *text, /* Look through the partial symtabs for all symbols which begin by matching SYM_TEXT. Expand all CUs that you find to the list. The real names will get added by COMPLETION_LIST_ADD_SYMBOL below. */ - expand_partial_symbol_names (expand_partial_symbol_name, &datum); + expand_symtabs_matching (NULL, expand_partial_symbol_name, ALL_DOMAIN, + &datum); /* At this point scan through the misc symbol vectors and add each symbol you find to the list. Eventually we want to ignore @@ -4770,8 +4765,8 @@ make_source_files_completion_list (const char *text, const char *word) datum.word = word; datum.text_len = text_len; datum.list = &list; - map_partial_symbol_filenames (maybe_add_partial_symtab_filename, &datum, - 0 /*need_fullname*/); + map_symbol_filenames (maybe_add_partial_symtab_filename, &datum, + 0 /*need_fullname*/); do_cleanups (cache_cleanup); discard_cleanups (back_to); ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3/3] psymtab.c cleanup: remove "partial" from function names 2013-12-06 22:35 [PATCH 3/3] psymtab.c cleanup: remove "partial" from function names Doug Evans @ 2013-12-06 23:57 ` Doug Evans 2014-01-15 2:39 ` Doug Evans 0 siblings, 1 reply; 3+ messages in thread From: Doug Evans @ 2013-12-06 23:57 UTC (permalink / raw) To: gdb-patches Doug Evans writes: > Hi. > > This last patch removes "partial" from the names of > expand_partial_symbol_names and map_partial_symbol_filenames. > It also renames expand_partial_symbol_names to match the > struct quick_symbol_functions "method" that it wraps: > expand_symtabs_matching. > > This patch also adds two parameters to expand_symtabs_matching > so that it can fully wrap the underlying quick_symbol_functions method. > This makes it usable in more places. > I thought of having a cover function that still had the same > signature as the old expand_partial_symbol_names function, > but I couldn't think of a good name, and it wasn't clear it was > worth it anyway. > > 2013-12-06 Doug Evans <dje@google.com> > > * symfile.h (expand_symtabs_matching): Renamed from > expand_partial_symbol_names. Update prototype. > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > * symfile.c (expand_symtabs_matching): Renamed from > expand_partial_symbol_names. New args file_matcher, kind. > Rename arg fun to symbol_matcher. > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > * ada-lang.c (ada_make_symbol_completion_list): Update to call > expand_symtabs_matching. > (ada_add_global_exceptions): Call expand_symtabs_matching. > * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to > call map_symbol_filenames. > * symtab.c (sources_info): Update to call map_symbol_filenames. > (search_symbols): Call expand_symtabs_matching. > (default_make_symbol_completion_list_break_on): Update to call > expand_symtabs_matching. > (make_source_files_completion_list): Update to call > map_symbol_filenames. Hi. I missed a few instances of expand_partial_symbol_names. Revised patch attached. 2013-12-06 Doug Evans <dje@google.com> * symfile.h (expand_symtabs_matching): Renamed from expand_partial_symbol_names. Update prototype. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * symfile.c (expand_symtabs_matching): Renamed from expand_partial_symbol_names. New args file_matcher, kind. Rename arg fun to symbol_matcher. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * ada-lang.c (ada_complete_symbol_matcher): Renamed from ada_expand_partial_symbol_name. (ada_make_symbol_completion_list): Update to call expand_symtabs_matching. (ada_add_global_exceptions): Call expand_symtabs_matching. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to call map_symbol_filenames. * symtab.c (sources_info): Update to call map_symbol_filenames. (search_symbols): Call expand_symtabs_matching. (symbol_completion_matcher): Renamed from expand_partial_symbol_name. (default_make_symbol_completion_list_break_on): Update to call expand_symtabs_matching. (make_source_files_completion_list): Update to call map_symbol_filenames. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 786ca7a..3bbf5cc 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5864,7 +5864,7 @@ symbol_completion_add (VEC(char_ptr) **sv, } /* An object of this type is passed as the user_data argument to the - expand_partial_symbol_names method. */ + expand_symtabs_matching method. */ struct add_partial_datum { VEC(char_ptr) **completions; @@ -5876,9 +5876,10 @@ struct add_partial_datum int encoded; }; -/* A callback for expand_partial_symbol_names. */ +/* A callback for expand_symtabs_matching. */ + static int -ada_expand_partial_symbol_name (const char *name, void *user_data) +ada_complete_symbol_matcher (const char *name, void *user_data) { struct add_partial_datum *data = user_data; @@ -5944,7 +5945,8 @@ ada_make_symbol_completion_list (const char *text0, const char *word, data.word = word; data.wild_match = wild_match_p; data.encoded = encoded_p; - expand_partial_symbol_names (ada_expand_partial_symbol_name, &data); + expand_symtabs_matching (NULL, ada_complete_symbol_matcher, ALL_DOMAIN, + &data); } /* At this point scan through the misc symbol vectors and add each @@ -12511,11 +12513,8 @@ ada_add_global_exceptions (regex_t *preg, VEC(ada_exc_info) **exceptions) struct objfile *objfile; struct symtab *s; - ALL_OBJFILES (objfile) - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching - (objfile, NULL, ada_exc_search_name_matches, - VARIABLES_DOMAIN, preg); + expand_symtabs_matching (NULL, ada_exc_search_name_matches, + VARIABLES_DOMAIN, preg); ALL_PRIMARY_SYMTABS (objfile, s) { diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c index 07d9722..81c887f 100644 --- a/gdb/mi/mi-cmd-file.c +++ b/gdb/mi/mi-cmd-file.c @@ -100,8 +100,8 @@ mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc) ui_out_end (uiout, ui_out_type_tuple); } - map_partial_symbol_filenames (print_partial_file_name, NULL, - 1 /*need_fullname*/); + map_symbol_filenames (print_partial_file_name, NULL, + 1 /*need_fullname*/); ui_out_end (uiout, ui_out_type_list); } diff --git a/gdb/symfile.c b/gdb/symfile.c index a67b398..8c39dd6 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3844,16 +3844,19 @@ symfile_free_objfile (struct objfile *objfile) See quick_symbol_functions.expand_symtabs_matching for details. */ void -expand_partial_symbol_names (expand_symtabs_symbol_matcher_ftype *fun, - void *data) +expand_symtabs_matching (expand_symtabs_file_matcher_ftype *file_matcher, + expand_symtabs_symbol_matcher_ftype *symbol_matcher, + enum search_domain kind, + void *data) { struct objfile *objfile; ALL_OBJFILES (objfile) { if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, NULL, fun, - ALL_DOMAIN, data); + objfile->sf->qf->expand_symtabs_matching (objfile, file_matcher, + symbol_matcher, kind, + data); } } @@ -3862,8 +3865,8 @@ expand_partial_symbol_names (expand_symtabs_symbol_matcher_ftype *fun, See quick_symbol_functions.map_symbol_filenames for details. */ void -map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, - int need_fullname) +map_symbol_filenames (symbol_filename_ftype *fun, void *data, + int need_fullname) { struct objfile *objfile; diff --git a/gdb/symfile.h b/gdb/symfile.h index 9780320..3829803 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -566,11 +566,12 @@ void free_symfile_segment_data (struct symfile_segment_data *data); extern struct cleanup *increment_reading_symtab (void); -void expand_partial_symbol_names (int (*fun) (const char *, void *), - void *data); +void expand_symtabs_matching (expand_symtabs_file_matcher_ftype *, + expand_symtabs_symbol_matcher_ftype *, + enum search_domain kind, void *data); -void map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, - int need_fullname); +void map_symbol_filenames (symbol_filename_ftype *fun, void *data, + int need_fullname); /* From dwarf2read.c */ diff --git a/gdb/symtab.c b/gdb/symtab.c index d554c67..be383bc 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3283,8 +3283,8 @@ sources_info (char *ignore, int from_tty) clear_filename_seen_cache (data.filename_seen_cache); data.first = 1; - map_partial_symbol_filenames (output_partial_symbol_filename, &data, - 1 /*need_fullname*/); + map_symbol_filenames (output_partial_symbol_filename, &data, + 1 /*need_fullname*/); printf_filtered ("\n"); do_cleanups (cleanups); @@ -3566,17 +3566,11 @@ search_symbols (char *regexp, enum search_domain kind, datum.nfiles = nfiles; datum.files = files; - ALL_OBJFILES (objfile) - { - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, - (nfiles == 0 - ? NULL - : search_symbols_file_matches), - search_symbols_name_matches, - kind, - &datum); - } + expand_symtabs_matching ((nfiles == 0 + ? NULL + : search_symbols_file_matches), + search_symbols_name_matches, + kind, &datum); /* Here, we search through the minimal symbol tables for functions and variables that match, and force their symbols to be read. @@ -4217,7 +4211,7 @@ completion_list_add_fields (struct symbol *sym, const char *sym_text, } /* Type of the user_data argument passed to add_macro_name or - expand_partial_symbol_name. The contents are simply whatever is + symbol_completion_matcher. The contents are simply whatever is needed by completion_list_add_name. */ struct add_name_data { @@ -4242,10 +4236,10 @@ add_macro_name (const char *name, const struct macro_definition *ignore, datum->text, datum->word); } -/* A callback for expand_partial_symbol_names. */ +/* A callback for expand_symtabs_matching. */ static int -expand_partial_symbol_name (const char *name, void *user_data) +symbol_completion_matcher (const char *name, void *user_data) { struct add_name_data *datum = (struct add_name_data *) user_data; @@ -4356,7 +4350,8 @@ default_make_symbol_completion_list_break_on (const char *text, /* Look through the partial symtabs for all symbols which begin by matching SYM_TEXT. Expand all CUs that you find to the list. The real names will get added by COMPLETION_LIST_ADD_SYMBOL below. */ - expand_partial_symbol_names (expand_partial_symbol_name, &datum); + expand_symtabs_matching (NULL, symbol_completion_matcher, ALL_DOMAIN, + &datum); /* At this point scan through the misc symbol vectors and add each symbol you find to the list. Eventually we want to ignore @@ -4770,8 +4765,8 @@ make_source_files_completion_list (const char *text, const char *word) datum.word = word; datum.text_len = text_len; datum.list = &list; - map_partial_symbol_filenames (maybe_add_partial_symtab_filename, &datum, - 0 /*need_fullname*/); + map_symbol_filenames (maybe_add_partial_symtab_filename, &datum, + 0 /*need_fullname*/); do_cleanups (cache_cleanup); discard_cleanups (back_to); ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3/3] psymtab.c cleanup: remove "partial" from function names 2013-12-06 23:57 ` Doug Evans @ 2014-01-15 2:39 ` Doug Evans 0 siblings, 0 replies; 3+ messages in thread From: Doug Evans @ 2014-01-15 2:39 UTC (permalink / raw) To: gdb-patches Doug Evans writes: > Doug Evans writes: > > Hi. > > > > This last patch removes "partial" from the names of > > expand_partial_symbol_names and map_partial_symbol_filenames. > > It also renames expand_partial_symbol_names to match the > > struct quick_symbol_functions "method" that it wraps: > > expand_symtabs_matching. > > > > This patch also adds two parameters to expand_symtabs_matching > > so that it can fully wrap the underlying quick_symbol_functions method. > > This makes it usable in more places. > > I thought of having a cover function that still had the same > > signature as the old expand_partial_symbol_names function, > > but I couldn't think of a good name, and it wasn't clear it was > > worth it anyway. > > > > 2013-12-06 Doug Evans <dje@google.com> > > > > * symfile.h (expand_symtabs_matching): Renamed from > > expand_partial_symbol_names. Update prototype. > > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > > * symfile.c (expand_symtabs_matching): Renamed from > > expand_partial_symbol_names. New args file_matcher, kind. > > Rename arg fun to symbol_matcher. > > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > > * ada-lang.c (ada_make_symbol_completion_list): Update to call > > expand_symtabs_matching. > > (ada_add_global_exceptions): Call expand_symtabs_matching. > > * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to > > call map_symbol_filenames. > > * symtab.c (sources_info): Update to call map_symbol_filenames. > > (search_symbols): Call expand_symtabs_matching. > > (default_make_symbol_completion_list_break_on): Update to call > > expand_symtabs_matching. > > (make_source_files_completion_list): Update to call > > map_symbol_filenames. > > Hi. > I missed a few instances of expand_partial_symbol_names. > Revised patch attached. > > 2013-12-06 Doug Evans <dje@google.com> > > * symfile.h (expand_symtabs_matching): Renamed from > expand_partial_symbol_names. Update prototype. > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > * symfile.c (expand_symtabs_matching): Renamed from > expand_partial_symbol_names. New args file_matcher, kind. > Rename arg fun to symbol_matcher. > (map_symbol_filenames): Renamed from map_partial_symbol_filenames. > * ada-lang.c (ada_complete_symbol_matcher): Renamed from > ada_expand_partial_symbol_name. > (ada_make_symbol_completion_list): Update to call > expand_symtabs_matching. > (ada_add_global_exceptions): Call expand_symtabs_matching. > * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to > call map_symbol_filenames. > * symtab.c (sources_info): Update to call map_symbol_filenames. > (search_symbols): Call expand_symtabs_matching. > (symbol_completion_matcher): Renamed from expand_partial_symbol_name. > (default_make_symbol_completion_list_break_on): Update to call > expand_symtabs_matching. > (make_source_files_completion_list): Update to call > map_symbol_filenames. I have committed this. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-15 2:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-12-06 22:35 [PATCH 3/3] psymtab.c cleanup: remove "partial" from function names Doug Evans 2013-12-06 23:57 ` Doug Evans 2014-01-15 2:39 ` Doug Evans
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).