mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

bug 72814: [Parser] Open Declaration fails on std::vector<int> reference

Browse source
This commit is contained in:
Andrew Niefer 2004-09-30 21:19:10 +00:00
parent 30a7d6170f
commit 0ab0b97b0f
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SelectionParseTest.java
View file

@ -478,5 +478,25 @@ public class SelectionParseTest extends SelectionParseBaseTest {
assertTrue( node instanceof IASTClassSpecifier ); assertTrue( node instanceof IASTClassSpecifier );
assertEquals( ((IASTClassSpecifier)node).getName(), "A" ); //$NON-NLS-1$ assertEquals( ((IASTClassSpecifier)node).getName(), "A" ); //$NON-NLS-1$
} }
public void testBug72814() throws Exception{
Writer writer = new StringWriter();
writer.write( "namespace N{ \n"); //$NON-NLS-1$
writer.write( " template < class T > class AAA { T _t };\n"); //$NON-NLS-1$
writer.write( "} \n"); //$NON-NLS-1$
writer.write( "N::AAA<int> a; \n"); //$NON-NLS-1$
String code = writer.toString();
int startIndex = code.indexOf( "AAA<int>" ); //$NON-NLS-1$
IASTNode node = parse( code, startIndex, startIndex + 3 );
assertTrue( node instanceof IASTClassSpecifier );
assertEquals( ((IASTClassSpecifier)node).getName(), "AAA" ); //$NON-NLS-1$
node = parse( code, startIndex, startIndex + 8 );
assertTrue( node instanceof IASTClassSpecifier );
assertEquals( ((IASTClassSpecifier)node).getName(), "AAA" ); //$NON-NLS-1$
}
} }

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

@ -6607,7 +6607,7 @@ public class Parser implements IParserData, IParser
// duple is a sub-duple of greaterContextDuple // duple is a sub-duple of greaterContextDuple
if( duple.getFirstToken().equals( greaterContextDuple.getFirstToken() )) if( duple.getFirstToken().equals( greaterContextDuple.getFirstToken() ))
finalDuple = duple; // => do not use greaterContextDuple finalDuple = duple; // => do not use greaterContextDuple
else if( duple.getLastToken().equals( greaterContextDuple.getLastToken() )) else if( duple.getLastSegment().getFirstToken().equals( greaterContextDuple.getLastSegment().getFirstToken() ))
finalDuple = greaterContextDuple; // => use greaterContextDuple finalDuple = greaterContextDuple; // => use greaterContextDuple
else else
throw new ParseError( ParseError.ParseErrorKind.OFFSET_RANGE_NOT_NAME ); throw new ParseError( ParseError.ParseErrorKind.OFFSET_RANGE_NOT_NAME );

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java
View file

@ -355,6 +355,16 @@ public class BasicTokenDuple implements ITokenDuple {
IToken iter = firstToken; IToken iter = firstToken;
while( iter != lastToken) while( iter != lastToken)
{ {
if( iter.getType() == IToken.tLT ){
iter = TokenFactory.consumeTemplateIdArguments( iter, lastToken );
if( iter.getType() == IToken.tGT ){
if( iter == lastToken ) break;
iter = iter.getNext();
continue;
}
continue;
}
if( iter.isOperator() ) if( iter.isOperator() )
{ {
iter = iter.getNext(); iter = iter.getNext();