2012-02-01 Gary Benson <gbenson@redhat.com>

* symtab.h (symbol_name_match_p_ftype): New typedef.
	(iterate_over_symbols): Use the above.
	* symtab.c (iterate_over_symbols): Likewise.
	* language.h (language_defn->la_iterate_over_symbols): Likewise.
	* ada-lang.c (ada_iterate_over_symbols): Likewise.
	* linespec.c (iterate_over_all_matching_symtabs): Likewise.
	(iterate_name_matcher): Document return values.
	(collect_one_symbol): Likewise.
	(collect_function_symbols): Likewise.
	(collect_symbols): Likewise.
This commit is contained in:
Gary Benson 2012-02-01 16:10:31 +00:00
parent d9680e739f
commit 8e704927af
6 changed files with 34 additions and 12 deletions

View file

@ -1,3 +1,16 @@
2012-02-01 Gary Benson <gbenson@redhat.com>
* symtab.h (symbol_name_match_p_ftype): New typedef.
(iterate_over_symbols): Use the above.
* symtab.c (iterate_over_symbols): Likewise.
* language.h (language_defn->la_iterate_over_symbols): Likewise.
* ada-lang.c (ada_iterate_over_symbols): Likewise.
* linespec.c (iterate_over_all_matching_symtabs): Likewise.
(iterate_name_matcher): Document return values.
(collect_one_symbol): Likewise.
(collect_function_symbols): Likewise.
(collect_symbols): Likewise.
2012-02-01 Tom Tromey <tromey@redhat.com>
* ada-lang.c (resolve_subexp): Update.

View file

@ -5102,7 +5102,7 @@ ada_name_for_lookup (const char *name)
static void
ada_iterate_over_symbols (const struct block *block,
const char *name, domain_enum domain,
int (*callback) (struct symbol *, void *),
symbol_found_callback_ftype *callback,
void *data)
{
int ndefs, i;

View file

@ -354,7 +354,7 @@ struct language_defn
void (*la_iterate_over_symbols) (const struct block *block,
const char *name,
domain_enum domain,
int (*callback) (struct symbol *, void *),
symbol_found_callback_ftype *callback,
void *data);
/* Add fields above this point, so the magic number is always last. */

View file

@ -341,8 +341,8 @@ iterate_name_matcher (const char *name, void *d)
const struct symbol_matcher_data *data = d;
if (data->symbol_name_match_p (name, data->lookup_name) == 0)
return 1;
return 0;
return 1; /* Expand this symbol's symbol table. */
return 0; /* Skip this symbol. */
}
/* A helper that walks over all matching symtabs in all objfiles and
@ -353,7 +353,7 @@ iterate_name_matcher (const char *name, void *d)
static void
iterate_over_all_matching_symtabs (const char *name,
const domain_enum domain,
int (*callback) (struct symbol *, void *),
symbol_found_callback_ftype *callback,
void *data,
struct program_space *search_pspace)
{
@ -1808,14 +1808,14 @@ collect_one_symbol (struct symbol *sym, void *d)
struct type *t;
if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
return 1;
return 1; /* Continue iterating. */
t = SYMBOL_TYPE (sym);
CHECK_TYPEDEF (t);
if (TYPE_CODE (t) != TYPE_CODE_STRUCT
&& TYPE_CODE (t) != TYPE_CODE_UNION
&& TYPE_CODE (t) != TYPE_CODE_NAMESPACE)
return 1;
return 1; /* Continue iterating. */
slot = htab_find_slot (collector->unique_syms, sym, INSERT);
if (!*slot)
@ -1824,7 +1824,7 @@ collect_one_symbol (struct symbol *sym, void *d)
VEC_safe_push (symbolp, collector->symbols, sym);
}
return 1;
return 1; /* Continue iterating. */
}
/* Return the symbol corresponding to the substring of *ARGPTR ending
@ -2215,7 +2215,7 @@ collect_function_symbols (struct symbol *sym, void *arg)
if (SYMBOL_CLASS (sym) == LOC_BLOCK)
VEC_safe_push (symbolp, *syms, sym);
return 1;
return 1; /* Continue iterating. */
}
/* Look up a function symbol in *ARGPTR. If found, advance *ARGPTR
@ -2722,7 +2722,7 @@ collect_symbols (struct symbol *sym, void *data)
add_sal_to_sals (info->state, &info->result, &sal,
SYMBOL_NATURAL_NAME (sym));
return 1;
return 1; /* Continue iterating. */
}
/* We've found a minimal symbol MSYMBOL to associate with our

View file

@ -1900,7 +1900,7 @@ lookup_block_symbol (const struct block *block, const char *name,
void
iterate_over_symbols (const struct block *block, const char *name,
const domain_enum domain,
int (*callback) (struct symbol *, void *),
symbol_found_callback_ftype *callback,
void *data)
{
while (block)

View file

@ -1248,9 +1248,18 @@ DEF_VEC_I (CORE_ADDR);
VEC (CORE_ADDR) *find_pcs_for_symtab_line (struct symtab *symtab, int line,
struct linetable_entry **best_entry);
/* Callback for LA_ITERATE_OVER_SYMBOLS. The callback will be called
once per matching symbol SYM, with DATA being the argument of the
same name that was passed to LA_ITERATE_OVER_SYMBOLS. The callback
should return nonzero to indicate that LA_ITERATE_OVER_SYMBOLS
should continue iterating, or zero to indicate that the iteration
should end. */
typedef int (symbol_found_callback_ftype) (struct symbol *sym, void *data);
void iterate_over_symbols (const struct block *block, const char *name,
const domain_enum domain,
int (*callback) (struct symbol *, void *),
symbol_found_callback_ftype *callback,
void *data);
struct cleanup *demangle_for_lookup (const char *name, enum language lang,