git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cp-demangle.c (d_print_comp): Omit a trailing space in the operator name. 

* cp-demangle.c (d_print_comp) [DEMANGLE_COMPONENT_OPERATOR]:
	Omit a trailing space in the operator name.

From-SVN: r183072
This commit is contained in:
Jason Merrill 2012-01-10 12:02:52 -05:00 committed by Jason Merrill
parent 594ec92f50
commit 3abbe4587d
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-10 Jason Merrill <jason@redhat.com>
* cp-demangle.c (d_print_comp) [DEMANGLE_COMPONENT_OPERATOR]:
Omit a trailing space in the operator name.
2012-01-06 Jason Merrill <jason@redhat.com> 2012-01-06 Jason Merrill <jason@redhat.com>
PR c++/6057 PR c++/6057

13
libiberty/cp-demangle.c
View File

@ -4357,14 +4357,17 @@ d_print_comp (struct d_print_info *dpi, int options,
case DEMANGLE_COMPONENT_OPERATOR: case DEMANGLE_COMPONENT_OPERATOR:
{ {
char c; const struct demangle_operator_info *op = dc->u.s_operator.op;
int len = op->len;
d_append_string (dpi, "operator"); d_append_string (dpi, "operator");
c = dc->u.s_operator.op->name[0]; /* Add a space before new/delete. */
if (IS_LOWER (c)) if (IS_LOWER (op->name[0]))
d_append_char (dpi, ' '); d_append_char (dpi, ' ');
d_append_buffer (dpi, dc->u.s_operator.op->name, /* Omit a trailing space. */
dc->u.s_operator.op->len); if (op->name[len-1] == ' ')
--len;
d_append_buffer (dpi, op->name, len);
return; return;
} }

3
libiberty/testsuite/demangle-expected
View File

@ -4058,6 +4058,9 @@ decltype ((::delete {parm#1}),(+{parm#1})) f<int>(int*)
_Z1fIiEDTcmdafp_psfp_EPT_ _Z1fIiEDTcmdafp_psfp_EPT_
decltype ((delete[] {parm#1}),(+{parm#1})) f<int>(int*) decltype ((delete[] {parm#1}),(+{parm#1})) f<int>(int*)
--format=gnu-v3 --format=gnu-v3
_ZN1AdlEPv
A::operator delete(void*)
--format=gnu-v3
_Z2f1IiEDTppfp_ET_ _Z2f1IiEDTppfp_ET_
decltype ({parm#1}++) f1<int>(int) decltype ({parm#1}++) f1<int>(int)
--format=gnu-v3 --format=gnu-v3