From 8157b174fd3b230a9d2cca6dae07562b38bad9fe Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 10 May 2012 19:50:09 +0000 Subject: * tracepoint.c (scope_info): Update. * symtab.c (lookup_block_symbol, iterate_over_symbols) (find_pc_sect_symtab, search_symbols) (default_make_symbol_completion_list_break_on) (make_file_symbol_completion_list): Update. * symmisc.c (dump_symtab_1): Update. * stack.c (print_frame_args, iterate_over_block_locals) (print_frame_labels, iterate_over_block_arg_vars): Update. * python/py-block.c (block_object) : Remove. : New field. : Change type. (blpy_iter): Update. (blpy_block_syms_iternext): Update. * psymtab.c (map_block): Use block iterators. * objfiles.c (objfile_relocate1): Use ALL_DICT_SYMBOLS. * mi/mi-cmd-stack.c (list_args_or_locals): Update. * mdebugread.c (parse_symbol, mylookup_symbol): Update. * infrun.c (check_exception_resume): Update. * cp-support.c (make_symbol_overload_list_block): Update. * coffread.c (patch_opaque_types): Update. * buildsym.c (finish_block, end_symtab): Use ALL_DICT_SYMBOLS. * block.h (struct block_iterator): New. (block_iterator_first, block_iterator_next, block_iter_name_first) (block_iter_name_next, block_iter_match_first) (block_iter_match_next): Declare. (ALL_BLOCK_SYMBOLS): Redefine. * block.c (block_iterator_first, block_iterator_next) (block_iter_name_first, block_iter_name_next) (block_iter_match_first, block_iter_match_next): New functions. * ada-lang.c (ada_add_block_symbols) (ada_make_symbol_completion_list): Use block iterator. --- gdb/block.h | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 8 deletions(-) (limited to 'gdb/block.h') diff --git a/gdb/block.h b/gdb/block.h index 2cbcc1b..2eec346 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -20,6 +20,8 @@ #ifndef BLOCK_H #define BLOCK_H +#include "dictionary.h" + /* Opaque declarations. */ struct symbol; @@ -27,7 +29,6 @@ struct symtab; struct block_namespace_info; struct using_direct; struct obstack; -struct dictionary; struct addrmap; /* All of the name-scope contours of the program @@ -105,13 +106,6 @@ struct block #define BLOCK_DICT(bl) (bl)->dict #define BLOCK_NAMESPACE(bl) (bl)->language_specific.cplus_specific.namespace -/* Macro to loop through all symbols in a block BL, in no particular - order. ITER helps keep track of the iteration, and should be a - struct dict_iterator. SYM points to the current symbol. */ - -#define ALL_BLOCK_SYMBOLS(block, iter, sym) \ - ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym) - struct blockvector { /* Number of blocks in the list. */ @@ -167,4 +161,80 @@ extern const struct block *block_global_block (const struct block *block); extern struct block *allocate_block (struct obstack *obstack); + +/* A block iterator. This structure should be treated as though it + were opaque; it is only defined here because we want to support + stack allocation of iterators. */ + +struct block_iterator +{ + /* The underlying dictionary iterator. */ + + struct dict_iterator dict_iter; +}; + +/* Initialize ITERATOR to point at the first symbol in BLOCK, and + return that first symbol, or NULL if BLOCK is empty. */ + +extern struct symbol *block_iterator_first (const struct block *block, + struct block_iterator *iterator); + +/* Advance ITERATOR, and return the next symbol, or NULL if there are + no more symbols. Don't call this if you've previously received + NULL from block_iterator_first or block_iterator_next on this + iteration. */ + +extern struct symbol *block_iterator_next (struct block_iterator *iterator); + +/* Initialize ITERATOR to point at the first symbol in BLOCK whose + SYMBOL_SEARCH_NAME is NAME (as tested using strcmp_iw), and return + that first symbol, or NULL if there are no such symbols. */ + +extern struct symbol *block_iter_name_first (const struct block *block, + const char *name, + struct block_iterator *iterator); + +/* Advance ITERATOR to point at the next symbol in BLOCK whose + SYMBOL_SEARCH_NAME is NAME (as tested using strcmp_iw), or NULL if + there are no more such symbols. Don't call this if you've + previously received NULL from block_iterator_first or + block_iterator_next on this iteration. And don't call it unless + ITERATOR was created by a previous call to block_iter_name_first + with the same NAME. */ + +extern struct symbol *block_iter_name_next (const char *name, + struct block_iterator *iterator); + +/* Initialize ITERATOR to point at the first symbol in BLOCK whose + SYMBOL_SEARCH_NAME is NAME, as tested using COMPARE (which must use + the same conventions as strcmp_iw and be compatible with any + block hashing function), and return that first symbol, or NULL + if there are no such symbols. */ + +extern struct symbol *block_iter_match_first (const struct block *block, + const char *name, + symbol_compare_ftype *compare, + struct block_iterator *iterator); + +/* Advance ITERATOR to point at the next symbol in BLOCK whose + SYMBOL_SEARCH_NAME is NAME, as tested using COMPARE (see + block_iter_match_first), or NULL if there are no more such symbols. + Don't call this if you've previously received NULL from + block_iterator_match_first or block_iterator_match_next on this + iteration. And don't call it unless ITERATOR was created by a + previous call to block_iter_match_first with the same NAME and COMPARE. */ + +extern struct symbol *block_iter_match_next (const char *name, + symbol_compare_ftype *compare, + struct block_iterator *iterator); + +/* Macro to loop through all symbols in a block BL, in no particular + order. ITER helps keep track of the iteration, and should be a + struct block_iterator. SYM points to the current symbol. */ + +#define ALL_BLOCK_SYMBOLS(block, iter, sym) \ + for ((sym) = block_iterator_first ((block), &(iter)); \ + (sym); \ + (sym) = block_iterator_next (&(iter))) + #endif /* BLOCK_H */ -- cgit v1.1