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

Bug 301933: Content assist for type-id in cast expression.

Browse source
This commit is contained in:
Markus Schorn 2010-02-05 14:55:43 +00:00
parent cf2231be77
commit b76048e02f
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,4 +204,15 @@ public class BasicCompletionTest extends CompletionTestBase {
String[] expectedCpp= {"test"}; String[] expectedCpp= {"test"};
checkCompletion(code, true, expectedCpp); checkCompletion(code, true, expectedCpp);
} }
// typedef int MyType;
// void func(){
// static_cast<My
public void testCastExpression_Bug301933() throws Exception {
String code = getAboveComment();
String[] expectedCpp= {"MyType"};
checkCompletion(code, true, expectedCpp);
}
} }

17
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
View file

@ -1432,10 +1432,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
final IASTTypeId typeID = typeId(DeclarationOptions.TYPEID); final IASTTypeId typeID = typeId(DeclarationOptions.TYPEID);
if (typeID == null) if (typeID == null)
throw backtrack; throw backtrack;
consume(IToken.tGT); consumeOrEOC(IToken.tGT);
consume(IToken.tLPAREN); consumeOrEOC(IToken.tLPAREN);
final IASTExpression operand= expression(); IASTExpression operand= null;
final int endOffset= consume(IToken.tRPAREN).getEndOffset(); if (LT(1) != IToken.tEOC) {
operand= expression();
}
final int endOffset= consumeOrEOC(IToken.tRPAREN).getEndOffset();
int operator; int operator;
switch(optype) { switch(optype) {
case IToken.t_dynamic_cast: case IToken.t_dynamic_cast:
@ -2231,7 +2234,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
endOffset= consume().getEndOffset(); endOffset= consume().getEndOffset();
break; break;
case IToken.t_mutable: case IToken.t_mutable:
storageClass = ICPPASTDeclSpecifier.sc_mutable; storageClass = IASTDeclSpecifier.sc_mutable;
endOffset= consume().getEndOffset(); endOffset= consume().getEndOffset();
break; break;
case IToken.t_typedef: case IToken.t_typedef:
@ -2318,14 +2321,14 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
case IToken.t_wchar_t: case IToken.t_wchar_t:
if (encounteredTypename) if (encounteredTypename)
break declSpecifiers; break declSpecifiers;
simpleType = ICPPASTSimpleDeclSpecifier.t_wchar_t; simpleType = IASTSimpleDeclSpecifier.t_wchar_t;
encounteredRawType= true; encounteredRawType= true;
endOffset= consume().getEndOffset(); endOffset= consume().getEndOffset();
break; break;
case IToken.t_bool: case IToken.t_bool:
if (encounteredTypename) if (encounteredTypename)
break declSpecifiers; break declSpecifiers;
simpleType = ICPPASTSimpleDeclSpecifier.t_bool; simpleType = IASTSimpleDeclSpecifier.t_bool;
encounteredRawType= true; encounteredRawType= true;
endOffset= consume().getEndOffset(); endOffset= consume().getEndOffset();
break; break;