* symtab.h: Remove objc_specific struct

(SYMBOL_OBJC_DEMANGLED_NAME): Remove.
* symtab.c (symbol_init_language_specific, symbol_demangled_name):
Have language_objc use cplus_specific struct.
This commit is contained in:
Adam Fedor 2003-02-21 03:00:27 +00:00
parent d4cad8db8c
commit 5784d15e43
3 changed files with 11 additions and 17 deletions

View File

@ -1,3 +1,10 @@
2003-02-20 Adam Fedor <fedor@gnu.org>
* symtab.h: Remove objc_specific struct
(SYMBOL_OBJC_DEMANGLED_NAME): Remove.
* symtab.c (symbol_init_language_specific, symbol_demangled_name):
Have language_objc use cplus_specific struct.
2003-02-20 Tom Tromey <tromey@redhat.com> 2003-02-20 Tom Tromey <tromey@redhat.com>
* jv-valprint.c (java_value_print): Look at TYPE_TAG_NAME, not * jv-valprint.c (java_value_print): Look at TYPE_TAG_NAME, not

View File

@ -413,14 +413,11 @@ symbol_init_language_specific (struct general_symbol_info *gsymbol,
{ {
gsymbol->language = language; gsymbol->language = language;
if (gsymbol->language == language_cplus if (gsymbol->language == language_cplus
|| gsymbol->language == language_java) || gsymbol->language == language_java
|| gsymbol->language == language_objc)
{ {
gsymbol->language_specific.cplus_specific.demangled_name = NULL; gsymbol->language_specific.cplus_specific.demangled_name = NULL;
} }
else if (gsymbol->language == language_objc)
{
gsymbol->language_specific.objc_specific.demangled_name = NULL;
}
else else
{ {
memset (&gsymbol->language_specific, 0, memset (&gsymbol->language_specific, 0,
@ -584,12 +581,10 @@ char *
symbol_demangled_name (struct general_symbol_info *gsymbol) symbol_demangled_name (struct general_symbol_info *gsymbol)
{ {
if (gsymbol->language == language_cplus if (gsymbol->language == language_cplus
|| gsymbol->language == language_java) || gsymbol->language == language_java
|| gsymbol->language == language_objc)
return gsymbol->language_specific.cplus_specific.demangled_name; return gsymbol->language_specific.cplus_specific.demangled_name;
else if (gsymbol->language == language_objc)
return gsymbol->language_specific.objc_specific.demangled_name;
else else
return NULL; return NULL;
} }

View File

@ -94,11 +94,6 @@ struct general_symbol_info
char *demangled_name; char *demangled_name;
} }
cplus_specific; cplus_specific;
struct objc_specific
{
char *demangled_name;
}
objc_specific;
} }
language_specific; language_specific;
@ -169,9 +164,6 @@ extern void symbol_set_names (struct general_symbol_info *symbol,
(symbol_demangled_name (&(symbol)->ginfo)) (symbol_demangled_name (&(symbol)->ginfo))
extern char *symbol_demangled_name (struct general_symbol_info *symbol); extern char *symbol_demangled_name (struct general_symbol_info *symbol);
#define SYMBOL_OBJC_DEMANGLED_NAME(symbol) \
(symbol)->ginfo.language_specific.objc_specific.demangled_name
/* Macro that returns a version of the name of a symbol that is /* Macro that returns a version of the name of a symbol that is
suitable for output. In C++ this is the "demangled" form of the suitable for output. In C++ this is the "demangled" form of the
name if demangle is on and the "mangled" form of the name if name if demangle is on and the "mangled" form of the name if