* symtab.c (search_symbols): Update.

* symtab.h (domain_enum_tag) <METHODS_DOMAIN>: Remove.
This commit is contained in:
Tom Tromey 2008-10-01 17:25:22 +00:00
parent 8b41ec6501
commit bd2e94cec8
3 changed files with 10 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2008-10-01 Tom Tromey <tromey@redhat.com>
* symtab.c (search_symbols): Update.
* symtab.h (domain_enum_tag) <METHODS_DOMAIN>: Remove.
2008-10-01 Tom Tromey <tromey@redhat.com>
* symfile.c (syms_from_objfile): Update.

View File

@ -2989,7 +2989,6 @@ sort_search_symbols (struct symbol_search *prevtail, int nfound)
Only symbols of KIND are searched:
FUNCTIONS_DOMAIN - search all functions
TYPES_DOMAIN - search all type names
METHODS_DOMAIN - search all methods NOT IMPLEMENTED
VARIABLES_DOMAIN - search all symbols, excluding functions, type names,
and constants (enums)
@ -3130,8 +3129,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[],
&& ((kind == VARIABLES_DOMAIN && SYMBOL_CLASS (*psym) != LOC_TYPEDEF
&& SYMBOL_CLASS (*psym) != LOC_BLOCK)
|| (kind == FUNCTIONS_DOMAIN && SYMBOL_CLASS (*psym) == LOC_BLOCK)
|| (kind == TYPES_DOMAIN && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)
|| (kind == METHODS_DOMAIN && SYMBOL_CLASS (*psym) == LOC_BLOCK))))
|| (kind == TYPES_DOMAIN && SYMBOL_CLASS (*psym) == LOC_TYPEDEF))))
{
PSYMTAB_TO_SYMTAB (ps);
keep_going = 0;
@ -3206,8 +3204,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[],
&& SYMBOL_CLASS (sym) != LOC_BLOCK
&& SYMBOL_CLASS (sym) != LOC_CONST)
|| (kind == FUNCTIONS_DOMAIN && SYMBOL_CLASS (sym) == LOC_BLOCK)
|| (kind == TYPES_DOMAIN && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
|| (kind == METHODS_DOMAIN && SYMBOL_CLASS (sym) == LOC_BLOCK))))
|| (kind == TYPES_DOMAIN && SYMBOL_CLASS (sym) == LOC_TYPEDEF))))
{
/* match */
psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));

View File

@ -386,18 +386,15 @@ typedef enum domain_enum_tag
/* Searching domains. These overlap with VAR_DOMAIN, providing
some granularity with the search_symbols function. */
/* Everything in VAR_DOMAIN minus FUNCTIONS_-, TYPES_-, and
METHODS_DOMAIN */
/* Everything in VAR_DOMAIN minus FUNCTIONS_DOMAIN and
TYPES_DOMAIN. */
VARIABLES_DOMAIN,
/* All functions -- for some reason not methods, though. */
FUNCTIONS_DOMAIN,
/* All defined types */
TYPES_DOMAIN,
/* All class methods -- why is this separated out? */
METHODS_DOMAIN
TYPES_DOMAIN
}
domain_enum;