Fix for bug 232086.

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

@@ -2082,7 +2082,7 @@ public class AST2TemplateTests extends AST2BaseTest {
     // void f(C<char>& str) {
     //   str.m();
     // }
-    public void _testBug232086() throws Exception {
+    public void testBug232086() throws Exception {
 		BindingAssertionHelper bh= new BindingAssertionHelper(getAboveComment(), true);
 		ICPPFunction b0 = bh.assertNonProblem("m();", 1, ICPPFunction.class);
     }

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

@@ -33,10 +33,12 @@ import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
  */
 public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
     static public class CPPBaseProblem extends ProblemBinding implements ICPPBase, ICPPInternalBase {
-    	private ICPPClassType classProblem = null; 
+    	private ICPPClassType classProblem;
+
         public CPPBaseProblem(IASTNode node, int id, char[] arg) {
             super(node, id, arg);
         }
+
         public IBinding getBaseClass() {
         	if (classProblem == null) {
         		classProblem = new CPPClassType.CPPClassTypeProblem(node, id, arg);
@@ -51,21 +53,23 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
         public boolean isVirtual() throws DOMException {
             throw new DOMException(this);
         }
+
 		public IName getBaseClassSpecifierName() {
 			return (IName) node;
 		}
+
 		public void setBaseClass(IBinding binding) throws DOMException {
 			throw new DOMException(this);
 		}
     }
-    private ICPPASTBaseSpecifier base = null;
+
-	private IBinding baseClass = null;
+    private ICPPASTBaseSpecifier base;
+	private IBinding baseClass;
     
     public CPPBaseClause(ICPPASTBaseSpecifier base) {
         this.base = base;
     }
     
-    
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#getBaseClass()
      */
@@ -75,10 +79,9 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
 	    	while (b instanceof ITypedef && ((ITypedef) b).getType() instanceof IBinding) {
 				b = (IBinding) ((ITypedef) b).getType();
 	    	}
-	    	if( b instanceof ICPPClassType || b instanceof ICPPTemplateParameter )
+	    	if (b instanceof ICPPClassType || b instanceof ICPPTemplateParameter) {
 	    		baseClass = b;
-	    	
+	    	} else if (b instanceof IProblemBinding) {
-	    	else if( b instanceof IProblemBinding ){
 	    		baseClass =  new CPPClassType.CPPClassTypeProblem(base.getName(), ((IProblemBinding) b).getID(), base.getName().toCharArray());
 	    	} else {
 				baseClass = new CPPClassType.CPPClassTypeProblem(base.getName(), IProblemBinding.SEMANTIC_NAME_NOT_FOUND, base.getName().toCharArray());

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

@@ -8,10 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Markus Schorn (Wind River Systems)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
 import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IBinding;
@@ -36,6 +38,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTemplateParameter;
 import org.eclipse.cdt.core.parser.util.ArrayUtil;
 import org.eclipse.cdt.core.parser.util.ObjectMap;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 
 /**
  * @author aniefer
@@ -43,9 +46,9 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates;
 public class CPPTemplateTemplateParameter extends CPPTemplateParameter implements
 		ICPPTemplateTemplateParameter, ICPPClassType, ICPPInternalTemplate, ICPPUnknownBinding {
 
-	private ICPPTemplateParameter[] templateParameters = null;
+	private ICPPTemplateParameter[] templateParameters;
-	private ObjectMap instances = null;
+	private ObjectMap instances;
-	private ICPPScope unknownScope = null;
+	private ICPPScope unknownScope;
 	
 	/**
 	 * @param name
@@ -65,7 +68,6 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement
 	    return unknownScope;
 	}
 	
-
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		if (templateParameters == null) {
 			ICPPASTTemplatedTypeTemplateParameter template = (ICPPASTTemplatedTypeTemplateParameter) getPrimaryDeclaration().getParent();
@@ -90,7 +92,6 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement
 		return templateParameters;
 	}
 
-
 	public IBinding resolveTemplateParameter(ICPPASTTemplateParameter templateParameter) {
 		IASTName name = CPPTemplates.getTemplateParameterName(templateParameter);
 		
@@ -108,12 +109,19 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement
 		return binding;
 	}
 
-
 	public ICPPClassTemplatePartialSpecialization[] getTemplateSpecializations() throws DOMException {
 		return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY;
 	}
 
 	public IType getDefault() throws DOMException {
+		IASTNode[] nds = getDeclarations();
+		if (nds == null || nds.length == 0)
+		    return null;
+		IASTName name = (IASTName) nds[0];
+		ICPPASTTemplatedTypeTemplateParameter param = (ICPPASTTemplatedTypeTemplateParameter) name.getParent();
+		IASTExpression defaultValue = param.getDefaultValue();
+		if (defaultValue != null)
+		    return CPPVisitor.createType(defaultValue);
 		return null;
 	}
 

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

@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Markus Schorn (Wind River Systems)
  *     Andrew Ferguson (Symbian)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
@@ -725,6 +726,7 @@ public class CPPVisitor {
 	    }
         return isConstructor(clsName, declarator);
 	}
+
 	public static boolean isConstructor(IASTName parentName, IASTDeclarator declarator) {
 	    if (declarator == null      || !(declarator instanceof IASTFunctionDeclarator))
 	        return false;
@@ -1607,6 +1609,7 @@ public class CPPVisitor {
 		}
 		return type;
 	}
+
 	private static IType getArrayTypes(IType type, IASTArrayDeclarator declarator) {
 	    IASTArrayModifier[] mods = declarator.getArrayModifiers();
 	    for (IASTArrayModifier mod : mods) {
@@ -1775,11 +1778,12 @@ public class CPPVisitor {
 					return ((IFunction) binding).getType();
 				} else if (binding instanceof ICPPTemplateNonTypeParameter) {
 					return ((ICPPTemplateNonTypeParameter) binding).getType();
+				} else if (binding instanceof ICPPClassType) {
+					return ((ICPPClassType) binding);
 				}
 			} catch (DOMException e) {
 				return e.getProblem();
 			}
-			
 	    } else if (expression instanceof IASTCastExpression) {
 	        IASTTypeId id = ((IASTCastExpression)expression).getTypeId();
 	        IType type = createType(id.getDeclSpecifier());