merge from gcc

This commit is contained in:
DJ Delorie 2003-11-20 02:01:32 +00:00
parent 43b5c447a2
commit dd9d4b48fd
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2003-11-19 Mark Mitchell <mark@codesourcery.com>
* cp-demangle.c (demangle_type): Correct thinko in substitution
processing.
2003-11-18 Ian Lance Taylor <ian@wasabisystems.com>
* cp-demangle.c (demangle_operator_name): Remove space before

View File

@ -2557,10 +2557,12 @@ demangle_type (dm)
case 'S':
/* First check if this is a special substitution. If it is,
this is a <class-enum-type>. Special substitutions have a
letter following the `S'; other substitutions have a digit
or underscore. */
lower-case letter following the `S'; other substitutions
have a digit, upper-case letter, or underscore. */
peek_next = peek_char_next (dm);
if (IS_DIGIT (peek_next) || peek_next == '_')
if (IS_DIGIT (peek_next)
|| (peek_next >= 'A' && peek_next <= 'Z')
|| peek_next == '_')
{
RETURN_IF_ERROR (demangle_substitution (dm, &encode_return_type));