2002-09-19 Martin Baulig <martin@gnome.org>

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

diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
index 53aedbe83b17ce6410757c3c162be9d29b8857b0..4a58e671d5ee4680b89ed8b6fe982edbbfd80f0b 100644 (file)
--- a/mcs/mcs/delegate.cs
+++ b/mcs/mcs/delegate.cs
@@ -20,7 +20,7 @@ namespace Mono.CSharp {
        /// <summary>\r
        ///   Holds Delegates\r
        /// </summary>\r
-       public class Delegate : DeclSpace, IMemberFinder {\r
+       public class Delegate : DeclSpace {\r
                public Expression ReturnType;\r
                public Parameters      Parameters;\r
                public Attributes      OptAttributes;\r
@@ -85,6 +85,11 @@ namespace Mono.CSharp {
                        return TypeBuilder;\r
                }\r
 \r
+               public override bool DefineMembers (TypeContainer container)\r
+               {\r
+                       return true;\r
+               }\r
+\r
                public override bool Define (TypeContainer container)\r
                {\r
                        MethodAttributes mattr;\r
@@ -452,7 +457,8 @@ namespace Mono.CSharp {
                }\r
                \r
                // Hack around System.Reflection as found everywhere else\r
-               public MemberList FindMembers (MemberTypes mt, BindingFlags bf, MemberFilter filter, object criteria)\r
+               public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,\r
+                                                       MemberFilter filter, object criteria)\r
                {\r
                        ArrayList members = new ArrayList ();\r
 \r
@@ -476,12 +482,13 @@ namespace Mono.CSharp {
 \r
                        return new MemberList (members);\r
                }\r
-               \r
-               public void CloseDelegate ()\r
-               {\r
-                       TypeBuilder.CreateType ();\r
+\r
+               public override MemberCache MemberCache {\r
+                       get {\r
+                               return null;\r
+                       }\r
                }\r
-               \r
+\r
                public Expression InstanceExpression {\r
                        get {\r
                                return instance_expr;\r
@@ -644,7 +651,11 @@ namespace Mono.CSharp {
                        else\r
                                delegate_instance_expr.Emit (ec);\r
                        \r
-                       ec.ig.Emit (OpCodes.Ldftn, (MethodInfo) delegate_method);\r
+                       if (delegate_method.IsVirtual) {\r
+                               ec.ig.Emit (OpCodes.Dup);\r
+                               ec.ig.Emit (OpCodes.Ldvirtftn, (MethodInfo) delegate_method);\r
+                       } else\r
+                               ec.ig.Emit (OpCodes.Ldftn, (MethodInfo) delegate_method);\r
                        ec.ig.Emit (OpCodes.Newobj, (ConstructorInfo) constructor_method);\r
                }\r
        }\r
@@ -665,6 +676,31 @@ namespace Mono.CSharp {
 \r
                public override Expression DoResolve (EmitContext ec)\r
                {\r
+                       if (InstanceExpr is EventExpr) {\r
+                               \r
+                               EventInfo ei = ((EventExpr) InstanceExpr).EventInfo;\r
+                               \r
+                               Expression ml = MemberLookup (\r
+                                       ec, ec.ContainerType, ei.Name,\r
+                                       MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);\r
+\r
+                               if (ml == null) {\r
+                                       //\r
+                                       // If this is the case, then the Event does not belong \r
+                                       // to this Type and so, according to the spec\r
+                                       // cannot be accessed directly\r
+                                       //\r
+                                       // Note that target will not appear as an EventExpr\r
+                                       // in the case it is being referenced within the same type container;\r
+                                       // it will appear as a FieldExpr in that case.\r
+                                       //\r
+                                       \r
+                                       Assign.error70 (ei, loc);\r
+                                       return null;\r
+                               }\r
+                       }\r
+                       \r
+                       \r
                        Type del_type = InstanceExpr.Type;\r
                        if (del_type == null)\r
                                return null;\r
@@ -679,13 +715,13 @@ namespace Mono.CSharp {
                        if (!Delegate.VerifyApplicability (ec, del_type, Arguments, loc))\r
                                return null;\r
 \r
-                       Expression ml = Expression.MemberLookup (ec, del_type, "Invoke", loc);\r
-                       if (!(ml is MethodGroupExpr)) {\r
+                       Expression lookup = Expression.MemberLookup (ec, del_type, "Invoke", loc);\r
+                       if (!(lookup is MethodGroupExpr)) {\r
                                Report.Error (-100, loc, "Internal error : could not find Invoke method!");\r
                                return null;\r
                        }\r
                        \r
-                       method = ((MethodGroupExpr) ml).Methods [0];\r
+                       method = ((MethodGroupExpr) lookup).Methods [0];\r
                        type = ((MethodInfo) method).ReturnType;\r
                        eclass = ExprClass.Value;\r
                        \r