2008-11-24 Marek Safar <marek.safar@gmail.com>
[mono.git] / mcs / mcs / enum.cs
index eaaa390e05a38d3df42f7e1215e948d53b46d29b..2523e0cf76c1cc701b5fb638ac8bc2d7254e300b 100644 (file)
@@ -5,9 +5,10 @@
 //         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;
@@ -19,678 +20,194 @@ using System.Globalization;
 
 namespace Mono.CSharp {
 
-       class EnumMember: MemberCore {
-               static string[] attribute_targets = new string [] { "field" };
+       public class EnumMember : Const {
+               protected readonly Enum ParentEnum;
+               protected readonly Expression ValueExpr;
+               readonly EnumMember prev_member;
 
-               Enum parent_enum;
-               public FieldBuilder builder;
-               internal readonly Expression Type;
-
-               public EnumMember (Enum parent_enum, Expression expr, string name, Location loc,
-                                  Attributes attrs):
-                       base (null, new MemberName (name, loc), attrs)
+               public EnumMember (Enum parent, EnumMember prev_member, string name, Expression expr,
+                                  Attributes attrs, Location loc)
+                       : base (parent, new EnumTypeExpr (parent), name, expr, Modifiers.PUBLIC,
+                               attrs, loc)
                {
-                       this.parent_enum = parent_enum;
-                       this.ModFlags = parent_enum.ModFlags;
-                       this.Type = expr;
+                       this.ParentEnum = parent;
+                       this.ValueExpr = expr;
+                       this.prev_member = prev_member;
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+               protected class EnumTypeExpr : TypeExpr
                {
-                       if (a.Type == TypeManager.marshal_as_attr_type) {
-                               UnmanagedMarshal marshal = a.GetMarshal (this);
-                               if (marshal != null) {
-                                       builder.SetMarshal (marshal);
-                               }
-                               return;
-                       }
+                       public readonly Enum Enum;
 
-                       if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
-                               a.Error_InvalidSecurityParent ();
-                               return;
+                       public EnumTypeExpr (Enum e)
+                       {
+                               this.Enum = e;
                        }
 
-                       builder.SetCustomAttribute (cb);
-               }
+                       protected override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
+                       {
+                               type = Enum.CurrentType != null ? Enum.CurrentType : Enum.TypeBuilder;
+                               return this;
+                       }
 
-               public override AttributeTargets AttributeTargets {
-                       get {
-                               return AttributeTargets.Field;
+                       public override TypeExpr ResolveAsTypeTerminal (IResolveContext ec, bool silent)
+                       {
+                               return DoResolveAsTypeStep (ec);
                        }
                }
 
-               public void DefineMember (TypeBuilder tb)
+               static bool IsValidEnumType (Type t)
                {
-                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
-                               | FieldAttributes.Literal;
-                       
-                       builder = tb.DefineField (Name, tb, attr);
+                       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);
                }
 
-               public override bool Define ()
-               {
-                       throw new NotImplementedException ();
+               public object Value {
+                       get { return ResolveValue () ? value.GetValue () : null; }
                }
 
-               public void Emit (EmitContext ec)
+               public override bool Define ()
                {
-                       if (OptAttributes != null)
-                               OptAttributes.Emit (ec, this); 
+                       if (!ResolveMemberType ())
+                               return false;
 
-                       Emit ();
+                       const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
+                       FieldBuilder = Parent.TypeBuilder.DefineField (Name, MemberType, attr);
+                       Parent.MemberCache.AddMember (FieldBuilder, this);
+                       TypeManager.RegisterConstant (FieldBuilder, this);
+                       return true;
                }
-
-               public override string GetSignatureForError()
+       
+               protected override Constant DoResolveValue (EmitContext ec)
                {
-                       return String.Concat (parent_enum.GetSignatureForError (), '.', base.GetSignatureForError ());
-               }
+                       if (ValueExpr != null) {
+                               Constant c = ValueExpr.ResolveAsConstant (ec, this);
+                               if (c == null)
+                                       return null;
 
-               public override string[] ValidAttributeTargets {
-                       get {
-                               return attribute_targets;
+                               if (c is EnumConstant)
+                                       c = ((EnumConstant)c).Child;
+
+                               c = c.ImplicitConversionRequired (ec, ParentEnum.UnderlyingType, Location);
+                               if (c == null)
+                                       return null;
+
+                               if (!IsValidEnumType (c.Type)) {
+                                       Enum.Error_1008 (Location);
+                                       return null;
+                               }
+
+                               return new EnumConstant (c, MemberType);
                        }
-               }
 
-               protected override bool VerifyClsCompliance(DeclSpace ds)
-               {
-                       // Because parent is TypeContainer and we have only DeclSpace parent.
-                       // Parameter replacing is required
-                       return base.VerifyClsCompliance (parent_enum);
-               }
+                       if (prev_member == null)
+                               return new EnumConstant (
+                                       New.Constantify (ParentEnum.UnderlyingType), MemberType);
 
-               // There is no base type
-               protected override void VerifyObsoleteAttribute()
-               {
-               }
+                       if (!prev_member.ResolveValue ())
+                               return null;
 
-               public override string DocCommentHeader {
-                       get { return "F:"; }
+                       try {
+                               return (EnumConstant) 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 (ParentEnum.UnderlyingType));
+                               return null;
+                       }
                }
        }
 
        /// <summary>
        ///   Enumeration container
        /// </summary>
-       public class Enum : DeclSpace {
-               public ArrayList ordered_enums;
-               
-               public Expression BaseType;
-               
-               public Type UnderlyingType;
-
-               Hashtable member_to_location;
-
-               //
-               // This is for members that have been defined
-               //
-               Hashtable member_to_value;
-
-               //
-               // This is used to mark members we're currently defining
-               //
-               Hashtable in_transit;
-               
-               ArrayList field_builders;
-               
-               public const int AllowedModifiers =
+       public class Enum : TypeContainer
+       {
+               public static readonly string UnderlyingValueField = "value__";
+
+               TypeExpr base_type;
+
+               const int AllowedModifiers =
                        Modifiers.NEW |
                        Modifiers.PUBLIC |
                        Modifiers.PROTECTED |
                        Modifiers.INTERNAL |
                        Modifiers.PRIVATE;
 
-               public Enum (NamespaceEntry ns, TypeContainer parent, Expression type,
+               public Enum (NamespaceEntry ns, DeclSpace parent, TypeExpr type,
                             int mod_flags, MemberName name, Attributes attrs)
-                       : base (ns, parent, name, attrs)
+                       : base (ns, parent, name, attrs, Kind.Enum)
                {
-                       this.BaseType = type;
-                       ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
-                                                   IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, name.Location);
-
-                       ordered_enums = new ArrayList ();
-                       member_to_location = new Hashtable ();
-                       member_to_value = new Hashtable ();
-                       in_transit = new Hashtable ();
-                       field_builders = new ArrayList ();
+                       this.base_type = type;
+                       int accmods = IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE;
+                       ModFlags = Modifiers.Check (AllowedModifiers, mod_flags, accmods, Location);
                }
 
-               /// <summary>
-               ///   Adds @name to the enumeration space, with @expr
-               ///   being its definition.  
-               /// </summary>
-               public void AddEnumMember (string name, Expression expr, Location loc, Attributes opt_attrs, string documentation)
+               public void AddEnumMember (EnumMember em)
                {
-                       if (name == "value__") {
-                               Report.Error (76, loc, "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;
                        }
 
-                       EnumMember em = new EnumMember (this, expr, name, loc, opt_attrs);
-                       em.DocComment = documentation;
-                       if (!AddToContainer (em, name))
-                               return;
-
-
-                       // TODO: can be almost deleted
-                       ordered_enums.Add (name);
-                       member_to_location.Add (name, loc);
+                       AddConstant (em);
                }
-               
-               public override TypeBuilder DefineType ()
-               {
-                       if (TypeBuilder != null)
-                               return TypeBuilder;
-
-                       ec = new EmitContext (this, this, Location, null, null, ModFlags, false);
-                       ec.InEnumContext = true;
-
-                       if (!(BaseType is TypeLookupExpression)) {
-                               Report.Error (1008, Location,
-                                       "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
-                               return null;
-                       }
 
-                       TypeExpr ute = ResolveBaseTypeExpr (BaseType, false, Location);
-                       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);
-                       }
-
-                       ec.ContainerType = TypeBuilder;
-
-                       //
-                       // Call MapToInternalType for corlib
-                       //
-                       TypeBuilder.DefineField ("value__", UnderlyingType,
-                                                FieldAttributes.Public | FieldAttributes.SpecialName
-                                                | FieldAttributes.RTSpecialName);
-
-                       TypeManager.AddUserType (Name, this);
-
-                       return TypeBuilder;
-               }
-
-               bool IsValidEnumConstant (Expression e)
-               {
-                       if (!(e is Constant))
-                               return false;
-
-                       if (e is IntConstant || e is UIntConstant || e is LongConstant ||
-                           e is ByteConstant || e is SByteConstant || e is ShortConstant ||
-                           e is UShortConstant || e is ULongConstant || e is EnumConstant ||
-                           e is CharConstant)
-                               return true;
-                       else
-                               return false;
-               }
-
-               object GetNextDefaultValue (object default_value)
+               public static void Error_1008 (Location loc)
                {
-                       if (UnderlyingType == TypeManager.int32_type) {
-                               int i = (int) default_value;
-                               
-                               if (i < System.Int32.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.uint32_type) {
-                               uint i = (uint) default_value;
-
-                               if (i < System.UInt32.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.int64_type) {
-                               long i = (long) default_value;
-
-                               if (i < System.Int64.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.uint64_type) {
-                               ulong i = (ulong) default_value;
-
-                               if (i < System.UInt64.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.short_type) {
-                               short i = (short) default_value;
-
-                               if (i < System.Int16.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.ushort_type) {
-                               ushort i = (ushort) default_value;
-
-                               if (i < System.UInt16.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.byte_type) {
-                               byte i = (byte) default_value;
-
-                               if (i < System.Byte.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       } else if (UnderlyingType == TypeManager.sbyte_type) {
-                               sbyte i = (sbyte) default_value;
-
-                               if (i < System.SByte.MaxValue)
-                                       return ++i;
-                               else
-                                       return null;
-                       }
-
-                       return null;
+                       Report.Error (1008, loc, "Type byte, sbyte, short, ushort, " +
+                                     "int, uint, long or ulong expected");
                }
 
-               /// <summary>
-               ///  Determines if a standard implicit conversion exists from
-               ///  expr_type to target_type
-               /// </summary>
-               public static bool ImplicitConversionExists (Type expr_type, Type target_type)
+               protected override bool DefineNestedTypes ()
                {
-                       expr_type = TypeManager.TypeToCoreType (expr_type);
-
-                       if (expr_type == TypeManager.void_type)
+                       if (!base.DefineNestedTypes ())
                                return false;
-                       
-                       if (expr_type == target_type)
-                               return true;
-
-                       // First numeric conversions 
-
-                       if (expr_type == TypeManager.sbyte_type){
-                               //
-                               // From sbyte to short, int, long, float, double.
-                               //
-                               if ((target_type == TypeManager.int32_type) || 
-                                   (target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type)  ||
-                                   (target_type == TypeManager.short_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                               
-                       } else if (expr_type == TypeManager.byte_type){
-                               //
-                               // From byte to short, ushort, int, uint, long, ulong, float, double
-                               // 
-                               if ((target_type == TypeManager.short_type) ||
-                                   (target_type == TypeManager.ushort_type) ||
-                                   (target_type == TypeManager.int32_type) ||
-                                   (target_type == TypeManager.uint32_type) ||
-                                   (target_type == TypeManager.uint64_type) ||
-                                   (target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-       
-                       } else if (expr_type == TypeManager.short_type){
-                               //
-                               // From short to int, long, float, double
-                               // 
-                               if ((target_type == TypeManager.int32_type) ||
-                                   (target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                                       
-                       } else if (expr_type == TypeManager.ushort_type){
-                               //
-                               // From ushort to int, uint, long, ulong, float, double
-                               //
-                               if ((target_type == TypeManager.uint32_type) ||
-                                   (target_type == TypeManager.uint64_type) ||
-                                   (target_type == TypeManager.int32_type) ||
-                                   (target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                                   
-                       } else if (expr_type == TypeManager.int32_type){
-                               //
-                               // From int to long, float, double
-                               //
-                               if ((target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                                       
-                       } else if (expr_type == TypeManager.uint32_type){
-                               //
-                               // From uint to long, ulong, float, double
-                               //
-                               if ((target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.uint64_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                                       
-                       } else if ((expr_type == TypeManager.uint64_type) ||
-                                  (expr_type == TypeManager.int64_type)) {
-                               //
-                               // From long/ulong to float, double
-                               //
-                               if ((target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-                                   
-                       } else if (expr_type == TypeManager.char_type){
-                               //
-                               // From char to ushort, int, uint, long, ulong, float, double
-                               // 
-                               if ((target_type == TypeManager.ushort_type) ||
-                                   (target_type == TypeManager.int32_type) ||
-                                   (target_type == TypeManager.uint32_type) ||
-                                   (target_type == TypeManager.uint64_type) ||
-                                   (target_type == TypeManager.int64_type) ||
-                                   (target_type == TypeManager.float_type) ||
-                                   (target_type == TypeManager.double_type) ||
-                                   (target_type == TypeManager.decimal_type))
-                                       return true;
-
-                       } else if (expr_type == TypeManager.float_type){
-                               //
-                               // float to double
-                               //
-                               if (target_type == TypeManager.double_type)
-                                       return true;
-                       }       
-                       
-                       return false;
-               }
-
-               /// <summary>
-               ///  This is used to lookup the value of an enum member. If the member is undefined,
-               ///  it attempts to define it and return its value
-               /// </summary>
-               public object LookupEnumValue (string name, Location loc)
-               {
-                       if (ec == null)
-                               Report.Error (-1, loc, "Enum.LookupEnumValue () called too soon");
-                       
-                       object default_value = null;
-                       Constant c = null;
-
-                       default_value = member_to_value [name];
-
-                       if (default_value != null)
-                               return default_value;
 
                        //
-                       // This may happen if we're calling a method in System.Enum, for instance
-                       // Enum.IsDefined().
-                       //
-                       if (!defined_names.Contains (name))
-                               return null;
-
-                       if (in_transit.Contains (name)) {
-                               Report.Error (110, loc, "The evaluation of the constant value for `" +
-                                             Name + "." + name + "' involves a circular definition.");
-                               return null;
-                       }
-
-                       //
-                       // So if the above doesn't happen, we have a member that is undefined
-                       // We now proceed to define it 
+                       // Call MapToInternalType for corlib
                        //
-                       Expression val = this [name];
-
-                       if (val == null) {
-                               
-                               int idx = ordered_enums.IndexOf (name);
-
-                               if (idx == 0)
-                                       default_value = 0;
-                               else {
-                                       for (int i = 0; i < idx; ++i) {
-                                               string n = (string) ordered_enums [i];
-                                               Location m_loc = (Mono.CSharp.Location)
-                                                       member_to_location [n];
-                                               in_transit.Add (name, true);
-                                               default_value = LookupEnumValue (n, m_loc);
-                                               in_transit.Remove (name);
-                                               if (default_value == null)
-                                                       return null;
-                                       }
-                                       
-                                       default_value = GetNextDefaultValue (default_value);
-                               }
-                               
-                       } else {
-                               in_transit.Add (name, true);
-                               val = val.Resolve (EmitContext);
-                               in_transit.Remove (name);
-
-                               if (val == null)
-                                       return null;
-
-                               if (!IsValidEnumConstant (val)) {
-                                       Report.Error (1008, loc,
-                                               "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
-                                       return null;
-                               }
-
-                               c = (Constant) val;
-                               default_value = c.GetValue ();
-
-                               if (default_value == null) {
-                                       c.Error_ConstantValueCannotBeConverted (loc, UnderlyingType);
-                                       return null;
-                               }
-
-                               if (val is EnumConstant){
-                                       Type etype = TypeManager.EnumToUnderlying (c.Type);
-                                       
-                                       if (!ImplicitConversionExists (etype, UnderlyingType)){
-                                               Convert.Error_CannotImplicitConversion (
-                                                       loc, c.Type, UnderlyingType);
-                                               return null;
-                                       }
-                               }
-                       }
-
-                       EnumMember em = (EnumMember) defined_names [name];
-                       em.DefineMember (TypeBuilder);
-
-                       bool fail;
-                       default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
-                       if (fail){
-                               c.Error_ConstantValueCannotBeConverted (loc, UnderlyingType);
-                               return null;
-                       }
-
-                       em.builder.SetConstant (default_value);
-                       field_builders.Add (em.builder);
-                       member_to_value [name] = default_value;
-
-                       if (!TypeManager.RegisterFieldValue (em.builder, default_value))
-                               return null;
+                       TypeBuilder.DefineField (UnderlyingValueField, UnderlyingType,
+                                                FieldAttributes.Public | FieldAttributes.SpecialName
+                                                | FieldAttributes.RTSpecialName);
 
-                       return default_value;
+                       return true;
                }
-               
+
                public override bool Define ()
                {
-                       //
-                       // If there was an error during DefineEnum, return
-                       //
-                       if (TypeBuilder == null)
-                               return false;
-
-                       if (ec == null)
-                               throw new InternalErrorException ("Enum.Define () called too soon");
-                       
-                       object default_value = 0;
-                       
-               
-                       foreach (string name in ordered_enums) {
-                               //
-                               // Have we already been defined, thanks to some cross-referencing ?
-                               // 
-                               if (member_to_value.Contains (name))
-                                       continue;
-                               
-                               Location loc = (Mono.CSharp.Location) member_to_location [name];
-
-                               if (this [name] != null) {
-                                       default_value = LookupEnumValue (name, loc);
-
-                                       if (default_value == null)
-                                               return true;
-                               } else {
-                                       EnumMember em = (EnumMember) defined_names [name];
-
-                                       em.DefineMember (TypeBuilder);
-                                       FieldBuilder fb = em.builder;
-                                       
-                                       if (default_value == null) {
-                                          Report.Error (543, loc, "The enumerator value `{0}.{1}' is too large to fit in its type `{2}'",
-                                                  GetSignatureForError (), name, TypeManager.CSharpName (this.UnderlyingType));
-                                               return false;
-                                       }
-
-                                       bool fail;
-                                       default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
-                                       if (fail){
-                                               //TODO: really interested if can be reached
-                                               throw new NotImplementedException ();
-                                       }
-
-                                       fb.SetConstant (default_value);
-                                       field_builders.Add (fb);
-                                       member_to_value [name] = default_value;
-                                       
-                                       if (!TypeManager.RegisterFieldValue (fb, default_value))
-                                               return false;
-                               }
-
-                               default_value = GetNextDefaultValue (default_value);
-                       }
-
+                       member_cache = new MemberCache (TypeManager.enum_type, this);
+                       DefineContainerMembers (constants);
                        return true;
                }
 
-               public override void Emit ()
+               public override bool IsUnmanagedType ()
                {
-                       if (OptAttributes != null) {
-                               OptAttributes.Emit (ec, this);
-                       }
+                       return true;
+               }
 
-                       foreach (EnumMember em in defined_names.Values) {
-                               em.Emit (ec);
+               public Type UnderlyingType {
+                       get {
+                               return base_type.Type;
                        }
-
-                       base.Emit ();
                }
-               
-               void VerifyClsName ()
-               {
-                       HybridDictionary dict = new HybridDictionary (defined_names.Count, true);
-                       foreach (EnumMember em in defined_names.Values) {
-                               if (!em.IsClsCompliaceRequired (this))
-                                       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 bool VerifyClsCompliance (DeclSpace ds)
+               protected override bool VerifyClsCompliance ()
                {
-                       if (!base.VerifyClsCompliance (ds))
+                       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;
-               }
-               
-               //
-               // IMemberFinder
-               //
-               public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
-                                                       MemberFilter filter, object criteria)
-               {
-                       ArrayList members = new ArrayList ();
-
-                       if ((mt & MemberTypes.Field) != 0) {
-                               if (criteria is string && member_to_value [criteria] == null) {
-                                       LookupEnumValue ((string) criteria, Location.Null);
-                               }
-                               
-                               foreach (FieldBuilder fb in field_builders)
-                                       if (filter (fb, criteria) == true)
-                                               members.Add (fb);
-                       }
-
-                       return new MemberList (members);
-               }
-
-               public override MemberCache MemberCache {
-                       get {
-                               return null;
-                       }
-               }
-
-               public ArrayList ValueNames {
-                       get {
-                               return ordered_enums;
-                       }
-               }
-
-               // indexer
-               public Expression this [string name] {
-                       get {
-                               return ((EnumMember) defined_names [name]).Type;
-                       }
-               }
+               }       
 
                public override AttributeTargets AttributeTargets {
                        get {
@@ -701,31 +218,8 @@ namespace Mono.CSharp {
                protected override TypeAttributes TypeAttr {
                        get {
                                return Modifiers.TypeAttr (ModFlags, IsTopLevel) |
-                               TypeAttributes.Class | TypeAttributes.Sealed |
-                               base.TypeAttr;
+                                       TypeAttributes.Class | TypeAttributes.Sealed | base.TypeAttr;
                        }
                }
-
-
-               protected override void VerifyObsoleteAttribute()
-               {
-                       // UnderlyingType is never obsolete
-               }
-
-               //
-               // Generates xml doc comments (if any), and if required,
-               // handle warning report.
-               //
-               internal override void GenerateDocComment (DeclSpace ds)
-               {
-                       DocUtil.GenerateEnumDocComment (this, ds);
-               }
-
-               //
-               //   Represents header string for documentation comment.
-               //
-               public override string DocCommentHeader {
-                       get { return "T:"; }
-               }
        }
 }