/// <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
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
ec, delegate_type, "Invoke", loc);\r
\r
if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, loc, "Internal error : could not find Invoke method!");\r
+ Report.Error (-100, loc, "Internal error: could not find Invoke method!");\r
return null;\r
}\r
\r
for (int i = pd_count; i > 0; ) {\r
i--;\r
\r
- if (invoke_pd.ParameterType (i) == pd.ParameterType (i))\r
+ if (invoke_pd.ParameterType (i) == pd.ParameterType (i) &&\r
+ invoke_pd.ParameterModifier (i) == pd.ParameterModifier (i))\r
continue;\r
else\r
return null;\r
\r
Expression ml = Expression.MemberLookup (\r
ec, delegate_type, "Invoke", loc);\r
- \r
+\r
if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, loc, "Internal error : could not find Invoke method!");\r
+ Report.Error (-100, loc, "Internal error: could not find Invoke method!" + delegate_type);\r
return false;\r
}\r
\r
\r
int pd_count = pd.Count;\r
\r
- bool not_params_method = (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS);\r
+ bool not_params_method = (pd_count == 0) ||\r
+ (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS);\r
\r
if (not_params_method && pd_count != arg_count) {\r
Report.Error (1593, loc,\r
ec, delegate_type, "Invoke", loc);\r
\r
if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, loc, "Internal error : could not find Invoke method!");\r
+ Report.Error (-100, loc, "Internal error: could not find Invoke method!");\r
return false;\r
}\r
\r
ec, delegate_type, "Invoke", loc);\r
\r
if (!(probe_ml is MethodGroupExpr)) {\r
- Report.Error (-100, loc, "Internal error : could not find Invoke method!");\r
+ Report.Error (-100, loc, "Internal error: could not find Invoke method!");\r
return false;\r
}\r
\r
\r
for (int i = length; i > 0; ) {\r
i--;\r
- \r
- sb.Append (TypeManager.CSharpName (pd.ParameterType (length - i - 1)));\r
+\r
+ sb.Append (pd.ParameterDesc (length - i - 1));\r
if (i != 0)\r
sb.Append (", ");\r
}\r
}\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
\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
ec, type, ".ctor", loc);\r
\r
if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, loc, "Internal error : Could not find delegate constructor!");\r
+ Report.Error (-100, loc, "Internal error: Could not find delegate constructor!");\r
return null;\r
}\r
\r
Expression.AllBindingFlags, loc);\r
\r
if (invoke_method == null) {\r
- Report.Error (-200, loc, "Internal error ! COuld not find Invoke method!");\r
+ Report.Error (-200, loc, "Internal error ! Could not find Invoke method!");\r
return null;\r
}\r
\r
\r
return null;\r
}\r
+\r
+ //\r
+ // Check safe/unsafe of the delegate\r
+ //\r
+ if (!ec.InUnsafe){\r
+ ParameterData param = Invocation.GetParameterData (delegate_method);\r
+ int count = param.Count;\r
+ \r
+ for (int i = 0; i < count; i++){\r
+ if (param.ParameterType (i).IsPointer){\r
+ Expression.UnsafeError (loc);\r
+ return null;\r
+ }\r
+ }\r
+ }\r
\r
if (mg.InstanceExpression != null)\r
delegate_instance_expr = mg.InstanceExpression.Resolve (ec);\r
}\r
\r
delegate_instance_expr = e;\r
- delegate_method = ((MethodGroupExpr) invoke_method).Methods [0];\r
+ delegate_method = ((MethodGroupExpr) invoke_method).Methods [0];\r
\r
eclass = ExprClass.Value;\r
return this;\r
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
\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
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
- Report.Error (-100, loc, "Internal error : could not find Invoke method!");\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
projects / mono.git / blobdiff