mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 07:25:23 +02:00
Code Issues Wiki Activity

fix bug 59893 & parser bugs with volatile methods

Browse source 
also mark strings in some tests as non externalizable
This commit is contained in:
Andrew Niefer 2004-04-28 21:33:50 +00:00
parent 971ac3a04c
commit c59044d3ac
9 changed files with 416 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTSymbolIteratorTest.java
View file

@ -67,10 +67,10 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
{ {
callback = new CompilationUnitCallback(); callback = new CompilationUnitCallback();
IParser parser = ParserFactory.createParser( IParser parser = ParserFactory.createParser(
ParserFactory.createScanner( new StringReader( code ), "test-code", new ScannerInfo(), ParserFactory.createScanner( new StringReader( code ), "test-code", new ScannerInfo(), //$NON-NLS-1$
ParserMode.COMPLETE_PARSE, language, callback, new NullLogService(), null ), callback, ParserMode.COMPLETE_PARSE, language, null ParserMode.COMPLETE_PARSE, language, callback, new NullLogService(), null ), callback, ParserMode.COMPLETE_PARSE, language, null
); );
if( ! parser.parse() && throwOnError ) throw new ParserException( "FAILURE"); if( ! parser.parse() && throwOnError ) throw new ParserException( "FAILURE"); //$NON-NLS-1$
return callback.getCompilationUnit(); return callback.getCompilationUnit();
} }
@ -84,7 +84,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testEmptyCompilationUnit() throws Exception public void testEmptyCompilationUnit() throws Exception
{ {
IASTScope compilationUnit = parse( "// no real code "); IASTScope compilationUnit = parse( "// no real code "); //$NON-NLS-1$
assertNotNull( compilationUnit ); assertNotNull( compilationUnit );
assertFalse( compilationUnit.getDeclarations().hasNext() ); assertFalse( compilationUnit.getDeclarations().hasNext() );
@ -98,10 +98,10 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testSimpleNamespace() throws Exception public void testSimpleNamespace() throws Exception
{ {
Iterator declarations = parse( "namespace A { }").getDeclarations(); Iterator declarations = parse( "namespace A { }").getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next(); IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next();
assertEquals( namespaceDefinition.getName(), "A" ); assertEquals( namespaceDefinition.getName(), "A" ); //$NON-NLS-1$
assertFalse( namespaceDefinition.getDeclarations().hasNext() ); assertFalse( namespaceDefinition.getDeclarations().hasNext() );
try{ try{
@ -113,40 +113,40 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testMultipleNamespaceDefinitions() throws Exception public void testMultipleNamespaceDefinitions() throws Exception
{ {
Iterator declarations = parse( "namespace A { } namespace A { }").getDeclarations(); Iterator declarations = parse( "namespace A { } namespace A { }").getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next(); IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next();
assertEquals( namespaceDefinition.getName(), "A" ); assertEquals( namespaceDefinition.getName(), "A" ); //$NON-NLS-1$
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testNestedNamespaceDefinitions() throws Exception public void testNestedNamespaceDefinitions() throws Exception
{ {
Iterator declarations = parse( "namespace A { namespace B { } }").getDeclarations(); Iterator declarations = parse( "namespace A { namespace B { } }").getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next(); IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next();
assertEquals( namespaceDefinition.getName(), "A" ); assertEquals( namespaceDefinition.getName(), "A" ); //$NON-NLS-1$
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
Iterator subDeclarations = namespaceDefinition.getDeclarations(); Iterator subDeclarations = namespaceDefinition.getDeclarations();
IASTNamespaceDefinition subDeclaration = (IASTNamespaceDefinition)subDeclarations.next(); IASTNamespaceDefinition subDeclaration = (IASTNamespaceDefinition)subDeclarations.next();
assertEquals( subDeclaration.getName(), "B" ); assertEquals( subDeclaration.getName(), "B" ); //$NON-NLS-1$
assertFalse( subDeclarations.hasNext() ); assertFalse( subDeclarations.hasNext() );
} }
public void testEmptyClassDeclaration() throws Exception public void testEmptyClassDeclaration() throws Exception
{ {
Iterator declarations = parse( "class A { };").getDeclarations(); Iterator declarations = parse( "class A { };").getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classSpec = (IASTClassSpecifier)declarations.next(); IASTClassSpecifier classSpec = (IASTClassSpecifier)declarations.next();
assertEquals( classSpec.getName(), "A"); assertEquals( classSpec.getName(), "A"); //$NON-NLS-1$
assertFalse( classSpec.getDeclarations().hasNext() ); assertFalse( classSpec.getDeclarations().hasNext() );
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testNestedSubclass() throws Exception public void testNestedSubclass() throws Exception
{ {
Iterator declarations = parse( "namespace N { class A { }; } class B : protected virtual N::A { };").getDeclarations(); Iterator declarations = parse( "namespace N { class A { }; } class B : protected virtual N::A { };").getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next(); IASTNamespaceDefinition namespaceDefinition = (IASTNamespaceDefinition)declarations.next();
@ -163,41 +163,41 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testSimpleVariable() throws Exception public void testSimpleVariable() throws Exception
{ {
Iterator declarations = parse( "int x;").getDeclarations(); Iterator declarations = parse( "int x;").getDeclarations(); //$NON-NLS-1$
IASTVariable v = (IASTVariable)declarations.next(); IASTVariable v = (IASTVariable)declarations.next();
assertEquals( v.getName(), "x"); assertEquals( v.getName(), "x"); //$NON-NLS-1$
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testSimpleClassReferenceVariable() throws Exception public void testSimpleClassReferenceVariable() throws Exception
{ {
Iterator declarations = parse( "class A { } a; A x;").getDeclarations(); Iterator declarations = parse( "class A { } a; A x;").getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next(); IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next();
assertFalse( classA.getDeclarations().hasNext() ); assertFalse( classA.getDeclarations().hasNext() );
IASTVariable a = (IASTVariable)declarations.next(); IASTVariable a = (IASTVariable)declarations.next();
assertEquals( a.getName(), "a"); assertEquals( a.getName(), "a"); //$NON-NLS-1$
IASTVariable v = (IASTVariable)declarations.next(); IASTVariable v = (IASTVariable)declarations.next();
assertEquals( v.getName(), "x"); assertEquals( v.getName(), "x"); //$NON-NLS-1$
assertEquals( ((IASTSimpleTypeSpecifier)v.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), classA ); assertEquals( ((IASTSimpleTypeSpecifier)v.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), classA );
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testMultipleDeclaratorsVariable() throws Exception public void testMultipleDeclaratorsVariable() throws Exception
{ {
Iterator declarations = parse( "class A { }; A x, y, z;").getDeclarations(); Iterator declarations = parse( "class A { }; A x, y, z;").getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next(); IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next();
IASTVariable v = (IASTVariable)declarations.next(); IASTVariable v = (IASTVariable)declarations.next();
assertEquals( v.getName(), "x"); assertEquals( v.getName(), "x"); //$NON-NLS-1$
v = (IASTVariable)declarations.next(); v = (IASTVariable)declarations.next();
assertEquals( v.getName(), "y"); assertEquals( v.getName(), "y"); //$NON-NLS-1$
v = (IASTVariable)declarations.next(); v = (IASTVariable)declarations.next();
assertEquals( v.getName(), "z"); assertEquals( v.getName(), "z"); //$NON-NLS-1$
assertEquals( ((IASTSimpleTypeSpecifier)v.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), classA ); assertEquals( ((IASTSimpleTypeSpecifier)v.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), classA );
@ -206,7 +206,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testSimpleField() throws Exception public void testSimpleField() throws Exception
{ {
Iterator declarations = parse( "class A { double x; };").getDeclarations(); Iterator declarations = parse( "class A { double x; };").getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next(); IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next();
@ -214,7 +214,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
IASTField f = (IASTField)fields.next(); IASTField f = (IASTField)fields.next();
assertEquals( f.getName(), "x" ); assertEquals( f.getName(), "x" ); //$NON-NLS-1$
assertFalse( fields.hasNext() ); assertFalse( fields.hasNext() );
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
@ -224,42 +224,42 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testSimpleFunction() throws Exception public void testSimpleFunction() throws Exception
{ {
Iterator declarations = parse( "void foo( void );").getDeclarations(); Iterator declarations = parse( "void foo( void );").getDeclarations(); //$NON-NLS-1$
IASTFunction function = (IASTFunction)declarations.next(); IASTFunction function = (IASTFunction)declarations.next();
assertEquals( function.getName(), "foo" ); assertEquals( function.getName(), "foo" ); //$NON-NLS-1$
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testSimpleMethod() throws Exception public void testSimpleMethod() throws Exception
{ {
Iterator declarations = parse( "class A { void foo(); };").getDeclarations(); Iterator declarations = parse( "class A { void foo(); };").getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next(); IASTClassSpecifier classA = (IASTClassSpecifier)declarations.next();
IASTMethod method = (IASTMethod) classA.getDeclarations().next(); IASTMethod method = (IASTMethod) classA.getDeclarations().next();
assertEquals( method.getName(), "foo" ); assertEquals( method.getName(), "foo" ); //$NON-NLS-1$
} }
public void testLinkageSpec() throws Exception public void testLinkageSpec() throws Exception
{ {
Iterator declarations = parse( "extern \"C\" { int foo(); }").getDeclarations(); Iterator declarations = parse( "extern \"C\" { int foo(); }").getDeclarations(); //$NON-NLS-1$
//7.5-4 A linkage specification does not establish a scope //7.5-4 A linkage specification does not establish a scope
IASTFunction f = (IASTFunction)declarations.next(); IASTFunction f = (IASTFunction)declarations.next();
assertEquals( f.getName(),"foo"); assertEquals( f.getName(),"foo"); //$NON-NLS-1$
assertFalse( declarations.hasNext() ); assertFalse( declarations.hasNext() );
} }
public void testSimpleTypedef() throws Exception public void testSimpleTypedef() throws Exception
{ {
Iterator iter = parse( "typedef int myInt;\n myInt var;").getDeclarations(); Iterator iter = parse( "typedef int myInt;\n myInt var;").getDeclarations(); //$NON-NLS-1$
IASTTypedefDeclaration typedef = (IASTTypedefDeclaration)iter.next(); IASTTypedefDeclaration typedef = (IASTTypedefDeclaration)iter.next();
assertEquals( typedef.getName(), "myInt"); assertEquals( typedef.getName(), "myInt"); //$NON-NLS-1$
assertEquals( ((IASTSimpleTypeSpecifier)typedef.getAbstractDeclarator().getTypeSpecifier()).getType(), IASTSimpleTypeSpecifier.Type.INT ); assertEquals( ((IASTSimpleTypeSpecifier)typedef.getAbstractDeclarator().getTypeSpecifier()).getType(), IASTSimpleTypeSpecifier.Type.INT );
IASTVariable v = (IASTVariable)iter.next(); IASTVariable v = (IASTVariable)iter.next();
assertEquals( v.getName(), "var"); assertEquals( v.getName(), "var"); //$NON-NLS-1$
assertFalse( iter.hasNext() ); assertFalse( iter.hasNext() );
@ -267,7 +267,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testOverride() throws Exception public void testOverride() throws Exception
{ {
Iterator i = parse( "void foo();\n void foo( int );\n").getDeclarations(); Iterator i = parse( "void foo();\n void foo( int );\n").getDeclarations(); //$NON-NLS-1$
IASTFunction f1 = (IASTFunction)i.next(); IASTFunction f1 = (IASTFunction)i.next();
IASTFunction f2 = (IASTFunction)i.next(); IASTFunction f2 = (IASTFunction)i.next();
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
@ -275,7 +275,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testEnumerations() throws Exception public void testEnumerations() throws Exception
{ {
Iterator declarations = parse( "namespace A { enum E { e1, e2, e3 }; E varE;}").getDeclarations(); Iterator declarations = parse( "namespace A { enum E { e1, e2, e3 }; E varE;}").getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition namespaceA = (IASTNamespaceDefinition)declarations.next(); IASTNamespaceDefinition namespaceA = (IASTNamespaceDefinition)declarations.next();
@ -283,17 +283,17 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
IASTEnumerationSpecifier enumE = (IASTEnumerationSpecifier)namespaceMembers.next(); IASTEnumerationSpecifier enumE = (IASTEnumerationSpecifier)namespaceMembers.next();
assertEquals( enumE.getName(), "E"); assertEquals( enumE.getName(), "E"); //$NON-NLS-1$
assertQualifiedName( enumE.getFullyQualifiedName(), new String [] { "A", "E" } ); assertQualifiedName( enumE.getFullyQualifiedName(), new String [] { "A", "E" } ); //$NON-NLS-1$ //$NON-NLS-2$
Iterator enumerators = enumE.getEnumerators(); Iterator enumerators = enumE.getEnumerators();
IASTEnumerator enumerator_e1 = (IASTEnumerator)enumerators.next(); IASTEnumerator enumerator_e1 = (IASTEnumerator)enumerators.next();
IASTEnumerator enumerator_e2 = (IASTEnumerator)enumerators.next(); IASTEnumerator enumerator_e2 = (IASTEnumerator)enumerators.next();
IASTEnumerator enumerator_e3 = (IASTEnumerator)enumerators.next(); IASTEnumerator enumerator_e3 = (IASTEnumerator)enumerators.next();
assertFalse( enumerators.hasNext() ); assertFalse( enumerators.hasNext() );
assertEquals( enumerator_e1.getName(), "e1"); assertEquals( enumerator_e1.getName(), "e1"); //$NON-NLS-1$
assertEquals( enumerator_e2.getName(), "e2"); assertEquals( enumerator_e2.getName(), "e2"); //$NON-NLS-1$
assertEquals( enumerator_e3.getName(), "e3"); assertEquals( enumerator_e3.getName(), "e3"); //$NON-NLS-1$
IASTVariable varE = (IASTVariable)namespaceMembers.next(); IASTVariable varE = (IASTVariable)namespaceMembers.next();
assertEquals( ((IASTSimpleTypeSpecifier)varE.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), enumE ); assertEquals( ((IASTSimpleTypeSpecifier)varE.getAbstractDeclaration().getTypeSpecifier()).getTypeSpecifier(), enumE );
@ -304,7 +304,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testMethodDefinitions() throws Exception public void testMethodDefinitions() throws Exception
{ {
Iterator i = parse( " class A { void f(); }; void A::f(){ }" ).getDeclarations(); Iterator i = parse( " class A { void f(); }; void A::f(){ }" ).getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier) i.next(); IASTClassSpecifier classA = (IASTClassSpecifier) i.next();
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
@ -318,7 +318,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testConstructorsDestructors() throws Exception public void testConstructorsDestructors() throws Exception
{ {
Iterator i = parse( "class A { A(); ~A(); }; A::A(){} A::~A(){}" ).getDeclarations(); Iterator i = parse( "class A { A(); ~A(); }; A::A(){} A::~A(){}" ).getDeclarations(); //$NON-NLS-1$
IASTClassSpecifier classA = (IASTClassSpecifier) i.next(); IASTClassSpecifier classA = (IASTClassSpecifier) i.next();
@ -328,16 +328,16 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
assertTrue( i.hasNext() ); assertTrue( i.hasNext() );
IASTMethod constructor = (IASTMethod) i.next(); IASTMethod constructor = (IASTMethod) i.next();
assertTrue( constructor.getName().equals( "A" ) ); assertTrue( constructor.getName().equals( "A" ) ); //$NON-NLS-1$
IASTMethod destructor = (IASTMethod) i.next(); IASTMethod destructor = (IASTMethod) i.next();
assertTrue( destructor.getName().equals( "~A" ) ); assertTrue( destructor.getName().equals( "~A" ) ); //$NON-NLS-1$
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
} }
public void testUsingDirectives() throws Exception public void testUsingDirectives() throws Exception
{ {
Iterator i = parse( "namespace NS { int i; } using namespace NS;" ).getDeclarations(); Iterator i = parse( "namespace NS { int i; } using namespace NS;" ).getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition ns = (IASTNamespaceDefinition) i.next(); IASTNamespaceDefinition ns = (IASTNamespaceDefinition) i.next();
IASTUsingDirective using = (IASTUsingDirective) i.next(); IASTUsingDirective using = (IASTUsingDirective) i.next();
@ -346,7 +346,7 @@ public class CompleteParseASTSymbolIteratorTest extends CompleteParseBaseTest {
public void testUsingDeclaration() throws Exception public void testUsingDeclaration() throws Exception
{ {
Iterator i = parse( "namespace NS{ void f(); void f( int ); }; using NS::f;" ).getDeclarations(); Iterator i = parse( "namespace NS{ void f(); void f( int ); }; using NS::f;" ).getDeclarations(); //$NON-NLS-1$
IASTNamespaceDefinition ns = (IASTNamespaceDefinition) i.next(); IASTNamespaceDefinition ns = (IASTNamespaceDefinition) i.next();
IASTUsingDeclaration using = (IASTUsingDeclaration) i.next(); IASTUsingDeclaration using = (IASTUsingDeclaration) i.next();

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

@ -47,7 +47,7 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateClassDeclaration() throws Exception public void testTemplateClassDeclaration() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > class A { T t; }; " ); writer.write( "template < class T > class A { T t; }; " ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -55,31 +55,31 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
Iterator params = template.getTemplateParameters(); Iterator params = template.getTemplateParameters();
IASTTemplateParameter T = (IASTTemplateParameter) params.next(); IASTTemplateParameter T = (IASTTemplateParameter) params.next();
assertEquals( T.getIdentifier(), "T" ); assertEquals( T.getIdentifier(), "T" ); //$NON-NLS-1$
assertFalse( params.hasNext() ); assertFalse( params.hasNext() );
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
i = getDeclarations( template ); i = getDeclarations( template );
IASTClassSpecifier classA = (IASTClassSpecifier)((IASTAbstractTypeSpecifierDeclaration)i.next()).getTypeSpecifier(); IASTClassSpecifier classA = (IASTClassSpecifier)((IASTAbstractTypeSpecifierDeclaration)i.next()).getTypeSpecifier();
assertEquals( classA.getName(), "A" ); assertEquals( classA.getName(), "A" ); //$NON-NLS-1$
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
i = getDeclarations( classA ); i = getDeclarations( classA );
IASTField t = (IASTField) i.next(); IASTField t = (IASTField) i.next();
assertEquals( t.getName(), "t" ); assertEquals( t.getName(), "t" ); //$NON-NLS-1$
IASTSimpleTypeSpecifier specifier = (IASTSimpleTypeSpecifier) t.getAbstractDeclaration().getTypeSpecifier(); IASTSimpleTypeSpecifier specifier = (IASTSimpleTypeSpecifier) t.getAbstractDeclaration().getTypeSpecifier();
assertEquals( specifier.getTypename(), "T" ); assertEquals( specifier.getTypename(), "T" ); //$NON-NLS-1$
//assertEquals( specifier.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed //assertEquals( specifier.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed
} }
public void testTemplateFunction() throws Exception public void testTemplateFunction() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > void f( T t ){} " ); writer.write( "template < class T > void f( T t ){} " ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -88,27 +88,27 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
Iterator params = template.getTemplateParameters(); Iterator params = template.getTemplateParameters();
IASTTemplateParameter T = (IASTTemplateParameter) params.next(); IASTTemplateParameter T = (IASTTemplateParameter) params.next();
assertEquals( T.getIdentifier(), "T" ); assertEquals( T.getIdentifier(), "T" ); //$NON-NLS-1$
assertFalse( params.hasNext() ); assertFalse( params.hasNext() );
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
i = getDeclarations( template ); i = getDeclarations( template );
IASTFunction f = (IASTFunction) i.next(); IASTFunction f = (IASTFunction) i.next();
assertEquals( f.getName(), "f" ); assertEquals( f.getName(), "f" ); //$NON-NLS-1$
params = f.getParameters(); params = f.getParameters();
IASTParameterDeclaration t = (IASTParameterDeclaration) params.next(); IASTParameterDeclaration t = (IASTParameterDeclaration) params.next();
assertEquals( t.getName(), "t" ); assertEquals( t.getName(), "t" ); //$NON-NLS-1$
IASTSimpleTypeSpecifier typeSpec = (IASTSimpleTypeSpecifier) t.getTypeSpecifier(); IASTSimpleTypeSpecifier typeSpec = (IASTSimpleTypeSpecifier) t.getTypeSpecifier();
assertEquals( typeSpec.getTypename(), "T" ); assertEquals( typeSpec.getTypename(), "T" ); //$NON-NLS-1$
//assertEquals( typeSpec.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed //assertEquals( typeSpec.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed
} }
public void testTemplateFunctionDefinition() throws Exception public void testTemplateFunctionDefinition() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template <class T> void f( T t );" ); writer.write( "template <class T> void f( T t );" ); //$NON-NLS-1$
writer.write( "template <class U> void f( U u ) { }" ); writer.write( "template <class U> void f( U u ) { }" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -117,20 +117,20 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
Iterator params = template.getTemplateParameters(); Iterator params = template.getTemplateParameters();
IASTTemplateParameter T = (IASTTemplateParameter) params.next(); IASTTemplateParameter T = (IASTTemplateParameter) params.next();
assertEquals( T.getIdentifier(), "T" ); assertEquals( T.getIdentifier(), "T" ); //$NON-NLS-1$
assertFalse( params.hasNext() ); assertFalse( params.hasNext() );
Iterator tempDecls = getDeclarations( template ); Iterator tempDecls = getDeclarations( template );
IASTFunction f = (IASTFunction) tempDecls.next(); IASTFunction f = (IASTFunction) tempDecls.next();
assertEquals( f.getName(), "f" ); assertEquals( f.getName(), "f" ); //$NON-NLS-1$
assertFalse( f.hasFunctionBody() ); assertFalse( f.hasFunctionBody() );
assertFalse( tempDecls.hasNext() ); assertFalse( tempDecls.hasNext() );
params = f.getParameters(); params = f.getParameters();
IASTParameterDeclaration t = (IASTParameterDeclaration) params.next(); IASTParameterDeclaration t = (IASTParameterDeclaration) params.next();
assertEquals( t.getName(), "t" ); assertEquals( t.getName(), "t" ); //$NON-NLS-1$
IASTSimpleTypeSpecifier typeSpec = (IASTSimpleTypeSpecifier) t.getTypeSpecifier(); IASTSimpleTypeSpecifier typeSpec = (IASTSimpleTypeSpecifier) t.getTypeSpecifier();
assertEquals( typeSpec.getTypename(), "T" ); assertEquals( typeSpec.getTypename(), "T" ); //$NON-NLS-1$
//assertEquals( typeSpec.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed //assertEquals( typeSpec.getTypeSpecifier(), T ); //TODO uncomment when bug 54029 is fixed
IASTTemplateDeclaration template2 = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template2 = (IASTTemplateDeclaration) i.next();
@ -138,19 +138,19 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
params = template2.getTemplateParameters(); params = template2.getTemplateParameters();
IASTTemplateParameter U = (IASTTemplateParameter) params.next(); IASTTemplateParameter U = (IASTTemplateParameter) params.next();
assertEquals( U.getIdentifier(), "U" ); assertEquals( U.getIdentifier(), "U" ); //$NON-NLS-1$
assertFalse( params.hasNext() ); assertFalse( params.hasNext() );
tempDecls = getDeclarations( template2 ); tempDecls = getDeclarations( template2 );
IASTFunction f2 = (IASTFunction) tempDecls.next(); IASTFunction f2 = (IASTFunction) tempDecls.next();
assertEquals( f2.getName(), "f" ); assertEquals( f2.getName(), "f" ); //$NON-NLS-1$
assertTrue( f2.previouslyDeclared() ); assertTrue( f2.previouslyDeclared() );
params = f2.getParameters(); params = f2.getParameters();
IASTParameterDeclaration u = (IASTParameterDeclaration) params.next(); IASTParameterDeclaration u = (IASTParameterDeclaration) params.next();
assertEquals( u.getName(), "u" ); assertEquals( u.getName(), "u" ); //$NON-NLS-1$
typeSpec = (IASTSimpleTypeSpecifier) u.getTypeSpecifier(); typeSpec = (IASTSimpleTypeSpecifier) u.getTypeSpecifier();
assertEquals( typeSpec.getTypename(), "U" ); assertEquals( typeSpec.getTypename(), "U" ); //$NON-NLS-1$
//assertEquals( typeSpec.getTypeSpecifier(), U ); //TODO uncomment when bug 54029 is fixed //assertEquals( typeSpec.getTypeSpecifier(), U ); //TODO uncomment when bug 54029 is fixed
assertFalse( i.hasNext() ); assertFalse( i.hasNext() );
@ -158,12 +158,12 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testClassMemberTemplate() throws Exception{ public void testClassMemberTemplate() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "namespace N { " ); writer.write( "namespace N { " ); //$NON-NLS-1$
writer.write( " class A { " ); writer.write( " class A { " ); //$NON-NLS-1$
writer.write( " template < class T > T f();" ); writer.write( " template < class T > T f();" ); //$NON-NLS-1$
writer.write( " }; " ); writer.write( " }; " ); //$NON-NLS-1$
writer.write( "}" ); writer.write( "}" ); //$NON-NLS-1$
writer.write( "template <class U> U N::A::f() {} " ); writer.write( "template <class U> U N::A::f() {} " ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -185,7 +185,7 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
i2 = getDeclarations( template ); i2 = getDeclarations( template );
IASTMethod f = (IASTMethod) i2.next(); IASTMethod f = (IASTMethod) i2.next();
assertEquals( ((IASTSimpleTypeSpecifier)f.getReturnType().getTypeSpecifier()).getTypename(), "T" ); assertEquals( ((IASTSimpleTypeSpecifier)f.getReturnType().getTypeSpecifier()).getTypename(), "T" ); //$NON-NLS-1$
assertFalse( i2.hasNext() ); assertFalse( i2.hasNext() );
IASTTemplateDeclaration template2 = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template2 = (IASTTemplateDeclaration) i.next();
@ -197,8 +197,8 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
i2 = getDeclarations( template2 ); i2 = getDeclarations( template2 );
IASTMethod f2 = (IASTMethod) i2.next(); IASTMethod f2 = (IASTMethod) i2.next();
assertEquals( ((IASTSimpleTypeSpecifier)f2.getReturnType().getTypeSpecifier()).getTypename(), "U" ); assertEquals( ((IASTSimpleTypeSpecifier)f2.getReturnType().getTypeSpecifier()).getTypename(), "U" ); //$NON-NLS-1$
assertQualifiedName( f2.getFullyQualifiedName(), new String [] { "N", "A", "f" } ); assertQualifiedName( f2.getFullyQualifiedName(), new String [] { "N", "A", "f" } ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
assertTrue( f2.previouslyDeclared() ); assertTrue( f2.previouslyDeclared() );
assertFalse( i2.hasNext() ); assertFalse( i2.hasNext() );
} }
@ -206,13 +206,13 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testOverloadedFunctionTemplates() throws Exception public void testOverloadedFunctionTemplates() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( " template < class T > void f ( T ) {} " ); writer.write( " template < class T > void f ( T ) {} " ); //$NON-NLS-1$
writer.write( " template < class T > void f ( T * ) {} " ); writer.write( " template < class T > void f ( T * ) {} " ); //$NON-NLS-1$
writer.write( " int * p;" ); writer.write( " int * p;" ); //$NON-NLS-1$
writer.write( " void main () {" ); writer.write( " void main () {" ); //$NON-NLS-1$
writer.write( " f( p );" ); writer.write( " f( p );" ); //$NON-NLS-1$
writer.write( " f( *p );" ); writer.write( " f( *p );" ); //$NON-NLS-1$
writer.write( " }" ); writer.write( " }" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -240,16 +240,16 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testOverloadedFunctionTemplates_2() throws Exception public void testOverloadedFunctionTemplates_2() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template< class T > struct A { }; \n"); writer.write("template< class T > struct A { }; \n"); //$NON-NLS-1$
writer.write("template< class T > void h( const T & ); //#1 \n"); writer.write("template< class T > void h( const T & ); //#1 \n"); //$NON-NLS-1$
writer.write("template< class T > void h( A<T>& ); //#2 \n"); writer.write("template< class T > void h( A<T>& ); //#2 \n"); //$NON-NLS-1$
writer.write("void foo() { \n"); writer.write("void foo() { \n"); //$NON-NLS-1$
writer.write(" A<int> z; \n"); writer.write(" A<int> z; \n"); //$NON-NLS-1$
writer.write(" h( z ); //calls 2 \n"); writer.write(" h( z ); //calls 2 \n"); //$NON-NLS-1$
writer.write(" const A<int> z2; \n"); writer.write(" const A<int> z2; \n"); //$NON-NLS-1$
writer.write(" h( z2 ); //calls 1 because 2 is not callable. \n"); writer.write(" h( z2 ); //calls 1 because 2 is not callable. \n"); //$NON-NLS-1$
writer.write( "} \n"); writer.write( "} \n"); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -290,27 +290,27 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateClassPartialSpecialization() throws Exception public void testTemplateClassPartialSpecialization() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T1, class T2, int I > class A {}; //#1\n" ); writer.write( "template < class T1, class T2, int I > class A {}; //#1\n" ); //$NON-NLS-1$
writer.write( "template < class T, int I > class A < T, T*, I > {}; //#2\n"); writer.write( "template < class T, int I > class A < T, T*, I > {}; //#2\n"); //$NON-NLS-1$
writer.write( "template < class T1, class T2, int I > class A < T1*, T2, I > {}; //#3\n"); writer.write( "template < class T1, class T2, int I > class A < T1*, T2, I > {}; //#3\n"); //$NON-NLS-1$
writer.write( "template < class T > class A < int, T*, 5 > {}; //#4\n"); writer.write( "template < class T > class A < int, T*, 5 > {}; //#4\n"); //$NON-NLS-1$
writer.write( "template < class T1, class T2, int I > class A < T1, T2*, I > {}; //#5\n"); writer.write( "template < class T1, class T2, int I > class A < T1, T2*, I > {}; //#5\n"); //$NON-NLS-1$
writer.write( "A <int, int, 1> a1; //uses #1 \n"); writer.write( "A <int, int, 1> a1; //uses #1 \n"); //$NON-NLS-1$
writer.write( "A <int, int*, 1> a2; //uses #2, T is int, I is 1 \n"); writer.write( "A <int, int*, 1> a2; //uses #2, T is int, I is 1 \n"); //$NON-NLS-1$
writer.write( "A <int, char*, 5> a4; //uses #4, T is char \n"); writer.write( "A <int, char*, 5> a4; //uses #4, T is char \n"); //$NON-NLS-1$
writer.write( "A <int, char*, 1> a5; //uses #5, T is int, T2 is char, I is1 \n"); writer.write( "A <int, char*, 1> a5; //uses #5, T is int, T2 is char, I is1 \n"); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
writer.write( " A <int*, int*, 2> amgiguous; //ambiguous, matches #3 & #5 \n"); writer.write( " A <int*, int*, 2> amgiguous; //ambiguous, matches #3 & #5 \n"); //$NON-NLS-1$
try{ try{
//we expect this parse to fail because of the ambiguity in the last line //we expect this parse to fail because of the ambiguity in the last line
parse( writer.toString() ); parse( writer.toString() );
assertFalse( true ); assertFalse( true );
} catch ( ParserException e ){ } catch ( ParserException e ){
assertEquals( e.getMessage(), "FAILURE" ); assertEquals( e.getMessage(), "FAILURE" ); //$NON-NLS-1$
} }
IASTTemplateDeclaration template1 = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template1 = (IASTTemplateDeclaration) i.next();
@ -342,14 +342,14 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateInstanceAsBaseClause() throws Exception public void testTemplateInstanceAsBaseClause() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template< class T > class A { T t; }; \n" ); writer.write( "template< class T > class A { T t; }; \n" ); //$NON-NLS-1$
writer.write( "class B : public A< int > {}; \n" ); writer.write( "class B : public A< int > {}; \n" ); //$NON-NLS-1$
writer.write( "void f( int ); \n" ); writer.write( "void f( int ); \n" ); //$NON-NLS-1$
writer.write( "void main(){ \n" ); writer.write( "void main(){ \n" ); //$NON-NLS-1$
writer.write( " B b; \n" ); writer.write( " B b; \n" ); //$NON-NLS-1$
writer.write( " f( b.t ); \n" ); //if this function call is good, it implies that b.t is type int writer.write( " f( b.t ); \n" ); //if this function call is good, it implies that b.t is type int //$NON-NLS-1$
writer.write( "} \n" ); writer.write( "} \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -381,13 +381,13 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateParameterAsBaseClause() throws Exception public void testTemplateParameterAsBaseClause() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > class A : public T {}; \n" ); writer.write( "template < class T > class A : public T {}; \n" ); //$NON-NLS-1$
writer.write( "class B { int i; }; \n" ); writer.write( "class B { int i; }; \n" ); //$NON-NLS-1$
writer.write( "void main() { \n" ); writer.write( "void main() { \n" ); //$NON-NLS-1$
writer.write( " A<B> a; \n" ); writer.write( " A<B> a; \n" ); //$NON-NLS-1$
writer.write( " a.i; \n" ); writer.write( " a.i; \n" ); //$NON-NLS-1$
writer.write( "} \n" ); writer.write( "} \n" ); //$NON-NLS-1$
writer.write( "\n" ); writer.write( "\n" ); //$NON-NLS-1$
Iterator iter = parse( writer.toString() ).getDeclarations(); Iterator iter = parse( writer.toString() ).getDeclarations();
@ -410,12 +410,12 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTypedefedTemplate() throws Exception{ public void testTypedefedTemplate() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > class _A{ int x; }; \n" ); writer.write( "template < class T > class _A{ int x; }; \n" ); //$NON-NLS-1$
writer.write( "typedef _A < char > A; \n" ); writer.write( "typedef _A < char > A; \n" ); //$NON-NLS-1$
writer.write( "void foo() { \n" ); writer.write( "void foo() { \n" ); //$NON-NLS-1$
writer.write( " A a; \n" ); writer.write( " A a; \n" ); //$NON-NLS-1$
writer.write( " a.x; \n" ); writer.write( " a.x; \n" ); //$NON-NLS-1$
writer.write( "} \n" ); writer.write( "} \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -432,22 +432,22 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTypedefedTemplate_2() throws Exception{ public void testTypedefedTemplate_2() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > struct A { T x; }; \n" ); writer.write( "template < class T > struct A { T x; }; \n" ); //$NON-NLS-1$
writer.write( "template < class U > struct B { \n" ); writer.write( "template < class U > struct B { \n" ); //$NON-NLS-1$
writer.write( " typedef A< U > AU; \n" ); writer.write( " typedef A< U > AU; \n" ); //$NON-NLS-1$
writer.write( " void f( U ); \n" ); writer.write( " void f( U ); \n" ); //$NON-NLS-1$
writer.write( " void f( char ); \n" ); writer.write( " void f( char ); \n" ); //$NON-NLS-1$
writer.write( " void g(){ \n" ); writer.write( " void g(){ \n" ); //$NON-NLS-1$
writer.write( " AU au; \n" ); writer.write( " AU au; \n" ); //$NON-NLS-1$
writer.write( " f( au.x ); \n" ); writer.write( " f( au.x ); \n" ); //$NON-NLS-1$
writer.write( " } \n" ); writer.write( " } \n" ); //$NON-NLS-1$
writer.write( "}; \n" ); writer.write( "}; \n" ); //$NON-NLS-1$
writer.write( "void f2( int ); \n" ); writer.write( "void f2( int ); \n" ); //$NON-NLS-1$
writer.write( "void f2( char ); \n" ); writer.write( "void f2( char ); \n" ); //$NON-NLS-1$
writer.write( "void h(){ \n" ); writer.write( "void h(){ \n" ); //$NON-NLS-1$
writer.write( " B< int >::AU b; \n" ); writer.write( " B< int >::AU b; \n" ); //$NON-NLS-1$
writer.write( " f2( b.x ); \n" ); writer.write( " f2( b.x ); \n" ); //$NON-NLS-1$
writer.write( "} \n" ); writer.write( "} \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -485,8 +485,8 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testInstantiatingDeferredInstances() throws Exception{ public void testInstantiatingDeferredInstances() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > struct A { A < T > next; }; \n" ); writer.write( "template < class T > struct A { A < T > next; }; \n" ); //$NON-NLS-1$
writer.write( "A< int > a; \n" ); writer.write( "A< int > a; \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -501,18 +501,18 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateArgumentDeduction() throws Exception{ public void testTemplateArgumentDeduction() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template< class T > struct B {}; \n" ); writer.write( "template< class T > struct B {}; \n" ); //$NON-NLS-1$
writer.write( "template< class T > struct D : public B < T > {}; \n" ); writer.write( "template< class T > struct D : public B < T > {}; \n" ); //$NON-NLS-1$
writer.write( "struct D2 : public B< int > {}; \n" ); writer.write( "struct D2 : public B< int > {}; \n" ); //$NON-NLS-1$
writer.write( "template< class T > T f( B<T> & ) {} \n" ); writer.write( "template< class T > T f( B<T> & ) {} \n" ); //$NON-NLS-1$
writer.write( "void test( int ); \n" ); writer.write( "void test( int ); \n" ); //$NON-NLS-1$
writer.write( "void test( char ); \n" ); writer.write( "void test( char ); \n" ); //$NON-NLS-1$
writer.write( "void main() { \n" ); writer.write( "void main() { \n" ); //$NON-NLS-1$
writer.write( " D<int> d; \n" ); writer.write( " D<int> d; \n" ); //$NON-NLS-1$
writer.write( " D2 d2; \n" ); writer.write( " D2 d2; \n" ); //$NON-NLS-1$
writer.write( " test( f( d ) ); \n" ); writer.write( " test( f( d ) ); \n" ); //$NON-NLS-1$
writer.write( " test( f( d2 ) ); \n" ); writer.write( " test( f( d2 ) ); \n" ); //$NON-NLS-1$
writer.write( "} \n" ); writer.write( "} \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -529,11 +529,11 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
} }
public void testClassTemplateStaticMemberDefinition() throws Exception { public void testClassTemplateStaticMemberDefinition() throws Exception {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template< class T > class A{ \n" ); writer.write( "template< class T > class A{ \n" ); //$NON-NLS-1$
writer.write( " typedef T * PT; \n" ); writer.write( " typedef T * PT; \n" ); //$NON-NLS-1$
writer.write( " static T member; \n" ); writer.write( " static T member; \n" ); //$NON-NLS-1$
writer.write( "}; \n" ); writer.write( "}; \n" ); //$NON-NLS-1$
writer.write( "template< class T> A<T>::PT A<T>::member = null; \n" ); writer.write( "template< class T> A<T>::PT A<T>::member = null; \n" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -543,7 +543,7 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
IASTTemplateParameter T2 = (IASTTemplateParameter) template2.getTemplateParameters().next(); IASTTemplateParameter T2 = (IASTTemplateParameter) template2.getTemplateParameters().next();
IASTField member = (IASTField) getDeclarations( template2 ).next(); IASTField member = (IASTField) getDeclarations( template2 ).next();
assertEquals( member.getName(), "member" ); assertEquals( member.getName(), "member" ); //$NON-NLS-1$
assertReferenceTask( new Task( T1, 2, false, false ) ); assertReferenceTask( new Task( T1, 2, false, false ) );
assertReferenceTask( new Task( T2, 2, false, false ) ); assertReferenceTask( new Task( T2, 2, false, false ) );
@ -551,23 +551,23 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateTemplateParameter() throws Exception{ public void testTemplateTemplateParameter() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( " template< class T > class A { "); writer.write( " template< class T > class A { "); //$NON-NLS-1$
writer.write( " int x; "); writer.write( " int x; "); //$NON-NLS-1$
writer.write( " }; "); writer.write( " }; "); //$NON-NLS-1$
writer.write( " template < class T > class A < T * > { "); writer.write( " template < class T > class A < T * > { "); //$NON-NLS-1$
writer.write( " long x; "); writer.write( " long x; "); //$NON-NLS-1$
writer.write( " }; "); writer.write( " }; "); //$NON-NLS-1$
writer.write( " template< template< class U > class V > class C{ "); writer.write( " template< template< class U > class V > class C{ "); //$NON-NLS-1$
writer.write( " V< int > y; "); writer.write( " V< int > y; "); //$NON-NLS-1$
writer.write( " V< int * > z; "); writer.write( " V< int * > z; "); //$NON-NLS-1$
writer.write( " }; "); writer.write( " }; "); //$NON-NLS-1$
writer.write( " void f( int ); "); writer.write( " void f( int ); "); //$NON-NLS-1$
writer.write( " void f( long ); "); writer.write( " void f( long ); "); //$NON-NLS-1$
writer.write( " void main() { "); writer.write( " void main() { "); //$NON-NLS-1$
writer.write( " C< A > c; "); writer.write( " C< A > c; "); //$NON-NLS-1$
writer.write( " f( c.y.x ); "); writer.write( " f( c.y.x ); "); //$NON-NLS-1$
writer.write( " f( c.z.x ); "); writer.write( " f( c.z.x ); "); //$NON-NLS-1$
writer.write( " } "); writer.write( " } "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -589,7 +589,7 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
} }
public void testBug56834() throws Exception{ public void testBug56834() throws Exception{
Iterator i = parse( "template < class T, class U = T > class A;" ).getDeclarations(); Iterator i = parse( "template < class T, class U = T > class A;" ).getDeclarations(); //$NON-NLS-1$
IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next();
@ -602,7 +602,7 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
} }
public void testDefaultTemplateParameters() throws Exception { public void testDefaultTemplateParameters() throws Exception {
Iterator i = parse( "template < class T = int > class A{}; A<> a;" ).getDeclarations(); Iterator i = parse( "template < class T = int > class A{}; A<> a;" ).getDeclarations(); //$NON-NLS-1$
IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next();
IASTVariable a = (IASTVariable) i.next(); IASTVariable a = (IASTVariable) i.next();
@ -610,8 +610,8 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testBug56834WithInstantiation() throws Exception{ public void testBug56834WithInstantiation() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template< class T, class U = T > class A {};" ); writer.write( "template< class T, class U = T > class A {};" ); //$NON-NLS-1$
writer.write( "A< char > a;" ); writer.write( "A< char > a;" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next(); IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next();
@ -620,9 +620,9 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testDefaultTemplateParameterWithDeferedInstance() throws Exception{ public void testDefaultTemplateParameterWithDeferedInstance() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > class A; \n" ); writer.write( "template < class T > class A; \n" ); //$NON-NLS-1$
writer.write( "template < class U, class V = A< U > > class B; \n" ); writer.write( "template < class U, class V = A< U > > class B; \n" ); //$NON-NLS-1$
writer.write( "B< int > b;" ); writer.write( "B< int > b;" ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -634,9 +634,9 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testExplicitInstantiation() throws Exception{ public void testExplicitInstantiation() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < class T > class A { }; " ); writer.write( "template < class T > class A { }; " ); //$NON-NLS-1$
writer.write( "template class A< int >; " ); writer.write( "template class A< int >; " ); //$NON-NLS-1$
writer.write( "A< int > a; " ); writer.write( "A< int > a; " ); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -651,12 +651,12 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateParametersInExpressions() throws Exception public void testTemplateParametersInExpressions() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < typename _Tp > power( _Tp, unsigned int ); \n" ); writer.write( "template < typename _Tp > power( _Tp, unsigned int ); \n" ); //$NON-NLS-1$
writer.write( "template < typename _Tp > _Tp helper( _Tp __x, int _n ) \n" ); writer.write( "template < typename _Tp > _Tp helper( _Tp __x, int _n ) \n" ); //$NON-NLS-1$
writer.write( "{ " ); writer.write( "{ " ); //$NON-NLS-1$
writer.write( " return n < 0 ? _Tp( 1 ) / power( __x, -__n ) \n" ); writer.write( " return n < 0 ? _Tp( 1 ) / power( __x, -__n ) \n" ); //$NON-NLS-1$
writer.write( " : power( __x, __n ); \n" ); writer.write( " : power( __x, __n ); \n" ); //$NON-NLS-1$
writer.write( "} " ); writer.write( "} " ); //$NON-NLS-1$
parse( writer.toString () ); parse( writer.toString () );
} }
@ -664,11 +664,11 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testBug44338() throws Exception public void testBug44338() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < bool T > class A { "); writer.write( "template < bool T > class A { "); //$NON-NLS-1$
writer.write( " void foo( bool b = T ); "); writer.write( " void foo( bool b = T ); "); //$NON-NLS-1$
writer.write( "}; "); writer.write( "}; "); //$NON-NLS-1$
writer.write( "typedef A< 1 < 2 > A_TRUE; "); writer.write( "typedef A< 1 < 2 > A_TRUE; "); //$NON-NLS-1$
writer.write( "typedef A< ( 1 > 2 ) > A_FALSE; "); writer.write( "typedef A< ( 1 > 2 ) > A_FALSE; "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -680,10 +680,10 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testBug44338_2() throws Exception public void testBug44338_2() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template < int i > class X {}; "); writer.write( "template < int i > class X {}; "); //$NON-NLS-1$
writer.write( "template < class T > class Y {}; "); writer.write( "template < class T > class Y {}; "); //$NON-NLS-1$
writer.write( "Y< X < 1 > > y1; "); writer.write( "Y< X < 1 > > y1; "); //$NON-NLS-1$
writer.write( "Y< X < 6 >> 1 > > y2; "); writer.write( "Y< X < 6 >> 1 > > y2; "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -697,21 +697,21 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
{ {
try{ try{
//this is expected to fail the parse //this is expected to fail the parse
parse( "template < int i > class X {}; X< 1 > 2 > x; " ); parse( "template < int i > class X {}; X< 1 > 2 > x; " ); //$NON-NLS-1$
assertTrue( false ); assertTrue( false );
} catch ( ParserException e ){ } catch ( ParserException e ){
assertTrue( e.getMessage().equals( "FAILURE" ) ); assertTrue( e.getMessage().equals( "FAILURE" ) ); //$NON-NLS-1$
} }
} }
public void testBug57754() throws Exception public void testBug57754() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template < class T > class A{ "); writer.write("template < class T > class A{ "); //$NON-NLS-1$
writer.write(" typedef int _type; "); writer.write(" typedef int _type; "); //$NON-NLS-1$
writer.write(" void f( _type, T ); "); writer.write(" void f( _type, T ); "); //$NON-NLS-1$
writer.write("}; "); writer.write("}; "); //$NON-NLS-1$
writer.write("template < class T > void A< T >::f( _type, T ) {} "); writer.write("template < class T > void A< T >::f( _type, T ) {} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -727,12 +727,12 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testContructorsAndExplicitSpecialization() throws Exception public void testContructorsAndExplicitSpecialization() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template < class T > class A { "); writer.write("template < class T > class A { "); //$NON-NLS-1$
writer.write(" A(); "); writer.write(" A(); "); //$NON-NLS-1$
writer.write(" A( int ); "); writer.write(" A( int ); "); //$NON-NLS-1$
writer.write(" ~A(); "); writer.write(" ~A(); "); //$NON-NLS-1$
writer.write("}; "); writer.write("}; "); //$NON-NLS-1$
writer.write("template <> A< char >::~A(); "); writer.write("template <> A< char >::~A(); "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -743,16 +743,16 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void testTemplateMemberTemplateDefinition() throws Exception public void testTemplateMemberTemplateDefinition() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write( "template< typename _Tp > "); writer.write( "template< typename _Tp > "); //$NON-NLS-1$
writer.write( "class list "); writer.write( "class list "); //$NON-NLS-1$
writer.write( "{ "); writer.write( "{ "); //$NON-NLS-1$
writer.write( " template<typename _S> void merge(list&, _S); "); writer.write( " template<typename _S> void merge(list&, _S); "); //$NON-NLS-1$
writer.write( "}; "); writer.write( "}; "); //$NON-NLS-1$
writer.write( "template < typename _Tp > "); writer.write( "template < typename _Tp > "); //$NON-NLS-1$
writer.write( "template < typename _S > "); writer.write( "template < typename _S > "); //$NON-NLS-1$
writer.write( "void list<_Tp>::merge(list<_Tp>& __x, _S __comp) "); writer.write( "void list<_Tp>::merge(list<_Tp>& __x, _S __comp) "); //$NON-NLS-1$
writer.write( "{} "); writer.write( "{} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -763,18 +763,18 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void test_14_7_3__5_ExplicitSpecialization() throws Exception public void test_14_7_3__5_ExplicitSpecialization() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template< class T > struct A { "); writer.write("template< class T > struct A { "); //$NON-NLS-1$
writer.write(" void f( T ) {} "); writer.write(" void f( T ) {} "); //$NON-NLS-1$
writer.write("}; "); writer.write("}; "); //$NON-NLS-1$
writer.write("template <> struct A< int >{ "); writer.write("template <> struct A< int >{ "); //$NON-NLS-1$
writer.write(" void f( int ); "); writer.write(" void f( int ); "); //$NON-NLS-1$
writer.write("}; "); writer.write("}; "); //$NON-NLS-1$
writer.write("void A< int >::f( int ){ } "); writer.write("void A< int >::f( int ){ } "); //$NON-NLS-1$
writer.write("void main(){ "); writer.write("void main(){ "); //$NON-NLS-1$
writer.write(" A<int> a; "); writer.write(" A<int> a; "); //$NON-NLS-1$
writer.write(" a.f( 1 ); "); writer.write(" a.f( 1 ); "); //$NON-NLS-1$
writer.write("} "); writer.write("} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -794,15 +794,15 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void test_14_7_3__11_ExplicitSpecializationArgumentDeduction() throws Exception public void test_14_7_3__11_ExplicitSpecializationArgumentDeduction() throws Exception
{ {
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template < class T > class Array { }; "); writer.write("template < class T > class Array { }; "); //$NON-NLS-1$
writer.write("template < class T > void sort( Array< T > & ); "); writer.write("template < class T > void sort( Array< T > & ); "); //$NON-NLS-1$
writer.write("template<> void sort( Array< int > & ){} "); writer.write("template<> void sort( Array< int > & ){} "); //$NON-NLS-1$
writer.write("void f(){ "); writer.write("void f(){ "); //$NON-NLS-1$
writer.write(" Array<int> a1; "); writer.write(" Array<int> a1; "); //$NON-NLS-1$
writer.write(" Array<char> a2; "); writer.write(" Array<char> a2; "); //$NON-NLS-1$
writer.write(" sort( a1 ); "); writer.write(" sort( a1 ); "); //$NON-NLS-1$
writer.write(" sort( a2 ); "); writer.write(" sort( a2 ); "); //$NON-NLS-1$
writer.write("} "); writer.write("} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -820,13 +820,13 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void test_14_8_1__2_ExplicitArgumentSpecification() throws Exception{ public void test_14_8_1__2_ExplicitArgumentSpecification() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("void f( int ){} //#1 \n"); writer.write("void f( int ){} //#1 \n"); //$NON-NLS-1$
writer.write("template < class T > void f( T ){} //#2 \n"); writer.write("template < class T > void f( T ){} //#2 \n"); //$NON-NLS-1$
writer.write("int main(){ \n"); writer.write("int main(){ \n"); //$NON-NLS-1$
writer.write(" f( 1 ); //calls #1 \n"); writer.write(" f( 1 ); //calls #1 \n"); //$NON-NLS-1$
writer.write(" f<int>( 1 ); //calls #2 \n"); writer.write(" f<int>( 1 ); //calls #2 \n"); //$NON-NLS-1$
writer.write(" f<> ( 1 ); //calls #2 \n"); writer.write(" f<> ( 1 ); //calls #2 \n"); //$NON-NLS-1$
writer.write("} \n"); writer.write("} \n"); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -841,33 +841,33 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void test_14_7_3__12_ExplicitSpecializationOverloadedFunction() throws Exception{ public void test_14_7_3__12_ExplicitSpecializationOverloadedFunction() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template< class T > void f( T ); "); writer.write("template< class T > void f( T ); "); //$NON-NLS-1$
writer.write("template< class T > void f( T * ); "); writer.write("template< class T > void f( T * ); "); //$NON-NLS-1$
writer.write("template <> void f< int*>( int * );"); writer.write("template <> void f< int*>( int * );"); //$NON-NLS-1$
writer.write("template <> void f< int >( int * );"); writer.write("template <> void f< int >( int * );"); //$NON-NLS-1$
writer.write("template <> void f( char ); "); writer.write("template <> void f( char ); "); //$NON-NLS-1$
parse( writer.toString() ); parse( writer.toString() );
} }
public void testPartialSpecializationDefinitions() throws Exception{ public void testPartialSpecializationDefinitions() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template < class T1, class T2 > class A { void f(); };"); writer.write("template < class T1, class T2 > class A { void f(); };"); //$NON-NLS-1$
writer.write("template < class T > class A < T, T > { void f(); };"); writer.write("template < class T > class A < T, T > { void f(); };"); //$NON-NLS-1$
writer.write("template < class T > class A < char, T > { void f(); };"); writer.write("template < class T > class A < char, T > { void f(); };"); //$NON-NLS-1$
writer.write("template < class U, class V > void A<U, V>::f(){} "); writer.write("template < class U, class V > void A<U, V>::f(){} "); //$NON-NLS-1$
writer.write("template < class W > void A < W, W >::f(){} "); writer.write("template < class W > void A < W, W >::f(){} "); //$NON-NLS-1$
writer.write("template < class X > void A < char, X >::f(){} "); writer.write("template < class X > void A < char, X >::f(){} "); //$NON-NLS-1$
writer.write("void main(){ "); writer.write("void main(){ "); //$NON-NLS-1$
writer.write(" A< int, char > a1; "); writer.write(" A< int, char > a1; "); //$NON-NLS-1$
writer.write(" a1.f(); "); writer.write(" a1.f(); "); //$NON-NLS-1$
writer.write(" A< int, int > a2; "); writer.write(" A< int, int > a2; "); //$NON-NLS-1$
writer.write(" a2.f(); "); writer.write(" a2.f(); "); //$NON-NLS-1$
writer.write(" A< char, int > a3; "); writer.write(" A< char, int > a3; "); //$NON-NLS-1$
writer.write(" a3.f(); "); writer.write(" a3.f(); "); //$NON-NLS-1$
writer.write("} "); writer.write("} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();
@ -892,20 +892,20 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
public void test_14_5_2__2_MemberFunctionTemplates() throws Exception{ public void test_14_5_2__2_MemberFunctionTemplates() throws Exception{
Writer writer = new StringWriter(); Writer writer = new StringWriter();
writer.write("template < class T > struct A { "); writer.write("template < class T > struct A { "); //$NON-NLS-1$
writer.write(" void f( int ); "); writer.write(" void f( int ); "); //$NON-NLS-1$
writer.write(" template < class T2 > void f( T2 ); "); writer.write(" template < class T2 > void f( T2 ); "); //$NON-NLS-1$
writer.write("}; "); writer.write("}; "); //$NON-NLS-1$
writer.write("template <> void A<int>::f(int) {} //non-template member \n"); writer.write("template <> void A<int>::f(int) {} //non-template member \n"); //$NON-NLS-1$
writer.write("template <> template<> void A<int>::f<>( int ) {} //template member \n"); writer.write("template <> template<> void A<int>::f<>( int ) {} //template member \n"); //$NON-NLS-1$
writer.write("int main(){ "); writer.write("int main(){ "); //$NON-NLS-1$
writer.write(" A< int > ac; "); writer.write(" A< int > ac; "); //$NON-NLS-1$
writer.write(" ac.f( 1 ); //non-template \n"); writer.write(" ac.f( 1 ); //non-template \n"); //$NON-NLS-1$
writer.write(" ac.f( 'c' ); //template \n"); writer.write(" ac.f( 'c' ); //template \n"); //$NON-NLS-1$
writer.write(" ac.f<>(1); //template \n"); writer.write(" ac.f<>(1); //template \n"); //$NON-NLS-1$
writer.write("} "); writer.write("} "); //$NON-NLS-1$
Iterator i = parse( writer.toString() ).getDeclarations(); Iterator i = parse( writer.toString() ).getDeclarations();

77
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompletionParseTest.java
View file

@ -854,4 +854,81 @@ public class CompletionParseTest extends CompletionParseBaseTest {
assertTrue( passed ); assertTrue( passed );
} }
public void testBug59893() throws Exception
{
StringWriter writer = new StringWriter();
writer.write( "struct A { \n" ); //$NON-NLS-1$
writer.write( " void f1() const volatile; \n" ); //$NON-NLS-1$
writer.write( " void f2() const; \n" ); //$NON-NLS-1$
writer.write( " void f3() volatile; \n" ); //$NON-NLS-1$
writer.write( " void f4(); \n" ); //$NON-NLS-1$
writer.write( "}; \n" ); //$NON-NLS-1$
writer.write( "void main( const A& a1 ) \n" ); //$NON-NLS-1$
writer.write( "{ \n" ); //$NON-NLS-1$
writer.write( " const volatile A * a2; \n" ); //$NON-NLS-1$
writer.write( " const A * a3; \n" ); //$NON-NLS-1$
writer.write( " volatile A * a4; \n" ); //$NON-NLS-1$
writer.write( " A * a5; \n" ); //$NON-NLS-1$
String code = writer.toString();
IASTCompletionNode node = parse( code + "a1. ", code.length() + 3 ); //$NON-NLS-1$
assertNotNull( node );
ILookupResult result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 2 );
node = parse( code + "a2-> ", code.length() + 4 ); //$NON-NLS-1$
assertNotNull( node );
result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 1 );
node = parse( code + "a3-> ", code.length() + 4 ); //$NON-NLS-1$
assertNotNull( node );
result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 2 );
node = parse( code + "a4-> ", code.length() + 4 ); //$NON-NLS-1$
assertNotNull( node );
result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 2 );
node = parse( code + "a5-> ", code.length() + 4 ); //$NON-NLS-1$
assertNotNull( node );
result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 4 );
}
public void testBug59893_Expression() throws Exception
{
StringWriter writer = new StringWriter();
writer.write( "struct A { \n" ); //$NON-NLS-1$
writer.write( " void f2() const; \n" ); //$NON-NLS-1$
writer.write( " void f4(); \n" ); //$NON-NLS-1$
writer.write( "}; \n" ); //$NON-NLS-1$
writer.write( "const A * foo(){} \n" ); //$NON-NLS-1$
writer.write( "void main( ) \n" ); //$NON-NLS-1$
writer.write( "{ \n" ); //$NON-NLS-1$
writer.write( " foo()->SP \n" ); //$NON-NLS-1$
String code = writer.toString();
int index = code.indexOf( "SP" ); //$NON-NLS-1$
IASTCompletionNode node = parse( code, index );
ILookupResult result = node.getCompletionScope().lookup( node.getCompletionPrefix(),
new IASTNode.LookupKind[]{ IASTNode.LookupKind.ALL },
node.getCompletionContext() );
assertEquals( result.getResultsSize(), 1 );
}
} }

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

@ -2176,17 +2176,17 @@ public abstract class Parser extends ExpressionParser implements IParser
break overallLoop; break overallLoop;
IToken beforeCVModifier = mark(); IToken beforeCVModifier = mark();
IToken cvModifier = null; IToken [] cvModifiers = new IToken[2];
int numCVModifiers = 0;
IToken afterCVModifier = beforeCVModifier; IToken afterCVModifier = beforeCVModifier;
// const-volatile // const-volatile
// 2 options: either this is a marker for the method, // 2 options: either this is a marker for the method,
// or it might be the beginning of old K&R style parameter declaration, see // or it might be the beginning of old K&R style parameter declaration, see
// void getenv(name) const char * name; {} // void getenv(name) const char * name; {}
// This will be determined further below // This will be determined further below
if (LT(1) == IToken.t_const while( (LT(1) == IToken.t_const || LT(1) == IToken.t_volatile) && numCVModifiers < 2 )
|| LT(1) == IToken.t_volatile)
{ {
cvModifier = consume(); cvModifiers[numCVModifiers++] = consume();
afterCVModifier = mark(); afterCVModifier = mark();
} }
//check for throws clause here //check for throws clause here
@ -2259,15 +2259,15 @@ public abstract class Parser extends ExpressionParser implements IParser
{ {
// There were C++-specific clauses after const/volatile modifier // There were C++-specific clauses after const/volatile modifier
// Then it is a marker for the method // Then it is a marker for the method
if (cvModifier != null) if ( numCVModifiers > 0 )
{ {
for( int i = 0; i < numCVModifiers; i++ ){
if (cvModifier.getType() == IToken.t_const) if( cvModifiers[i].getType() == IToken.t_const )
d.setConst(true); d.setConst(true);
if (cvModifier.getType() if( cvModifiers[i].getType() == IToken.t_volatile )
== IToken.t_volatile)
d.setVolatile(true); d.setVolatile(true);
} }
}
afterCVModifier = mark(); afterCVModifier = mark();
// In this case (method) we can't expect K&R parameter declarations, // In this case (method) we can't expect K&R parameter declarations,
// but we'll check anyway, for errorhandling // but we'll check anyway, for errorhandling

24
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTExpression.java
View file

@ -21,6 +21,7 @@ import org.eclipse.cdt.core.parser.ast.IASTExpression;
import org.eclipse.cdt.core.parser.ast.IASTReference; import org.eclipse.cdt.core.parser.ast.IASTReference;
import org.eclipse.cdt.core.parser.ast.IASTTypeId; import org.eclipse.cdt.core.parser.ast.IASTTypeId;
import org.eclipse.cdt.internal.core.parser.pst.IContainerSymbol; import org.eclipse.cdt.internal.core.parser.pst.IContainerSymbol;
import org.eclipse.cdt.internal.core.parser.pst.ISymbol;
import org.eclipse.cdt.internal.core.parser.pst.TypeInfo; import org.eclipse.cdt.internal.core.parser.pst.TypeInfo;
/** /**
@ -310,9 +311,10 @@ public class ASTExpression extends ASTNode implements IASTExpression
} }
return stringRepresentation; return stringRepresentation;
} }
public IContainerSymbol getLookupQualificationSymbol() throws LookupError { public IContainerSymbol getLookupQualificationSymbol() throws LookupError {
ExpressionResult result = getResultType(); ExpressionResult result = getResultType();
TypeInfo type = (result != null ) ? getResultType().getResult() : null; TypeInfo type = (result != null ) ? result.getResult() : null;
if( type != null ){ if( type != null ){
type = type.getFinalType(); type = type.getFinalType();
@ -324,7 +326,25 @@ public class ASTExpression extends ASTNode implements IASTExpression
} }
return null; return null;
} /** }
public boolean shouldFilterLookupResult( ISymbol symbol ){
ExpressionResult result = getResultType();
TypeInfo type = ( result != null ) ? result.getResult() : null;
if( type != null ){
type = type.getFinalType();
if( type.checkBit( TypeInfo.isConst ) && !symbol.getTypeInfo().checkBit( TypeInfo.isConst ) )
return true;
if( type.checkBit( TypeInfo.isVolatile ) && !symbol.getTypeInfo().checkBit( TypeInfo.isVolatile ) )
return true;
}
return false;
}
/**
* @param duple * @param duple
* @return * @return
*/ */

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNode.java
View file

@ -83,6 +83,9 @@ public class ASTNode implements IASTNode {
{ {
iter.remove(); iter.remove();
} }
if( context != null && ((ASTNode)context).shouldFilterLookupResult( s ) )
iter.remove();
} }
SymbolIterator iterator = new SymbolIterator( lookupResults.iterator() ); SymbolIterator iterator = new SymbolIterator( lookupResults.iterator() );
@ -126,6 +129,10 @@ public class ASTNode implements IASTNode {
throw new LookupError(); throw new LookupError();
} }
public boolean shouldFilterLookupResult( ISymbol symbol ){
return false;
}
private class Result implements ILookupResult{ private class Result implements ILookupResult{
private String prefix; private String prefix;
private Iterator iterator; private Iterator iterator;

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTSymbol.java
View file

@ -56,4 +56,22 @@ public abstract class ASTSymbol extends ASTSymbolOwner implements ISymbolOwner,
return null; return null;
} }
public boolean shouldFilterLookupResult( ISymbol sym ){
TypeInfo info = null;
try{
info = getSymbol().getTypeInfo().getFinalType();
} catch( ParserSymbolTableError e ){
return true;
}
if( info.checkBit( TypeInfo.isConst ) && !sym.getTypeInfo().checkBit( TypeInfo.isConst ) )
return true;
if( info.checkBit( TypeInfo.isVolatile ) && !sym.getTypeInfo().checkBit( TypeInfo.isVolatile ) )
return true;
return false;
}
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
View file

@ -2450,7 +2450,7 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
protected void setMethodTypeInfoBits(IParameterizedSymbol symbol, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit) protected void setMethodTypeInfoBits(IParameterizedSymbol symbol, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit)
{ {
symbol.getTypeInfo().setBit( isConst, TypeInfo.isConst ); symbol.getTypeInfo().setBit( isConst, TypeInfo.isConst );
symbol.getTypeInfo().setBit( isVolatile, TypeInfo.isConst ); symbol.getTypeInfo().setBit( isVolatile, TypeInfo.isVolatile );
symbol.getTypeInfo().setBit( isVirtual, TypeInfo.isVirtual ); symbol.getTypeInfo().setBit( isVirtual, TypeInfo.isVirtual );
symbol.getTypeInfo().setBit( isExplicit, TypeInfo.isExplicit ); symbol.getTypeInfo().setBit( isExplicit, TypeInfo.isExplicit );
} }

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/TypeInfo.java
View file

@ -245,16 +245,6 @@ public class TypeInfo {
"", //$NON-NLS-1$ t_templateParameter "", //$NON-NLS-1$ t_templateParameter
"typename" //$NON-NLS-1$ t_typeName "typename" //$NON-NLS-1$ t_typeName
}; };
//Partial ordering :
// none < const
// none < volatile
// none < const volatile
// const < const volatile
// volatile < const volatile
public static final int cvConst = 2;
public static final int cvVolatile = 3;
public static final int cvConstVolatile = 5;
// Convenience methods // Convenience methods
public void setBit(boolean b, int mask){ public void setBit(boolean b, int mask){
if( b ){ if( b ){