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

Bug 531701 - ClassCastException in

Browse source 
AttributeWriter.writeGCCAttributeSpecifier()

* Added test to reproduce initial issue.

Change-Id: I72e60fb2244b7d40492bfcdeaa58a8707c39e277
Signed-off-by: Thomas Corbat <tcorbat@hsr.ch>
This commit is contained in:
Nathan Ridge 2018-02-27 00:06:59 -05:00 • committed by Thomas Corbat
parent e02e28eec1
commit 4e4e010e33
2 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/AttributeWriter.java
View file

@ -21,7 +21,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTAttributeList;
import org.eclipse.cdt.core.dom.ast.gnu.IGCCASTAttributeList;
import org.eclipse.cdt.core.parser.GCCKeywords;
import org.eclipse.cdt.core.parser.Keywords;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTAttribute;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
/**
@ -65,7 +64,11 @@ public class AttributeWriter extends NodeWriter {
IASTAttribute[] innerAttributes = specifier.getAttributes();
for (int i = 0; i < innerAttributes.length; i++) {
IASTAttribute innerAttribute = innerAttributes[i];
writeAttribute((CPPASTAttribute)innerAttribute);
if (innerAttribute instanceof ICPPASTAttribute) {
writeAttribute((ICPPASTAttribute) innerAttribute);
} else {
writeAttribute(innerAttribute);
}
if (i < innerAttributes.length - 1) {
scribe.print(',');
scribe.printSpace();
@ -91,12 +94,7 @@ public class AttributeWriter extends NodeWriter {
scribe.print(CLOSING_SQUARE_BRACKET);
}
private void writeAttribute(ICPPASTAttribute attribute) {
char[] scope = attribute.getScope();
if (scope != null) {
scribe.print(scope);
scribe.print(COLON_COLON);
}
private void writeAttribute(IASTAttribute attribute) {
scribe.print(attribute.getName());
IASTToken argumentClause = attribute.getArgumentClause();
@ -105,13 +103,29 @@ public class AttributeWriter extends NodeWriter {
printTokens(argumentClause);
scribe.print(CLOSING_PARENTHESIS);
}
}
private void writeAttributeScope(ICPPASTAttribute attribute) {
char[] scope = attribute.getScope();
if (scope != null) {
scribe.print(scope);
scribe.print(COLON_COLON);
}
}
private void writeAttributeVarArgs(ICPPASTAttribute attribute) {
if (attribute.hasPackExpansion()) {
scribe.printSpace();
scribe.print(VAR_ARGS);
}
}
private void writeAttribute(ICPPASTAttribute attribute) {
writeAttributeScope(attribute);
writeAttribute((IASTAttribute) attribute);
writeAttributeVarArgs(attribute);
}
protected void printTokens(IASTToken token) {
if (token instanceof IASTTokenList) {
for (IASTToken innerToken : ((IASTTokenList) token).getTokens()) {

17
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java
View file

@ -3551,4 +3551,21 @@ public class ToggleRefactoringTest extends RefactoringTestBase {
public void testToggleWithTemplateArgumentDependentQualifierInReturnType_399931() throws Exception {
assertRefactoringSuccess();
}
//A.c
//void /*$*/freefunction/*$$*/(int x __attribute__((unused))) {
// return;
//}
//====================
//#include "A.h"
//
//A.h
//====================
//void freefunction(int x __attribute__((unused))) {
// return;
//}
public void testFreeFunctionFromHeaderToImplInC_531701() throws Exception {
assertRefactoringSuccess();
}
}