X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fenum.cs;h=d8f5415fe500a691b9c52b3f49c3be36e86fbb49;hb=e482c4db5e7393fb76731cfff7a507d1f2cb290c;hp=a7943cdbf3881ef837f5e202ad0e5dfd9394b18a;hpb=b39d5edf62fb3908e10647e1a7e60dadeb88b2be;p=mono.git
diff --git a/mcs/mcs/enum.cs b/mcs/mcs/enum.cs
index a7943cdbf38..d8f5415fe50 100644
--- a/mcs/mcs/enum.cs
+++ b/mcs/mcs/enum.cs
@@ -5,404 +5,278 @@
// Ravi Pratap (ravi@ximian.com)
// Marek Safar (marek.safar@seznam.cz)
//
-// Licensed under the terms of the GNU GPL
+// Dual licensed under the terms of the MIT X11 or GNU GPL
//
-// (C) 2001 Ximian, Inc (http://www.ximian.com)
+// Copyright 2001 Ximian, Inc (http://www.ximian.com)
+// Copyright 2003-2003 Novell, Inc (http://www.novell.com)
//
using System;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
using System.Globalization;
namespace Mono.CSharp {
- public class EnumMember : MemberCore, IConstant {
- static string[] attribute_targets = new string [] { "field" };
-
- public FieldBuilder builder;
-
- readonly Enum parent_enum;
- readonly Expression ValueExpr;
- readonly EnumMember prev_member;
-
- Constant value;
- bool in_transit;
-
- // TODO: remove or simplify
- EmitContext ec;
-
- public EnumMember (Enum parent_enum, EnumMember prev_member, Expression expr,
- MemberName name, Attributes attrs):
- base (parent_enum, name, attrs)
- {
- this.parent_enum = parent_enum;
- this.ModFlags = parent_enum.ModFlags;
- this.ValueExpr = expr;
- this.prev_member = prev_member;
-
- ec = new EmitContext (this, parent_enum, parent_enum, Location, null, null, ModFlags, false);
- ec.InEnumContext = true;
- }
-
- public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+ public class EnumMember : Const
+ {
+ class EnumTypeExpr : TypeExpr
{
- if (a.Type == TypeManager.marshal_as_attr_type) {
- UnmanagedMarshal marshal = a.GetMarshal (this);
- if (marshal != null) {
- builder.SetMarshal (marshal);
- }
- return;
+ protected override TypeExpr DoResolveAsTypeStep (IMemberContext ec)
+ {
+ type = ec.CurrentType;
+ return this;
}
- if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
- a.Error_InvalidSecurityParent ();
- return;
+ public override TypeExpr ResolveAsTypeTerminal (IMemberContext ec, bool silent)
+ {
+ return DoResolveAsTypeStep (ec);
}
-
- builder.SetCustomAttribute (cb);
}
- public override AttributeTargets AttributeTargets {
- get {
- return AttributeTargets.Field;
- }
+ public EnumMember (Enum parent, MemberName name, Attributes attrs)
+ : base (parent, new EnumTypeExpr (), Modifiers.PUBLIC, name, attrs)
+ {
}
- static bool IsValidEnumType (Type t)
+ static bool IsValidEnumType (TypeSpec t)
{
return (t == TypeManager.int32_type || t == TypeManager.uint32_type || t == TypeManager.int64_type ||
t == TypeManager.byte_type || t == TypeManager.sbyte_type || t == TypeManager.short_type ||
t == TypeManager.ushort_type || t == TypeManager.uint64_type || t == TypeManager.char_type ||
- t.IsEnum);
+ TypeManager.IsEnumType (t));
}
-
- public override bool Define ()
- {
- const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
- TypeBuilder tb = parent_enum.TypeBuilder;
- builder = tb.DefineField (Name, tb, attr);
- ec.ContainerType = tb;
- TypeManager.RegisterConstant (builder, this);
- return true;
- }
-
- // Because parent is TypeContainer and we have DeclSpace only
- public override void CheckObsoleteness (Location loc)
+ public override Constant ConvertInitializer (ResolveContext rc, Constant expr)
{
- parent_enum.CheckObsoleteness (loc);
-
- ObsoleteAttribute oa = GetObsoleteAttribute ();
- if (oa == null) {
- return;
+ if (expr is EnumConstant)
+ expr = ((EnumConstant) expr).Child;
+
+ var underlying = ((Enum) Parent).UnderlyingType;
+ if (expr != null) {
+ expr = expr.ImplicitConversionRequired (rc, underlying, Location);
+ if (expr != null && !IsValidEnumType (expr.Type)) {
+ Enum.Error_1008 (Location, Report);
+ expr = null;
+ }
}
- AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+ if (expr == null)
+ expr = New.Constantify (underlying);
+
+ return new EnumConstant (expr, MemberType).Resolve (rc);
}
- public bool ResolveValue ()
+ public override bool Define ()
{
- if (value != null)
- return true;
-
- if (in_transit) {
- // suppress cyclic errors
- value = new EnumConstant (New.Constantify (parent_enum.UnderlyingType), parent_enum.TypeBuilder);
- Const.Error_CyclicDeclaration (this);
+ if (!ResolveMemberType ())
return false;
- }
- if (ValueExpr != null) {
- in_transit = true;
- Constant c = ValueExpr.ResolveAsConstant (ec, this);
- in_transit = false;
-
- if (c == null)
- return false;
+ const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
+ FieldBuilder = Parent.TypeBuilder.DefineField (Name, MemberType.GetMetaInfo (), attr);
+ spec = new ConstSpec (Parent.Definition, this, MemberType, FieldBuilder, ModFlags, initializer);
- if (c is EnumConstant)
- c = ((EnumConstant)c).Child;
-
- c = c.ToType (parent_enum.UnderlyingType, Location);
- if (c == null)
- return false;
+ Parent.MemberCache.AddMember (spec);
+ return true;
+ }
+ }
- if (!IsValidEnumType (c.Type)) {
- Report.Error (1008, Location, "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
- return false;
- }
+ ///
+ /// Enumeration container
+ ///
+ public class Enum : TypeContainer
+ {
+ //
+ // Implicit enum member initializer, used when no constant value is provided
+ //
+ class ImplicitInitializer : Expression
+ {
+ readonly EnumMember prev;
+ readonly EnumMember current;
- in_transit = false;
- value = new EnumConstant (c, parent_enum.TypeBuilder);
- return true;
+ public ImplicitInitializer (EnumMember current, EnumMember prev)
+ {
+ this.current = current;
+ this.prev = prev;
}
- if (prev_member == null) {
- value = new EnumConstant (New.Constantify (parent_enum.UnderlyingType), parent_enum.TypeBuilder);
- return true;
+ public override Expression CreateExpressionTree (ResolveContext ec)
+ {
+ throw new NotSupportedException ("Missing Resolve call");
}
- if (!prev_member.ResolveValue ())
- return false;
+ protected override Expression DoResolve (ResolveContext rc)
+ {
+ // We are the first member
+ if (prev == null) {
+ return New.Constantify (current.Parent.Definition).Resolve (rc);
+ }
- in_transit = true;
+ 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 ());
- try {
- value = prev_member.value.Increment ();
- }
- catch (OverflowException) {
- Report.Error (543, Location, "The enumerator value `{0}' is too large to fit in its type `{1}'",
- GetSignatureForError (), TypeManager.CSharpName (parent_enum.UnderlyingType));
- return false;
+ return New.Constantify (current.Parent.Definition).Resolve (rc);
+ }
}
- in_transit = false;
- return true;
+ public override void Emit (EmitContext ec)
+ {
+ throw new NotSupportedException ("Missing Resolve call");
+ }
}
- public override void Emit ()
- {
- if (OptAttributes != null)
- OptAttributes.Emit ();
+ public static readonly string UnderlyingValueField = "value__";
- if (!ResolveValue ())
- return;
-
- builder.SetConstant (value.GetValue ());
- base.Emit ();
- }
+ const Modifiers AllowedModifiers =
+ Modifiers.NEW |
+ Modifiers.PUBLIC |
+ Modifiers.PROTECTED |
+ Modifiers.INTERNAL |
+ Modifiers.PRIVATE;
- public override string GetSignatureForError()
+ public Enum (NamespaceEntry ns, DeclSpace parent, TypeExpression type,
+ Modifiers mod_flags, MemberName name, Attributes attrs)
+ : base (ns, parent, name, attrs, MemberKind.Enum)
{
- return String.Concat (parent_enum.GetSignatureForError (), '.', Name);
+ 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);
}
- public override string[] ValidAttributeTargets {
+ #region Properties
+
+ public override AttributeTargets AttributeTargets {
get {
- return attribute_targets;
+ return AttributeTargets.Enum;
}
}
- public override string DocCommentHeader {
- get { return "F:"; }
+ public TypeExpr BaseTypeExpression {
+ get {
+ return base_type_expr;
+ }
}
- #region IConstant Members
+ protected override TypeAttributes TypeAttr {
+ get {
+ return ModifiersExtensions.TypeAttr (ModFlags, IsTopLevel) |
+ TypeAttributes.Class | TypeAttributes.Sealed | base.TypeAttr;
+ }
+ }
- public Constant Value {
+ public TypeSpec UnderlyingType {
get {
- return value;
+ return ((EnumSpec) spec).UnderlyingType;
}
}
#endregion
- }
-
- ///
- /// Enumeration container
- ///
- public class Enum : DeclSpace {
- Expression BaseType;
- public Type UnderlyingType;
-
- static MemberList no_list = new MemberList (new object[0]);
-
- public const int AllowedModifiers =
- Modifiers.NEW |
- Modifiers.PUBLIC |
- Modifiers.PROTECTED |
- Modifiers.INTERNAL |
- Modifiers.PRIVATE;
-
- public Enum (NamespaceEntry ns, DeclSpace parent, Expression type,
- int mod_flags, MemberName name, Attributes attrs)
- : base (ns, parent, name, attrs)
- {
- this.BaseType = type;
- ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
- IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, name.Location);
- }
public void AddEnumMember (EnumMember em)
{
- if (em.Name == "value__") {
- Report.Error (76, em.Location, "An item in an enumeration cannot have an identifier `value__'");
+ if (em.Name == UnderlyingValueField) {
+ Report.Error (76, em.Location, "An item in an enumeration cannot have an identifier `{0}'",
+ UnderlyingValueField);
return;
}
- if (!AddToContainer (em, em.Name))
- return;
+ AddConstant (em);
}
-
- public override TypeBuilder DefineType ()
- {
- if (TypeBuilder != null)
- return TypeBuilder;
- if (!(BaseType is TypeLookupExpression)) {
- Report.Error (1008, Location,
- "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
- return null;
- }
-
- TypeExpr ute = BaseType.ResolveAsTypeTerminal (this, false);
- UnderlyingType = ute.Type;
-
- if (UnderlyingType != TypeManager.int32_type &&
- UnderlyingType != TypeManager.uint32_type &&
- UnderlyingType != TypeManager.int64_type &&
- UnderlyingType != TypeManager.uint64_type &&
- UnderlyingType != TypeManager.short_type &&
- UnderlyingType != TypeManager.ushort_type &&
- UnderlyingType != TypeManager.byte_type &&
- UnderlyingType != TypeManager.sbyte_type) {
- Report.Error (1008, Location,
- "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
- return null;
- }
-
- if (IsTopLevel) {
- if (TypeManager.NamespaceClash (Name, Location))
- return null;
-
- ModuleBuilder builder = CodeGen.Module.Builder;
-
- TypeBuilder = builder.DefineType (Name, TypeAttr, TypeManager.enum_type);
- } else {
- TypeBuilder builder = Parent.TypeBuilder;
-
- TypeBuilder = builder.DefineNestedType (
- Basename, TypeAttr, TypeManager.enum_type);
- }
+ public static void Error_1008 (Location loc, Report Report)
+ {
+ Report.Error (1008, loc,
+ "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
+ }
- //
- // Call MapToInternalType for corlib
- //
- TypeBuilder.DefineField ("value__", UnderlyingType,
- FieldAttributes.Public | FieldAttributes.SpecialName
- | FieldAttributes.RTSpecialName);
+ protected override bool DefineNestedTypes ()
+ {
+ ((EnumSpec) spec).UnderlyingType = base_type_expr == null ? TypeManager.int32_type : base_type_expr.Type;
- TypeManager.AddUserType (this);
+ TypeBuilder.DefineField (UnderlyingValueField, UnderlyingType.GetMetaInfo (),
+ FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
- foreach (EnumMember em in defined_names.Values) {
- if (!em.Define ())
- return null;
- }
+ if (!RootContext.StdLib)
+ RootContext.hack_corlib_enums.Add (this);
- return TypeBuilder;
- }
-
- public override bool Define ()
- {
return true;
}
- public override void Emit ()
+ protected override bool DoDefineMembers ()
{
- if (OptAttributes != null) {
- OptAttributes.Emit ();
- }
-
- foreach (EnumMember em in defined_names.Values) {
- em.Emit ();
+ 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 ();
+ }
}
- base.Emit ();
+ return true;
}
- //
- // IMemberFinder
- //
- public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
- MemberFilter filter, object criteria)
+ public override bool IsUnmanagedType ()
{
- if ((mt & MemberTypes.Field) == 0)
- return no_list;
-
- EnumMember em = defined_names [criteria] as EnumMember;
- if (em == null)
- return no_list;
-
- FieldBuilder[] fb = new FieldBuilder[] { em.builder };
- return new MemberList (fb);
+ return true;
}
- void VerifyClsName ()
- {
- HybridDictionary dict = new HybridDictionary (defined_names.Count, true);
- foreach (EnumMember em in defined_names.Values) {
- if (!em.IsClsComplianceRequired ())
- continue;
-
- try {
- dict.Add (em.Name, em);
- }
- catch (ArgumentException) {
- Report.SymbolRelatedToPreviousError (em);
- MemberCore col = (MemberCore)dict [em.Name];
- Report.Error (3005, col.Location, "Identifier `{0}' differing only in case is not CLS-compliant", col.GetSignatureForError ());
- }
- }
- }
+ protected override TypeExpr[] ResolveBaseTypes (out TypeExpr base_class)
+ {
+ base_type = TypeManager.enum_type;
+ base_class = base_type_expr;
+ return null;
+ }
protected override bool VerifyClsCompliance ()
{
if (!base.VerifyClsCompliance ())
return false;
- VerifyClsName ();
-
if (UnderlyingType == TypeManager.uint32_type ||
UnderlyingType == TypeManager.uint64_type ||
UnderlyingType == TypeManager.ushort_type) {
- Report.Error (3009, Location, "`{0}': base type `{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (UnderlyingType));
+ Report.Warning (3009, 1, Location, "`{0}': base type `{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (UnderlyingType));
}
return true;
- }
-
+ }
+ }
- public override MemberCache MemberCache {
- get {
- return null;
- }
- }
+ class EnumSpec : TypeSpec
+ {
+ TypeSpec underlying;
- public override AttributeTargets AttributeTargets {
- get {
- return AttributeTargets.Enum;
- }
+ public EnumSpec (TypeSpec declaringType, ITypeDefinition definition, TypeSpec underlyingType, Type info, Modifiers modifiers)
+ : base (MemberKind.Enum, declaringType, definition, info, modifiers | Modifiers.SEALED)
+ {
+ this.underlying = underlyingType;
}
- protected override TypeAttributes TypeAttr {
+ public TypeSpec UnderlyingType {
get {
- return Modifiers.TypeAttr (ModFlags, IsTopLevel) |
- TypeAttributes.Class | TypeAttributes.Sealed |
- base.TypeAttr;
+ return underlying;
}
- }
-
- //
- // Generates xml doc comments (if any), and if required,
- // handle warning report.
- //
- internal override void GenerateDocComment (DeclSpace ds)
- {
- base.GenerateDocComment (ds);
+ set {
+ if (underlying != null)
+ throw new InternalErrorException ("UnderlyingType reset");
- foreach (EnumMember em in defined_names.Values) {
- em.GenerateDocComment (this);
+ underlying = value;
}
}
- //
- // Represents header string for documentation comment.
- //
- public override string DocCommentHeader {
- get { return "T:"; }
+ public static TypeSpec GetUnderlyingType (TypeSpec t)
+ {
+ return ((EnumSpec) t.GetDefinition ()).UnderlyingType;
}
}
}