X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fdelegate.cs;h=e78c6e1dbfdb9a4083874c889ae4c35083d00b7b;hb=2b808a73a435ae7c50a5edbd98eb12ba96fef4b5;hp=53aedbe83b17ce6410757c3c162be9d29b8857b0;hpb=e0c104ea3992d4720761f2eb1828ac2feee63ecf;p=mono.git diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs index 53aedbe83b1..e78c6e1dbfd 100644 --- a/mcs/mcs/delegate.cs +++ b/mcs/mcs/delegate.cs @@ -20,7 +20,7 @@ namespace Mono.CSharp { /// /// Holds Delegates /// - 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; @@ -316,7 +321,7 @@ namespace Mono.CSharp { ec, delegate_type, "Invoke", loc); if (!(ml is MethodGroupExpr)) { - Report.Error (-100, loc, "Internal error : could not find Invoke method!"); + Report.Error (-100, loc, "Internal error: could not find Invoke method!"); return null; } @@ -330,7 +335,8 @@ namespace Mono.CSharp { for (int i = pd_count; i > 0; ) { i--; - if (invoke_pd.ParameterType (i) == pd.ParameterType (i)) + if (invoke_pd.ParameterType (i) == pd.ParameterType (i) && + invoke_pd.ParameterModifier (i) == pd.ParameterModifier (i)) continue; else return null; @@ -360,9 +366,9 @@ namespace Mono.CSharp { Expression ml = Expression.MemberLookup ( ec, delegate_type, "Invoke", loc); - + if (!(ml is MethodGroupExpr)) { - Report.Error (-100, loc, "Internal error : could not find Invoke method!"); + Report.Error (-100, loc, "Internal error: could not find Invoke method!" + delegate_type); return false; } @@ -371,7 +377,8 @@ namespace Mono.CSharp { int pd_count = pd.Count; - bool not_params_method = (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS); + bool not_params_method = (pd_count == 0) || + (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS); if (not_params_method && pd_count != arg_count) { Report.Error (1593, loc, @@ -394,7 +401,7 @@ namespace Mono.CSharp { ec, delegate_type, "Invoke", loc); if (!(ml is MethodGroupExpr)) { - Report.Error (-100, loc, "Internal error : could not find Invoke method!"); + Report.Error (-100, loc, "Internal error: could not find Invoke method!"); return false; } @@ -405,7 +412,7 @@ namespace Mono.CSharp { ec, delegate_type, "Invoke", loc); if (!(probe_ml is MethodGroupExpr)) { - Report.Error (-100, loc, "Internal error : could not find Invoke method!"); + Report.Error (-100, loc, "Internal error: could not find Invoke method!"); return false; } @@ -440,8 +447,8 @@ namespace Mono.CSharp { for (int i = length; i > 0; ) { i--; - - sb.Append (TypeManager.CSharpName (pd.ParameterType (length - i - 1))); + + sb.Append (pd.ParameterDesc (length - i - 1)); if (i != 0) sb.Append (", "); } @@ -452,7 +459,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 +484,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; @@ -547,7 +556,7 @@ namespace Mono.CSharp { ec, type, ".ctor", loc); if (!(ml is MethodGroupExpr)) { - Report.Error (-100, loc, "Internal error : Could not find delegate constructor!"); + Report.Error (-100, loc, "Internal error: Could not find delegate constructor!"); return null; } @@ -564,7 +573,7 @@ namespace Mono.CSharp { Expression.AllBindingFlags, loc); if (invoke_method == null) { - Report.Error (-200, loc, "Internal error ! COuld not find Invoke method!"); + Report.Error (-200, loc, "Internal error ! Could not find Invoke method!"); return null; } @@ -594,6 +603,21 @@ namespace Mono.CSharp { return null; } + + // + // Check safe/unsafe of the delegate + // + if (!ec.InUnsafe){ + ParameterData param = Invocation.GetParameterData (delegate_method); + int count = param.Count; + + for (int i = 0; i < count; i++){ + if (param.ParameterType (i).IsPointer){ + Expression.UnsafeError (loc); + return null; + } + } + } if (mg.InstanceExpression != null) delegate_instance_expr = mg.InstanceExpression.Resolve (ec); @@ -630,7 +654,7 @@ namespace Mono.CSharp { } delegate_instance_expr = e; - delegate_method = ((MethodGroupExpr) invoke_method).Methods [0]; + delegate_method = ((MethodGroupExpr) invoke_method).Methods [0]; eclass = ExprClass.Value; return this; @@ -644,7 +668,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 +693,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 +732,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)) { - Report.Error (-100, loc, "Internal error : could not find Invoke method!"); + 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;