A type parameter can never be optional.
[mono.git] / mcs / gmcs / enum.cs
index cb6a8649cc73b20c8c510693a9b7b616101f9347..6c4eb38fcc6c8c1b2c5a09ab565f022851ce8789 100755 (executable)
@@ -13,9 +13,92 @@ 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>
@@ -41,6 +124,9 @@ namespace Mono.CSharp {
                
                ArrayList field_builders;
                
+
+               Hashtable name_to_member;
+               
                public const int AllowedModifiers =
                        Modifiers.NEW |
                        Modifiers.PUBLIC |
@@ -61,6 +147,8 @@ namespace Mono.CSharp {
                        member_to_value = new Hashtable ();
                        in_transit = new Hashtable ();
                        field_builders = new ArrayList ();
+
+                       name_to_member = new Hashtable ();
                }
 
                /// <summary>
@@ -88,12 +176,9 @@ namespace Mono.CSharp {
 
                        member_to_attributes.Add (name, opt_attrs);
                        
-                       return AdditionResult.Success;
-               }
+                       name_to_member.Add (name, new EnumMember (name, this, loc, opt_attrs));
 
-               public override void ApplyAttributeBuilder (object builder, Attribute a, CustomAttributeBuilder cb)
-               {
-                       ((TypeBuilder) builder).SetCustomAttribute (cb);
+                       return AdditionResult.Success;
                }
 
                //
@@ -137,6 +222,13 @@ namespace Mono.CSharp {
 
                        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 &&
@@ -505,10 +597,8 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
-                                       | FieldAttributes.Literal;
-                       
-                       FieldBuilder fb = TypeBuilder.DefineField (name, TypeBuilder, attr);
+                       EnumMember em = name_to_member [name] as EnumMember;
+                       em.DefineMember (TypeBuilder);
 
                        bool fail;
                        default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
@@ -517,18 +607,13 @@ namespace Mono.CSharp {
                                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.RegisterFieldValue (fb, default_value))
+                       if (!TypeManager.RegisterFieldValue (em.builder, default_value))
                                return null;
 
-                       //
-                       // Now apply attributes
-                       //
-                       Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name]); 
-                       
                        return default_value;
                }
 
@@ -551,9 +636,6 @@ namespace Mono.CSharp {
                        
                        object default_value = 0;
                        
-                       FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
-                                            | FieldAttributes.Literal;
-
                        
                        foreach (string name in ordered_enums) {
                                //
@@ -575,8 +657,10 @@ namespace Mono.CSharp {
                                                return false;
                                        }
 
-                                       FieldBuilder fb = TypeBuilder.DefineField (
-                                               name, TypeBuilder, attr);
+                                       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 " +
@@ -597,11 +681,6 @@ namespace Mono.CSharp {
                                        
                                        if (!TypeManager.RegisterFieldValue (fb, default_value))
                                                return false;
-
-                                       //
-                                       // Apply attributes on the enum member
-                                       //
-                                       Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name]);
                                }
 
                                default_value = GetNextDefaultValue (default_value);
@@ -611,9 +690,14 @@ namespace Mono.CSharp {
                        
                public override void Emit (TypeContainer tc)
                {
-                       if (OptAttributes != null) {
                                EmitContext ec = new EmitContext (tc, this, Location, null, null, ModFlags, false);
-                       Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes);
+
+                       if (OptAttributes != null) {
+                               OptAttributes.Emit (ec, this);
+                       }
+
+                       foreach (EnumMember em in name_to_member.Values) {
+                               em.Emit (ec);
                        }
 
                        base.Emit (tc);
@@ -631,7 +715,7 @@ namespace Mono.CSharp {
                                                continue;
 
                                        string enumerator_name = ordered_enums [ii] as string;
-                                       if (String.Compare (checked_name, enumerator_name, true) == 0) {
+                                       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;
@@ -702,5 +786,39 @@ namespace Mono.CSharp {
                                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;
+               }
        }
 }