diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-05-10 19:50:09 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-05-10 19:50:09 +0000 |
| commit | 8157b174fd3b230a9d2cca6dae07562b38bad9fe (patch) | |
| tree | 16844a9f26a2871e5d4f1679c3ed8bfbe9d84f3b /gdb/ada-lang.c | |
| parent | a2ca7a527ea93943b440b592de2f71c5a9e03392 (diff) | |
| download | gdb-8157b174fd3b230a9d2cca6dae07562b38bad9fe.zip gdb-8157b174fd3b230a9d2cca6dae07562b38bad9fe.tar.gz gdb-8157b174fd3b230a9d2cca6dae07562b38bad9fe.tar.bz2 | |
* 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) <dict>: Remove.
<block>: New field.
<iter>: 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.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 180fadb..ad17cb4 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5515,7 +5515,7 @@ ada_add_block_symbols (struct obstack *obstackp, domain_enum domain, struct objfile *objfile, int wild) { - struct dict_iterator iter; + struct block_iterator iter; int name_len = strlen (name); /* A matching argument symbol, if any. */ struct symbol *arg_sym; @@ -5527,9 +5527,8 @@ ada_add_block_symbols (struct obstack *obstackp, found_sym = 0; if (wild) { - for (sym = dict_iter_match_first (BLOCK_DICT (block), name, - wild_match, &iter); - sym != NULL; sym = dict_iter_match_next (name, wild_match, &iter)) + for (sym = block_iter_match_first (block, name, wild_match, &iter); + sym != NULL; sym = block_iter_match_next (name, wild_match, &iter)) { if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), SYMBOL_DOMAIN (sym), domain) @@ -5551,9 +5550,8 @@ ada_add_block_symbols (struct obstack *obstackp, } else { - for (sym = dict_iter_match_first (BLOCK_DICT (block), name, - full_match, &iter); - sym != NULL; sym = dict_iter_match_next (name, full_match, &iter)) + for (sym = block_iter_match_first (block, name, full_match, &iter); + sym != NULL; sym = block_iter_match_next (name, full_match, &iter)) { if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), SYMBOL_DOMAIN (sym), domain)) @@ -5816,7 +5814,7 @@ ada_make_symbol_completion_list (char *text0, char *word) struct objfile *objfile; struct block *b, *surrounding_static_block = 0; int i; - struct dict_iterator iter; + struct block_iterator iter; if (text0[0] == '<') { |