diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttribute.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttribute.java
index dadc2eb439e..d7473fbabb3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttribute.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttribute.java
@@ -12,6 +12,7 @@
package org.eclipse.cdt.core.dom.ast.cpp;
import org.eclipse.cdt.core.dom.ast.IASTAttribute;
+
/**
* Represents a C++11 (ISO/IEC 14882:2011 7.6) attribute.
*
@@ -26,7 +27,6 @@ public interface ICPPASTAttribute extends IASTAttribute {
public char[] getScope();
/**
- *
* Returns true if this attribute has a pack expansion.
*/
public boolean hasPackExpansion();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java
index ae502b29209..59a63fdeb9d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java
@@ -6,28 +6,26 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * John Camelon (IBM) - Initial API and implementation
+ * John Camelon (IBM) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.core.dom.ast.cpp;
import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
/**
- * Elaborated types in C++ include classes.
+ * Elaborated types specifier in C++ [dcl.type.elab].
*
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
-public interface ICPPASTElaboratedTypeSpecifier extends
- IASTElaboratedTypeSpecifier, ICPPASTDeclSpecifier {
-
+public interface ICPPASTElaboratedTypeSpecifier extends IASTElaboratedTypeSpecifier, ICPPASTDeclSpecifier {
/**
- * k_class represents elaborated class declaration
+ * {@code k_class} represents elaborated class declaration.
*/
public static final int k_class = IASTElaboratedTypeSpecifier.k_last + 1;
/**
- * k_last is defined for subinterfaces.
+ * {@code k_last} is defined for subinterfaces.
*/
public static final int k_last = k_class;
@@ -42,5 +40,4 @@ public interface ICPPASTElaboratedTypeSpecifier extends
*/
@Override
public ICPPASTElaboratedTypeSpecifier copy(CopyStyle style);
-
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
index 8793d23c861..a09cc26fd3a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
@@ -29,20 +29,6 @@ public interface ICPPASTTemplateId extends ICPPASTName, IASTNameOwner {
public static final ASTNodeProperty TEMPLATE_NAME = new ASTNodeProperty(
"ICPPASTTemplateId.TEMPLATE_NAME - TemplateId Name"); //$NON-NLS-1$
- /**
- * Returns the name.
- *
- * @return {@code IASTName}
- */
- public IASTName getTemplateName();
-
- /**
- * Sets the name.
- *
- * @param name {@code IASTName}
- */
- public void setTemplateName(IASTName name);
-
/**
* TEMPLATE_ID_ARGUMENT = template id argument.
*/
@@ -51,10 +37,25 @@ public interface ICPPASTTemplateId extends ICPPASTName, IASTNameOwner {
/**
* @deprecated Use IASTNode.EMPTY_NODE_ARRAY instead.
+ * @noreference This field is not intended to be referenced by clients.
*/
@Deprecated
public static final IASTNode[] EMPTY_ARG_ARRAY = IASTNode.EMPTY_NODE_ARRAY;
+ /**
+ * Returns the name of the template.
+ *
+ * @return {@code IASTName}
+ */
+ public IASTName getTemplateName();
+
+ /**
+ * Sets the name of the template.
+ *
+ * @param name {@code IASTName}
+ */
+ public void setTemplateName(IASTName name);
+
/**
* Adds template argument.
*
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
index f8e7dd237a7..8a1e761a670 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * John Camelon (IBM) - Initial API and implementation
+ * John Camelon (IBM) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.core.dom.ast.cpp;
@@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface ICPPASTTemplateSpecialization extends IASTDeclaration {
-
/**
* The declaration that the specialization affects.
*/
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
index 80f918d75d6..b4e395e100e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
@@ -6,9 +6,9 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Devin Steffler (IBM) - Initial API and implementation
- * Emanuel Graf IFS - Fix for #198259
- * Markus Schorn (Wind River Systems)
+ * Devin Steffler (IBM) - Initial API and implementation
+ * Emanuel Graf IFS - Fix for #198259
+ * Markus Schorn (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp;
@@ -23,10 +23,10 @@ import org.eclipse.cdt.core.parser.Keywords;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
/**
- * Implementation of conversion function ids
+ * Implementation of conversion function ids.
*/
public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConversionName {
- private IASTTypeId typeId = null;
+ private IASTTypeId typeId;
private char[] fName;
public CPPASTConversionName() {
@@ -56,7 +56,7 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
@Override
public void setTypeId(IASTTypeId typeId) {
assertNotFrozen();
- this.typeId=typeId;
+ this.typeId= typeId;
if (typeId != null) {
typeId.setParent(this);
typeId.setPropertyInParent(TYPE_ID);
@@ -76,7 +76,8 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
}
}
- if(typeId != null )if(! typeId.accept( action )) return false;
+ if (typeId != null && !typeId.accept(action))
+ return false;
if (action.shouldVisitNames) {
switch (action.leave(this)) {