mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Bug 527872: UDL operator name gets duplicated on rewrite

Browse source 
Change-Id: Id1cda5f09f6fc3852a99a607be21f6ea33f5faf5
Signed-off-by: Hansruedi Patzen <hansruedi.patzen@hsr.ch>
This commit is contained in:
Hansruedi Patzen 2017-11-28 15:40:28 +01:00
parent 6db1357b1a
commit 7d208e098f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core.tests/resources/rewrite/ASTWriterDeclaratorTestSource.awts
View file

@ -171,3 +171,10 @@ void foo() noexcept (noexcept (1 + 1))
void foo() noexcept (noexcept (1 + 1) && noexcept (2 + 3)) void foo() noexcept (noexcept (1 + 1) && noexcept (2 + 3))
{ {
} }
//!Basic UDL operator
//%CPP
constexpr long double operator ""_deg(long double deg)
{
return deg * 3.141592 / 180;
}

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
View file

@ -913,7 +913,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IToken ident = consume(IToken.tIDENTIFIER); IToken ident = consume(IToken.tIDENTIFIER);
char[] operatorName = CharArrayUtils.concat(firstToken.getCharImage(), " ".toCharArray()); //$NON-NLS-1$ char[] operatorName = CharArrayUtils.concat(firstToken.getCharImage(), " ".toCharArray()); //$NON-NLS-1$
operatorName = CharArrayUtils.concat(operatorName, strOp.getCharImage()); operatorName = CharArrayUtils.concat(operatorName, strOp.getCharImage());
operatorName = CharArrayUtils.concat(operatorName, ident.getCharImage()); operatorName = CharArrayUtils.concat(operatorName, ident.getCharImage());
IASTName name = getNodeFactory().newOperatorName(operatorName); IASTName name = getNodeFactory().newOperatorName(operatorName);
@ -929,12 +929,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
int startQuote = image.indexOf('"'); int startQuote = image.indexOf('"');
int endQuote = image.lastIndexOf('"'); int endQuote = image.lastIndexOf('"');
if (startQuote != -1 && endQuote == startQuote + 1) { if (startQuote != -1 && endQuote == startQuote + 1) {
char[] ident = image.substring(endQuote + 1).toCharArray();
char[] operatorName = CharArrayUtils.concat(firstToken.getCharImage(), " ".toCharArray()); //$NON-NLS-1$ char[] operatorName = CharArrayUtils.concat(firstToken.getCharImage(), " ".toCharArray()); //$NON-NLS-1$
operatorName = CharArrayUtils.concat(operatorName, strOp.getCharImage()); operatorName = CharArrayUtils.concat(operatorName, strOp.getCharImage());
operatorName = CharArrayUtils.concat(operatorName, ident);
IASTName name = getNodeFactory().newOperatorName(operatorName); IASTName name = getNodeFactory().newOperatorName(operatorName);
setRange(name, firstToken.getOffset(), strOp.getEndOffset()); setRange(name, firstToken.getOffset(), strOp.getEndOffset());
return name; return name;