mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Bug 533319: ASTRewrite parameter pack wrong pointer operators position

Browse source 
Change-Id: I4798afa95d66aeed04b155ccd62a2b133f579296
Signed-off-by: Hansruedi Patzen <hansruedi.patzen@hsr.ch>
This commit is contained in:
Hansruedi Patzen 2018-04-06 17:01:48 +02:00
parent a10fc3eafe
commit 54287859f0
2 changed files with 55 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,3 +178,49 @@ constexpr long double operator ""_deg(long double deg)
{ {
return deg * 3.141592 / 180; return deg * 3.141592 / 180;
} }
//!Memberfunction with varargs parameter without pointer ops
//%CPP
struct Foo
{
template<typename... ARGS>
void bar(ARGS... args)
{
}
};
//!Memberfunction with varargs parameter with pointer ops
//%CPP
struct Foo
{
template<typename... ARGS>
void bar(ARGS&&... args)
{
}
};
//!Template function with varargs parameter without pointer ops
//%CPP
template<typename... ARGS>
void foo(ARGS... args)
{
}
//!Template function with varargs parameter with pointer ops
//%CPP
template<typename... ARGS>
void foo(ARGS&&... args)
{
}
//!Function with varargs parameter without pointer ops
//%CPP
void foo(int arg, ...)
{
}
//!Function with varargs parameter with pointer ops
//%CPP
void foo(int&& arg, ...)
{
}

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/DeclaratorWriter.java
View file

@ -66,8 +66,6 @@ public class DeclaratorWriter extends NodeWriter {
writeFieldDeclarator((IASTFieldDeclarator) declarator); writeFieldDeclarator((IASTFieldDeclarator) declarator);
} else if (declarator instanceof ICASTKnRFunctionDeclarator) { } else if (declarator instanceof ICASTKnRFunctionDeclarator) {
writeCKnRFunctionDeclarator((ICASTKnRFunctionDeclarator) declarator); writeCKnRFunctionDeclarator((ICASTKnRFunctionDeclarator) declarator);
} else if (declarator instanceof ICPPASTDeclarator) {
writeCPPDeclarator((ICPPASTDeclarator) declarator);
} else { } else {
writeDefaultDeclarator(declarator); writeDefaultDeclarator(declarator);
} }
@ -79,6 +77,7 @@ public class DeclaratorWriter extends NodeWriter {
protected void writeDefaultDeclarator(IASTDeclarator declarator) { protected void writeDefaultDeclarator(IASTDeclarator declarator) {
IASTPointerOperator[] pointOps = declarator.getPointerOperators(); IASTPointerOperator[] pointOps = declarator.getPointerOperators();
writePointerOperators(declarator, pointOps); writePointerOperators(declarator, pointOps);
writeParameterPack(declarator);
IASTName name = declarator.getName(); IASTName name = declarator.getName();
name.accept(visitor); name.accept(visitor);
writeNestedDeclarator(declarator); writeNestedDeclarator(declarator);
@ -97,6 +96,14 @@ public class DeclaratorWriter extends NodeWriter {
} }
} }
private void writeParameterPack(IASTDeclarator declarator) {
if (declarator instanceof ICPPASTDeclarator) {
if (((ICPPASTDeclarator) declarator).declaresParameterPack()) {
scribe.print(VAR_ARGS);
}
}
}
private void writeFunctionDeclarator(IASTStandardFunctionDeclarator funcDec) { private void writeFunctionDeclarator(IASTStandardFunctionDeclarator funcDec) {
IASTPointerOperator[] pointOps = funcDec.getPointerOperators(); IASTPointerOperator[] pointOps = funcDec.getPointerOperators();
writePointerOperators(funcDec, pointOps); writePointerOperators(funcDec, pointOps);
@ -330,11 +337,4 @@ public class DeclaratorWriter extends NodeWriter {
protected void writeKnRParameterNames(ICASTKnRFunctionDeclarator knrFunct, IASTName[] parameterNames) { protected void writeKnRParameterNames(ICASTKnRFunctionDeclarator knrFunct, IASTName[] parameterNames) {
writeNodeList(parameterNames); writeNodeList(parameterNames);
} }
protected void writeCPPDeclarator(ICPPASTDeclarator declarator) {
if (declarator.declaresParameterPack()) {
scribe.print(VAR_ARGS);
}
writeDefaultDeclarator(declarator);
}
} }