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

Follow up for fix of bug 273759.

Browse source
This commit is contained in:
Markus Schorn 2009-04-27 08:53:57 +00:00
parent b65a792506
commit 7f998b3962
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -389,20 +389,27 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
endOffset= figureEndOffset(declSpec, declarators); endOffset= figureEndOffset(declSpec, declarators);
break; break;
default: default:
if (declOption != DeclarationOptions.LOCAL && endOffset != firstOffset) { if (declOption != DeclarationOptions.LOCAL) {
insertSemi= true; insertSemi= true;
if (markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) { if (markBeforDtor != null) {
backup(markBeforDtor); endOffset= calculateEndOffset(declSpec);
declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY; if (firstOffset != endOffset && !isOnSameLine(endOffset, markBeforDtor.getOffset())) {
endOffset= calculateEndOffset(declSpec); backup(markBeforDtor);
break; declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
break;
}
} }
endOffset= figureEndOffset(declSpec, declarators); endOffset= figureEndOffset(declSpec, declarators);
if (lt1 == 0 || !isOnSameLine(endOffset, LA(1).getOffset())) { if (lt1 == 0) {
break; break;
} }
if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) { if (firstOffset != endOffset) {
break; if (!isOnSameLine(endOffset, LA(1).getOffset())) {
break;
}
if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) {
break;
}
} }
} }
throwBacktrack(LA(1)); throwBacktrack(LA(1));