[cdt-patch] Applied [HEAD] Symbol Table lookupForDefinition() usage rath

[John Camelon <jcamelon@xxxxxxxxxx>]

CORE
        Fixed bug41445 - QualifiedLookup succeeds where it should fail. 
TESTS
        Added testBug41445() to CompleteParseASTTests.java. 

JohnC

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/ChangeLog,v
retrieving revision 1.73
diff -u -r1.73 ChangeLog
--- ChangeLog	2 Sep 2003 20:05:20 -0000	1.73
+++ ChangeLog	3 Sep 2003 15:15:18 -0000
@@ -1,3 +1,6 @@
+2003-09-03 John Camelon
+	Added testBug41445() to CompleteParseASTTests.java.  
+	
 2003-09-02 Hoda Amer
 	Modified CCompletionProposalsTest to complete on a body file 
 	that includes a header file.
Index: model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java,v
retrieving revision 1.2
diff -u -r1.2 CompletionProposalsTest.java
--- model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java	2 Sep 2003 17:17:01 -0000	1.2
+++ model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java	3 Sep 2003 15:15:18 -0000
@@ -18,7 +18,6 @@
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.internal.core.model.TranslationUnit;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
Index: parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java,v
retrieving revision 1.18
diff -u -r1.18 CompleteParseASTTest.java
--- parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java	28 Aug 2003 15:50:09 -0000	1.18
+++ parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java	3 Sep 2003 15:15:19 -0000
@@ -557,4 +557,14 @@
 		IASTMethod method = (IASTMethod)i.next();
 		assertTrue (method.isDestructor()); 
 	}
+	
+	public void testBug41445() throws Exception
+	{
+		Iterator i = parse( "class A { }; namespace N { class B : public A { struct A {}; }; }").getDeclarations();
+		IASTClassSpecifier classA = (IASTClassSpecifier) ((IASTAbstractTypeSpecifierDeclaration)i.next()).getTypeSpecifier();
+		IASTNamespaceDefinition namespaceN = (IASTNamespaceDefinition)i.next(); 
+		Iterator sub = getDeclarations( namespaceN );
+		IASTClassSpecifier classB = (IASTClassSpecifier) ((IASTAbstractTypeSpecifierDeclaration)sub.next()).getTypeSpecifier();
+		IASTClassSpecifier structA = (IASTClassSpecifier)((IASTAbstractTypeSpecifierDeclaration)( getDeclarations( classB ).next())).getTypeSpecifier();
+	}
 }

Index: parser/ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/ChangeLog,v
retrieving revision 1.107
diff -u -r1.107 ChangeLog
--- parser/ChangeLog	2 Sep 2003 20:05:14 -0000	1.107
+++ parser/ChangeLog	3 Sep 2003 15:12:07 -0000
@@ -1,3 +1,6 @@
+2003-09-03 John Camelon
+	Fixed bug41445 - QualifiedLookup succeeds where it should fail.  
+
 2003-09-02 Andrew Niefer
 	bug41935 - Modifications to PST to allow for namespace aliases
 
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java,v
retrieving revision 1.23
diff -u -r1.23 CompleteParseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java	28 Aug 2003 15:50:31 -0000	1.23
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java	3 Sep 2003 15:12:09 -0000
@@ -435,7 +435,7 @@
 		ISymbol classSymbol = null;
         try
         {
-            classSymbol = currentScopeSymbol.qualifiedLookup(lastToken.getImage());
+            classSymbol = currentScopeSymbol.lookupMemberForDefinition(lastToken.getImage());
         }
         catch (ParserSymbolTableException e)
         {