Bug 367607: Short name for templated in qualified name.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -5689,4 +5689,18 @@ public class AST2TemplateTests extends AST2BaseTest {
 	public void testDeductionForConstFunctionType_367562() throws Exception {
 		parseAndCheckBindings();
 	}
+	
+	//	template <typename> struct base {
+	//	    typedef int type;
+	//	};
+	//	template <typename A, typename B> struct derived;
+	//	template <typename B> struct derived<int, B> : public base<B> {
+	//	    typedef typename derived::type type;  // ERROR HERE
+	//	};
+	public void testTemplateShortNameInQualifiedName_367607() throws Exception {
+		parseAndCheckBindings();
+		BindingAssertionHelper bh= new BindingAssertionHelper(getAboveComment(), true);
+		ICPPDeferredClassInstance shortHand= bh.assertNonProblem("derived:", -1);
+		assertTrue(shortHand.getClassTemplate() instanceof ICPPClassTemplatePartialSpecialization);
+	}
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -124,7 +124,7 @@ public interface IASTName extends IASTNode, IName {
 	public char[] getLookupKey();
 
 	/**
-	 * Gets the intermediate representation of the biniding, if already available.
+	 * Gets the intermediate representation of the binding, if already available.
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	public IBinding getPreBinding();
@@ -134,4 +134,10 @@ public interface IASTName extends IASTNode, IName {
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	public IBinding resolvePreBinding();
+
+	/**
+	 * Returns whether this name is qualified, i.e. whether it is preceded by a scope operator.
+	 * @since 5.4
+	 */
+	public boolean isQualified();
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -265,4 +265,8 @@ public class CASTName extends ASTNode implements IASTName, IASTCompletionContext
 	public IASTName getLastName() {
 		return this;
 	}
+	@Override
+	public boolean isQualified() {
+		return false;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2012 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNameOwner;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.IProblemBinding;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
 import org.eclipse.cdt.internal.core.dom.Linkage;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.dom.parser.IASTInternalNameOwner;
@@ -152,6 +153,22 @@ public abstract class CPPASTNameBase extends ASTNode implements IASTName {
 		return this;
 	}
 
+	@Override
+	public boolean isQualified() {
+		IASTNode parent= getParent();
+		if (parent instanceof ICPPASTQualifiedName) {
+			ICPPASTQualifiedName qn= (ICPPASTQualifiedName) parent;
+			if (qn.isFullyQualified())
+				return true;
+			IASTName[] qns = qn.getNames();
+			if (qns.length > 0 && qns[0] == this)
+				return false;
+			return true;
+		}
+		return false;
+	}
+
+	
 	@Override
 	public final String toString() {
 		return new String(toCharArray());

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -324,7 +324,7 @@ public class CPPSemantics {
 		if (binding instanceof ICPPClassTemplate && !(binding instanceof ICPPClassSpecialization) &&
 				!(binding instanceof ICPPTemplateParameter) && !(data.astName instanceof ICPPASTTemplateId)) {
 			ASTNodeProperty prop = data.astName.getPropertyInParent();
-			if (prop != ICPPASTTemplateId.TEMPLATE_NAME && prop != ICPPASTQualifiedName.SEGMENT_NAME) {
+			if (prop != ICPPASTTemplateId.TEMPLATE_NAME && !data.astName.isQualified()) {
 				// You cannot use a class template name outside of the class template scope,
 				// mark it as a problem.
 				IBinding replacement= CPPTemplates.isUsedInClassTemplateScope((ICPPClassTemplate) binding, data.astName);

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,40 +37,52 @@ class ASTPreprocessorName extends ASTPreprocessorNode implements IASTName {
 		fBinding= binding;
 	}
 
+	@Override
 	public IBinding resolveBinding() {
 		return fBinding;
 	}
+	@Override
 	public IBinding resolvePreBinding() {
 		return fBinding;
 	}
+	@Override
 	public IBinding getBinding() {
 		return fBinding;
 	}
+	@Override
 	public IBinding getPreBinding() {
 		return fBinding;
 	}
+	@Override
 	public ILinkage getLinkage() {
 		final IASTTranslationUnit tu= getTranslationUnit();
 		return tu == null ? Linkage.NO_LINKAGE : tu.getLinkage();
 	}
+	@Override
 	public IASTCompletionContext getCompletionContext() {
 		return null;
 	}
+	@Override
 	public boolean isDeclaration() {
 		return false;
 	}
+	@Override
 	public boolean isDefinition() {
 		return false;
 	}
+	@Override
 	public boolean isReference() {
 		return false;
 	}
+	@Override
 	public char[] toCharArray() {
 		return fName;
 	}    	
+	@Override
 	public char[] getSimpleID() {
 		return fName;
 	}
+	@Override
 	public char[] getLookupKey() {
 		return fName;
 	}
@@ -79,15 +91,22 @@ class ASTPreprocessorName extends ASTPreprocessorNode implements IASTName {
 	public String toString() {
 		return new String(fName);
 	}
+	@Override
 	public void setBinding(IBinding binding) {assert false;}
 
+	@Override
 	public int getRoleOfName(boolean allowResolution) {
 		return IASTNameOwner.r_unclear;
 	}
+	@Override
 	public IASTName getLastName() {
 		return this;
 	}
 	@Override
+	public boolean isQualified() {
+		return false;
+	}
+	@Override
 	public IASTName copy() {
 		throw new UnsupportedOperationException();
 	}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -51,144 +51,179 @@ public class PDOMASTAdapter {
 		public AnonymousASTName(IASTName name, final IASTFileLocation loc) {
 			fDelegate= name;
 			fLocation= new IASTFileLocation() {
+				@Override
 				public int getEndingLineNumber() {
 					return loc.getStartingLineNumber();
 				}
 
+				@Override
 				public String getFileName() {
 					return loc.getFileName();
 				}
 
+				@Override
 				public int getStartingLineNumber() {
 					return loc.getStartingLineNumber();
 				}
 
+				@Override
 				public IASTFileLocation asFileLocation() {
 					return loc.asFileLocation();
 				}
 
+				@Override
 				public int getNodeLength() {
 					return 0;
 				}
 
+				@Override
 				public int getNodeOffset() {
 					return loc.getNodeOffset();
 				}
 
+				@Override
 				public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 					return loc.getContextInclusionStatement();
 				}
 			};
 		}
 
+		@Override
 		public boolean accept(ASTVisitor visitor) {
 			return fDelegate.accept(visitor);
 		}
 
+		@Override
 		public boolean contains(IASTNode node) {
 			return fDelegate.contains(node);
 		}
 
+		@Override
 		public IBinding getBinding() {
 			return fDelegate.getBinding();
 		}
 
+		@Override
 		public IBinding getPreBinding() {
 			return fDelegate.getPreBinding();
 		}
 
+		@Override
 		public String getContainingFilename() {
 			return fLocation.getFileName();
 		}
 
+		@Override
 		public IASTFileLocation getFileLocation() {
 			return fLocation;
 		}
 
+		@Override
 		public ILinkage getLinkage() {
 			return fDelegate.getLinkage();
 		}
 
+		@Override
 		public IASTNodeLocation[] getNodeLocations() {
 			return fDelegate.getNodeLocations();
 		}
 
+		@Override
 		public IASTNode getParent() {
 			return fDelegate.getParent();
 		}
 
+		@Override
 		public IASTNode[] getChildren() {
 			return fDelegate.getChildren();
 		}
 
+		@Override
 		public ASTNodeProperty getPropertyInParent() {
 			return fDelegate.getPropertyInParent();
 		}
 
+		@Override
 		public String getRawSignature() {
 			return fDelegate.getRawSignature();
 		}
 
+		@Override
 		public IASTTranslationUnit getTranslationUnit() {
 			return fDelegate.getTranslationUnit();
 		}
 
+		@Override
 		public int getRoleOfName(boolean allowResolution) {
 			return fDelegate.getRoleOfName(allowResolution);
 		}
 
+		@Override
 		public boolean isDeclaration() {
 			return fDelegate.isDeclaration();
 		}
 
+		@Override
 		public boolean isDefinition() {
 			return fDelegate.isDefinition();
 		}
 
+		@Override
 		public boolean isReference() {
 			return fDelegate.isReference();
 		}
 
+		@Override
 		public IBinding resolveBinding() {
 			return fDelegate.resolveBinding();
 		}
 
+		@Override
 		public IBinding resolvePreBinding() {
 			return fDelegate.resolvePreBinding();
 		}
 
+		@Override
 		public IASTCompletionContext getCompletionContext() {
 			return fDelegate.getCompletionContext();
 		}
 
+		@Override
 		public void setBinding(IBinding binding) {
 			fDelegate.setBinding(binding);
 		}
 
+		@Override
 		public void setParent(IASTNode node) {
 			fDelegate.setParent(node);
 		}
 
+		@Override
 		public void setPropertyInParent(ASTNodeProperty property) {
 			fDelegate.setPropertyInParent(property);
 		}
 
+		@Override
 		public char[] toCharArray() {
 			return fDelegate.toCharArray();
 		}
 
+		@Override
 		public char[] getSimpleID() {
 			return fDelegate.getSimpleID();
 		}
 		
+		@Override
 		public char[] getLookupKey() {
 			return fDelegate.getLookupKey();
 		}
 
+		@Override
 		public IASTImageLocation getImageLocation() {
 			return null;
 		}
 
+		@Override
 		public boolean isPartOfTranslationUnitFile() {
 			return fLocation.getFileName().equals(fDelegate.getTranslationUnit().getFilePath());
 		}
@@ -198,40 +233,53 @@ public class PDOMASTAdapter {
 			return fDelegate.toString();
 		}
 
+		@Override
 		public IASTName getLastName() {
 			return this;
 		}
 
+		@Override
 		public IToken getSyntax() throws ExpansionOverlapsBoundaryException,
 				UnsupportedOperationException {
 			return fDelegate.getSyntax();
 		}
 
+		@Override
 		public IToken getLeadingSyntax() throws ExpansionOverlapsBoundaryException,
 				UnsupportedOperationException {
 			return fDelegate.getLeadingSyntax();
 		}
 
+		@Override
 		public IToken getTrailingSyntax() throws ExpansionOverlapsBoundaryException,
 				UnsupportedOperationException {
 			return fDelegate.getTrailingSyntax();
 		}
 		
+		@Override
 		public boolean isFrozen() {
 			return fDelegate.isFrozen();
 		}
 			
+		@Override
 		public boolean isActive() {
 			return fDelegate.isFrozen();
 		}
 
+		@Override
 		public IASTName copy() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public IASTName copy(CopyStyle style) {
 			throw new UnsupportedOperationException();
 		}
+
+		@Override
+		public boolean isQualified() {
+			return fDelegate.isQualified();
+		}
 	}
 
 	private static class AnonymousEnumeration implements IEnumeration {
@@ -248,43 +296,53 @@ public class PDOMASTAdapter {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object getAdapter(Class adapter) {
 			return fDelegate.getAdapter(adapter);
 		}
 
+		@Override
 		public IEnumerator[] getEnumerators() throws DOMException {
 			return fDelegate.getEnumerators();
 		}
 
+		@Override
 		public ILinkage getLinkage() {
 			return fDelegate.getLinkage();
 		}
 
+		@Override
 		public String getName() {
 			return new String(fName);
 		}
 
+		@Override
 		public char[] getNameCharArray() {
 			return fName;
 		}
 
+		@Override
 		public IScope getScope() throws DOMException {
 			return fDelegate.getScope();
 		}
 
+		@Override
 		public boolean isSameType(IType type) {
 			return fDelegate.isSameType(type);
 		}
 
+		@Override
 		public IBinding getOwner() {
 			return fDelegate.getOwner();
 		}
 		
+		@Override
 		public long getMinValue() {
 			return fDelegate.getMinValue();
 		}
 
+		@Override
 		public long getMaxValue() {
 			return fDelegate.getMaxValue();
 		}
@@ -304,51 +362,63 @@ public class PDOMASTAdapter {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public IField findField(String name) {
 			return fDelegate.findField(name);
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object getAdapter(Class adapter) {
 			return fDelegate.getAdapter(adapter);
 		}
 
+		@Override
 		public IScope getCompositeScope() {
 			return fDelegate.getCompositeScope();
 		}
 
+		@Override
 		public IField[] getFields() {
 			return fDelegate.getFields();
 		}
 
+		@Override
 		public int getKey() {
 			return fDelegate.getKey();
 		}
 
+		@Override
 		public ILinkage getLinkage() {
 			return fDelegate.getLinkage();
 		}
 
+		@Override
 		public String getName() {
 			return new String(fName);
 		}
 
+		@Override
 		public char[] getNameCharArray() {
 			return fName;
 		}
 
+		@Override
 		public IScope getScope() throws DOMException {
 			return fDelegate.getScope();
 		}
 
+		@Override
 		public boolean isSameType(IType type) {
 			return fDelegate.isSameType(type);
 		}
 		
+		@Override
 		public IBinding getOwner() {
 			return fDelegate.getOwner();
 		}
 
+		@Override
 		public boolean isAnonymous() {
 			return fDelegate.isAnonymous();
 		}
@@ -368,14 +438,17 @@ public class PDOMASTAdapter {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String getName() {
 			return new String(fName);
 		}
 
+		@Override
 		public char[] getNameCharArray() {
 			return fName;
 		}
 
+		@Override
 		public String[] getQualifiedName() throws DOMException {
 			String[] qn= fDelegate.getQualifiedName();
 			if (qn.length < 1) {
@@ -385,6 +458,7 @@ public class PDOMASTAdapter {
 			return qn;
 		}
 
+		@Override
 		public char[][] getQualifiedNameCharArray() throws DOMException {
 			char[][] qn= fDelegate.getQualifiedNameCharArray();
 			if (qn.length < 1) {
@@ -394,23 +468,28 @@ public class PDOMASTAdapter {
 			return qn;
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object getAdapter(Class adapter) {
 			return fDelegate.getAdapter(adapter);
 		}
 
+		@Override
 		public ILinkage getLinkage() {
 			return fDelegate.getLinkage();
 		}
 
+		@Override
 		public IScope getScope() throws DOMException {
 			return fDelegate.getScope();
 		}
 
+		@Override
 		public boolean isGloballyQualified() throws DOMException {
 			return fDelegate.isGloballyQualified();
 		}
 
+		@Override
 		public IBinding getOwner() {
 			return fDelegate.getOwner();
 		}
@@ -421,30 +500,37 @@ public class PDOMASTAdapter {
 			super(name, (ICPPBinding) delegate);
 		}
 
+		@Override
 		public IEnumerator[] getEnumerators() throws DOMException {
 			return ((IEnumeration) fDelegate).getEnumerators();
 		}
 
+		@Override
 		public boolean isSameType(IType type) {
 			return ((IEnumeration) fDelegate).isSameType(type);
 		}
 		
+		@Override
 		public long getMinValue() {
 			return ((IEnumeration)fDelegate).getMinValue();
 		}
 
+		@Override
 		public long getMaxValue() {
 			return ((IEnumeration)fDelegate).getMaxValue();
 		}
 
+		@Override
 		public boolean isScoped() {
 			return ((ICPPEnumeration)fDelegate).isScoped();
 		}
 
+		@Override
 		public IType getFixedType() {
 			return ((ICPPEnumeration)fDelegate).getFixedType();
 		}
 
+		@Override
 		public ICPPScope asScope() {
 			return ((ICPPEnumeration)fDelegate).asScope();
 		}
@@ -455,58 +541,72 @@ public class PDOMASTAdapter {
 			super(name, delegate);
 		}
 		
+		@Override
 		public IField findField(String name) {
 			return ((ICPPClassType) fDelegate).findField(name);
 		}
 
+		@Override
 		public ICPPMethod[] getAllDeclaredMethods() {
 			return ((ICPPClassType) fDelegate).getAllDeclaredMethods();
 		}
 
+		@Override
 		public ICPPBase[] getBases() {
 			return ((ICPPClassType) fDelegate).getBases();
 		}
 
+		@Override
 		public IScope getCompositeScope() {
 			return ((ICPPClassType) fDelegate).getCompositeScope();
 		}
 
+		@Override
 		public ICPPConstructor[] getConstructors() {
 			return ((ICPPClassType) fDelegate).getConstructors();
 		}
 
+		@Override
 		public ICPPField[] getDeclaredFields() {
 			return ((ICPPClassType) fDelegate).getDeclaredFields();
 		}
 
+		@Override
 		public ICPPMethod[] getDeclaredMethods() {
 			return ((ICPPClassType) fDelegate).getDeclaredMethods();
 		}
 
+		@Override
 		public IField[] getFields() {
 			return ((ICPPClassType) fDelegate).getFields();
 		}
 
+		@Override
 		public IBinding[] getFriends() {
 			return ((ICPPClassType) fDelegate).getFriends();
 		}
 
+		@Override
 		public int getKey() {
 			return ((ICPPClassType) fDelegate).getKey();
 		}
 
+		@Override
 		public ICPPMethod[] getMethods() {
 			return ((ICPPClassType) fDelegate).getMethods();
 		}
 
+		@Override
 		public ICPPClassType[] getNestedClasses() {
 			return ((ICPPClassType) fDelegate).getNestedClasses();
 		}
 
+		@Override
 		public boolean isSameType(IType type) {
 			return ((ICPPClassType) fDelegate).isSameType(type);
 		}
 
+		@Override
 		public boolean isAnonymous() {
 			return ((ICPPClassType) fDelegate).isAnonymous();
 		}