mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Fixed bug in GNUCSourceParser regarding parsing typedefed anonymous structs as parameters in a function definition.

Browse source
This commit is contained in:
John Camelon 2004-11-23 15:22:42 +00:00
parent 894e597b9e
commit b36410c4ee
2 changed files with 38 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -712,5 +712,11 @@ public class AST2Tests extends AST2BaseTest {
assertEquals( label_1, label_2 );
}
public void testAnonStruct() throws Exception
{
StringBuffer buffer = new StringBuffer( "typedef struct { } X;\n"); //$NON-NLS-1$
buffer.append( "int f( X x );"); //$NON-NLS-1$
parse( buffer.toString(), ParserLanguage.C );
}
}

98
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser2/c/GNUCSourceParser.java
View file

@ -1580,74 +1580,40 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
for (;;) {
switch (LT(1)) {
case IToken.tLPAREN:
boolean failed = false;
// temporary fix for initializer/function declaration
// ambiguity
if (!LA(2).looksLikeExpression()) {
if (LT(2) == IToken.tIDENTIFIER) {
IToken newMark = mark();
consume(IToken.tLPAREN);
ITokenDuple queryName = null;
try {
try {
IToken i = identifier();
queryName = TokenFactory.createTokenDuple(
i, i);
// look it up
failed = true;
} catch (Exception e) {
int endOffset = (lastToken != null) ? lastToken
.getEndOffset()
: 0;
logException(
"declarator:queryIsTypeName", e); //$NON-NLS-1$
throwBacktrack(startingOffset, endOffset,
line, newMark.getFilename());
}
} catch (BacktrackException b) {
failed = true;
}
if (queryName != null)
queryName.freeReferences();
backup(newMark);
}
}
if ((!LA(2).looksLikeExpression() && !failed)) {
// parameterDeclarationClause
// d.setIsFunction(true);
// TODO need to create a temporary scope object here
consume(IToken.tLPAREN);
isFunction = true;
boolean seenParameter = false;
parameterDeclarationLoop: for (;;) {
switch (LT(1)) {
case IToken.tRPAREN:
consume();
break parameterDeclarationLoop;
case IToken.tELLIPSIS:
consume();
encounteredVarArgs = true;
break;
case IToken.tCOMMA:
consume();
seenParameter = false;
break;
default:
int endOffset = (lastToken != null) ? lastToken
.getEndOffset() : 0;
if (seenParameter)
throwBacktrack(startingOffset, endOffset,
line, fn);
IASTParameterDeclaration pd = parameterDeclaration();
if (parameters == Collections.EMPTY_LIST)
parameters = new ArrayList(
DEFAULT_PARAMETERS_LIST_SIZE);
parameters.add(pd);
seenParameter = true;
}
// parameterDeclarationClause
// d.setIsFunction(true);
// TODO need to create a temporary scope object here
consume(IToken.tLPAREN);
isFunction = true;
boolean seenParameter = false;
parameterDeclarationLoop: for (;;) {
switch (LT(1)) {
case IToken.tRPAREN:
consume();
break parameterDeclarationLoop;
case IToken.tELLIPSIS:
consume();
encounteredVarArgs = true;
break;
case IToken.tCOMMA:
consume();
seenParameter = false;
break;
default:
int endOffset = (lastToken != null) ? lastToken
.getEndOffset() : 0;
if (seenParameter)
throwBacktrack(startingOffset, endOffset,
line, fn);
IASTParameterDeclaration pd = parameterDeclaration();
if (parameters == Collections.EMPTY_LIST)
parameters = new ArrayList(
DEFAULT_PARAMETERS_LIST_SIZE);
parameters.add(pd);
seenParameter = true;
}
}
break;
case IToken.tLBRACKET:
if( arrayMods == Collections.EMPTY_LIST )