aboutsummaryrefslogtreecommitdiff
path: root/gdb/maint.c
diff options
context:
space:
mode:
authorAdam Fedor <fedor@gnu.org>2003-04-02 03:02:46 +0000
committerAdam Fedor <fedor@gnu.org>2003-04-02 03:02:46 +0000
commit9a3d7dfd2e56889dce422be422767465d3f0f06b (patch)
treef86ad9aba59abf9c3148e8b7596b96e36ba4c3bf /gdb/maint.c
parent5eb7f2340accc91a9efeab18386f95f24dd9709e (diff)
downloadgdb-9a3d7dfd2e56889dce422be422767465d3f0f06b.zip
gdb-9a3d7dfd2e56889dce422be422767465d3f0f06b.tar.gz
gdb-9a3d7dfd2e56889dce422be422767465d3f0f06b.tar.bz2
* Makefile.in (c_lang.o, jv_lang.o, language.o): Add $(demangle_h).
* language.h (struct language_defn): Add la_demangle. (language_demangle): Declare. * language.c (language_demangle): New function. (unk_lang_demangle): Likewise. (unknown_language_defn, auto_language_defn, local_language_defn): Add ukn_lang_demangle. * ada-lang.c (ada_language_defn): Add NULL for la_demangle element. * f-lang.c, m2-lang.c, p-lang.c, scm-lang.c: Likewise. * c-lang.c (c_language_defn, asm_language_defn): Likewise. (cplus_language_defn): Add cplus_demangle for la_demangle element. * jv-lang.c (java_demangle): New function (java_language_defn): Use it for la_demangle element. * objc-lang.c (objc_demangle): Add options argument (objc_language_defn): Use objc_demangle for la_demangle element. * maint.c (maintenance_demangle): Replace switch with call to language_demangle. * utils.c (fprintf_symbol_filtered): Likewise.
Diffstat (limited to 'gdb/maint.c')
-rw-r--r--gdb/maint.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/gdb/maint.c b/gdb/maint.c
index f2dfa68..166acdb 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -151,17 +151,8 @@ maintenance_demangle (char *args, int from_tty)
}
else
{
- switch (current_language->la_language)
- {
- case language_objc:
- /* Commented out until ObjC handling is enabled. */
- /* demangled = objc_demangle (args); */
- /* break; */
- case language_cplus:
- default:
- demangled = cplus_demangle (args, DMGL_ANSI | DMGL_PARAMS);
- break;
- }
+ demangled = language_demangle (current_language, args,
+ DMGL_ANSI | DMGL_PARAMS);
if (demangled != NULL)
{
printf_unfiltered ("%s\n", demangled);