MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cplus-dem.c (demangle_integral_value): Correction to reflect patch of 2002-01-10 in order to also make negative...

Browse Source 
* cplus-dem.c (demangle_integral_value): Correction to reflect
patch of 2002-01-10 in order to also make negative multi-digits
without leading underscore work.

From-SVN: r64179
This commit is contained in:
Carlo Wood 2003-03-11 19:55:46 +00:00 committed by DJ Delorie
parent d2f55c5c66
commit 8fe857758f
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libiberty/ChangeLog
View File

@ -1,3 +1,9 @@
2003-03-11 Carlo Wood <carlo@gnu.org>
* cplus-dem.c (demangle_integral_value): Correction to reflect
patch of 2002-01-10 in order to also make negative multi-digits
without leading underscore work.
2003-03-03 Mark Mitchell <mark@codesourcery.com> 2003-03-03 Mark Mitchell <mark@codesourcery.com>
* cplus-dem.c: Add license exception to copyright notice. * cplus-dem.c: Add license exception to copyright notice.

21
libiberty/cplus-dem.c
View File

@ -1797,13 +1797,9 @@ demangle_integral_value (work, mangled, s)
success = 0; success = 0;
/* Negative numbers are indicated with a leading `m'. */ if (**mangled == '_')
if (**mangled == 'm')
{ {
string_appendn (s, "-", 1); if (mangled[0][1] == 'm')
(*mangled)++;
}
else if (mangled[0][0] == '_' && mangled[0][1] == 'm')
{ {
/* Since consume_count_with_underscores does not handle the /* Since consume_count_with_underscores does not handle the
`m'-prefix we must do it here, using consume_count and `m'-prefix we must do it here, using consume_count and
@ -1813,15 +1809,22 @@ demangle_integral_value (work, mangled, s)
string_appendn (s, "-", 1); string_appendn (s, "-", 1);
(*mangled) += 2; (*mangled) += 2;
} }
else if (**mangled == '_') else
{ {
/* Do not consume a following underscore; /* Do not consume a following underscore;
multidigit_without_leading_underscore will consume what should be consume_count_with_underscores will consume what
consumed. */ should be consumed. */
leave_following_underscore = 1; leave_following_underscore = 1;
} }
}
else else
{ {
/* Negative numbers are indicated with a leading `m'. */
if (**mangled == 'm')
{
string_appendn (s, "-", 1);
(*mangled)++;
}
/* Since consume_count_with_underscores does not handle /* Since consume_count_with_underscores does not handle
multi-digit numbers that do not start with an underscore, multi-digit numbers that do not start with an underscore,
and this number can be an integer template parameter, and this number can be an integer template parameter,