diff options
| author | DJ Delorie <dj@delorie.com> | 2003-11-20 02:01:32 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2003-11-20 02:01:32 +0000 |
| commit | 5f1d9bea6a548ec8c87e1e35c816f9033c0f3f2e (patch) | |
| tree | 00a56356b5a98d02fbfce57ce2cb4e038af6fbb1 | |
| parent | 38931ef842091569e2634c1cdb9090063f04ce73 (diff) | |
| download | gdb-5f1d9bea6a548ec8c87e1e35c816f9033c0f3f2e.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 26485fcedb8..fc3544d1cfa 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -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 diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index a707a833402..8caa733c91f 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -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)); |