/// Holds Delegates\r
/// </summary>\r
public class Delegate : DeclSpace {\r
- public readonly string ReturnType;\r
+ public Expression ReturnType;\r
public Parameters Parameters;\r
public Attributes OptAttributes;\r
\r
Modifiers.UNSAFE |\r
Modifiers.PRIVATE;\r
\r
- public Delegate (TypeContainer parent, string type, int mod_flags,\r
+ public Delegate (TypeContainer parent, Expression type, int mod_flags,\r
string name, Parameters param_list,\r
Attributes attrs, Location l)\r
: base (parent, name, l)\r
{\r
this.ReturnType = type;\r
- ModFlags = Modifiers.Check (AllowedModifiers, mod_flags, Modifiers.PUBLIC, l);\r
+ ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,\r
+ IsTopLevel ? Modifiers.INTERNAL :\r
+ Modifiers.PRIVATE, l);\r
Parameters = param_list;\r
OptAttributes = attrs;\r
}\r
if (TypeBuilder != null)\r
return TypeBuilder;\r
\r
- string name = Name.Substring (1 + Name.LastIndexOf ('.'));\r
-\r
if (IsTopLevel) {\r
ModuleBuilder builder = CodeGen.ModuleBuilder;\r
attr = TypeAttributes.Public | TypeAttributes.Class | TypeAttributes.Sealed;\r
\r
TypeBuilder = builder.DefineType (\r
- name, attr, TypeManager.multicast_delegate_type);\r
+ Name, attr, TypeManager.multicast_delegate_type);\r
} else {\r
TypeBuilder builder = Parent.TypeBuilder;\r
attr = TypeAttributes.NestedPublic | TypeAttributes.Class |\r
TypeAttributes.Sealed;\r
\r
+ string name = Name.Substring (1 + Name.LastIndexOf ('.'));\r
TypeBuilder = builder.DefineNestedType (\r
name, attr, TypeManager.multicast_delegate_type);\r
}\r
return TypeBuilder;\r
}\r
\r
- public override bool Define (TypeContainer parent)\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
int i;\r
//\r
// Invoke method\r
//\r
- \r
+\r
// Check accessibility\r
foreach (Type partype in param_types)\r
- if (!TypeContainer.AsAccessible (partype, ModFlags))\r
+ if (!container.AsAccessible (partype, ModFlags)) {\r
+ Report.Error (59, Location,\r
+ "Inconsistent accessibility: parameter type `" +\r
+ TypeManager.CSharpName (partype) + "` is less " +\r
+ "accessible than delegate `" + Name + "'");\r
return false;\r
+ }\r
\r
- ret_type = FindType (ReturnType);\r
+ ReturnType = ResolveTypeExpr (ReturnType, false, Location);\r
+ ret_type = ReturnType.Type;\r
if (ret_type == null)\r
return false;\r
\r
- if (!TypeContainer.AsAccessible (ret_type, ModFlags))\r
+ if (!container.AsAccessible (ret_type, ModFlags)) {\r
+ Report.Error (58, Location,\r
+ "Inconsistent accessibility: return type `" +\r
+ TypeManager.CSharpName (ret_type) + "` is less " +\r
+ "accessible than delegate `" + Name + "'");\r
return false;\r
+ }\r
\r
//\r
// We don't have to check any others because they are all\r
InvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);\r
\r
TypeManager.RegisterMethod (InvokeBuilder,\r
- new InternalParameters (parent, Parameters),\r
+ new InternalParameters (container, Parameters),\r
param_types);\r
\r
//\r
if (Parameters.ArrayParameter != null)\r
async_params [n] = Parameters.ArrayParameter;\r
\r
- async_params [params_num] = new Parameter ("System.AsyncCallback", "callback",\r
+ async_params [params_num] = new Parameter (\r
+ TypeManager.system_asynccallback_expr, "callback",\r
Parameter.Modifier.NONE, null);\r
- async_params [params_num + 1] = new Parameter ("System.Object", "object",\r
+ async_params [params_num + 1] = new Parameter (\r
+ TypeManager.system_object_expr, "object",\r
Parameter.Modifier.NONE, null);\r
\r
Parameters async_parameters = new Parameters (async_params, null, Location);\r
\r
async_parameters.ComputeAndDefineParameterTypes (this);\r
TypeManager.RegisterMethod (BeginInvokeBuilder,\r
- new InternalParameters (parent, async_parameters),\r
+ new InternalParameters (container, async_parameters),\r
async_param_types);\r
\r
//\r
EndInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);\r
\r
Parameter [] end_params = new Parameter [1];\r
- end_params [0] = new Parameter ("System.IAsyncResult", "result",\r
+ end_params [0] = new Parameter (\r
+ TypeManager.system_iasyncresult_expr, "result",\r
Parameter.Modifier.NONE, null);\r
\r
- TypeManager.RegisterMethod (EndInvokeBuilder,\r
- new InternalParameters (\r
- parent,\r
- new Parameters (end_params, null, Location)),\r
+ TypeManager.RegisterMethod (\r
+ EndInvokeBuilder, new InternalParameters (\r
+ container,\r
+ new Parameters (\r
+ end_params, null, Location)),\r
end_param_types);\r
\r
return true;\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
if (invoke_pd.Count != pd_count)\r
return null;\r
\r
- bool mismatch = false;\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
- mismatch = true;\r
- break;\r
- }\r
- }\r
-\r
- if (mismatch) {\r
- Report.Error (\r
- 123, loc, "Method '" + Invocation.FullMethodDesc (mb) +\r
- "' does not match delegate '" +\r
- FullDelegateDesc (delegate_type, invoke_mb, invoke_pd) + "'");\r
- return null;\r
+ else\r
+ return null;\r
}\r
\r
if (((MethodInfo) invoke_mb).ReturnType == ((MethodInfo) mb).ReturnType)\r
return mb;\r
else\r
- mismatch = true;\r
-\r
- if (mismatch) {\r
- Report.Error (123, loc, "Method '" + Invocation.FullMethodDesc (mb) +\r
- "' does not match delegate '" +\r
- FullDelegateDesc (delegate_type, invoke_mb, invoke_pd) + "'");\r
return null;\r
- }\r
-\r
- return null;\r
}\r
\r
// <summary>\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 MemberInfo [] 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
if ((mt & MemberTypes.Method) != 0) {\r
+ if (ConstructorBuilder != null)\r
if (filter (ConstructorBuilder, criteria))\r
members.Add (ConstructorBuilder);\r
\r
+ if (InvokeBuilder != null)\r
if (filter (InvokeBuilder, criteria))\r
members.Add (InvokeBuilder);\r
\r
+ if (BeginInvokeBuilder != null)\r
if (filter (BeginInvokeBuilder, criteria))\r
members.Add (BeginInvokeBuilder);\r
\r
+ if (EndInvokeBuilder != null)\r
if (filter (EndInvokeBuilder, criteria))\r
members.Add (EndInvokeBuilder);\r
}\r
\r
- int count = members.Count;\r
+ return new MemberList (members);\r
+ }\r
\r
- if (count > 0) {\r
- MemberInfo [] mi = new MemberInfo [count];\r
- members.CopyTo (mi, 0);\r
- return mi;\r
+ public override MemberCache MemberCache {\r
+ get {\r
+ return null;\r
}\r
-\r
- return null;\r
}\r
- \r
- public void CloseDelegate ()\r
- {\r
- TypeBuilder.CreateType ();\r
- }\r
- \r
+\r
public Expression InstanceExpression {\r
get {\r
return instance_expr;\r
MethodBase delegate_method;\r
Expression delegate_instance_expr;\r
\r
- Location Location;\r
- \r
public NewDelegate (Type type, ArrayList Arguments, Location loc)\r
{\r
this.type = type;\r
this.Arguments = Arguments;\r
- this.Location = loc; \r
+ this.loc = loc; \r
}\r
\r
public override Expression DoResolve (EmitContext ec)\r
{\r
if (Arguments == null) {\r
- Report.Error (-11, Location,\r
+ Report.Error (-11, loc,\r
"Delegate creation expression takes only one argument");\r
return null;\r
}\r
\r
if (Arguments.Count != 1) {\r
- Report.Error (-11, Location,\r
+ Report.Error (-11, loc,\r
"Delegate creation expression takes only one argument");\r
return null;\r
}\r
\r
Expression ml = Expression.MemberLookup (\r
- ec, type, ".ctor", Location);\r
+ ec, type, ".ctor", loc);\r
\r
if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, Location, "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
constructor_method = ((MethodGroupExpr) ml).Methods [0];\r
Argument a = (Argument) Arguments [0];\r
\r
- if (!a.Resolve (ec, Location))\r
+ if (!a.ResolveMethodGroup (ec, Location))\r
return null;\r
\r
Expression e = a.Expr;\r
\r
+ Expression invoke_method = Expression.MemberLookup (\r
+ ec, type, "Invoke", MemberTypes.Method,\r
+ Expression.AllBindingFlags, loc);\r
+\r
+ if (invoke_method == null) {\r
+ Report.Error (-200, loc, "Internal error ! Could not find Invoke method!");\r
+ return null;\r
+ }\r
+\r
if (e is MethodGroupExpr) {\r
MethodGroupExpr mg = (MethodGroupExpr) e;\r
\r
- for (int i = 0; i < mg.Methods.Length; ++i) {\r
- delegate_method = Delegate.VerifyMethod (ec, type, mg.Methods [i], Location);\r
+ foreach (MethodInfo mi in mg.Methods){\r
+ delegate_method = Delegate.VerifyMethod (ec, type, mi, loc);\r
\r
if (delegate_method != null)\r
break;\r
}\r
\r
if (delegate_method == null) {\r
- Report.Error (-14, Location, "Ambiguous method reference in delegate creation");\r
+ string method_desc;\r
+ if (mg.Methods.Length > 1)\r
+ method_desc = mg.Methods [0].Name;\r
+ else\r
+ method_desc = Invocation.FullMethodDesc (mg.Methods [0]);\r
+\r
+ MethodBase dm = ((MethodGroupExpr) invoke_method).Methods [0];\r
+ ParameterData param = Invocation.GetParameterData (dm);\r
+ string delegate_desc = Delegate.FullDelegateDesc (type, dm, param);\r
+\r
+ Report.Error (123, loc, "Method '" + method_desc + "' does not " +\r
+ "match delegate '" + delegate_desc + "'");\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
Type e_type = e.Type;\r
\r
if (!TypeManager.IsDelegateType (e_type)) {\r
- Report.Error (-12, Location, "Cannot create a delegate from something " +\r
+ Report.Error (-12, loc, "Cannot create a delegate from something " +\r
"not a delegate or a method.");\r
return null;\r
}\r
// This is what MS' compiler reports. We could always choose\r
// to be more verbose and actually give delegate-level specifics\r
\r
- if (!Delegate.VerifyDelegate (ec, type, e_type, Location)) {\r
- Report.Error (29, Location, "Cannot implicitly convert type '" + e_type + "' " +\r
+ if (!Delegate.VerifyDelegate (ec, type, e_type, loc)) {\r
+ Report.Error (29, loc, "Cannot implicitly convert type '" + e_type + "' " +\r
"to type '" + type + "'");\r
return null;\r
}\r
-\r
- Expression invoke_method = Expression.MemberLookup (\r
- ec, e_type, "Invoke", MemberTypes.Method,\r
- Expression.AllBindingFlags, Location);\r
-\r
- if (invoke_method == null) {\r
- Report.Error (-200, Location, "Internal error ! COuld not find Invoke method!");\r
- return null;\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
\r
public override void Emit (EmitContext ec)\r
{\r
- if (delegate_instance_expr == null)\r
+ if (delegate_instance_expr == null ||\r
+ delegate_method.IsStatic)\r
ec.ig.Emit (OpCodes.Ldnull);\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 Expression InstanceExpr;\r
public ArrayList Arguments;\r
- public Location Location;\r
\r
MethodBase method;\r
\r
{\r
this.InstanceExpr = instance_expr;\r
this.Arguments = args;\r
- this.Location = loc;\r
+ this.loc = loc;\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
\r
if (Arguments != null){\r
- for (int i = Arguments.Count; i > 0;){\r
- --i;\r
- Argument a = (Argument) Arguments [i];\r
- \r
- if (!a.Resolve (ec, Location))\r
+ foreach (Argument a in Arguments){\r
+ if (!a.Resolve (ec, loc))\r
return null;\r
}\r
}\r
\r
- if (!Delegate.VerifyApplicability (ec, del_type, Arguments, Location))\r
+ if (!Delegate.VerifyApplicability (ec, del_type, Arguments, loc))\r
return null;\r
\r
- Expression ml = Expression.MemberLookup (ec, del_type, "Invoke", Location);\r
- if (!(ml is MethodGroupExpr)) {\r
- Report.Error (-100, Location, "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
// Invocation on delegates call the virtual Invoke member\r
// so we are always `instance' calls\r
//\r
- Invocation.EmitCall (ec, false, false, InstanceExpr, method, Arguments);\r
+ Invocation.EmitCall (ec, false, false, InstanceExpr, method, Arguments, loc);\r
}\r
\r
public override void EmitStatement (EmitContext ec)\r
projects / mono.git / blobdiff