X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fgmcs%2Fenum.cs;h=1858d4c37273093625aaf6bb08064b318670b8fd;hb=267ee5eab7c01df351de440def17b05340f9a239;hp=a9974b1ba9d4614f7f0fc816d53657237cba7530;hpb=15bd385f953e7c63f1c450b3e97d14387ee4206c;p=mono.git
diff --git a/mcs/gmcs/enum.cs b/mcs/gmcs/enum.cs
old mode 100755
new mode 100644
index a9974b1ba9d..1858d4c3727
--- a/mcs/gmcs/enum.cs
+++ b/mcs/gmcs/enum.cs
@@ -3,6 +3,7 @@
//
// Author: Miguel de Icaza (miguel@gnu.org)
// Ravi Pratap (ravi@ximian.com)
+// Marek Safar (marek.safar@seznam.cz)
//
// Licensed under the terms of the GNU GPL
//
@@ -11,37 +12,50 @@
using System;
using System.Collections;
+using System.Collections.Specialized;
using System.Reflection;
using System.Reflection.Emit;
using System.Globalization;
namespace Mono.CSharp {
- class EnumMember: MemberCore {
+ public class EnumMember : MemberCore, IConstant {
static string[] attribute_targets = new string [] { "field" };
- 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), attrs, loc)
+ readonly Enum parent_enum;
+ readonly Expression ValueExpr;
+ readonly EnumMember prev_member;
+
+ Constant value;
+ bool in_transit;
+
+ // TODO: remove or simplify
+ EmitContext ec;
+
+ public EnumMember (Enum parent_enum, EnumMember prev_member, Expression expr,
+ MemberName name, Attributes attrs):
+ base (parent_enum, name, attrs)
{
this.parent_enum = parent_enum;
this.ModFlags = parent_enum.ModFlags;
- this.Type = expr;
+ this.ValueExpr = expr;
+ this.prev_member = prev_member;
+
+ ec = new EmitContext (parent_enum, parent_enum, Location, null, null, ModFlags, false);
+ ec.InEnumContext = true;
}
- public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
+ public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
if (a.Type == TypeManager.marshal_as_attr_type) {
UnmanagedMarshal marshal = a.GetMarshal (this);
if (marshal != null) {
builder.SetMarshal (marshal);
}
- return;
- }
+ return;
+ }
if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
a.Error_InvalidSecurityParent ();
@@ -57,30 +71,113 @@ namespace Mono.CSharp {
}
}
- public void DefineMember (TypeBuilder tb)
+ bool IsValidEnumType (Type t)
{
- FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
- | FieldAttributes.Literal;
-
+ 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 ()
+ {
+ const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
+ TypeBuilder tb = parent_enum.TypeBuilder;
builder = tb.DefineField (Name, tb, attr);
+ ec.ContainerType = tb;
+
+ TypeManager.RegisterConstant (builder, this);
+ return true;
}
- public override bool Define ()
+ // Because parent is TypeContainer and we have DeclSpace only
+ public override void CheckObsoleteness (Location loc)
{
- throw new NotImplementedException ();
+ parent_enum.CheckObsoleteness (loc);
+
+ ObsoleteAttribute oa = GetObsoleteAttribute ();
+ if (oa == null) {
+ return;
+ }
+
+ AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+ }
+
+ public bool ResolveValue ()
+ {
+ if (value != null)
+ return true;
+
+ if (in_transit) {
+ // suppress cyclic errors
+ value = new EnumConstant (New.Constantify (parent_enum.UnderlyingType), parent_enum.TypeBuilder);
+ Const.Error_CyclicDeclaration (this);
+ return false;
+ }
+
+ if (ValueExpr != null) {
+ in_transit = true;
+ Constant c = ValueExpr.ResolveAsConstant (ec, this);
+ in_transit = false;
+
+ if (c == null)
+ return false;
+
+ if (c is EnumConstant)
+ c = ((EnumConstant)c).Child;
+
+ c = c.ToType (parent_enum.UnderlyingType, Location);
+ if (c == null)
+ return false;
+
+ if (!IsValidEnumType (c.Type)) {
+ Report.Error (1008, Location, "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
+ return false;
+ }
+
+ in_transit = false;
+ value = new EnumConstant (c, parent_enum.TypeBuilder);
+ return true;
+ }
+
+ if (prev_member == null) {
+ value = new EnumConstant (New.Constantify (parent_enum.UnderlyingType), parent_enum.TypeBuilder);
+ return true;
+ }
+
+ if (!prev_member.ResolveValue ())
+ return false;
+
+ in_transit = true;
+
+ try {
+ value = prev_member.value.Increment ();
+ }
+ catch (OverflowException) {
+ Report.Error (543, Location, "The enumerator value `{0}' is too large to fit in its type `{1}'",
+ GetSignatureForError (), TypeManager.CSharpName (parent_enum.UnderlyingType));
+ return false;
+ }
+ in_transit = false;
+
+ return true;
}
- public void Emit (EmitContext ec)
+ public override void Emit ()
{
if (OptAttributes != null)
- OptAttributes.Emit (ec, this);
+ OptAttributes.Emit ();
- Emit ();
+ if (!ResolveValue ())
+ return;
+
+ builder.SetConstant (value.GetValue ());
+ base.Emit ();
}
public override string GetSignatureForError()
{
- return String.Concat (parent_enum.GetSignatureForError (), '.', base.GetSignatureForError ());
+ return String.Concat (parent_enum.GetSignatureForError (), '.', Name);
}
public override string[] ValidAttributeTargets {
@@ -96,35 +193,29 @@ namespace Mono.CSharp {
return base.VerifyClsCompliance (parent_enum);
}
- // There is no base type
- protected override void VerifyObsoleteAttribute()
- {
+ public override string DocCommentHeader {
+ get { return "F:"; }
}
+
+ #region IConstant Members
+
+ public Constant Value {
+ get {
+ return value;
+ }
+ }
+
+ #endregion
}
///
/// Enumeration container
///
public class Enum : DeclSpace {
- ArrayList ordered_enums;
-
- public Expression BaseType;
-
+ 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;
+ static MemberList no_list = new MemberList (new object[0]);
public const int AllowedModifiers =
Modifiers.NEW |
@@ -134,71 +225,23 @@ namespace Mono.CSharp {
Modifiers.PRIVATE;
public Enum (NamespaceEntry ns, TypeContainer parent, Expression type,
- int mod_flags, MemberName name, Attributes attrs, Location l)
- : base (ns, parent, name, attrs, l)
+ int mod_flags, MemberName name, Attributes attrs)
+ : base (ns, parent, name, attrs)
{
this.BaseType = type;
ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
- IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, l);
-
- ordered_enums = new ArrayList ();
- member_to_location = new Hashtable ();
- member_to_value = new Hashtable ();
- in_transit = new Hashtable ();
- field_builders = new ArrayList ();
+ IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, name.Location);
}
- ///
- /// Adds @name to the enumeration space, with @expr
- /// being its definition.
- ///
- public void AddEnumMember (string name, Expression expr, Location loc, Attributes opt_attrs)
+ public void AddEnumMember (EnumMember em)
{
- if (name == "value__") {
- Report.Error (76, loc, "An item in an enumeration can't have an identifier `value__'");
+ if (em.Name == "value__") {
+ Report.Error (76, em.Location, "An item in an enumeration cannot have an identifier `value__'");
return;
}
- EnumMember em = new EnumMember (this, expr, name, loc, opt_attrs);
- if (!AddToContainer (em, false, name, ""))
+ if (!AddToContainer (em, em.Name))
return;
-
-
- // TODO: can be almost deleted
- ordered_enums.Add (name);
- member_to_location.Add (name, loc);
- }
-
- //
- // 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 ()
@@ -206,24 +249,17 @@ namespace Mono.CSharp {
if (TypeBuilder != null)
return TypeBuilder;
- TypeAttributes attr = Modifiers.TypeAttr (ModFlags, IsTopLevel);
-
- ec = new EmitContext (this, this, Location, null, null, ModFlags, false);
-
- 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);
+ "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
return null;
}
- TypeExpr texpr = ResolveTypeExpr (BaseType, Location);
- if (texpr == null)
+ TypeExpr ute = ResolveBaseTypeExpr (BaseType, false, Location);
+ if (ute == null)
return null;
- UnderlyingType = texpr.Type;
+ UnderlyingType = ute.Type;
if (UnderlyingType != TypeManager.int32_type &&
UnderlyingType != TypeManager.uint32_type &&
@@ -234,9 +270,7 @@ namespace Mono.CSharp {
UnderlyingType != TypeManager.byte_type &&
UnderlyingType != TypeManager.sbyte_type) {
Report.Error (1008, Location,
- "Type byte, sbyte, short, ushort, int, uint, " +
- "long, or ulong expected (got: " +
- TypeManager.CSharpName (UnderlyingType) + ")");
+ "Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
return null;
}
@@ -246,12 +280,12 @@ namespace Mono.CSharp {
ModuleBuilder builder = CodeGen.Module.Builder;
- TypeBuilder = builder.DefineType (Name, attr, TypeManager.enum_type);
+ TypeBuilder = builder.DefineType (Name, TypeAttr, TypeManager.enum_type);
} else {
TypeBuilder builder = Parent.TypeBuilder;
TypeBuilder = builder.DefineNestedType (
- Basename, attr, TypeManager.enum_type);
+ Basename, TypeAttr, TypeManager.enum_type);
}
//
@@ -261,454 +295,67 @@ namespace Mono.CSharp {
FieldAttributes.Public | FieldAttributes.SpecialName
| FieldAttributes.RTSpecialName);
- TypeManager.AddEnumType (Name, TypeBuilder, 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)
- {
- 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;
+ TypeManager.AddUserType (this);
- 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
+ foreach (EnumMember em in defined_names.Values) {
+ if (!em.Define ())
return null;
}
- return null;
+ return TypeBuilder;
}
-
- void Error_ConstantValueCannotBeConverted (object val, Location loc)
+
+ public override bool Define ()
{
- if (val is Constant)
- Report.Error (31, loc, "Constant value '" + ((Constant) val).AsString () +
- "' cannot be converted" +
- " to a " + TypeManager.CSharpName (UnderlyingType));
- else
- Report.Error (31, loc, "Constant value '" + val +
- "' cannot be converted" +
- " to a " + TypeManager.CSharpName (UnderlyingType));
- return;
+ return true;
}
- ///
- /// Determines if a standard implicit conversion exists from
- /// expr_type to target_type
- ///
- public static bool ImplicitConversionExists (Type expr_type, Type target_type)
+ public override void Emit ()
{
- expr_type = TypeManager.TypeToCoreType (expr_type);
+ if (OptAttributes != null) {
+ OptAttributes.Emit ();
+ }
- if (expr_type == TypeManager.void_type)
- return false;
-
- if (expr_type == target_type)
- return true;
+ foreach (EnumMember em in defined_names.Values) {
+ em.Emit ();
+ }
- // 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;
+ base.Emit ();
}
//
- // 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
+ // IMemberFinder
//
- static EmitContext current_ec = null;
-
- ///
- /// 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
- ///
- public object LookupEnumValue (EmitContext ec, string name, Location loc)
+ public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+ MemberFilter filter, object criteria)
{
-
- 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
- //
- 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);
-
- 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;
-
- in_transit.Remove (name);
- ec.InEnumContext = old;
-
- if (val == null)
- return null;
-
- 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 ((mt & MemberTypes.Field) == 0)
+ return no_list;
- 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){
- Error_ConstantValueCannotBeConverted (c, loc);
- return null;
- }
+ EnumMember em = defined_names [criteria] as EnumMember;
+ if (em == null)
+ return no_list;
- 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;
-
- return default_value;
- }
-
- public override bool DefineMembers (TypeContainer parent)
- {
- return true;
+ FieldBuilder[] fb = new FieldBuilder[] { em.builder };
+ return new MemberList (fb);
}
-
- public override bool Define ()
- {
- //
- // If there was an error during DefineEnum, return
- //
- if (TypeBuilder == null)
- return false;
- ec = new EmitContext (this, this, Location, null, UnderlyingType, ModFlags, false);
-
- 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))
+ void VerifyClsName ()
+ {
+ HybridDictionary dict = new HybridDictionary (defined_names.Count, true);
+ foreach (EnumMember em in defined_names.Values) {
+ if (!em.IsClsComplianceRequired ())
continue;
-
- Location loc = (Mono.CSharp.Location) member_to_location [name];
- if (this [name] != null) {
- default_value = LookupEnumValue (ec, name, loc);
-
- if (default_value == null)
- return true;
- } else {
- if (name == "value__"){
- Report.Error (76, loc, "The name `value__' is reserved for enumerations");
- return false;
- }
-
- EnumMember em = (EnumMember) defined_names [name];
-
- 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 false;
- }
-
- bool fail;
- default_value = TypeManager.ChangeType (default_value, UnderlyingType, out fail);
- if (fail){
- Error_ConstantValueCannotBeConverted (default_value, loc);
- return false;
- }
-
- fb.SetConstant (default_value);
- field_builders.Add (fb);
- member_to_value [name] = default_value;
-
- if (!TypeManager.RegisterFieldValue (fb, default_value))
- return false;
+ try {
+ dict.Add (em.Name, em);
+ }
+ catch (ArgumentException) {
+ Report.SymbolRelatedToPreviousError (em);
+ MemberCore col = (MemberCore)dict [em.Name];
+ Report.Warning (3005, 1, col.Location, "Identifier `{0}' differing only in case is not CLS-compliant", col.GetSignatureForError ());
}
-
- default_value = GetNextDefaultValue (default_value);
- }
-
- return true;
- }
-
- public override void Emit ()
- {
- if (OptAttributes != null) {
- OptAttributes.Emit (ec, this);
- }
-
- foreach (EnumMember em in defined_names.Values) {
- em.Emit (ec);
}
-
- base.Emit ();
- }
-
- void VerifyClsName ()
- {
- Hashtable ht = new Hashtable ();
- foreach (string name in ordered_enums) {
- string locase = name.ToLower (System.Globalization.CultureInfo.InvariantCulture);
- if (!ht.Contains (locase)) {
- ht.Add (locase, defined_names [name]);
- continue;
- }
-
- MemberCore conflict = (MemberCore)ht [locase];
- Report.SymbolRelatedToPreviousError (conflict);
- conflict = GetDefinition (name);
- Report.Error (3005, conflict.Location, "Identifier '{0}' differing only in case is not CLS-compliant", conflict.GetSignatureForError ());
- }
}
protected override bool VerifyClsCompliance (DeclSpace ds)
@@ -718,43 +365,15 @@ namespace Mono.CSharp {
VerifyClsName ();
- if (!AttributeTester.IsClsCompliant (UnderlyingType)) {
- Report.Error (3009, Location, "'{0}': base type '{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (UnderlyingType));
+ 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));
}
return true;
}
-
- ///
- /// Returns full enum name.
- ///
- string GetEnumeratorName (string valueName)
- {
- return String.Concat (Name, ".", valueName);
- }
-
- //
- // 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){
- 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);
- }
-
- return new MemberList (members);
- }
+
public override MemberCache MemberCache {
get {
@@ -762,28 +381,38 @@ namespace Mono.CSharp {
}
}
- public ArrayList ValueNames {
+ public override AttributeTargets AttributeTargets {
get {
- return ordered_enums;
+ return AttributeTargets.Enum;
}
}
- // indexer
- public Expression this [string name] {
+ protected override TypeAttributes TypeAttr {
get {
- return ((EnumMember) defined_names [name]).Type;
+ return Modifiers.TypeAttr (ModFlags, IsTopLevel) |
+ TypeAttributes.Class | TypeAttributes.Sealed |
+ base.TypeAttr;
}
}
- public override AttributeTargets AttributeTargets {
- get {
- return AttributeTargets.Enum;
+ //
+ // Generates xml doc comments (if any), and if required,
+ // handle warning report.
+ //
+ internal override void GenerateDocComment (DeclSpace ds)
+ {
+ base.GenerateDocComment (ds);
+
+ foreach (EnumMember em in defined_names.Values) {
+ em.GenerateDocComment (this);
}
}
- protected override void VerifyObsoleteAttribute()
- {
- // UnderlyingType is never obsolete
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { return "T:"; }
}
}
}