From 9a044a8903fdfe53411787984379191d15373019 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 30 Sep 2008 17:21:28 +0000 Subject: gdb PR gdb/2484: * symtab.c (struct add_macro_name_data): New struct. (add_macro_name): New function. (default_make_symbol_completion_list): Complete macro names. * scm-lang.c (scm_language_defn): Update. * p-lang.c (pascal_language_defn): Update. * objc-lang.c (objc_language_defn): Update. * macrotab.h (macro_callback_fn): Add user_data argument. (macro_for_each): Likewise. (macro_for_each_in_scope): Declare. * macrotab.c: (struct macro_for_each_data): New struct. (foreach_macro): Use it. (macro_for_each): Likewise. (foreach_macro_in_scope): New function. (macro_for_each_in_scope): Likewise. * macrocmd.c (print_one_macro): Add argument. (macro_list_command): Pass NULL to macro_for_each. * m2-lang.c (m2_language_defn): Update. * language.h (struct language_defn) : New field. (macro_expansion): New enum. * language.c (unknown_language_defn): Update. Fix order of initializers. (auto_language_defn): Likewise. (local_language_defn): Update. * jv-lang.c (java_language_defn): Update. * f-lang.c (f_language_defn): Update. * c-lang.c (c_language_defn): Update. (cplus_language_defn): Likewise. (asm_language_defn): Likewise. (minimal_language_defn): Likewise. * ada-lang.c (ada_language_defn): Update. gdb/testsuite * gdb.base/macscp.exp: Add completion tests. * gdb.base/macscp1.c (FIFTY_SEVEN): New macro. (TWENTY_THREE): Likewise. (FORTY_EIGHT): Likewise. --- gdb/macrocmd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gdb/macrocmd.c') diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c index c9ab440f794..56e9a48ff22 100644 --- a/gdb/macrocmd.c +++ b/gdb/macrocmd.c @@ -345,7 +345,8 @@ macro_undef_command (char *exp, int from_tty) static void -print_one_macro (const char *name, const struct macro_definition *macro) +print_one_macro (const char *name, const struct macro_definition *macro, + void *ignore) { fprintf_filtered (gdb_stdout, "macro define %s", name); if (macro->kind == macro_function_like) @@ -366,7 +367,7 @@ print_one_macro (const char *name, const struct macro_definition *macro) static void macro_list_command (char *exp, int from_tty) { - macro_for_each (macro_user_macros, print_one_macro); + macro_for_each (macro_user_macros, print_one_macro, NULL); } -- cgit v1.2.1