mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 01:35:39 +02:00
Code Issues Wiki Activity

Bug 324384: Content assist within K&R style function definition.

Browse source
This commit is contained in:
Markus Schorn 2010-09-06 13:48:54 +00:00
parent 12d6c482ed
commit 55296a05be
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/BasicCompletionTest.java
View file

@ -259,4 +259,12 @@ public class BasicCompletionTest extends CompletionTestBase {
String[] expected= {"B"}; String[] expected= {"B"};
checkCompletion(code, true, expected); checkCompletion(code, true, expected);
} }
// typedef int tint;
// void f(x) ti
public void testIncompleteKnrFunction_Bug324384() throws Exception {
String code = getAboveComment();
String[] expected= {"tint"};
checkCompletion(code, false, expected);
}
} }

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

@ -71,7 +71,6 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTPointer;
import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTTypedefNameSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTTypedefNameSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICNodeFactory; import org.eclipse.cdt.core.dom.ast.c.ICNodeFactory;
import org.eclipse.cdt.core.dom.ast.gnu.IGNUASTTypeIdExpression;
import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTArrayRangeDesignator; import org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTArrayRangeDesignator;
import org.eclipse.cdt.core.dom.parser.IExtensionToken; import org.eclipse.cdt.core.dom.parser.IExtensionToken;
@ -1115,7 +1114,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
simpleType= IASTSimpleDeclSpecifier.t_typeof; simpleType= IASTSimpleDeclSpecifier.t_typeof;
consume(IGCCToken.t_typeof); consume(IGCCToken.t_typeof);
typeofExpression = parseTypeidInParenthesisOrUnaryExpression(false, LA(1).getOffset(), typeofExpression = parseTypeidInParenthesisOrUnaryExpression(false, LA(1).getOffset(),
IGNUASTTypeIdExpression.op_typeof, -1, CastExprCtx.eNotBExpr); IASTTypeIdExpression.op_typeof, -1, CastExprCtx.eNotBExpr);
encounteredTypename= true; encounteredTypename= true;
endOffset= calculateEndOffset(typeofExpression); endOffset= calculateEndOffset(typeofExpression);
@ -1895,7 +1894,6 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
// look ahead for the start of the function body, if end of file is // look ahead for the start of the function body, if end of file is
// found then return 0 parameters found (implies not KnR C) // found then return 0 parameters found (implies not KnR C)
int previous=-1; int previous=-1;
int next=LA(1).hashCode();
while (LT(1) != IToken.tLBRACE) { while (LT(1) != IToken.tLBRACE) {
// fix for 100104: check if the parameter declaration is a valid one // fix for 100104: check if the parameter declaration is a valid one
try { try {
@ -1905,7 +1903,11 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
return 0; return 0;
} }
next = LA(1).hashCode(); final IToken t = LA(1);
if (t.getType() == IToken.tEOC)
break;
final int next = t.hashCode();
if (next == previous) { // infinite loop detected if (next == previous) { // infinite loop detected
break; break;
} }