+2000-06-09 Zack Weinberg <zack@wolery.cumb.org>
+
+ * cp-demangle.c (demangle_operator_name): Add spaces before
+ names beginning with a letter: delete, delete[], new, new[],
+ sizeof.
+ (demangle_special_name): Handle TF <type> and TJ <type>.
+
Thu Jun 8 18:52:24 2000 Philippe De Muyter <phdm@macqel.be>
* cp-demangle.c (template_arg_list_new): Revert previous PARAMS patch.
{ "cm", "," , 2 },
{ "co", "~" , 1 },
{ "dV", "/=" , 2 },
- { "da", "delete[]" , 1 },
+ { "da", " delete[]", 1 },
{ "de", "*" , 1 },
- { "dl", "delete" , 1 },
+ { "dl", " delete" , 1 },
{ "dv", "/" , 2 },
{ "eO", "^=" , 2 },
{ "eo", "^" , 2 },
{ "mi", "-" , 2 },
{ "ml", "*" , 2 },
{ "mm", "--" , 1 },
- { "na", "new[]" , 1 },
+ { "na", " new[]" , 1 },
{ "ne", "!=" , 2 },
{ "ng", "-" , 1 },
{ "nt", "!" , 1 },
- { "nw", "new" , 1 },
+ { "nw", " new" , 1 },
{ "oR", "|=" , 2 },
{ "oo", "||" , 2 },
{ "or", "|" , 2 },
{ "rS", ">>=" , 2 },
{ "rm", "%" , 2 },
{ "rs", ">>" , 2 },
- { "sz", "sizeof" , 1 }
+ { "sz", " sizeof" , 1 }
};
const int num_operators =
::= TI <type> # typeinfo structure
::= TS <type> # typeinfo name
- Also demangles the special g++ mangling,
+ Also demangles the special g++ manglings,
<special-name> ::= CT <type> <offset number> _ <base type>
- # construction vtable */
+ # construction vtable
+ ::= TF <type> # typeinfo function (old ABI only)
+ ::= TJ <type> # java Class structure */
static status_t
demangle_special_name (dm)
RETURN_IF_ERROR (demangle_type (dm));
break;
+ case 'F':
+ /* Typeinfo function. Used only in old ABI with new mangling. */
+ advance_char (dm);
+ result_append (dm, "typeinfo fn for ");
+ RETURN_IF_ERROR (demangle_type (dm));
+ break;
+
case 'S':
/* Character string containing type name, used in typeinfo. */
advance_char (dm);
RETURN_IF_ERROR (demangle_type (dm));
break;
+ case 'J':
+ /* The java Class variable corresponding to a C++ class. */
+ advance_char (dm);
+ result_append (dm, "java Class for ");
+ RETURN_IF_ERROR (demangle_type (dm));
+ break;
+
case 'h':
/* Non-virtual thunk. */
advance_char (dm);