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

Partial fix for Bug 84476 - [C++ Parser] NPE caused by strange code from C++ 5.11-2

Browse source
This commit is contained in:
John Camelon 2005-02-23 21:19:53 +00:00
parent 1dba0da21f
commit 18201b4720
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
View file

@ -2069,24 +2069,19 @@ public class AST2CPPTests extends AST2BaseTest {
assertTrue( r.getReturnValue() instanceof IASTCastExpression );
}
public void testBug86336() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append("struct T1 { \n"); //$NON-NLS-1$
buffer.append(" T1 operator() ( int x ) { \n"); //$NON-NLS-1$
buffer.append(" return T1(x); \n"); //$NON-NLS-1$
buffer.append(" } \n"); //$NON-NLS-1$
buffer.append(" T1( int ) {} \n"); //$NON-NLS-1$
buffer.append("}; \n"); //$NON-NLS-1$
IASTTranslationUnit tu = parse(buffer.toString(), ParserLanguage.CPP);
CPPNameCollector col = new CPPNameCollector();
tu.getVisitor().visitTranslationUnit(col);
ICPPConstructor T1_ctor = (ICPPConstructor) col.getName(6).resolveBinding();
ICPPClassType T1 = (ICPPClassType) col.getName(0).resolveBinding();
assertInstances( col, T1_ctor, 2 );
assertInstances( col, T1, 2 );
public void testBug84476() throws Exception
{
StringBuffer buffer = new StringBuffer();
// buffer.append( "struct B { int f();};\n"); //$NON-NLS-1$
// buffer.append( "int (B::*pb)() = &B::f; \n"); //$NON-NLS-1$
buffer.append( "void foo() {\n"); //$NON-NLS-1$
buffer.append( "struct B {\n"); //$NON-NLS-1$
buffer.append( "int f();\n"); //$NON-NLS-1$
buffer.append( "}; \n"); //$NON-NLS-1$
buffer.append( "int (B::*pb)() = &B::f;\n"); //$NON-NLS-1$
buffer.append( "}\n" ); //$NON-NLS-1$
String code = buffer.toString();
parse( code, ParserLanguage.CPP );
}
}

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

@ -101,6 +101,11 @@ public class BasicTokenDuple implements ITokenDuple {
for( ;; ){
if( token == last )
break;
if( startOfSegment == last.getNext() )
{
startOfSegment = null;
break;
}
prev = token;
token = ( token != null ) ? token.getNext() : getFirstToken();
if( token.getType() == IToken.tLT )
@ -112,8 +117,11 @@ public class BasicTokenDuple implements ITokenDuple {
continue;
}
}
ITokenDuple d = TokenFactory.createTokenDuple( startOfSegment, last );
r.add( d );
if( startOfSegment != null )
{
ITokenDuple d = TokenFactory.createTokenDuple( startOfSegment, last );
r.add( d );
}
return (ITokenDuple[]) r.toArray( new ITokenDuple[ r.size() ]);
}