X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fdelegate.cs;h=4a58e671d5ee4680b89ed8b6fe982edbbfd80f0b;hb=e9e273a33bb56653d40b19455396c382a7da3e2b;hp=53aedbe83b17ce6410757c3c162be9d29b8857b0;hpb=e0c104ea3992d4720761f2eb1828ac2feee63ecf;p=mono.git

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