expand some of the CompleteParser2Tests

- enumerator getType()
- class decls with qualified names

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/CompleteParser2Tests.java

@@ -17,7 +17,10 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.cdt.core.dom.ast.IBasicType;
 import org.eclipse.cdt.core.dom.ast.IBinding;
@@ -29,6 +32,7 @@ import org.eclipse.cdt.core.dom.ast.IParameter;
 import org.eclipse.cdt.core.dom.ast.IPointerType;
 import org.eclipse.cdt.core.dom.ast.IQualifierType;
 import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.core.dom.ast.ITypedef;
 import org.eclipse.cdt.core.dom.ast.IVariable;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
@@ -443,33 +447,108 @@ public class CompleteParser2Tests extends TestCase {
 	
 	public void testUsingDeclarationWithFunctionsAndMethods() throws Exception
 	{
-		parse( "namespace N { int foo(void); } class A { static int bar(void); }; using N::foo; using ::A::bar;" ); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "namespace N { int foo(void); } class A { static int bar(void); }; using N::foo; using ::A::bar;" ); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 13 );
+ 		ICPPNamespace N = (ICPPNamespace) col.getName(0).resolveBinding();
+ 		IFunction foo = (IFunction) col.getName(1).resolveBinding();
+ 		ICPPClassType A = (ICPPClassType) col.getName(3).resolveBinding();
+ 		ICPPMethod bar = (ICPPMethod) col.getName(4).resolveBinding();
+ 		
+ 		assertInstances( col, N, 2 );
+ 		assertInstances( col, foo, 3 );
+ 		assertInstances( col, A, 2 );
+ 		assertInstances( col, bar, 3 );	
 	}
 	
 	public void testLinkageSpec() throws Exception
 	{
-		parse( "extern \"C\" { int foo(); }"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "extern \"C\" { int foo(); }"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 1 );
+ 		IFunction foo = (IFunction) col.getName(0).resolveBinding();
+ 		assertNotNull( foo );
 	}
 	
 
 	public void testBogdansExample() throws Exception
 	{
-		parse( "namespace A { namespace B {	enum e1{e_1,e_2};	int x;	class C	{	static int y = 5;	}; }} "); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "namespace A { namespace B {	enum e1{e_1,e_2};	int x;	class C	{	static int y = 5;	}; }} "); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 8 );
+ 		ICPPNamespace A = (ICPPNamespace) col.getName(0).resolveBinding();
+ 		ICPPNamespace B = (ICPPNamespace) col.getName(1).resolveBinding();
+ 		IEnumeration e1 = (IEnumeration) col.getName(2).resolveBinding();
+ 		IEnumerator e_1 = (IEnumerator) col.getName(3).resolveBinding();
+ 		IEnumerator e_2 = (IEnumerator) col.getName(4).resolveBinding();
+ 		IVariable x = (IVariable) col.getName(5).resolveBinding();
+ 		ICPPClassType C = (ICPPClassType) col.getName(6).resolveBinding();
+ 		ICPPField y = (ICPPField) col.getName(7).resolveBinding();
+ 		
+ 		assertSame( B.getScope(), A.getNamespaceScope() );
+ 		assertSame( e1.getScope(), B.getNamespaceScope() );
+ 		assertSame( e_1.getScope(), B.getNamespaceScope() );
+ 		assertSame( e_2.getType(), e1 );
+ 		assertNotNull( x );
+ 		assertNotNull( C );
+ 		assertNotNull( y );
 	}
 	
 	public void testAndrewsExample() throws Exception
 	{
-		parse( "namespace N{ class A {}; }	using namespace N;	class B: public A{};"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "namespace N{ class A {}; }	using namespace N;	class B: public A{};"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 5 );
+ 		ICPPNamespace N = (ICPPNamespace) col.getName(0).resolveBinding();
+ 		ICPPClassType A = (ICPPClassType) col.getName(1).resolveBinding();
+ 		ICPPClassType B = (ICPPClassType) col.getName(3).resolveBinding();
+ 		
+ 		assertInstances( col, N, 2 );
+ 		assertInstances( col, A, 2 );
+ 		
+ 		ICPPBase base = B.getBases()[0];
+ 		assertSame( base.getBaseClass(), A );
 	}
 	
 	public void testSimpleTypedef() throws Exception
 	{
-		parse( "typedef int myInt;\n myInt var;"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "typedef int myInt;\n myInt var;"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 3 );
+ 		ITypedef myInt = (ITypedef) col.getName(0).resolveBinding();
+ 		IVariable var = (IVariable) col.getName(2).resolveBinding();
+ 		
+ 		assertInstances( col, myInt, 2 );
+ 		assertTrue( myInt.getType() instanceof IBasicType );
+ 		assertSame( var.getType(), myInt );
 	}
 	
 	public void testComplexTypedef() throws Exception
 	{
-		parse( "class A{ }; typedef A ** A_DOUBLEPTR;"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "class A{ }; typedef A ** A_DOUBLEPTR;"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 3 );
+ 		ICPPClassType A = (ICPPClassType) col.getName(0).resolveBinding();
+ 		ITypedef APTR = (ITypedef) col.getName(2).resolveBinding();
+ 		
+ 		assertInstances( col, A, 2 );
+ 		assertTrue( APTR.getType() instanceof IPointerType );
+ 		IPointerType pt = (IPointerType) APTR.getType();
+ 		assertTrue( pt.getType() instanceof IPointerType );
+ 		pt = (IPointerType) pt.getType();
+ 		assertSame( pt.getType(), A );
 	}
 	
 	
