* 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.
This commit is contained in:
Adam Fedor
2003-04-02 03:02:46 +00:00
parent 5eb7f2340a
commit 9a3d7dfd2e
15 changed files with 81 additions and 32 deletions

View File

@@ -2298,22 +2298,7 @@ fprintf_symbol_filtered (struct ui_file *stream, char *name,
}
else
{
switch (lang)
{
case language_cplus:
demangled = cplus_demangle (name, arg_mode);
break;
case language_java:
demangled = cplus_demangle (name, arg_mode | DMGL_JAVA);
break;
case language_objc:
/* Commented out until ObjC handling is enabled. */
/*demangled = objc_demangle (name); */
/*break; */
default:
demangled = NULL;
break;
}
demangled = language_demangle (language_def (lang), name, arg_mode);
fputs_filtered (demangled ? demangled : name, stream);
if (demangled != NULL)
{