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

Fixes a loop in the c-parser, bug 273759.

Browse source
This commit is contained in:
Markus Schorn 2009-04-27 08:32:31 +00:00
parent 7784c9c727
commit b65a792506
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/FaultToleranceTests.java
View file

@ -242,4 +242,22 @@ public class FaultToleranceTests extends AST2BaseTest {
IASTSimpleDeclaration s= getDeclaration(ct, 2);
assertEquals("int i;", s.getRawSignature());
}
// #define XX() .
// int c;
// XX(
// );
// int d;
public void testErrorRecovery_273759() throws Exception {
IASTTranslationUnit tu= parse(getAboveComment(), ParserLanguage.C, false, false);
IASTSimpleDeclaration s= getDeclaration(tu, 0);
IASTProblemDeclaration p= getDeclaration(tu, 1);
s= getDeclaration(tu, 2);
tu= parse(getAboveComment(), ParserLanguage.CPP, false, false);
s= getDeclaration(tu, 0);
p= getDeclaration(tu, 1);
s= getDeclaration(tu, 2);
}
}

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
View file

@ -1539,8 +1539,11 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
// a node was detected by assuming additional tokens (e.g. missing semicolon)
IASTNode n= bt.getNodeBeforeProblem();
if (n instanceof IASTDeclaration) {
declarationMark= null;
return new IASTDeclaration[] {(IASTDeclaration) n, buildProblemDeclaration(origProblem)};
IToken la1= LAcatchEOF(1);
if (la1 == null || la1.getOffset() > offset) {
declarationMark= null;
return new IASTDeclaration[] {(IASTDeclaration) n, buildProblemDeclaration(origProblem)};
}
}
if (declarationMark != null && isActiveCode()) {

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
View file

@ -389,7 +389,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
endOffset= figureEndOffset(declSpec, declarators);
break;
default:
if (declOption != DeclarationOptions.LOCAL) {
if (declOption != DeclarationOptions.LOCAL && endOffset != firstOffset) {
insertSemi= true;
if (markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
backup(markBeforDtor);