}
}
- public EnumMember (Enum parent, EnumMember prev_member, string name, Expression expr,
- Attributes attrs, Location loc)
- : base (parent, new EnumTypeExpr (), name, null, Modifiers.PUBLIC,
- attrs, loc)
+ public EnumMember (Enum parent, MemberName name, Attributes attrs)
+ : base (parent, new EnumTypeExpr (), Modifiers.PUBLIC, name, attrs)
{
- initializer = new EnumInitializer (this, expr, prev_member);
}
static bool IsValidEnumType (TypeSpec t)
}
}
- class EnumInitializer : ConstInitializer
+ /// <summary>
+ /// Enumeration container
+ /// </summary>
+ public class Enum : TypeContainer
{
- EnumMember prev;
-
- public EnumInitializer (Const field, Expression init, EnumMember prev)
- : base (field, init)
+ //
+ // Implicit enum member initializer, used when no constant value is provided
+ //
+ class ImplicitInitializer : Expression
{
- this.prev = prev;
- }
+ readonly EnumMember prev;
+ readonly EnumMember current;
- protected override Expression DoResolveInitializer (ResolveContext rc)
- {
- if (expr != null)
- return base.DoResolveInitializer (rc);
+ public ImplicitInitializer (EnumMember current, EnumMember prev)
+ {
+ this.current = current;
+ this.prev = prev;
+ }
- if (prev == null)
- return field.ConvertInitializer (rc, null);
+ public override Expression CreateExpressionTree (ResolveContext ec)
+ {
+ throw new NotSupportedException ("Missing Resolve call");
+ }
- try {
- var ec = prev.DefineValue () as EnumConstant;
- expr = ec.Increment ().Resolve (rc);
- } catch (OverflowException) {
- rc.Report.Error (543, field.Location,
- "The enumerator value `{0}' is outside the range of enumerator underlying type `{1}'",
- field.GetSignatureForError (),
- TypeManager.CSharpName (((Enum) field.Parent).UnderlyingType));
+ protected override Expression DoResolve (ResolveContext rc)
+ {
+ // We are the first member
+ if (prev == null) {
+ return New.Constantify (current.Parent.Definition).Resolve (rc);
+ }
- expr = field.ConvertInitializer (rc, null);
- }
+ var c = ((ConstSpec) prev.Spec).GetConstant (rc) as EnumConstant;
+ try {
+ return c.Increment ().Resolve (rc);
+ } catch (OverflowException) {
+ rc.Report.Error (543, current.Location,
+ "The enumerator value `{0}' is outside the range of enumerator underlying type `{1}'",
+ current.GetSignatureForError (), ((Enum) current.Parent).UnderlyingType.GetSignatureForError ());
- return expr;
+ return New.Constantify (current.Parent.Definition).Resolve (rc);
+ }
+ }
+
+ public override void Emit (EmitContext ec)
+ {
+ throw new NotSupportedException ("Missing Resolve call");
+ }
}
- }
- /// <summary>
- /// Enumeration container
- /// </summary>
- public class Enum : TypeContainer
- {
public static readonly string UnderlyingValueField = "value__";
- TypeExpr base_type;
-
const Modifiers AllowedModifiers =
Modifiers.NEW |
Modifiers.PUBLIC |
Modifiers.INTERNAL |
Modifiers.PRIVATE;
- public Enum (NamespaceEntry ns, DeclSpace parent, TypeExpr type,
+ public Enum (NamespaceEntry ns, DeclSpace parent, TypeExpression type,
Modifiers mod_flags, MemberName name, Attributes attrs)
: base (ns, parent, name, attrs, MemberKind.Enum)
{
- this.base_type = type;
+ base_type_expr = type;
var accmods = IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE;
ModFlags = ModifiersExtensions.Check (AllowedModifiers, mod_flags, accmods, Location, Report);
spec = new EnumSpec (null, this, null, null, ModFlags);
}
+ #region Properties
+
+ public override AttributeTargets AttributeTargets {
+ get {
+ return AttributeTargets.Enum;
+ }
+ }
+
+ public TypeExpr BaseTypeExpression {
+ get {
+ return base_type_expr;
+ }
+ }
+
+ protected override TypeAttributes TypeAttr {
+ get {
+ return ModifiersExtensions.TypeAttr (ModFlags, IsTopLevel) |
+ TypeAttributes.Class | TypeAttributes.Sealed | base.TypeAttr;
+ }
+ }
+
+ public TypeSpec UnderlyingType {
+ get {
+ return ((EnumSpec) spec).UnderlyingType;
+ }
+ }
+
+ #endregion
+
public void AddEnumMember (EnumMember em)
{
if (em.Name == UnderlyingValueField) {
public static void Error_1008 (Location loc, Report Report)
{
- Report.Error (1008, loc, "Type byte, sbyte, short, ushort, " +
- "int, uint, long or ulong expected");
+ Report.Error (1008, loc,
+ "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
}
protected override bool DefineNestedTypes ()
{
- if (!base.DefineNestedTypes ())
- return false;
-
- ((EnumSpec) spec).UnderlyingType = UnderlyingType;
+ ((EnumSpec) spec).UnderlyingType = base_type_expr == null ? TypeManager.int32_type : base_type_expr.Type;
TypeBuilder.DefineField (UnderlyingValueField, UnderlyingType.GetMetaInfo (),
FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
protected override bool DoDefineMembers ()
{
- DefineContainerMembers (constants);
+ if (constants != null) {
+ for (int i = 0; i < constants.Count; ++i) {
+ EnumMember em = (EnumMember) constants [i];
+ if (em.Initializer == null) {
+ em.Initializer = new ImplicitInitializer (em, i == 0 ? null : (EnumMember) constants[i - 1]);
+ }
+
+ em.Define ();
+ }
+ }
+
return true;
}
return true;
}
- public TypeSpec UnderlyingType {
- get {
- return base_type.Type;
- }
+ protected override TypeExpr[] ResolveBaseTypes (out TypeExpr base_class)
+ {
+ base_type = TypeManager.enum_type;
+ base_class = base_type_expr;
+ return null;
}
protected override bool VerifyClsCompliance ()
return true;
}
-
- public override AttributeTargets AttributeTargets {
- get {
- return AttributeTargets.Enum;
- }
- }
-
- protected override TypeAttributes TypeAttr {
- get {
- return ModifiersExtensions.TypeAttr (ModFlags, IsTopLevel) |
- TypeAttributes.Class | TypeAttributes.Sealed | base.TypeAttr;
- }
- }
}
class EnumSpec : TypeSpec