2005-12-23 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / mcs / class.cs

diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index 5a7ecf65f3814e6cd2be5f1f0e65260479a0ce83..4a723460b316d334c973294378151ef994f5aaa1 100644 (file)
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -1374,12 +1374,12 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Populates our TypeBuilder with fields and methods
                /// </summary>
-               public override bool DefineMembers (TypeContainer container)
+               public override bool DefineMembers ()
                {
                        if (members_defined)
                                return members_defined_ok;
 
-                       if (!base.DefineMembers (container))
+                       if (!base.DefineMembers ())
                                return false;
 
                        members_defined_ok = DoDefineMembers ();
@@ -1436,7 +1436,7 @@ namespace Mono.CSharp {
 
                        if (parts != null) {
                                foreach (ClassPart part in parts) {
-                                       if (!part.DefineMembers (this))
+                                       if (!part.DefineMembers ())
                                                return false;
                                }
                        }
@@ -1474,7 +1474,7 @@ namespace Mono.CSharp {
                                }
 
                                foreach (Iterator iterator in iterators) {
-                                       if (!iterator.DefineMembers (this))
+                                       if (!iterator.DefineMembers ())
                                                return false;
                                }
                        }
@@ -1545,7 +1545,7 @@ namespace Mono.CSharp {
                {
                        ArrayList members = new ArrayList ();
 
-                       DefineMembers (null);
+                       DefineMembers ();
 
                        if (methods != null) {
                                int len = methods.Count;
@@ -2452,6 +2452,15 @@ namespace Mono.CSharp {
                        return false;
                }
 
+               public virtual void Mark_HasEquals ()
+               {
+                       Methods.HasEquals = true;
+               }
+
+               public virtual void Mark_HasGetHashCode ()
+               {
+                       Methods.HasGetHashCode = true;
+               }
 
                //
                // IMemberContainer
@@ -2742,6 +2751,15 @@ namespace Mono.CSharp {
                        throw new InternalErrorException ("Should not get here");
                }
 
+               public override void Mark_HasEquals ()
+               {
+                       PartialContainer.Mark_HasEquals ();
+               }
+
+               public override void Mark_HasGetHashCode ()
+               {
+                       PartialContainer.Mark_HasGetHashCode ();
+               }
        }
 
        public abstract class ClassOrStruct : TypeContainer {
@@ -3221,12 +3239,10 @@ namespace Mono.CSharp {
                                        return false;
                                }
 
-                               if (RootContext.WarningLevel > 2) {
-                                       if (Name == "Equals" && Parameters.Count == 1 && ParameterTypes [0] == TypeManager.object_type)
-                                               Parent.Methods.HasEquals = true;
-                                       else if (Name == "GetHashCode" && Parameters.Empty)
-                                               Parent.Methods.HasGetHashCode = true;
-                               }
+                               if (Name == "Equals" && Parameters.Count == 1 && ParameterTypes [0] == TypeManager.object_type)
+                                       Parent.Mark_HasEquals ();
+                               else if (Name == "GetHashCode" && Parameters.Empty)
+                                       Parent.Mark_HasGetHashCode ();
 
                                if ((ModFlags & Modifiers.OVERRIDE) != 0) {
                                        ObsoleteAttribute oa = AttributeTester.GetMethodObsoleteAttribute (base_method);
@@ -4950,9 +4966,11 @@ namespace Mono.CSharp {
                //
                public string ShortName {
                        get { return MemberName.Name; }
-                       set {
-                               SetMemberName (new MemberName (MemberName.Left, value, Location));
-                       }
+                       set { SetMemberName (new MemberName (MemberName.Left, value, Location)); }
+               }
+
+               public new TypeContainer Parent {
+                       get { return (TypeContainer) base.Parent; }
                }
 
                //
@@ -6094,8 +6112,7 @@ namespace Mono.CSharp {
                                // Setup iterator if we are one
                                //
                                if (yields) {
-                                       Iterator iterator = new Iterator (this,
-                                               Parent, ModFlags);
+                                       Iterator iterator = new Iterator (this, Parent as TypeContainer, ModFlags);
                                        
                                        if (!iterator.DefineIterator ())
                                                return null;