mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

fix bug 71410.

Browse source 
move test FailedCompleteParseASTTest.testInheritsFromTemplateParameter_bug71410()
to CompleteParseASTTemplateTest.java
This commit is contained in:
Andrew Niefer 2004-08-10 19:33:52 +00:00
parent c545faa301
commit e803a76b2a
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/parser/failedTests/FailedCompleteParseASTTest.java
View file

@ -204,25 +204,6 @@ public class FailedCompleteParseASTTest extends CompleteParseBaseTest
// assertFalse(j.hasNext());
}
public void testInheritsFromTemplateParameter_bug71410() throws Exception {
try {
// An inner type definition inherits from a template parameter
parse("template <typename T, class U> \n class A { \n struct B : U { T* mpT; }; \n B mB; \n T* foo() { return mB.mpT; } \n }; \n");//$NON-NLS-1$
fail();
} catch (ParserException e) {
assertTrue( e.getMessage().equals( "FAILURE" ) ); //$NON-NLS-1$
}
// Iterator i = parse("template <typename T, class U> \n class A { \n struct B : U { T* mT; }; \n B mB; \n T* getVal() { return mB.mT; } \n }; \n").getDeclarations();//$NON-NLS-1$
// IASTTemplateDeclaration td = (IASTTemplateDeclaration)i.next();
// assertFalse(i.hasNext());
// IASTClassSpecifier cs = (IASTClassSpecifier) td.getOwnedDeclaration();
// Iterator j = cs.getDeclarations();
// IASTClassSpecifier cs2 = (IASTClassSpecifier) j.next();
// IASTField f = (IASTField) j.next();
// IASTMethod m = (IASTMethod) j.next();
// assertFalse(j.hasNext());
}
public void testParametrizedTypeDefinition_bug69751() throws Exception {
try {
// a typedef refers to an unknown type in a template parameter

13
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTemplateTest.java
View file

@ -1044,4 +1044,17 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
assertEquals( clause.getParentClassSpecifier(), B1cls );
}
public void testInheritsFromTemplateParameter_bug71410() throws Exception {
// An inner type definition inherits from a template parameter
Iterator i = parse("template <typename T, class U> \n class A { \n struct B : U { T* mT; }; \n B mB; \n T* getVal() { return mB.mT; } \n }; \n").getDeclarations();//$NON-NLS-1$
IASTTemplateDeclaration td = (IASTTemplateDeclaration)i.next();
assertFalse(i.hasNext());
IASTClassSpecifier cs = (IASTClassSpecifier) td.getOwnedDeclaration();
Iterator j = cs.getDeclarations();
IASTClassSpecifier cs2 = (IASTClassSpecifier) j.next();
IASTField f = (IASTField) j.next();
IASTMethod m = (IASTMethod) j.next();
assertFalse(j.hasNext());
}
}

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java
View file

@ -651,7 +651,9 @@ public class ParserSymbolTable {
{
wrapper = (IDerivableContainerSymbol.IParentSymbol) scopes.get(i);
ISymbol parent = wrapper.getParent();
if( parent == null )
//skip if parent is template parameter
if( parent == null || parent.isType( ITypeInfo.t_templateParameter ) )
continue;
if( !wrapper.isVirtual() || !data.visited.containsKey( parent ) ){