@@ -487,27 +566,64 @@ public class CompleteParser2Tests extends TestCase {
 	public void testBug40842() throws Exception{
 		Writer code = new StringWriter();		
 		code.write("class A {} a;\n"); //$NON-NLS-1$
-		parse(code.toString());
+		IASTTranslationUnit tu = parse(code.toString());
+
+		IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
+		IASTCompositeTypeSpecifier comp = (IASTCompositeTypeSpecifier) decl.getDeclSpecifier();
+		ICPPClassType A = (ICPPClassType) comp.getName().resolveBinding();
+		IVariable a = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
+		assertSame( a.getType(), A );
 	}
 	
 	public void testNestedClassname() throws Exception
 	{
-		parse( "namespace A { } \n class A::B { };"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "namespace A { } \n class A::B { };"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+        CPPVisitor.visitTranslationUnit( tu, col );
+        
+        ICPPNamespace A = (ICPPNamespace) col.getName(0).resolveBinding();
+        ICPPClassType B = (ICPPClassType) col.getName(1).resolveBinding();
+        assertInstances( col, A, 2 );
+        assertEquals( B.getScope(), A.getNamespaceScope() );
 	}
 	
 	public void testForwardDeclaration() throws Exception
 	{
-		parse( "class forward;"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "class forward;"); //$NON-NLS-1$
+		IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
+		assertEquals( decl.getDeclarators().length, 0 );
+		
+		IASTElaboratedTypeSpecifier spec = (IASTElaboratedTypeSpecifier) decl.getDeclSpecifier();
+		ICPPClassType forward = (ICPPClassType) spec.getName().resolveBinding();
+		assertNotNull( forward );
 	}
 	
 	public void testElaboratedType() throws Exception
 	{
-		parse( "class A; class A * a;"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "class A; class A * a;"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 3 );
+ 		ICPPClassType A = (ICPPClassType) col.getName(0).resolveBinding();
+ 		IVariable a = (IVariable) col.getName(2).resolveBinding();
+ 		IPointerType ptr = (IPointerType) a.getType();
+ 		assertInstances( col, A, 2 );
+ 		assertSame( ptr.getType(), A );
 	}
 	
 	public void testForewardDeclarationWithUsage() throws Exception
 	{
-		parse( "class A; A * anA;class A { };"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "class A; A * anA;class A { };"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 4 );
+ 		ICPPClassType A = (ICPPClassType) col.getName(0).resolveBinding();
+ 		IVariable anA = (IVariable) col.getName(2).resolveBinding();
+ 		assertInstances( col, A, 3 );
+ 		IPointerType ptr = (IPointerType) anA.getType();
+ 		assertSame( ptr.getType(), A );
 	}
 		
 	
@@ -518,12 +634,28 @@ public class CompleteParser2Tests extends TestCase {
 
 	public void testOverride() throws Exception
 	{
-		parse( "void foo();\n void foo( int );\n"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "void foo();\n void foo( int );\n"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 3 );
+ 		IFunction foo1 = (IFunction) col.getName(0).resolveBinding();
+ 		IFunction foo2 = (IFunction) col.getName(1).resolveBinding();
+ 		
+ 		assertNotSame( foo1, foo2 );
 	}	 
 	
 	public void testSimpleExpression() throws Exception
 	{
-		parse( "int x; int y = x;"); //$NON-NLS-1$
+		IASTTranslationUnit tu = parse( "int x; int y = x;"); //$NON-NLS-1$
+        CPPNameCollector col = new CPPNameCollector();
+ 		CPPVisitor.visitTranslationUnit( tu, col );
+ 		
+ 		assertEquals( col.size(), 3 );
+ 		IVariable x = (IVariable) col.getName(0).resolveBinding();
+ 		IVariable y = (IVariable) col.getName(1).resolveBinding();
+ 		assertInstances( col, x, 2 );
+ 		assertNotNull( y );
 	}
 	
 	public void testParameterExpressions() throws Exception

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IEnumerator.java

@@ -18,5 +18,8 @@ package org.eclipse.cdt.core.dom.ast;
  * @author aniefer
  */
 public interface IEnumerator extends IBinding {
-
+	/**
+	 * @return the type of the variable
+	 */
+	public IType getType();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java

@@ -14,9 +14,12 @@
  */
 package org.eclipse.cdt.internal.core.dom.parser.c;
 
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IEnumeration;
 import org.eclipse.cdt.core.dom.ast.IEnumerator;
 import org.eclipse.cdt.core.dom.ast.IScope;
+import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
 
 /**
@@ -49,4 +52,13 @@ public class CEnumerator implements IEnumerator {
         return CVisitor.getContainingScope( enumerator );
     }
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType()
+	 */
+	public IType getType() {
+		IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) enumerator.getParent();
+		IEnumeration enum = (IEnumeration) enumSpec.getName().resolveBinding();
+		return enum;
+	}
+
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java

@@ -20,6 +20,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
 import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
 import org.eclipse.cdt.core.dom.ast.IBinding;
@@ -27,6 +28,7 @@ import org.eclipse.cdt.core.dom.ast.IField;
 import org.eclipse.cdt.core.dom.ast.IScope;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
@@ -108,7 +110,12 @@ public class CPPClassType implements ICPPClassType {
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
 	public IScope getScope() {
-		return (definition != null ) ? CPPVisitor.getContainingScope( definition ) : CPPVisitor.getContainingScope( declarations[0] );
+		IASTName name = definition != null ? definition.getName() : declarations[0].getName();
+		if( name instanceof ICPPASTQualifiedName ){
+			IASTName [] ns = ((ICPPASTQualifiedName)name).getNames();
+			name = ns[ ns.length - 1 ];
+		}
+		return CPPVisitor.getContainingScope( name );
 	}
 
 	/* (non-Javadoc)

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java

@@ -14,9 +14,12 @@
  */
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IEnumeration;
 import org.eclipse.cdt.core.dom.ast.IEnumerator;
 import org.eclipse.cdt.core.dom.ast.IScope;
+import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
 
 /**
@@ -58,4 +61,13 @@ public class CPPEnumerator implements IEnumerator {
     public IASTNode getPhysicalNode() {
         return enumerator;
     }
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType()
+	 */
+	public IType getType() {
+		IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) enumerator.getParent();
+		IEnumeration enum = (IEnumeration) enumSpec.getName().resolveBinding();
+		return enum;
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java

@@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
 import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
 import org.eclipse.cdt.core.dom.ast.IScope;
 import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.ITypedef;
@@ -49,8 +48,7 @@ public class CPPTypedef implements ITypedef, ITypeContainer {
 	 * @see org.eclipse.cdt.core.dom.ast.ITypedef#getType()
 	 */
 	public IType getType() {
-		IASTSimpleDeclaration decl = (IASTSimpleDeclaration) declarator.getParent();
+		return CPPVisitor.createType( declarator );
-		return CPPVisitor.createType( decl.getDeclSpecifier() );
 	}
 
 	/* (non-Javadoc)

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java

@@ -124,7 +124,11 @@ public class CPPVisitor {
 		    parent instanceof ICPPASTQualifiedName    ||
 			parent instanceof ICPPASTBaseSpecifier ) 
 		{
-			return CPPSemantics.resolveBinding( name );
+			IBinding binding = CPPSemantics.resolveBinding( name ); 
+			if( binding == null && parent instanceof ICPPASTQualifiedName ){
+				binding = createBinding( (IASTName) parent );
+			}
+			return binding;
 		} else if( parent instanceof IASTIdExpression ){
 			return resolveBinding( parent );
 		} else if( parent instanceof ICPPASTFieldReference ){
@@ -191,7 +195,12 @@ public class CPPVisitor {
 		return binding;
 	}
 	private static IBinding createBinding( ICPPASTCompositeTypeSpecifier compType ){
-		ICPPScope scope = (ICPPScope) getContainingScope( compType );
+		IASTName name = compType.getName();
+		if( name instanceof ICPPASTQualifiedName ){
+			IASTName [] ns = ((ICPPASTQualifiedName)name).getNames();
+			name = ns[ ns.length - 1 ];
+		}
+		ICPPScope scope = (ICPPScope) getContainingScope( name );
 		IBinding binding = scope.getBinding( compType.getName() );
 		if( binding == null || !(binding instanceof ICPPClassType) ){
 			binding = new CPPClassType( compType );
@@ -378,8 +387,22 @@ public class CPPVisitor {
 		return scope;
 	}
 	
-	public static IScope getContainingScope( IASTDeclSpecifier compTypeSpec ){
+	public static IScope getContainingScope( IASTDeclSpecifier typeSpec ){
-	    IASTNode parent = compTypeSpec.getParent();
+//		if( typeSpec instanceof ICPPASTCompositeTypeSpecifier ){
+//			ICPPASTCompositeTypeSpecifier compTypeSpec = (ICPPASTCompositeTypeSpecifier) typeSpec;
+//			IASTName name = compTypeSpec.getName();
+//			if( name instanceof ICPPASTQualifiedName ){
+//				IASTName [] names = ((ICPPASTQualifiedName)name).getNames();
+//				if( names.length > 1 ){
+//					IBinding binding = names[ names.length - 2 ].resolveBinding();
+//					if( binding instanceof ICPPClassType )
+//						return ((ICPPClassType)binding).getCompositeScope();
+//					else if( binding instanceof ICPPNamespace )
+//						return ((ICPPNamespace)binding).getNamespaceScope();
+//				}
+//			}
+//		}
+	    IASTNode parent = typeSpec.getParent();
 	    if( parent instanceof IASTSimpleDeclaration )
 	        return getContainingScope( (IASTSimpleDeclaration) parent );
 	    else if( parent instanceof IASTTypeId )