null if there is no owner.
*
* The owner is determined as follows:
- *
{@link ICPPUsingDeclaration}: the owner depends on where the declaration is found, within a
+ *
{@link ICPPUsingDeclaration}: The owner depends on where the declaration is found, within a
* function or method, a class-type, a namespace or on global scope.
- *
{@link ICPPTemplateParameter}: the owner is the {@link ICPPTemplateDefinition}.
- *
for all other bindings the owner depends on where the binding can be defined (it could be
+ *
{@link ICPPTemplateParameter}: The owner is the {@link ICPPTemplateDefinition}.
+ *
{@link IEnumerator}: The owner is the {@link IEnumeration}, independent of whether they are scoped or not.
+ *
For all other bindings: The owner depends on where the binding can be defined (it could be
* declared else where).
*
Possible owners are:
*
{@link IFunction}: for parameters, local types, variables, enumerators, labels and using declarations;
@@ -60,7 +61,8 @@ public interface IBinding extends IAdaptable {
*
{@link ICompositeType}: for struct- and union-members, even if the composite type is anonymous;
* also for anonymous structs or unions found within another struct;
*
{@link ICPPNamespace}: for global types, functions, variables, enumerators, namespaces and using declarations;
- *
null: for types, functions, variables, enumerators, namespaces and using declarations;
+ *
{@link IEnumeration}: for enumerators.
+ *
null: for types, functions, variables, namespaces and using declarations;
* @since 5.1
*/
public IBinding getOwner() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java
new file mode 100644
index 00000000000..78678e5240f
--- /dev/null
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Markus Schorn - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.dom.ast.cpp;
+
+import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
+
+/**
+ * enum struct : unsigned int {...}
+ *
+ * @since 5.2
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface ICPPASTEnumerationSpecifier extends IASTEnumerationSpecifier, ICPPASTDeclSpecifier {
+
+ public static final ASTNodeProperty BASE_TYPE = new ASTNodeProperty(
+ "ICPPASTEnumerationSpecifier.BASE_TYPE [ICPPASTDeclSpecifier]"); //$NON-NLS-1$
+
+ public ICPPASTEnumerationSpecifier copy();
+
+ /**
+ * Not allowed on frozen ast.
+ */
+ public void setIsScoped(boolean isScoped);
+
+ /**
+ * An enum is scoped if it uses the enumeration head
+ * enum class or enum struct
+ */
+ public boolean isScoped();
+
+ /**
+ * Not allowed on frozen ast.
+ */
+ public void setIsOpaque(boolean isOpaque);
+
+ /**
+ * An opaque specifier does not have a body.
+ */
+ public boolean isOpaque();
+
+ /**
+ * Not allowed on frozen ast.
+ */
+ public void setBaseType(ICPPASTDeclSpecifier baseType);
+
+ /**
+ * Returns the base type for this enum or null if it was not specified.
+ */
+ public ICPPASTDeclSpecifier getBaseType();
+
+ /**
+ * Returns the scope containing the enumerators of this enumeration, or null if the specifier
+ * is opaque.
+ */
+ public ICPPScope getScope();
+}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java
new file mode 100644
index 00000000000..7cd598500e0
--- /dev/null
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Markus Schorn - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.dom.ast.cpp;
+
+import org.eclipse.cdt.core.dom.ast.IEnumeration;
+import org.eclipse.cdt.core.dom.ast.IType;
+
+/**
+ * C++ specific version of enumerations.
+ *
+ * @since 5.2
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface ICPPEnumeration extends IEnumeration, ICPPBinding {
+
+ /**
+ * Returns whether this enumeration is scoped.
+ * An enumeration can only be scoped in C++.
+ */
+ boolean isScoped();
+
+ /**
+ * Returns the underlying type of the enumeration if it is fixed, or null otherwise.
+ * The underlying type can only be fixed in C++.
+ */
+ IType getFixedType();
+
+ /**
+ * Returns the scope containing the enumerators.
+ * By the standard the scope is only defined for scoped enums, however it will be returned
+ * for any enum. In case the enum has no definition (just opaque declarations) an empty scope
+ * will be returned.
+ */
+ ICPPScope asScope();
+}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
index a69eb686ad7..b29a6ce8219 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
@@ -99,6 +99,11 @@ public interface ICPPNodeFactory extends INodeFactory {
public ICPPASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name);
+ /**
+ * @since 5.2
+ */
+ public ICPPASTEnumerationSpecifier newEnumerationSpecifier(boolean isScoped, IASTName name, ICPPASTDeclSpecifier baseType);
+
public ICPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiation(IASTDeclaration declaration);
/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
index 6a3767650c5..65ef81c1824 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
@@ -1451,8 +1451,13 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
final IASTEnumerationSpecifier result= nodeFactory.newEnumerationSpecifier(name);
- boolean needComma= false;
- int endOffset= consume().getEndOffset(); // IToken.tLBRACE
+ int endOffset= enumBody(result);
+ return setRange(result, offset, endOffset);
+ }
+
+ protected int enumBody(final IASTEnumerationSpecifier result) throws EndOfFileException, BacktrackException {
+ boolean needComma= false;
+ int endOffset= consume(IToken.tLBRACE).getEndOffset(); // IToken.tLBRACE
int problemOffset= endOffset;
try {
loop: while (true) {
@@ -1504,9 +1509,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
IASTProblem problem= skipProblemEnumerator(problemOffset);
throwBacktrack(problem, result);
}
- setRange(result, offset, endOffset);
- return result;
- }
+ return endOffset;
+ }
protected abstract IASTStatement statement() throws EndOfFileException, BacktrackException;
@@ -1556,7 +1560,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return result;
// support simple declarations without declarators
- final boolean acceptEmpty = acceptCompoundWithoutDtor && specifiesCompound(result.fDeclSpec1);
+ final boolean acceptEmpty = acceptCompoundWithoutDtor && isLegalWithoutDtor(result.fDeclSpec1);
if (acceptEmpty) {
switch(lt1) {
case 0:
@@ -1615,7 +1619,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return result.set(declspec2, dtor2, dtorMark2);
}
- protected boolean specifiesCompound(IASTDeclSpecifier declSpec) {
+ protected boolean isLegalWithoutDtor(IASTDeclSpecifier declSpec) {
if (declSpec instanceof IASTCompositeTypeSpecifier)
return true;
if (declSpec instanceof IASTElaboratedTypeSpecifier)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ArithmeticConversion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ArithmeticConversion.java
index 47758ddc058..bd86e1eae97 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ArithmeticConversion.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ArithmeticConversion.java
@@ -12,10 +12,11 @@ package org.eclipse.cdt.internal.core.dom.parser;
import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IBasicType;
+import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IType;
-import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
/**
* Arithmetic conversions as required to compute the type of unary or binary expressions.
@@ -46,7 +47,7 @@ public abstract class ArithmeticConversion {
* or 5.0.9 of C++ standard
*/
public final IType convertOperandTypes(int operator, IType op1, IType op2) {
- if (!isArithmeticOrEnum(op1) || !isArithmeticOrEnum(op2)) {
+ if (!isArithmeticOrUnscopedEnum(op1) || !isArithmeticOrUnscopedEnum(op2)) {
return null;
}
switch (operator) {
@@ -76,17 +77,24 @@ public abstract class ArithmeticConversion {
}
public final IType promoteType(IType type) {
- if (!isIntegralOrEnum(type))
+ if (!isIntegralOrUnscopedEnum(type))
return null;
return promote(type, getDomain(type));
}
- private boolean isArithmeticOrEnum(IType op1) {
- return op1 instanceof IBasicType || op1 instanceof IEnumeration;
+ private boolean isArithmeticOrUnscopedEnum(IType op1) {
+ if (op1 instanceof IBasicType)
+ return true;
+ if (op1 instanceof IEnumeration) {
+ if (op1 instanceof ICPPEnumeration && ((ICPPEnumeration) op1).isScoped())
+ return false;
+ return true;
+ }
+ return false;
}
- private boolean isIntegralOrEnum(IType op1) {
+ private boolean isIntegralOrUnscopedEnum(IType op1) {
if (op1 instanceof IEnumeration)
return true;
@@ -175,8 +183,16 @@ public abstract class ArithmeticConversion {
private IBasicType promote(IType type, Domain domain) {
if (type instanceof IEnumeration) {
- return createBasicType(Kind.eInt, domain.getModifier() | getEnumIntTypeModifiers((IEnumeration) type));
- } else if (type instanceof IBasicType) {
+ IType fixedType= null;
+ if (type instanceof ICPPEnumeration) {
+ fixedType= ((ICPPEnumeration) type).getFixedType();
+ }
+ if (fixedType == null)
+ return createBasicType(Kind.eInt, domain.getModifier() | getEnumIntTypeModifiers((IEnumeration) type));
+ type= fixedType;
+ }
+
+ if (type instanceof IBasicType) {
final IBasicType bt = (IBasicType) type;
final Kind kind = bt.getKind();
switch (kind) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/DeclarationOptions.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/DeclarationOptions.java
index 31345c55536..0a986d15408 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/DeclarationOptions.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/DeclarationOptions.java
@@ -27,13 +27,14 @@ public class DeclarationOptions {
final public static int ALLOW_PARAMETER_PACKS= 0x400;
final public static int REQUIRE_SIMPLE_NAME= 0x800;
final public static int ALLOW_FOLLOWED_BY_BRACE= 0x1000;
+ final public static int ALLOW_OPAQUE_ENUM= 0x2000;
public static final DeclarationOptions
- GLOBAL= new DeclarationOptions(ALLOW_EMPTY_SPECIFIER),
+ GLOBAL= new DeclarationOptions(ALLOW_EMPTY_SPECIFIER | ALLOW_OPAQUE_ENUM),
FUNCTION_STYLE_ASM= new DeclarationOptions(ALLOW_EMPTY_SPECIFIER | NO_INITIALIZER | ALLOW_ABSTRACT),
C_MEMBER= new DeclarationOptions(ALLOW_BITFIELD | ALLOW_ABSTRACT),
CPP_MEMBER= new DeclarationOptions(ALLOW_EMPTY_SPECIFIER | ALLOW_BITFIELD | NO_CTOR_STYLE_INITIALIZER),
- LOCAL= new DeclarationOptions(0),
+ LOCAL= new DeclarationOptions(ALLOW_OPAQUE_ENUM),
PARAMETER= new DeclarationOptions(ALLOW_ABSTRACT | ALLOW_PARAMETER_PACKS | REQUIRE_SIMPLE_NAME | NO_BRACED_INITIALIZER | NO_CTOR_STYLE_INITIALIZER),
TYPEID= new DeclarationOptions(REQUIRE_ABSTRACT | NO_INITIALIZER),
TYPEID_TRAILING_RETURN_TYPE= new DeclarationOptions(REQUIRE_ABSTRACT | NO_INITIALIZER | ALLOW_FOLLOWED_BY_BRACE),
@@ -55,6 +56,7 @@ public class DeclarationOptions {
final public boolean fAllowNested;
final public boolean fAllowParameterPacks;
final public boolean fRequireSimpleName;
+ final public boolean fAllowOpaqueEnum;
public DeclarationOptions(int options) {
fAllowEmptySpecifier= (options & ALLOW_EMPTY_SPECIFIER) != 0;
@@ -69,5 +71,6 @@ public class DeclarationOptions {
fAllowParameterPacks= (options & ALLOW_PARAMETER_PACKS) != 0;
fRequireSimpleName= (options & REQUIRE_SIMPLE_NAME) != 0;
fCanBeFollowedByBrace= fAllowBracedInitializer || (options & ALLOW_FOLLOWED_BY_BRACE) != 0;
+ fAllowOpaqueEnum= (options & ALLOW_OPAQUE_ENUM) != 0;
}
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java
index 3d747f9bed1..b22d16fffe8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -38,6 +38,8 @@ import org.eclipse.core.runtime.PlatformObject;
* Implementation of problem bindings
*/
public class ProblemBinding extends PlatformObject implements IProblemBinding, IASTInternalScope {
+ public static ProblemBinding NOT_INITIALIZED= new ProblemBinding(null, 0);
+
protected final int id;
protected char[] arg;
protected IASTNode node;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
index feb7c24a701..7b19eeb589b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -14,15 +14,14 @@ package org.eclipse.cdt.internal.core.dom.parser.c;
import org.eclipse.cdt.core.dom.ILinkage;
import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IEnumerator;
import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IValue;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.internal.core.dom.Linkage;
import org.eclipse.cdt.internal.core.dom.parser.ASTEnumerator;
import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
@@ -76,18 +75,17 @@ public class CEnumerator extends PlatformObject implements IEnumerator {
* @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType()
*/
public IType getType() {
- IASTEnumerator etor = (IASTEnumerator) enumeratorName.getParent();
- IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent();
- IEnumeration enumeration = (IEnumeration) enumSpec.getName().resolveBinding();
- return enumeration;
+ return (IType) getOwner();
}
public ILinkage getLinkage() {
return Linkage.C_LINKAGE;
}
- public IBinding getOwner() throws DOMException {
- return CVisitor.findEnclosingFunction(enumeratorName);
+ public IBinding getOwner() {
+ IASTEnumerator etor = (IASTEnumerator) enumeratorName.getParent();
+ IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent();
+ return enumSpec.getName().resolveBinding();
}
public IValue getValue() {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
index f4fb42ccffd..37bfb093d72 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -13,6 +13,9 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
import org.eclipse.cdt.core.parser.util.ArrayUtil;
import org.eclipse.cdt.internal.core.dom.parser.IASTInternalEnumerationSpecifier;
@@ -20,22 +23,34 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTInternalEnumerationSpecifier
* AST node for c++ enumeration specifiers.
*/
public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
- implements IASTInternalEnumerationSpecifier {
+ implements IASTInternalEnumerationSpecifier, ICPPASTEnumerationSpecifier {
- private IASTName name;
- private boolean valuesComputed= false;
+ private boolean fIsScoped;
+ private boolean fIsOpaque;
+ private IASTName fName;
+ private ICPPASTDeclSpecifier fBaseType;
+
+ private IASTEnumerator[] fItems = null;
+ private int fItemPos=-1;
+
+ private boolean fValuesComputed= false;
+ private CPPEnumScope fScope;
-
public CPPASTEnumerationSpecifier() {
}
- public CPPASTEnumerationSpecifier(IASTName name) {
+ public CPPASTEnumerationSpecifier(boolean isScoped, IASTName name, ICPPASTDeclSpecifier baseType) {
+ fIsScoped= isScoped;
setName(name);
+ setBaseType(baseType);
}
public CPPASTEnumerationSpecifier copy() {
- CPPASTEnumerationSpecifier copy = new CPPASTEnumerationSpecifier(name == null ? null : name.copy());
- for(IASTEnumerator enumerator : getEnumerators())
+ CPPASTEnumerationSpecifier copy = new CPPASTEnumerationSpecifier(fIsScoped,
+ fName == null ? null : fName.copy(),
+ fBaseType == null ? null : fBaseType.copy());
+ copy.fIsOpaque= fIsOpaque;
+ for (IASTEnumerator enumerator : getEnumerators())
copy.addEnumerator(enumerator == null ? null : enumerator.copy());
copyBaseDeclSpec(copy);
return copy;
@@ -43,10 +58,10 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
public boolean startValueComputation() {
- if (valuesComputed)
+ if (fValuesComputed)
return false;
- valuesComputed= true;
+ fValuesComputed= true;
return true;
}
@@ -55,24 +70,21 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
if (enumerator != null) {
enumerator.setParent(this);
enumerator.setPropertyInParent(ENUMERATOR);
- enumerators = (IASTEnumerator[]) ArrayUtil.append( IASTEnumerator.class, enumerators, ++enumeratorsPos, enumerator );
+ fItems = (IASTEnumerator[]) ArrayUtil.append( IASTEnumerator.class, fItems, ++fItemPos, enumerator );
}
}
public IASTEnumerator[] getEnumerators() {
- if (enumerators == null)
+ if (fItems == null)
return IASTEnumerator.EMPTY_ENUMERATOR_ARRAY;
- enumerators = (IASTEnumerator[]) ArrayUtil.removeNullsAfter( IASTEnumerator.class, enumerators, enumeratorsPos );
- return enumerators;
+
+ fItems = (IASTEnumerator[]) ArrayUtil.removeNullsAfter(IASTEnumerator.class, fItems, fItemPos);
+ return fItems;
}
-
- private IASTEnumerator[] enumerators = null;
- private int enumeratorsPos=-1;
-
public void setName(IASTName name) {
assertNotFrozen();
- this.name = name;
+ fName = name;
if (name != null) {
name.setParent(this);
name.setPropertyInParent(ENUMERATION_NAME);
@@ -80,7 +92,7 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
}
public IASTName getName() {
- return name;
+ return fName;
}
@Override
@@ -95,28 +107,67 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
break;
}
}
- if (name != null)
- if (!name.accept(action))
- return false;
- IASTEnumerator[] enums = getEnumerators();
- for (int i = 0; i < enums.length; i++)
- if (!enums[i].accept(action))
- return false;
-
- if( action.shouldVisitDeclSpecifiers ){
- switch( action.leave( this ) ){
- case ASTVisitor.PROCESS_ABORT : return false;
- case ASTVisitor.PROCESS_SKIP : return true;
- default : break;
- }
+ if (fName != null && !fName.accept(action))
+ return false;
+
+ if (fBaseType != null && !fBaseType.accept(action)) {
+ return false;
}
+
+ for (IASTEnumerator e : getEnumerators()) {
+ if (!e.accept(action))
+ return false;
+ }
+
+ if (action.shouldVisitDeclSpecifiers && action.leave(this) == ASTVisitor.PROCESS_ABORT)
+ return false;
return true;
}
public int getRoleForName(IASTName n) {
- if (name == n)
- return r_definition;
+ if (fName == n)
+ return isOpaque() ? r_declaration : r_definition;
return r_unclear;
}
+
+ public void setIsScoped(boolean isScoped) {
+ assertNotFrozen();
+ fIsScoped= isScoped;
+ }
+
+ public boolean isScoped() {
+ return fIsScoped;
+ }
+
+ public void setBaseType(ICPPASTDeclSpecifier baseType) {
+ assertNotFrozen();
+ fBaseType= baseType;
+ if (baseType != null) {
+ baseType.setParent(this);
+ baseType.setPropertyInParent(BASE_TYPE);
+ }
+ }
+
+ public ICPPASTDeclSpecifier getBaseType() {
+ return fBaseType;
+ }
+
+ public void setIsOpaque(boolean isOpaque) {
+ assertNotFrozen();
+ fIsOpaque= isOpaque;
+ }
+
+ public boolean isOpaque() {
+ return fIsOpaque;
+ }
+
+ public ICPPScope getScope() {
+ if (isOpaque())
+ return null;
+ if (fScope == null) {
+ fScope= new CPPEnumScope(this);
+ }
+ return fScope;
+ }
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
index 3eb92576c84..ebeaec8ea0c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -24,9 +24,11 @@ import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter;
import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, IASTCompletionContext {
@@ -92,7 +94,21 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, IAS
if (binding instanceof IVariable) {
return SemanticUtil.mapToAST(((IVariable) binding).getType(), this);
} else if (binding instanceof IEnumerator) {
- return ((IEnumerator) binding).getType();
+ IType type= ((IEnumerator) binding).getType();
+ if (type instanceof ICPPEnumeration) {
+ ICPPEnumeration enumType= (ICPPEnumeration) type;
+ if (enumType.asScope() == CPPVisitor.getContainingScope(this)) {
+ // C++0x: 7.2-5
+ IType fixedType= enumType.getFixedType();
+ if (fixedType != null)
+ return fixedType;
+ // This is a simplification, the actual type is determined
+ // - in an implementation dependent manner - by the value
+ // of the enumerator.
+ return CPPSemantics.INT_TYPE;
+ }
+ }
+ return type;
} else if (binding instanceof IProblemBinding) {
return (IType) binding;
} else if (binding instanceof IFunction) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
index 5b29f013e3d..ab54ddcfb9e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -34,6 +34,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
* Unqualified name, also base class for operator and conversion name.
*/
public class CPPASTName extends CPPASTNameBase implements IASTCompletionContext {
+ public static IASTName NOT_INITIALIZED= new CPPASTName(null);
+
private char[] name;
public CPPASTName(char[] name) {
this.name = name;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java
new file mode 100644
index 00000000000..db69723d23a
--- /dev/null
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Markus Schorn - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.dom.parser.cpp;
+
+import org.eclipse.cdt.core.dom.IName;
+import org.eclipse.cdt.core.dom.ast.EScopeKind;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
+
+/**
+ * Implementation of namespace scopes, including global scope.
+ */
+public class CPPEnumScope extends CPPScope {
+ public CPPEnumScope(ICPPASTEnumerationSpecifier specifier) {
+ super(specifier);
+ }
+
+ public EScopeKind getKind() {
+ return EScopeKind.eNamespace;
+ }
+
+ @Override
+ public IName getScopeName() {
+ ICPPASTEnumerationSpecifier node = (ICPPASTEnumerationSpecifier) getPhysicalNode();
+ return node.getName();
+ }
+}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
index 2eab4fe1c15..123b68ff3c4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
@@ -14,18 +14,32 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.dom.ILinkage;
import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IEnumerator;
import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IValue;
+import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBlockScope;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
+import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.index.IIndexBinding;
+import org.eclipse.cdt.core.parser.util.ArrayUtil;
+import org.eclipse.cdt.core.parser.util.CharArrayUtils;
import org.eclipse.cdt.internal.core.dom.Linkage;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
import org.eclipse.core.runtime.PlatformObject;
@@ -33,22 +47,87 @@ import org.eclipse.core.runtime.PlatformObject;
/**
* Enumerations in C++
*/
-public class CPPEnumeration extends PlatformObject implements IEnumeration, ICPPInternalBinding {
- private IASTName enumName;
+public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, ICPPInternalBinding {
+ private static final IASTName NOT_INITIALIZED = CPPASTName.NOT_INITIALIZED;
+ private static final IEnumerator[] EMPTY_ENUMERATORS = {};
+
+ private final boolean fIsScoped;
+ private final IType fFixedType;
+ private IASTName fDefinition= NOT_INITIALIZED;
+ private IASTName[] fDeclarations= IASTName.EMPTY_NAME_ARRAY;
private Long fMaxValue;
private Long fMinValue;
- public CPPEnumeration(IASTName name) {
- this.enumName = name;
- name.setBinding(this);
+ private ICPPEnumeration fIndexBinding= null;
+ private boolean fSearchedIndex= false;
+
+ public CPPEnumeration(ICPPASTEnumerationSpecifier spec, IType fixedType) {
+ final IASTName name = spec.getName();
+ fIsScoped= spec.isScoped();
+ fFixedType= fixedType;
+ if (spec.isOpaque()) {
+ addDeclaration(name);
+ } else {
+ addDefinition(name);
+ }
+ name.setBinding(this);
}
public IASTNode[] getDeclarations() {
- return null;
+ fDeclarations= ArrayUtil.trim(fDeclarations);
+ return fDeclarations;
}
- public IASTNode getDefinition() {
- return enumName;
+ private class FindDefinitionAction extends CPPASTVisitor {
+ private char[] nameArray = CPPEnumeration.this.getNameCharArray();
+ public IASTName result = null;
+
+ {
+ shouldVisitNames = true;
+ shouldVisitDeclarations = true;
+ shouldVisitDeclSpecifiers = true;
+ shouldVisitDeclarators = true;
+ }
+
+ @Override
+ public int visit(IASTName name) {
+ if (name instanceof ICPPASTTemplateId || name instanceof ICPPASTQualifiedName)
+ return PROCESS_SKIP;
+ char[] c = name.getLookupKey();
+ if (name.getParent() instanceof ICPPASTEnumerationSpecifier && CharArrayUtils.equals(c, nameArray)) {
+ IBinding binding = name.resolveBinding();
+ if (binding == CPPEnumeration.this) {
+ result= name;
+ return PROCESS_ABORT;
+ }
+ }
+ return PROCESS_CONTINUE;
+ }
+
+ @Override
+ public int visit(IASTDeclaration declaration) {
+ if (declaration instanceof IASTSimpleDeclaration)
+ return PROCESS_CONTINUE;
+ return PROCESS_SKIP;
+ }
+ @Override
+ public int visit(IASTDeclSpecifier declSpec) {
+ return (declSpec instanceof ICPPASTEnumerationSpecifier) ? PROCESS_CONTINUE : PROCESS_SKIP;
+ }
+ @Override
+ public int visit(IASTDeclarator declarator) {
+ return PROCESS_SKIP;
+ }
+ }
+
+ public IASTName getDefinition() {
+ if (fDefinition == NOT_INITIALIZED) {
+ FindDefinitionAction action = new FindDefinitionAction();
+ IASTNode node = CPPVisitor.getContainingBlockItem(getADeclaration()).getParent();
+ node.accept(action);
+ fDefinition = action.result;
+ }
+ return fDefinition;
}
public String getName() {
@@ -56,37 +135,22 @@ public class CPPEnumeration extends PlatformObject implements IEnumeration, ICPP
}
public char[] getNameCharArray() {
- return enumName.getSimpleID();
+ return getADeclaration().getSimpleID();
}
- public IScope getScope() {
- return CPPVisitor.getContainingScope(enumName);
+ private IASTName getADeclaration() {
+ if (fDefinition != null && fDefinition != NOT_INITIALIZED)
+ return fDefinition;
+ return fDeclarations[0];
+ }
+
+ public IScope getScope() {
+ return CPPVisitor.getContainingScope(getADeclaration());
}
- public IASTNode getPhysicalNode() {
- return enumName;
- }
-
@Override
public Object clone() {
- IType t = null;
- try {
- t = (IType) super.clone();
- } catch (CloneNotSupportedException e) {
- //not going to happen
- }
- return t;
- }
-
- public IEnumerator[] getEnumerators() {
- IASTEnumerationSpecifier.IASTEnumerator[] enums =
- ((IASTEnumerationSpecifier) enumName.getParent()).getEnumerators();
- IEnumerator[] bindings = new IEnumerator[enums.length];
-
- for (int i = 0; i < enums.length; i++) {
- bindings[i] = (IEnumerator) enums[i].getName().resolveBinding();
- }
- return bindings;
+ throw new IllegalArgumentException("Enums must not be cloned"); //$NON-NLS-1$
}
public String[] getQualifiedName() {
@@ -108,9 +172,17 @@ public class CPPEnumeration extends PlatformObject implements IEnumeration, ICPP
}
public void addDefinition(IASTNode node) {
+ assert fDefinition == null || fDefinition == NOT_INITIALIZED;
+ fDefinition= (IASTName) node;
}
public void addDeclaration(IASTNode node) {
+ assert node instanceof IASTName;
+ if (fDeclarations == null) {
+ fDeclarations= new IASTName[] {(IASTName) node};
+ } else {
+ fDeclarations= ArrayUtil.append(fDeclarations, (IASTName) node);
+ }
}
public boolean isSameType(IType type) {
@@ -126,7 +198,7 @@ public class CPPEnumeration extends PlatformObject implements IEnumeration, ICPP
}
public IBinding getOwner() throws DOMException {
- return CPPVisitor.findDeclarationOwner(enumName, true);
+ return CPPVisitor.findDeclarationOwner(getADeclaration(), true);
}
@Override
@@ -177,4 +249,56 @@ public class CPPEnumeration extends PlatformObject implements IEnumeration, ICPP
fMaxValue= maxValue;
return maxValue;
}
+
+ public boolean isScoped() {
+ return fIsScoped;
+ }
+
+ public IType getFixedType() {
+ return fFixedType;
+ }
+
+ public IEnumerator[] getEnumerators() {
+ final IASTName definition = getDefinition();
+ if (definition == null) {
+ ICPPEnumeration typeInIndex= getIndexBinding();
+ if (typeInIndex != null) {
+ try {
+ return typeInIndex.getEnumerators();
+ } catch (DOMException e) {
+ }
+ }
+ return EMPTY_ENUMERATORS;
+ }
+
+ IASTEnumerator[] enums = ((IASTEnumerationSpecifier) definition.getParent()).getEnumerators();
+ IEnumerator[] bindings = new IEnumerator[enums.length];
+ for (int i = 0; i < enums.length; i++) {
+ bindings[i] = (IEnumerator) enums[i].getName().resolveBinding();
+ }
+ return bindings;
+ }
+
+ private ICPPEnumeration getIndexBinding() {
+ if (!fSearchedIndex) {
+ final IASTTranslationUnit translationUnit = getADeclaration().getTranslationUnit();
+ IIndex index= translationUnit.getIndex();
+ if (index != null) {
+ fIndexBinding= (ICPPEnumeration) index.adaptBinding(this);
+ }
+ }
+ return fIndexBinding;
+ }
+
+ public ICPPScope asScope() {
+ IASTName def = getDefinition();
+ if (def == null) {
+ ICPPEnumeration indexBinding= getIndexBinding();
+ if (indexBinding != null) {
+ return indexBinding.asScope();
+ }
+ def= getADeclaration();
+ }
+ return ((ICPPASTEnumerationSpecifier) def.getParent()).getScope();
+ }
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
index 85c5e4d0b7d..4661f2afa41 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
@@ -24,7 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTDefaultStatement;
import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.IASTEqualsInitializer;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
@@ -47,13 +47,13 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTStatement;
import org.eclipse.cdt.core.dom.ast.IASTTypeId;
import org.eclipse.cdt.core.dom.ast.IASTTypeIdInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTArrayDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTArraySubscriptExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorChainInitializer;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorInitializer;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName;
@@ -61,6 +61,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeleteExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExpressionList;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFieldDeclarator;
@@ -103,7 +104,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTWhileStatement;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPNodeFactory;
-import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
import org.eclipse.cdt.core.dom.ast.gnu.IGNUASTCompoundStatementExpression;
import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointer;
import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointerToMember;
@@ -237,8 +237,13 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
return new CPPASTElaboratedTypeSpecifier(kind, name);
}
- public IASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) {
- return new CPPASTEnumerationSpecifier(name);
+ public ICPPASTEnumerationSpecifier newEnumerationSpecifier(boolean isScoped, IASTName name,
+ ICPPASTDeclSpecifier baseType) {
+ return new CPPASTEnumerationSpecifier(isScoped, name, baseType);
+ }
+
+ public ICPPASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) {
+ return new CPPASTEnumerationSpecifier(false, name, null);
}
public IASTEnumerator newEnumerator(IASTName name, IASTExpression value) {
@@ -261,7 +266,7 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public ICPPASTExpressionList newExpressionList() {
return new CPPASTExpressionList();
}
-
+
public IASTExpressionStatement newExpressionStatement(IASTExpression expression) {
return new CPPASTExpressionStatement(expression);
}
@@ -269,15 +274,15 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public ICPPASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize) {
return new CPPASTFieldDeclarator(name, bitFieldSize);
}
-
+
public ICPPASTFieldReference newFieldReference(IASTName name, IASTExpression owner) {
return new CPPASTFieldReference(name, owner);
}
-
+
public ICPPASTForStatement newForStatement() {
return new CPPASTForStatement();
}
-
+
public ICPPASTForStatement newForStatement(IASTStatement init, IASTDeclaration condition,
IASTExpression iterationExpression, IASTStatement body) {
return new CPPASTForStatement(init, condition, iterationExpression, body);
@@ -287,14 +292,14 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
IASTExpression iterationExpr, IASTStatement body) {
return new CPPASTForStatement(init, condition, iterationExpr, body);
}
-
+
@Deprecated
public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) {
CPPASTFunctionCallExpression result = new CPPASTFunctionCallExpression(idExpr, null);
result.setParameterExpression(argList);
return result;
}
-
+
public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments) {
return new CPPASTFunctionCallExpression(idExpr, arguments);
}
@@ -316,7 +321,7 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IGNUASTCompoundStatementExpression newGNUCompoundStatementExpression(IASTCompoundStatement compoundStatement) {
return new CPPASTCompoundStatementExpression(compoundStatement);
}
-
+
public IASTGotoStatement newGotoStatement(IASTName name) {
return new CPPASTGotoStatement(name);
}
@@ -324,7 +329,7 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IASTIdExpression newIdExpression(IASTName name) {
return new CPPASTIdExpression(name);
}
-
+
public ICPPASTIfStatement newIfStatement() {
return new CPPASTIfStatement();
}
@@ -349,19 +354,19 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IASTLabelStatement newLabelStatement(IASTName name, IASTStatement nestedStatement) {
return new CPPASTLabelStatement(name, nestedStatement);
}
-
+
public ICPPASTLinkageSpecification newLinkageSpecification(String literal) {
return new CPPASTLinkageSpecification(literal);
}
-
+
public ICPPASTLiteralExpression newLiteralExpression(int kind, String rep) {
return new CPPASTLiteralExpression(kind, rep.toCharArray());
}
-
+
public IASTName newName() {
return new CPPASTName();
}
-
+
public IASTName newName(char[] name) {
return new CPPASTName(name);
}
@@ -409,11 +414,11 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IGPPASTPointer newPointerGPP() {
return new GPPASTPointer();
}
-
+
public ICPPASTPointerToMember newPointerToMember(IASTName name) {
return new CPPASTPointerToMember(name);
}
-
+
public IGPPASTPointerToMember newPointerToMemberGPP(IASTName name) {
return new GPPASTPointerToMember(name);
}
@@ -457,11 +462,11 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IASTReturnStatement newReturnStatement(IASTInitializerClause retValue) {
return new CPPASTReturnStatement(retValue);
}
-
+
public IASTSimpleDeclaration newSimpleDeclaration(IASTDeclSpecifier declSpecifier) {
return new CPPASTSimpleDeclaration(declSpecifier);
}
-
+
public ICPPASTSimpleDeclSpecifier newSimpleDeclSpecifier() {
return new CPPASTSimpleDeclSpecifier();
}
@@ -470,6 +475,11 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTSimpleDeclSpecifier newSimpleDeclSpecifierGPP() {
return new GPPASTSimpleDeclSpecifier();
}
+
+ public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(
+ ICPPASTDeclSpecifier declSpec, IASTInitializer initializer) {
+ return new CPPASTSimpleTypeConstructorExpression(declSpec, initializer);
+ }
@Deprecated
public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(int type, IASTExpression expression) {
@@ -478,11 +488,6 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
result.setInitialValue(expression);
return result;
}
-
- public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(
- ICPPASTDeclSpecifier declSpec, IASTInitializer initializer) {
- return new CPPASTSimpleTypeConstructorExpression(declSpec, initializer);
- }
public ICPPASTSimpleTypeTemplateParameter newSimpleTypeTemplateParameter(int type, IASTName name, IASTTypeId typeId) {
return new CPPASTSimpleTypeTemplateParameter(type, name, typeId);
@@ -508,11 +513,11 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public ICPPASTTemplateDeclaration newTemplateDeclaration(IASTDeclaration declaration) {
return new CPPASTTemplateDeclaration(declaration);
}
-
+
public ICPPASTTemplatedTypeTemplateParameter newTemplatedTypeTemplateParameter(IASTName name, IASTExpression defaultValue) {
return new CPPASTTemplatedTypeTemplateParameter(name, defaultValue);
}
-
+
public ICPPASTTemplateId newTemplateId(IASTName templateName) {
return new CPPASTTemplateId(templateName);
}
@@ -554,12 +559,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
public IASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer) {
return new CPPASTTypeIdInitializerExpression(typeId, initializer);
}
-
+
@Deprecated
public org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypenameExpression newTypenameExpression(IASTName qualifiedName, IASTExpression expr, boolean isTemplate) {
return new CPPASTTypenameExpression(qualifiedName, expr);
}
-
+
public ICPPASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand) {
return new CPPASTUnaryExpression(operator, operand);
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 88f5df13c79..da044f9075c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -72,6 +72,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeleteExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFieldDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFieldReference;
@@ -1874,8 +1875,15 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
return null;
}
+ @Override
+ protected boolean isLegalWithoutDtor(IASTDeclSpecifier declSpec) {
+ if (declSpec instanceof IASTElaboratedTypeSpecifier) {
+ return ((IASTElaboratedTypeSpecifier) declSpec).getKind() != IASTElaboratedTypeSpecifier.k_enum;
+ }
+ return super.isLegalWithoutDtor(declSpec);
+ }
- /**
+ /**
* Parses a declaration with the given options.
*/
protected IASTDeclaration simpleDeclaration(DeclarationOptions declOption) throws BacktrackException, EndOfFileException {
@@ -1905,7 +1913,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
dtor= addInitializer(lie, declOption);
} catch (BacktrackException e) {
IASTNode node= e.getNodeBeforeProblem();
- if (node instanceof IASTDeclSpecifier && specifiesCompound((IASTDeclSpecifier) node)) {
+ if (node instanceof IASTDeclSpecifier && isLegalWithoutDtor((IASTDeclSpecifier) node)) {
IASTSimpleDeclaration d= nodeFactory.newSimpleDeclaration((IASTDeclSpecifier) node);
setRange(d, node);
throwBacktrack(e.getProblem(), d);
@@ -1956,7 +1964,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
default:
if (declOption != DeclarationOptions.LOCAL) {
insertSemi= true;
- if (specifiesCompound(declSpec) && markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
+ if (isLegalWithoutDtor(declSpec) && markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
backup(markBeforDtor);
declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
endOffset= calculateEndOffset(declSpec);
@@ -2147,15 +2155,20 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
*/
@Override
protected Decl declSpecifierSeq(final DeclarationOptions option) throws BacktrackException, EndOfFileException {
- return declSpecifierSeq(option.fAllowEmptySpecifier, false);
+ return declSpecifierSeq(option, false);
}
private ICPPASTDeclSpecifier simpleTypeSpecifier() throws BacktrackException, EndOfFileException {
- Decl d= declSpecifierSeq(false, true);
+ Decl d= declSpecifierSeq(null, true);
return (ICPPASTDeclSpecifier) d.fDeclSpec1;
}
-
- private Decl declSpecifierSeq(final boolean allowEmpty, final boolean single) throws BacktrackException, EndOfFileException {
+
+ private ICPPASTDeclSpecifier simpleTypeSpecifierSequence() throws BacktrackException, EndOfFileException {
+ Decl d= declSpecifierSeq(null, false);
+ return (ICPPASTDeclSpecifier) d.fDeclSpec1;
+ }
+
+ private Decl declSpecifierSeq(final DeclarationOptions option, final boolean single) throws BacktrackException, EndOfFileException {
int storageClass = IASTDeclSpecifier.sc_unspecified;
int simpleType = IASTSimpleDeclSpecifier.t_unspecified;
int options= 0;
@@ -2350,7 +2363,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (encounteredRawType || encounteredTypename)
break declSpecifiers;
- if (allowEmpty && LT(1) != IToken.tCOMPLETION) {
+ if (option != null && option.fAllowEmptySpecifier && LT(1) != IToken.tCOMPLETION) {
if ((options & FORBID_IN_EMPTY_DECLSPEC) == 0 && storageClass == IASTDeclSpecifier.sc_unspecified) {
altResult= buildSimpleDeclSpec(storageClass, simpleType, options, isLong, typeofExpression, offset, endOffset);
returnToken= mark();
@@ -2382,15 +2395,14 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (encounteredTypename || encounteredRawType)
break declSpecifiers;
try {
- result= (ICPPASTDeclSpecifier) enumSpecifier();
+ result= enumDeclaration(option != null && option.fAllowOpaqueEnum);
} catch (BacktrackException bt) {
if (bt.getNodeBeforeProblem() instanceof ICPPASTDeclSpecifier) {
result= (ICPPASTDeclSpecifier) bt.getNodeBeforeProblem();
problem= bt.getProblem();
break declSpecifiers;
- } else {
- result= elaboratedTypeSpecifier();
- }
+ }
+ throw bt;
}
endOffset= calculateEndOffset(result);
encounteredTypename= true;
@@ -2450,7 +2462,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
}
// check for empty specification
- if (!encounteredRawType && !encounteredTypename && LT(1) != IToken.tEOC && !allowEmpty) {
+ if (!encounteredRawType && !encounteredTypename && LT(1) != IToken.tEOC
+ && (option == null || !option.fAllowEmptySpecifier)) {
throwBacktrack(LA(1));
}
@@ -2526,6 +2539,65 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
declSpec.setRestrict((options & RESTRICT) != 0);
}
+ private ICPPASTDeclSpecifier enumDeclaration(boolean allowOpaque) throws BacktrackException, EndOfFileException {
+ IToken mark= mark();
+ final int offset= consume(IToken.t_enum).getOffset();
+ int endOffset= 0;
+ boolean isScoped= false;
+ IASTName name= null;
+ ICPPASTDeclSpecifier baseType= null;
+
+ try {
+ int lt1= LT(1);
+ if (lt1 == IToken.t_class || lt1 == IToken.t_struct) {
+ isScoped= true;
+ consume();
+ }
+ // if __attribute__ or __declspec occurs after struct/union/class and before the identifier
+ __attribute_decl_seq(supportAttributeSpecifiers, supportDeclspecSpecifiers);
+
+ if (isScoped || LT(1) == IToken.tIDENTIFIER) {
+ name= identifier();
+ endOffset= calculateEndOffset(name);
+ }
+
+ if (LT(1) == IToken.tCOLON) {
+ consume();
+ baseType= simpleTypeSpecifierSequence();
+ endOffset= calculateEndOffset(baseType);
+ }
+ } catch (BacktrackException e) {
+ backup(mark);
+ return elaboratedTypeSpecifier();
+ }
+
+ final int lt1= LT(1);
+ final boolean isDef= lt1 == IToken.tLBRACE || (lt1 == IToken.tEOC && baseType != null);
+ final boolean isOpaque= !isDef && allowOpaque && lt1 == IToken.tSEMI;
+ if (!isDef && !isOpaque) {
+ backup(mark);
+ return elaboratedTypeSpecifier();
+ }
+ mark= null;
+
+ if (isOpaque && !isScoped && baseType == null)
+ throwBacktrack(LA(1));
+
+ if (name == null) {
+ if (isOpaque)
+ throwBacktrack(LA(1));
+ name= nodeFactory.newName();
+ }
+
+ final ICPPASTEnumerationSpecifier result= nodeFactory.newEnumerationSpecifier(isScoped, name, baseType);
+ result.setIsOpaque(isOpaque);
+ if (lt1 == IToken.tLBRACE) {
+ endOffset= enumBody(result);
+ }
+ assert endOffset != 0;
+ return setRange(result, offset, endOffset);
+ }
+
/**
* Parse an elaborated type specifier.
*
@@ -2534,10 +2606,10 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
*/
protected ICPPASTElaboratedTypeSpecifier elaboratedTypeSpecifier() throws BacktrackException, EndOfFileException {
// this is an elaborated class specifier
- IToken t = consume();
+ final int lt1= LT(1);
int eck = 0;
- switch (t.getType()) {
+ switch (lt1) {
case IToken.t_class:
eck = ICPPASTElaboratedTypeSpecifier.k_class;
break;
@@ -2551,18 +2623,16 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
eck = IASTElaboratedTypeSpecifier.k_enum;
break;
default:
- backup(t);
- throwBacktrack(t.getOffset(), t.getLength());
+ throwBacktrack(LA(1));
}
+
+ final int offset= consume().getOffset();
// if __attribute__ or __declspec occurs after struct/union/class and before the identifier
__attribute_decl_seq(supportAttributeSpecifiers, supportDeclspecSpecifiers);
IASTName name = qualifiedName(CastExprCtx.eNotBExpr);
-
- ICPPASTElaboratedTypeSpecifier elaboratedTypeSpec = nodeFactory.newElaboratedTypeSpecifier(eck, name);
- ((ASTNode) elaboratedTypeSpec).setOffsetAndLength(t.getOffset(), calculateEndOffset(name) - t.getOffset());
- return elaboratedTypeSpec;
+ return setRange(nodeFactory.newElaboratedTypeSpecifier(eck, name), offset, calculateEndOffset(name));
}
@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
index da4c58662f1..f1ef7980e68 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
@@ -40,7 +40,6 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.IASTEqualsInitializer;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
@@ -89,6 +88,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeleteExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFieldReference;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTForStatement;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator;
@@ -209,6 +209,7 @@ public class CPPSemantics {
public static final char[] OPERATOR_ = new char[] {'o','p','e','r','a','t','o','r',' '};
private static final char[] CALL_FUNCTION = "call-function".toCharArray(); //$NON-NLS-1$
public static final IType VOID_TYPE = new CPPBasicType(Kind.eVoid, 0);
+ public static final IType INT_TYPE = new CPPBasicType(Kind.eInt, 0);
// Set to true for debugging.
public static boolean traceBindingResolution = false;
@@ -814,7 +815,6 @@ public class CPPSemantics {
* @param start either a scope or a name.
*/
static protected void lookup(LookupData data, IScope start) throws DOMException {
- final IIndexFileSet fileSet= getIndexFileSet(data);
if (data.astName == null)
return;
@@ -850,6 +850,7 @@ public class CPPSemantics {
}
}
+ final IIndexFileSet fileSet= getIndexFileSet(data);
while (nextScope != null || nextTmplScope != null) {
// when the non-template scope is no longer contained within the first template scope,
// we use the template scope for the next iteration.
@@ -1208,6 +1209,12 @@ public class CPPSemantics {
} else {
nodes= new IASTNode[] {initDeclaration};
}
+ } else if (parent instanceof ICPPASTEnumerationSpecifier) {
+ // The enumeration scope contains the enumeration items
+ for (IASTEnumerator enumerator : ((ICPPASTEnumerationSpecifier) parent).getEnumerators()) {
+ ASTInternal.addName(scope, enumerator.getName());
+ }
+ return;
}
int idx = -1;
@@ -1390,18 +1397,15 @@ public class CPPSemantics {
populateCache(scope, decl);
}
}
- } else if (declSpec instanceof IASTEnumerationSpecifier) {
- IASTEnumerationSpecifier enumeration = (IASTEnumerationSpecifier) declSpec;
+ } else if (declSpec instanceof ICPPASTEnumerationSpecifier) {
+ ICPPASTEnumerationSpecifier enumeration = (ICPPASTEnumerationSpecifier) declSpec;
specName = enumeration.getName();
- // Check enumerators too
- IASTEnumerator[] list = enumeration.getEnumerators();
- IASTName tempName;
- for (IASTEnumerator enumerator : list) {
- if (enumerator == null)
- break;
- tempName = enumerator.getName();
- ASTInternal.addName(scope, tempName);
+ // Add unscoped enumerators to the enclosing scope
+ if (!enumeration.isScoped()) {
+ for (IASTEnumerator enumerator : enumeration.getEnumerators()) {
+ ASTInternal.addName(scope, enumerator.getName());
+ }
}
}
if (specName != null) {
@@ -1422,6 +1426,7 @@ public class CPPSemantics {
dtor.accept(visitor);
}
break;
+ case eEnumeration:
case eClassType:
case eTemplateDeclaration:
break;
@@ -1462,6 +1467,7 @@ public class CPPSemantics {
break;
case eClassType:
case eTemplateDeclaration:
+ case eEnumeration:
break;
}
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index a6d490161f5..0823ef86f3a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -88,6 +88,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFieldReference;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator;
@@ -120,6 +121,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplate;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionTemplate;
@@ -254,8 +256,8 @@ public class CPPVisitor extends ASTQueries {
return createBinding((ICPPASTElaboratedTypeSpecifier) parent);
} else if (parent instanceof IASTDeclaration) {
return createBinding((IASTDeclaration) parent);
- } else if (parent instanceof IASTEnumerationSpecifier) {
- return createBinding((IASTEnumerationSpecifier) parent);
+ } else if (parent instanceof ICPPASTEnumerationSpecifier) {
+ return createBinding((ICPPASTEnumerationSpecifier) parent);
} else if (parent instanceof IASTEnumerator) {
return createBinding((IASTEnumerator) parent);
} else if (parent instanceof IASTGotoStatement) {
@@ -322,23 +324,48 @@ public class CPPVisitor extends ASTQueries {
return enumtor;
}
- private static IBinding createBinding(IASTEnumerationSpecifier specifier) {
+ private static IBinding createBinding(ICPPASTEnumerationSpecifier specifier) {
ICPPScope scope = (ICPPScope) getContainingScope(specifier);
- IBinding enumeration;
try {
final IASTName name = specifier.getName();
- enumeration = scope.getBinding(name, false);
- if (enumeration == null || !(enumeration instanceof IEnumeration)) {
- enumeration = new CPPEnumeration(name);
- }
+ IType fixedType= createEnumBaseType(specifier);
+ IBinding binding = scope.getBinding(name, false);
+ if (binding instanceof CPPEnumeration) {
+ CPPEnumeration e= (CPPEnumeration) binding;
+ if (e.isScoped() == specifier.isScoped()) {
+ IType ft2= e.getFixedType();
+ if (fixedType == ft2 || (fixedType != null && fixedType.isSameType(ft2))) {
+ if (specifier.isOpaque()) {
+ e.addDeclaration(specifier);
+ } else if (e.getDefinition() == null) {
+ e.addDefinition(specifier);
+ } else {
+ return new ProblemBinding(name, IProblemBinding.SEMANTIC_INVALID_REDEFINITION);
+ }
+ return e;
+ }
+ }
+ return new ProblemBinding(name, IProblemBinding.SEMANTIC_INVALID_REDECLARATION);
+ }
+ return new CPPEnumeration(specifier, fixedType);
} catch (DOMException e) {
- enumeration = e.getProblem();
+ return e.getProblem();
}
-
- return enumeration;
}
- private static IBinding createBinding(final ICPPASTElaboratedTypeSpecifier elabType) {
+ private static IType createEnumBaseType(ICPPASTEnumerationSpecifier specifier) {
+ ICPPASTDeclSpecifier declspec = specifier.getBaseType();
+ if (declspec != null) {
+ IType type= createType(declspec);
+ return SemanticUtil.getNestedType(type, ALLCVQ);
+ }
+ if (specifier.isScoped()) {
+ return CPPSemantics.INT_TYPE;
+ }
+ return null;
+ }
+
+ private static IBinding createBinding(final ICPPASTElaboratedTypeSpecifier elabType) {
final IASTNode parent = elabType.getParent();
IBinding binding = null;
boolean mustBeSimple = true;
@@ -940,6 +967,18 @@ public class CPPVisitor extends ASTQueries {
}
return getContainingScope(n);
+ } else if (node instanceof IASTEnumerator) {
+ node= node.getParent();
+ if (node instanceof ICPPASTEnumerationSpecifier) {
+ ICPPASTEnumerationSpecifier enumSpec= (ICPPASTEnumerationSpecifier) node;
+ IBinding binding = enumSpec.getName().resolveBinding();
+ if (binding instanceof ICPPEnumeration) {
+ ICPPEnumeration enumType = (ICPPEnumeration) binding;
+ if (enumType.isScoped()) {
+ return enumType.asScope();
+ }
+ }
+ }
}
node = node.getParent();
}
@@ -1017,6 +1056,8 @@ public class CPPVisitor extends ASTQueries {
scope= ((ICPPClassType) binding).getCompositeScope();
} else if (binding instanceof ICPPNamespace) {
scope= ((ICPPNamespace) binding).getNamespaceScope();
+ } else if (binding instanceof ICPPEnumeration) {
+ scope= ((ICPPEnumeration) binding).asScope();
} else if (binding instanceof ICPPUnknownBinding) {
scope= ((ICPPUnknownBinding) binding).asScope();
} else if (binding instanceof IProblemBinding) {
@@ -2144,6 +2185,9 @@ public class CPPVisitor extends ASTQueries {
String[] ns = null;
try {
for (IBinding owner= binding.getOwner(); owner != null; owner= owner.getOwner()) {
+ if (owner instanceof ICPPEnumeration && !((ICPPEnumeration) owner).isScoped()) {
+ continue;
+ }
String n= owner.getName();
if (n == null)
break;
@@ -2306,6 +2350,8 @@ public class CPPVisitor extends ASTQueries {
isNonSimpleElabDecl= false;
}
}
+ } else if (node instanceof IASTEnumerator) {
+ break;
}
node= node.getParent();
}
@@ -2348,6 +2394,10 @@ public class CPPVisitor extends ASTQueries {
name= ((ICPPASTNamespaceDefinition) node).getName();
break;
}
+ if (node instanceof ICPPASTEnumerationSpecifier) {
+ name= ((ICPPASTEnumerationSpecifier) node).getName();
+ break;
+ }
}
if (name == null)
return null;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/Conversions.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/Conversions.java
index 7ea27c4cd8d..4909609fd68 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/Conversions.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/Conversions.java
@@ -26,6 +26,7 @@ import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IArrayType;
import org.eclipse.cdt.core.dom.ast.IBasicType;
+import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IFunctionType;
@@ -34,11 +35,11 @@ import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.IQualifierType;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IValue;
-import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTInitializerList;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace;
@@ -903,7 +904,32 @@ public class Conversions {
if (trg instanceof IBasicType) {
IBasicType basicTgt = (IBasicType) trg;
final Kind tKind = basicTgt.getKind();
-
+
+ if (src instanceof ICPPEnumeration) {
+ final ICPPEnumeration enumType = (ICPPEnumeration) src;
+ if (enumType.isScoped()) {
+ return false;
+ }
+ IType fixedType= enumType.getFixedType();
+ if (fixedType == null) {
+ if (tKind == Kind.eInt || tKind == Kind.eUnspecified) {
+ if (trg instanceof ICPPBasicType) {
+ int qualifiers = ArithmeticConversion.getEnumIntTypeModifiers((IEnumeration) src);
+ int targetModifiers = ((ICPPBasicType) trg).getModifiers();
+ if (qualifiers == (targetModifiers & (IBasicType.IS_LONG | IBasicType.IS_LONG_LONG | IBasicType.IS_SHORT | IBasicType.IS_UNSIGNED))) {
+ canPromote = true;
+ }
+ } else {
+ canPromote = true;
+ }
+ }
+ } else {
+ if (fixedType.isSameType(trg))
+ canPromote= true;
+ // Allow to further promote the fixed type
+ src= fixedType;
+ }
+ }
if (src instanceof IBasicType) {
final IBasicType basicSrc = (IBasicType) src;
Kind sKind = basicSrc.getKind();
@@ -926,19 +952,7 @@ public class Conversions {
} else if (tKind == Kind.eDouble && sKind == Kind.eFloat) {
canPromote= true;
}
- } else if (src instanceof IEnumeration) {
- if (tKind == Kind.eInt || tKind == Kind.eUnspecified) {
- if (trg instanceof ICPPBasicType) {
- int qualifiers = ArithmeticConversion.getEnumIntTypeModifiers((IEnumeration) src);
- int targetModifiers = ((ICPPBasicType) trg).getModifiers();
- if (qualifiers == (targetModifiers & (IBasicType.IS_LONG | IBasicType.IS_LONG_LONG | IBasicType.IS_SHORT | IBasicType.IS_UNSIGNED))) {
- canPromote = true;
- }
- } else {
- canPromote = true;
- }
- }
- }
+ }
}
if (canPromote) {
cost.setRank(Rank.PROMOTION);
@@ -963,9 +977,14 @@ public class Conversions {
// 4.7 integral conversion
// 4.8 floating point conversion
// 4.9 floating-integral conversion
- if (s instanceof IBasicType || s instanceof IEnumeration) {
+ if (s instanceof IBasicType) {
// 4.7 An rvalue of an integer type can be converted to an rvalue of another integer type.
- // An rvalue of an enumeration type can be converted to an rvalue of an integer type.
+ cost.setRank(Rank.CONVERSION);
+ cost.setCouldNarrow();
+ return true;
+ }
+ if (s instanceof ICPPEnumeration && !((ICPPEnumeration) s).isScoped()) {
+ // 4.7 An rvalue of an enumeration type can be converted to an rvalue of an integer type.
cost.setRank(Rank.CONVERSION);
cost.setCouldNarrow();
return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
index 92a942f84fa..abeb51c1236 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Symbian Software Systems and others.
+ * Copyright (c) 2007, 2010 Symbian Software Systems 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
@@ -16,7 +16,6 @@ import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IArrayType;
import org.eclipse.cdt.core.dom.ast.IBasicType;
import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IEnumerator;
import org.eclipse.cdt.core.dom.ast.IPointerType;
import org.eclipse.cdt.core.dom.ast.IQualifierType;
@@ -30,6 +29,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecializationSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPField;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionTemplate;
@@ -344,8 +344,8 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
result = ns.length == 0 ? null : new CompositeCPPNamespace(this, ns);
} else if (binding instanceof ICPPUsingDeclaration) {
result = new CompositeCPPUsingDeclaration(this, (ICPPUsingDeclaration) binding);
- } else if (binding instanceof IEnumeration) {
- IEnumeration def = (IEnumeration) findOneBinding(binding);
+ } else if (binding instanceof ICPPEnumeration) {
+ ICPPEnumeration def = (ICPPEnumeration) findOneBinding(binding);
result = def == null ? null : new CompositeCPPEnumeration(this, def);
} else if (binding instanceof ICPPFunction) {
result = new CompositeCPPFunction(this, (ICPPFunction) binding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java
new file mode 100644
index 00000000000..3413928e38a
--- /dev/null
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Markus Schorn - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.index.composite.cpp;
+
+import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.EScopeKind;
+import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IBinding;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
+import org.eclipse.cdt.core.index.IIndexBinding;
+import org.eclipse.cdt.core.index.IIndexFileSet;
+import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
+import org.eclipse.cdt.internal.core.index.composite.CompositeScope;
+import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
+
+class CompositeCPPEnumScope extends CompositeScope implements ICPPScope {
+ public CompositeCPPEnumScope(ICompositesFactory cf, IIndexFragmentBinding rbinding) {
+ super(cf, rbinding);
+ }
+
+ public EScopeKind getKind() {
+ return EScopeKind.eEnumeration;
+ }
+
+ public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) throws DOMException {
+ IBinding binding = ((ICPPEnumeration)rbinding).asScope().getBinding(name, resolve, fileSet);
+ return processUncertainBinding(binding);
+ }
+
+ public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) throws DOMException {
+ IBinding[] bindings = ((ICPPEnumeration)rbinding).asScope().getBindings(name, resolve, prefixLookup, fileSet);
+ return processUncertainBindings(bindings);
+ }
+
+ public IBinding[] find(String name) throws DOMException {
+ IBinding[] preresult = ((ICPPEnumeration)rbinding).asScope().find(name);
+ return processUncertainBindings(preresult);
+ }
+
+ public IIndexBinding getScopeBinding() {
+ return cf.getCompositeBinding(rbinding);
+ }
+}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
index 091b88c98df..75a7cbace78 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
@@ -15,12 +15,14 @@ import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IEnumerator;
import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
import org.eclipse.cdt.internal.core.index.IIndexType;
import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
-class CompositeCPPEnumeration extends CompositeCPPBinding implements IEnumeration, IIndexType {
- public CompositeCPPEnumeration(ICompositesFactory cf, IEnumeration rbinding) {
+class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumeration, IIndexType {
+ public CompositeCPPEnumeration(ICompositesFactory cf, ICPPEnumeration rbinding) {
super(cf, rbinding);
}
@@ -49,4 +51,16 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements IEnumeratio
public long getMaxValue() {
return ((IEnumeration)rbinding).getMaxValue();
}
+
+ public boolean isScoped() {
+ return ((ICPPEnumeration)rbinding).isScoped();
+ }
+
+ public IType getFixedType() {
+ return ((ICPPEnumeration)rbinding).getFixedType();
+ }
+
+ public ICPPScope asScope() {
+ return new CompositeCPPEnumScope(cf, rbinding);
+ }
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
index 8c6049ef55e..88036473e75 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 QNX Software Systems and others.
+ * Copyright (c) 2005, 2010 QNX Software Systems 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
@@ -46,6 +46,7 @@ import org.eclipse.cdt.core.dom.ast.IMacroBinding;
import org.eclipse.cdt.core.dom.ast.IParameter;
import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IVariable;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable;
import org.eclipse.cdt.core.index.IIndexBinding;
@@ -181,9 +182,9 @@ public class PDOM extends PlatformObject implements IPDOM {
* 81.0 - change to c++ function types, bug 264479
* 82.0 - offsets for using directives, bug 270806
* #83.0# - unconditionally store name in PDOMInclude, bug 272815 - <