diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java index 6938527c524..ef7b553a89c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java @@ -6,12 +6,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Niefer (IBM Corporation) - initial API and implementation - * Markus Schorn (Wind River Systems) + * Andrew Niefer (IBM Corporation) - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.core.dom.ast.cpp; - /** * Interface for class scopes. * @@ -20,8 +19,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; */ public interface ICPPClassScope extends ICPPScope { /** - * Get the binding for the class this scope is associated with - * + * Returns the binding for the class this scope is associated with. */ ICPPClassType getClassType(); @@ -30,7 +28,6 @@ public interface ICPPClassScope extends ICPPScope { * scope. These methods may or may not have been explicitly declared in the * code. The methods that will be implicitly declared are: the default * constructor, copy constructor, copy assignment operator, and destructor - * */ public ICPPMethod[] getImplicitMethods(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java index 633387a65c3..1fc4b2daffa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java @@ -86,18 +86,17 @@ public interface ICPPClassType extends ICompositeType, ICPPBinding { * Returns an array of ICPPConstructor objects representing the constructors * for this class. This list includes both declared and implicit * constructors. - * */ public ICPPConstructor[] getConstructors(); /** - * return an array of bindings for those classes/functions declared as + * Returns an array of bindings for those classes/functions declared as * friends of this class. */ public IBinding[] getFriends(); /** - * return an array of nested classes/structures + * Returns an array of nested classes/structures */ public ICPPClassType[] getNestedClasses(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecializationScope.java index b03b19a2dd8..e3f11c51f09 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecializationScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecializationScope.java @@ -6,10 +6,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Niefer (IBM) - Initial API and implementation - * Markus Schorn (Wind River Systems) - * Bryan Wilkinson (QNX) - * Andrew Ferguson (Symbian) + * Andrew Niefer (IBM) - Initial API and implementation + * Markus Schorn (Wind River Systems) + * Bryan Wilkinson (QNX) + * Andrew Ferguson (Symbian) *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownBinding.java index af26b8dd21e..4d41e4df2f0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownBinding.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownClassInstance.java index 2ec1d50f377..daef1004737 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPUnknownClassInstance.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Sergey Prigogin (Google) - initial API and implementation - * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BuiltinOperators.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BuiltinOperators.java index 228047b9233..5cc74b55ef7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BuiltinOperators.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BuiltinOperators.java @@ -10,7 +10,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; -import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.*; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.ALLCVQ; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.CVTYPE; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF; import java.util.ArrayList; import java.util.HashSet; @@ -80,7 +83,7 @@ class BuiltinOperators { Object[] globCandidates) { fFileScope= point.getTranslationUnit().getScope(); fOperator= operator; - fUnary= args.length<2; + fUnary= args.length < 2; fGlobalCandidates= globCandidates; if (args.length > 0) { IType type= args[0].getTypeOrFunctionSet(point); @@ -95,7 +98,6 @@ class BuiltinOperators { } } - private ICPPFunction[] create() { switch (fOperator) { case ARROW: @@ -231,8 +233,6 @@ class BuiltinOperators { return fResult.toArray(new ICPPFunction[fResult.size()]); } - - // 13.6-3, 13.6-4, 13.6-5 private void opIncOrDec() { IType[] types= getClassConversionTypes(FIRST); @@ -424,7 +424,6 @@ class BuiltinOperators { return p1; } - // 13.6-13, 13.6.14 private void pointerArithmetic(boolean useRef, boolean isDiff) { IType[] types= getClassConversionTypes(FIRST); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CVQualifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CVQualifier.java index cd3f8035b3b..76b0fbaa3fd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CVQualifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CVQualifier.java @@ -6,11 +6,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; - /** * Represents the possible cv-qualification of a type. */ @@ -23,16 +22,19 @@ public enum CVQualifier { private static final int R = 4; final private int fQualifiers; + private CVQualifier(int qualifiers) { fQualifiers= qualifiers; } - + public boolean isConst() { return (fQualifiers & C) != 0; } + public boolean isVolatile() { return (fQualifiers & V) != 0; } + public boolean isRestrict() { return (fQualifiers & R) != 0; } @@ -54,7 +56,7 @@ public enum CVQualifier { } private CVQualifier fromQualifier(final int q) { - switch(q) { + switch (q) { case C|V|R: return CONST_VOLATILE_RESTRICT; case V|R: return VOLATILE_RESTRICT; case C|R: return CONST_RESTRICT; @@ -65,7 +67,7 @@ public enum CVQualifier { case 0: default: return NONE; } } - + /** * [3.9.3-4] Implements cv-qualification (partial) comparison. There is a (partial) * ordering on cv-qualifiers, so that a type can be said to be more @@ -83,12 +85,12 @@ public enum CVQualifier { * */ public int partialComparison(CVQualifier cv2) { - // same qualifications + // Same qualifications. if (this == cv2) return 0; if (!isAtLeastAsQualifiedAs(cv2)) return -1; - return fQualifiers-cv2.fQualifiers; + return fQualifiers - cv2.fQualifiers; } }