mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-17 21:25:58 +02:00
Code Issues Wiki Activity

Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=60264

Browse source
This commit is contained in:
John Camelon 2004-06-10 19:33:38 +00:00
parent 4e1eceac72
commit dc9f25b601
3 changed files with 10 additions and 0 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/SelectionParseTest.java
View file

@ -163,6 +163,14 @@ public class SelectionParseTest extends SelectionParseBaseTest {
IASTNamespaceDefinition namespace = (IASTNamespaceDefinition) node; IASTNamespaceDefinition namespace = (IASTNamespaceDefinition) node;
assertEquals( namespace.getName(), "Muppets"); //$NON-NLS-1$ assertEquals( namespace.getName(), "Muppets"); //$NON-NLS-1$
assertEquals( namespace.getStartingLine(), 1 ); assertEquals( namespace.getStartingLine(), 1 );
index = code.indexOf( "e Muppets") + 2; //$NON-NLS-1$
node = parse( code, index, index + 7 );
assertTrue( node instanceof IASTNamespaceDefinition );
namespace = (IASTNamespaceDefinition) node;
assertEquals( namespace.getName(), "Muppets"); //$NON-NLS-1$
assertEquals( namespace.getStartingLine(), 1 );
} }
public void testBug61613() throws Exception public void testBug61613() throws Exception

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java
View file

@ -2963,6 +2963,7 @@ public class ExpressionParser implements IExpressionParser, IParserData {
*/ */
public IToken identifier() throws EndOfFileException, BacktrackException { public IToken identifier() throws EndOfFileException, BacktrackException {
IToken first = consume(IToken.tIDENTIFIER); // throws backtrack if its not that IToken first = consume(IToken.tIDENTIFIER); // throws backtrack if its not that
if( first instanceof ITokenDuple ) setGreaterNameContext((ITokenDuple) first);
return first; return first;
} }
/* (non-Javadoc) /* (non-Javadoc)

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
View file

@ -952,6 +952,7 @@ public abstract class Parser extends ExpressionParser implements IParser
} }
namespaceDefinition.enterScope( requestor, astFactory.getReferenceManager() ); namespaceDefinition.enterScope( requestor, astFactory.getReferenceManager() );
setCompletionValues(scope,CompletionKind.VARIABLE_TYPE, KeywordSetKey.DECLARATION ); setCompletionValues(scope,CompletionKind.VARIABLE_TYPE, KeywordSetKey.DECLARATION );
endDeclaration( namespaceDefinition );
namespaceDeclarationLoop : while (LT(1) != IToken.tRBRACE) namespaceDeclarationLoop : while (LT(1) != IToken.tRBRACE)
{ {
int checkToken = LA(1).hashCode(); int checkToken = LA(1).hashCode();