Cosmetics.

core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java

@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     John Cortell - Initial API and implementation
+ *******************************************************************************/
 package org.eclipse.cdt.alltests;
 
 import junit.framework.Test;

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

@@ -40,9 +40,6 @@ import org.eclipse.core.runtime.content.IContentType;
  * @author dsteffle
  */
 public class DOMSearchUtil {
-	private static final IASTName[] BLANK_NAME_ARRAY = new IASTName[0];
-//    private static final IASTName[] EMPTY_NAME_LIST = BLANK_NAME_ARRAY;
-
 	public static final int DECLARATIONS = 1;
     public static final int DEFINITIONS = 2;
     public static final int DECLARATIONS_DEFINITIONS = 3;
@@ -135,7 +132,7 @@ public class DOMSearchUtil {
 		IASTTranslationUnit tu = searchName.getTranslationUnit();
 
 		if (tu == null) {
-			return BLANK_NAME_ARRAY;
+			return IASTName.EMPTY_NAME_ARRAY;
 		}
 
 		IBinding binding = searchName.resolveBinding();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionScope.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 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
@@ -19,8 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IScope;
  */
 public interface ICPPFunctionScope extends ICPPScope {
 	/**
-	 * Get the scope representing the function body. returns null if there is no
-	 * function definition
+	 * Returns the scope representing the function body, or {@code null} if there is no
+	 * function definition.
 	 * 
 	 * @throws DOMException
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/IASTInternalScope.java

@@ -20,18 +20,18 @@ import org.eclipse.cdt.core.dom.ast.IScope;
  */
 public interface IASTInternalScope extends IScope {
     /**
-     * Return the physical IASTNode that this scope was created for
+     * Returns the physical IASTNode that this scope was created for
      */
     public IASTNode getPhysicalNode();
 		
 	/**
-	 * This adds an IBinding to the scope.  It is primarily used by the parser to add
+	 * Adds an IBinding to the scope.  It is primarily used by the parser to add
 	 * implicit IBindings to the scope (such as GCC built-in functions).
 	 */
 	public void addBinding(IBinding binding);
 
 	/**
-	 * Add an IASTName to be cached in this scope
+	 * Adds an IASTName to be cached in this scope
 	 */
 	public void addName(IASTName name);
 	
@@ -47,5 +47,4 @@ public interface IASTInternalScope extends IScope {
 	 * node from the cache.
 	 */
 	public void removeNestedFromCache(IASTNode container);
-
 }

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

@@ -37,7 +37,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
  * Scope of a function, containing labels.
  */
 public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
-
     private CharArrayObjectMap<IBinding> labels = CharArrayObjectMap.emptyMap();
     
 	/**
@@ -52,9 +51,6 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
 		return EScopeKind.eLocal;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#addBinding(org.eclipse.cdt.core.dom.ast.IBinding)
-	 */
 	@Override
 	public void addBinding(IBinding binding) {
 	    //3.3.4 only labels have function scope
@@ -67,16 +63,10 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
 	    labels.put(binding.getNameCharArray(), binding);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getBinding(int, char[])
-	 */
 	public IBinding getBinding(IASTName name) {
 	    return labels.get(name.getLookupKey());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.IScope#find(java.lang.String)
-	 */
 	@Override
 	public IBinding[] find(String name) {
 	    char[] n = name.toCharArray();
@@ -106,9 +96,6 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
 	    return CPPVisitor.getContainingNonTemplateScope(name);
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionScope#getBodyScope()
-     */
     @Override
 	public IScope getBodyScope() {
         IASTFunctionDeclarator fnDtor = (IASTFunctionDeclarator) getPhysicalNode();
@@ -121,9 +108,6 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getScopeName()
-     */
     @Override
 	public IName getScopeName() {
         IASTNode node = getPhysicalNode();

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

@@ -375,10 +375,9 @@ public class CPPVisitor extends ASTQueries {
 	}
 
 	private static IBinding createBinding(IASTGotoStatement gotoStatement) {
-	    ICPPFunctionScope functionScope = (ICPPFunctionScope) getContainingScope(gotoStatement.getName());
 	    IASTName name = gotoStatement.getName();
-	    IBinding binding;
-        binding = functionScope.getBinding(name, false);
+	    ICPPFunctionScope functionScope = (ICPPFunctionScope) getContainingScope(name);
+	    IBinding binding = functionScope.getBinding(name, false);
 		if (binding == null || !(binding instanceof ILabel)) {
 		    binding = new CPPLabel(name);
 		    ASTInternal.addName(functionScope, name);
@@ -388,10 +387,9 @@ public class CPPVisitor extends ASTQueries {
 	}
 
 	private static IBinding createBinding(IASTLabelStatement labelStatement) {
-	    ICPPFunctionScope functionScope = (ICPPFunctionScope) getContainingScope(labelStatement.getName());
 	    IASTName name = labelStatement.getName();
-	    IBinding binding;
-        binding = functionScope.getBinding(name, false);
+	    ICPPFunctionScope functionScope = (ICPPFunctionScope) getContainingScope(name);
+	    IBinding binding = functionScope.getBinding(name, false);
 		if (binding == null || !(binding instanceof ILabel)) {
 		    binding = new CPPLabel(name);
 		    ASTInternal.addName(functionScope, name);