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

partial fix for bug 252243 for LR parser

Browse source
This commit is contained in:
Mike Kucera 2009-03-30 15:59:54 +00:00
parent dae94a218c
commit 8fe659c7a4
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
View file

@ -95,7 +95,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
ILanguage gppLanguage = getParserLanguage() == ParserLanguage.CPP ? GPPLanguage.getDefault() : GCCLanguage.getDefault(); ILanguage gppLanguage = getParserLanguage() == ParserLanguage.CPP ? GPPLanguage.getDefault() : GCCLanguage.getDefault();
gtu = gppLanguage.getASTTranslationUnit(reader, scanInfo, fileCreator, index, options, log); gtu = gppLanguage.getASTTranslationUnit(reader, scanInfo, fileCreator, index, options, log);
System.out.println("GPP AST:"); System.out.println(gppLanguage.getName() + " AST:");
ASTPrinter.print(gtu); ASTPrinter.print(gtu);
System.out.println(); System.out.println();
} }

10
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java
View file

@ -433,6 +433,8 @@ public abstract class BuildASTParserAction extends AbstractParserAction {
if(alternateExpr == null) if(alternateExpr == null)
astStack.push(expr); astStack.push(expr);
else if(isFunctionType(expr)) // bug 252243
astStack.push(alternateExpr);
else { else {
IASTNode ambiguityNode = createAmbiguousExpression(expr, alternateExpr); IASTNode ambiguityNode = createAmbiguousExpression(expr, alternateExpr);
setOffsetAndLength(ambiguityNode); setOffsetAndLength(ambiguityNode);
@ -441,6 +443,14 @@ public abstract class BuildASTParserAction extends AbstractParserAction {
} }
private static boolean isFunctionType(IASTExpression expr) {
if(expr instanceof IASTTypeIdExpression) {
IASTTypeId typeId = ((IASTTypeIdExpression) expr).getTypeId();
return typeId.getAbstractDeclarator() instanceof IASTFunctionDeclarator;
}
return false;
}
/** /**
* Lots of rules, no need to list them all. * Lots of rules, no need to list them all.