* ILTokenizer.cs: Handle comments first, handle whitespace in hex
[mono.git] / mcs / mcs / enum.cs
index 223fd0a1e1f52231f056268921e0a5a97d225f16..ac9ef2b430533d49fe20041eefddcd7c9b03440a 100755 (executable)
@@ -13,34 +13,119 @@ using System;
 using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Globalization;
 
 namespace Mono.CSharp {
 
+       // Maybe can be usefull to derive from MemberCore
+       class EnumMember: Attributable {
+               string name;
+               Enum parent;
+               Location loc;
+
+               static string[] attribute_targets = new string [] { "field" };
+
+               public FieldBuilder builder;
+
+               public EnumMember (string name, Enum parent, Location loc, Attributes attrs):
+                       base (attrs)
+               {
+                       this.name = name;
+                       this.parent = parent;
+                       this.loc = loc;
+               }
+
+               public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
+               {
+                       if (a.Type == TypeManager.marshal_as_attr_type) {
+                               UnmanagedMarshal marshal = a.GetMarshal ();
+                               if (marshal != null) {
+                                       builder.SetMarshal (marshal);
+                                       return;
+                               }
+                               Report.Warning_T (-24, a.Location);
+                               return;
+                       }
+
+                       builder.SetCustomAttribute (cb);
+               }
+
+               public override AttributeTargets AttributeTargets {
+                       get {
+                               return AttributeTargets.Field;
+                       }
+               }
+
+               public override bool IsClsCompliaceRequired(DeclSpace ds)
+               {
+                       return parent.IsClsCompliaceRequired (ds);
+               }
+
+               public void DefineMember (TypeBuilder tb)
+               {
+                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
+                               | FieldAttributes.Literal;
+                       
+                       builder = tb.DefineField (name, tb, attr);
+               }
+
+               public void Emit (EmitContext ec)
+               {
+                       if (OptAttributes != null)
+                               OptAttributes.Emit (ec, this); 
+               }
+
+               // TODO: caching would be usefull
+               public ObsoleteAttribute GetObsoleteAttribute (EmitContext ec)
+               {
+                       if (OptAttributes == null)
+                               return null;
+
+                       Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type, ec);
+                       if (obsolete_attr == null)
+                               return null;
+
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ec.DeclSpace);
+                       if (obsolete == null)
+                               return null;
+
+                       return obsolete;
+               }
+
+               protected override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
+       }
+
        /// <summary>
        ///   Enumeration container
        /// </summary>
        public class Enum : DeclSpace {
-
                ArrayList ordered_enums;
-               public readonly string BaseType;
-               public readonly string EnumName;
-               int mod_flags;
-               public TypeBuilder EnumBuilder;
-               public Attributes  OptAttributes;
+               
+               public Expression BaseType;
                
                public Type UnderlyingType;
 
-               public readonly RootContext RootContext;
-
                Hashtable member_to_location;
+               Hashtable member_to_attributes;
 
                //
                // 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;
-               Location loc;
+
+
+               Hashtable name_to_member;
                
                public const int AllowedModifiers =
                        Modifiers.NEW |
@@ -49,44 +134,102 @@ namespace Mono.CSharp {
                        Modifiers.INTERNAL |
                        Modifiers.PRIVATE;
 
-               public Enum (RootContext rc, string type, int mod_flags, string name, Attributes attrs, Location l)
-                       : base (name, l)
+               public Enum (NamespaceEntry ns, TypeContainer parent, Expression type, int mod_flags,
+                            string name, Attributes attrs, Location l)
+                       : base (ns, parent, name, attrs, l)
                {
-                       RootContext = rc;
                        this.BaseType = type;
-                       this.EnumName = name;
-                       this.mod_flags = Modifiers.Check (AllowedModifiers, mod_flags, Modifiers.PUBLIC);
-                       OptAttributes = attrs;
-                       loc = l;
+                       ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
+                                                   IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, l);
 
                        ordered_enums = new ArrayList ();
                        member_to_location = new Hashtable ();
                        member_to_value = new Hashtable ();
+                       in_transit = new Hashtable ();
                        field_builders = new ArrayList ();
+
+                       name_to_member = new Hashtable ();
                }
 
                /// <summary>
                ///   Adds @name to the enumeration space, with @expr
                ///   being its definition.  
                /// </summary>
-               public AdditionResult AddEnumMember (string name, Expression expr, Location loc)
+               public AdditionResult AddEnumMember (string name, Expression expr, Location loc,
+                                                    Attributes opt_attrs)
                {
                        if (defined_names.Contains (name))
                                return AdditionResult.NameExists;
 
+                       if (name == "value__") {
+                               Report.Error (76, loc, "An item in an enumeration can't have an identifier `value__'");
+                               return AdditionResult.Error;
+                       }
+
                        DefineName (name, expr);
 
                        ordered_enums.Add (name);
                        member_to_location.Add (name, loc);
+
+                       if (member_to_attributes == null)
+                               member_to_attributes = new Hashtable ();
+
+                       member_to_attributes.Add (name, opt_attrs);
+
+                       name_to_member.Add (name, new EnumMember (name, this, loc, opt_attrs));
                        
                        return AdditionResult.Success;
                }
 
-               public void DefineEnum (object parent_builder)
+               //
+               // This is used by corlib compilation: we map from our
+               // type to a type that is consumable by the DefineField
+               //
+               Type MapToInternalType (Type t)
+               {
+                       if (t == TypeManager.int32_type)
+                               return typeof (int);
+                       if (t == TypeManager.int64_type)
+                               return typeof (long);
+                       if (t == TypeManager.uint32_type)
+                               return typeof (uint);
+                       if (t == TypeManager.uint64_type)
+                               return typeof (ulong);
+                       if (t == TypeManager.float_type)
+                               return typeof (float);
+                       if (t == TypeManager.double_type)
+                               return typeof (double);
+                       if (t == TypeManager.byte_type)
+                               return typeof (byte);
+                       if (t == TypeManager.sbyte_type)
+                               return typeof (sbyte);
+                       if (t == TypeManager.char_type)
+                               return typeof (char);
+                       if (t == TypeManager.short_type)
+                               return typeof (short);
+                       if (t == TypeManager.ushort_type)
+                               return typeof (ushort);
+
+                       throw new Exception ();
+               }
+               
+               public override TypeBuilder DefineType ()
                {
-                       TypeAttributes attr = TypeAttributes.Class | TypeAttributes.Sealed;
+                       if (TypeBuilder != null)
+                               return TypeBuilder;
 
-                       UnderlyingType = RootContext.TypeManager.LookupType (BaseType);
+                       TypeAttributes attr = Modifiers.TypeAttr (ModFlags, IsTopLevel);
+
+                       attr |= TypeAttributes.Class | TypeAttributes.Sealed;
+
+                       if (!(BaseType is TypeLookupExpression)) {
+                               Report.Error (1008, Location,
+                                             "Type byte, sbyte, short, ushort, int, uint, " +
+                                             "long, or ulong expected (got: `{0}')", BaseType);
+                               return null;
+                       }
+
+                       UnderlyingType = ResolveType (BaseType, false, Location);
 
                        if (UnderlyingType != TypeManager.int32_type &&
                            UnderlyingType != TypeManager.uint32_type &&
@@ -98,45 +241,46 @@ namespace Mono.CSharp {
                            UnderlyingType != TypeManager.sbyte_type) {
                                Report.Error (1008, Location,
                                              "Type byte, sbyte, short, ushort, int, uint, " +
-                                             "long, or ulong expected");
-                               return;
+                                             "long, or ulong expected (got: " +
+                                             TypeManager.CSharpName (UnderlyingType) + ")");
+                               return null;
                        }
 
-                       if (parent_builder is ModuleBuilder) {
-                               ModuleBuilder builder = (ModuleBuilder) parent_builder;
-
-                               if ((ModFlags & Modifiers.PUBLIC) != 0)
-                                       attr |= TypeAttributes.Public;
-                               else
-                                       attr |= TypeAttributes.NotPublic;
+                       if (IsTopLevel) {
+                               if (TypeManager.NamespaceClash (Name, Location))
+                                       return null;
                                
-                               EnumBuilder = builder.DefineType (EnumName, attr, TypeManager.enum_type);
+                               ModuleBuilder builder = CodeGen.Module.Builder;
 
+                               TypeBuilder = builder.DefineType (Name, attr, TypeManager.enum_type);
                        } else {
-                               TypeBuilder builder = (TypeBuilder) parent_builder;
+                               TypeBuilder builder = Parent.TypeBuilder;
 
-                               if ((ModFlags & Modifiers.PUBLIC) != 0)
-                                       attr |= TypeAttributes.NestedPublic;
-                               else
-                                       attr |= TypeAttributes.NestedPrivate;
-                               
-                               EnumBuilder = builder.DefineNestedType (EnumName, attr, TypeManager.enum_type);
+                               TypeBuilder = builder.DefineNestedType (
+                                       Basename, attr, TypeManager.enum_type);
                        }
 
-                       EnumBuilder.DefineField ("value__", UnderlyingType,
-                                                FieldAttributes.Public | FieldAttributes.SpecialName);
+                       //
+                       // Call MapToInternalType for corlib
+                       //
+                       TypeBuilder.DefineField ("value__", UnderlyingType,
+                                                FieldAttributes.Public | FieldAttributes.SpecialName
+                                                | FieldAttributes.RTSpecialName);
 
-                       RootContext.TypeManager.AddEnumType (EnumName, EnumBuilder, this);
+                       TypeManager.AddEnumType (Name, TypeBuilder, this);
 
-                       return;
+                       return TypeBuilder;
                }
 
-               bool IsValidEnumLiteral (Expression e)
+               bool IsValidEnumConstant (Expression e)
                {
-                       if (!(e is Literal))
+                       if (!(e is Constant))
                                return false;
 
-                       if (e is IntLiteral || e is UIntLiteral || e is LongLiteral || e is ULongLiteral || e is EnumLiteral)
+                       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;
@@ -205,10 +349,10 @@ namespace Mono.CSharp {
                        return null;
                }
 
-               void error31 (object val, Location loc)
+               void Error_ConstantValueCannotBeConverted (object val, Location loc)
                {
-                       if (val is Literal)
-                               Report.Error (31, loc, "Constant value '" + ((Literal) val).AsString () +
+                       if (val is Constant)
+                               Report.Error (31, loc, "Constant value '" + ((Constant) val).AsString () +
                                              "' cannot be converted" +
                                              " to a " + TypeManager.CSharpName (UnderlyingType));
                        else 
@@ -218,23 +362,161 @@ namespace Mono.CSharp {
                        return;
                }
 
+               /// <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)
+               {
+                       expr_type = TypeManager.TypeToCoreType (expr_type);
+
+                       if (expr_type == TypeManager.void_type)
+                               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;
+               }
+
+               //
+               // Horrible, horrible.  But there is no other way we can pass the EmitContext
+               // to the recursive definition triggered by the evaluation of a forward
+               // expression
+               //
+               static EmitContext current_ec = null;
+               
                /// <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 (EmitContext ec, string name, Location loc)
                {
+                       
                        object default_value = null;
-                       Literal l = null;
+                       Constant c = null;
 
                        default_value = member_to_value [name];
 
                        if (default_value != null)
                                return default_value;
 
-                       if (!defined_names.Contains (name)) {
-                               Report.Error (117, loc, "'"+ EnumName + "' does not contain a definition for '"
-                                             + name + "'");
+                       //
+                       // 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;
                        }
 
@@ -253,190 +535,290 @@ namespace Mono.CSharp {
                                else {
                                        for (int i = 0; i < idx; ++i) {
                                                string n = (string) ordered_enums [i];
-                                               Location m_loc = (Location) member_to_location [n];
+                                               Location m_loc = (Mono.CSharp.Location)
+                                                       member_to_location [n];
+                                               in_transit.Add (name, true);
+
+                                               EmitContext old_ec = current_ec;
+                                               current_ec = ec;
+                       
                                                default_value = LookupEnumValue (ec, n, m_loc);
+
+                                               current_ec = old_ec;
+                                               
+                                               in_transit.Remove (name);
+                                               if (default_value == null)
+                                                       return null;
                                        }
                                        
                                        default_value = GetNextDefaultValue (default_value);
                                }
                                
                        } else {
+                               bool old = ec.InEnumContext;
+                               ec.InEnumContext = true;
+                               in_transit.Add (name, true);
+
+                               EmitContext old_ec = current_ec;
+                               current_ec = ec;
                                val = val.Resolve (ec);
+                               current_ec = old_ec;
                                
-                               if (val == null) {
-                                       Report.Error (-12, loc, "Definition is circular.");
+                               in_transit.Remove (name);
+                               ec.InEnumContext = old;
+
+                               if (val == null)
                                        return null;
-                               }       
-                               
-                               if (IsValidEnumLiteral (val)) {
-                                       l = (Literal) val;
-                                       default_value = l.GetValue ();
+
+                               if (!IsValidEnumConstant (val)) {
+                                       Report.Error (
+                                               1008, loc,
+                                               "Type byte, sbyte, short, ushort, int, uint, long, or " +
+                                               "ulong expected (have: " + val + ")");
+                                       return null;
+                               }
+
+                               c = (Constant) val;
+                               default_value = c.GetValue ();
+
+                               if (default_value == null) {
+                                       Error_ConstantValueCannotBeConverted (c, loc);
+                                       return null;
+                               }
+
+                               if (val is EnumConstant){
+                                       Type etype = TypeManager.EnumToUnderlying (c.Type);
                                        
-                                       if (default_value == null) {
-                                               error31 (l, loc);
+                                       if (!ImplicitConversionExists (etype, UnderlyingType)){
+                                               Convert.Error_CannotImplicitConversion (
+                                                       loc, c.Type, UnderlyingType);
                                                return null;
                                        }
-                                       
-                               } else {
-                                       Report.Error (1008, loc,
-                                                     "Type byte, sbyte, short, ushort, int, uint, long, or ulong expected");
-                                       return null;
                                }
                        }
 
-                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
-                                       | FieldAttributes.Literal;
-                       
-                       FieldBuilder fb = EnumBuilder.DefineField (name, UnderlyingType, attr);
-                       
-                       try {
-                               default_value = Convert.ChangeType (default_value, UnderlyingType);
-                       } catch {
-                               error31 (l, loc);
+                       EnumMember em = name_to_member [name] as EnumMember;
+                       em.DefineMember (TypeBuilder);
+
+                       bool fail;
+                       default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
+                       if (fail){
+                               Error_ConstantValueCannotBeConverted (c, loc);
                                return null;
                        }
 
-                       fb.SetConstant (default_value);
-                       field_builders.Add (fb);
+                       em.builder.SetConstant (default_value);
+                       field_builders.Add (em.builder);
                        member_to_value [name] = default_value;
 
-                       if (!TypeManager.RegisterField (fb, default_value))
+                       if (!TypeManager.RegisterFieldValue (em.builder, default_value))
                                return null;
-                       
+
                        return default_value;
                }
+
+               public override bool DefineMembers (TypeContainer parent)
+               {
+                       return true;
+               }
                
-               public void Populate (TypeContainer tc)
+               public override bool Define (TypeContainer parent)
                {
                        //
                        // If there was an error during DefineEnum, return
                        //
-                       if (EnumBuilder == null)
-                               return;
-                       
-                       EmitContext ec = new EmitContext (tc, Location, null, UnderlyingType, ModFlags);
+                       if (TypeBuilder == null)
+                               return false;
+
+                       EmitContext ec = new EmitContext (this, this, Location, null,
+                                                         UnderlyingType, ModFlags, false);
+
                        
                        object default_value = 0;
                        
-                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
-                                            | FieldAttributes.Literal;
-
-                       
+               
                        foreach (string name in ordered_enums) {
-
-                               Expression val;
-
                                //
                                // Have we already been defined, thanks to some cross-referencing ?
                                // 
                                if (member_to_value.Contains (name))
                                        continue;
                                
-                               Location loc = (Location) member_to_location [name];
+                               Location loc = (Mono.CSharp.Location) member_to_location [name];
 
                                if (this [name] != null) {
                                        default_value = LookupEnumValue (ec, name, loc);
 
                                        if (default_value == null)
-                                               return;
-
+                                               return true;
                                } else {
-                                       
-                                       FieldBuilder fb = EnumBuilder.DefineField (name, UnderlyingType, attr);
+                                       if (name == "value__"){
+                                               Report.Error (76, loc, "The name `value__' is reserved for enumerations");
+                                               return false;
+                                       }
+
+                                       EnumMember em = name_to_member [name] as EnumMember;
+
+                                       em.DefineMember (TypeBuilder);
+                                       FieldBuilder fb = em.builder;
                                        
                                        if (default_value == null) {
                                           Report.Error (543, loc, "Enumerator value for '" + name + "' is too large to " +
                                                              "fit in its type");
-                                               return;
+                                               return false;
                                        }
-                                       
-                                       try {
-                                               default_value = Convert.ChangeType (default_value, UnderlyingType);
-                                       } catch {
-                                               error31 (default_value, loc);
-                                               return;
+
+                                       bool fail;
+                                       default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
+                                       if (fail){
+                                               Error_ConstantValueCannotBeConverted (default_value, loc);
+                                               return false;
                                        }
 
-                                       val = Expression.Literalize (default_value, UnderlyingType);
-                                       
                                        fb.SetConstant (default_value);
                                        field_builders.Add (fb);
                                        member_to_value [name] = default_value;
                                        
-                                       if (!TypeManager.RegisterField (fb, default_value))
-                                               return;
+                                       if (!TypeManager.RegisterFieldValue (fb, default_value))
+                                               return false;
                                }
 
                                default_value = GetNextDefaultValue (default_value);
                        }
-                       
-                       if (OptAttributes == null)
-                               return;
-                       
-                       if (OptAttributes.AttributeSections == null)
-                               return;
-                       
-                       foreach (AttributeSection asec in OptAttributes.AttributeSections) {
-                               if (asec.Attributes == null)
-                                       continue;
-                               
-                               foreach (Attribute a in asec.Attributes) {
-                                       CustomAttributeBuilder cb = a.Resolve (ec);
+                       return true;
+               }
 
-                                       if (cb == null)
+               public override void Emit (TypeContainer tc)
+               {
+                       EmitContext ec = new EmitContext (tc, this, Location, null, null, ModFlags, false);
+
+                       if (OptAttributes != null) {
+                               OptAttributes.Emit (ec, this);
+                       }
+
+                       foreach (EnumMember em in name_to_member.Values) {
+                               em.Emit (ec);
+                       }
+
+                       base.Emit (tc);
+               }
+               
+               protected override bool IsIdentifierClsCompliant (DeclSpace ds)
+               {
+                       if (!base.IsIdentifierClsCompliant (ds))
+                               return false;
+
+                       for (int i = 1; i < ordered_enums.Count; ++i) {
+                               string checked_name = ordered_enums [i] as string;
+                               for (int ii = 0; ii < ordered_enums.Count; ++ii) {
+                                       if (ii == i)
                                                continue;
-                                       
-                                       EnumBuilder.SetCustomAttribute (cb);
+
+                                       string enumerator_name = ordered_enums [ii] as string;
+                                       if (String.Compare (checked_name, enumerator_name, true, CultureInfo.InvariantCulture) == 0) {
+                                               Report.SymbolRelatedToPreviousError ((Location)member_to_location [enumerator_name], enumerator_name);
+                                               Report.Error_T (3005, (Location)member_to_location [checked_name], GetEnumeratorName (checked_name));
+                                               break;
+                                       }
                                }
                        }
+                       return true;
+               }
+
+               protected override bool VerifyClsCompliance (DeclSpace ds)
+               {
+                       if (!base.VerifyClsCompliance (ds))
+                               return false;
+
+                       if (!AttributeTester.IsClsCompliant (UnderlyingType)) {
+                               Report.Error_T (3009, Location, GetSignatureForError (), TypeManager.CSharpName (UnderlyingType));
+                       }
+
+                       return true;
                }
                
+               /// <summary>
+               /// Returns full enum name.
+               /// </summary>
+               string GetEnumeratorName (string valueName)
+               {
+                       return String.Concat (Name, ".", valueName);
+               }
+
                //
-               // Hack around System.Reflection as found everywhere else
+               // IMemberFinder
                //
-               public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, MemberFilter filter, object criteria)
+               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){
+                                       if (member_to_value [criteria] == null && current_ec != null){
+                                               LookupEnumValue (current_ec, (string) criteria, Location.Null);
+                                       }
+                               }
+                               
                                foreach (FieldBuilder fb in field_builders)
                                        if (filter (fb, criteria) == true)
                                                members.Add (fb);
                        }
 
-                       int count = members.Count;
+                       return new MemberList (members);
+               }
 
-                       if (count > 0) {
-                               MemberInfo [] mi = new MemberInfo [count];
-                               members.CopyTo (mi, 0);
-                               return mi;
+               public override MemberCache MemberCache {
+                       get {
+                               return null;
                        }
-
-                       return null;
                }
 
-               public void CloseEnum ()
-               {
-                       EnumBuilder.CreateType ();
-               }
-               
                public ArrayList ValueNames {
                        get {
                                return ordered_enums;
                        }
                }
 
-               public int ModFlags {
-                       get {
-                               return mod_flags;
-                       }
-               }
-               
                // indexer
                public Expression this [string name] {
                        get {
                                return (Expression) defined_names [name];
                        }
                }
+
+               public override AttributeTargets AttributeTargets {
+                       get {
+                               return AttributeTargets.Enum;
+                       }
+               }
+
+               protected override void VerifyObsoleteAttribute()
+               {
+                       // UnderlyingType is never obsolete
+               }
+
+               /// <summary>
+               /// Returns ObsoleteAttribute for both enum type and enum member
+               /// </summary>
+               public ObsoleteAttribute GetObsoleteAttribute (EmitContext ec, string identifier)
+               {
+                       if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
+                               return null;
+                       }
+
+                       ObsoleteAttribute oa = GetObsoleteAttribute (ec.DeclSpace);
+                       if (oa != null)
+                               return oa;
+
+                       EnumMember em = (EnumMember)name_to_member [identifier];
+                       oa = em.GetObsoleteAttribute (ec);
+
+                       if (oa == null)
+                               return null;
+
+                       caching_flags |= Flags.Obsolete;
+                       return oa;
+               }
        }
 }