X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fdelegate.cs;h=853d6902542ca2a2e1e0479b533f1b9227ca358a;hb=b2f4a1cccb1b2ffd72df830a2fdc06caec96c4c4;hp=a1f4c0fc8dd30242a7a17d0960834207f3a77165;hpb=d42981dba90ae29d13642df67b5a4fcdcdb479f6;p=mono.git
diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
index a1f4c0fc8dd..853d6902542 100644
--- a/mcs/mcs/delegate.cs
+++ b/mcs/mcs/delegate.cs
@@ -20,11 +20,10 @@ namespace Mono.CSharp {
///
/// Holds Delegates
///
- public class Delegate : MemberCore {
- public readonly string ReturnType;
+ public class Delegate : DeclSpace {
+ public Expression ReturnType;
public Parameters Parameters;
public Attributes OptAttributes;
- public TypeBuilder TypeBuilder;
public ConstructorBuilder ConstructorBuilder;
public MethodBuilder InvokeBuilder;
@@ -42,47 +41,62 @@ namespace Mono.CSharp {
Modifiers.PUBLIC |
Modifiers.PROTECTED |
Modifiers.INTERNAL |
+ Modifiers.UNSAFE |
Modifiers.PRIVATE;
- public Delegate (string type, int mod_flags, string name, Parameters param_list,
- Attributes attrs, Location loc)
- : base (name, loc)
+ public Delegate (TypeContainer parent, Expression type, int mod_flags,
+ string name, Parameters param_list,
+ Attributes attrs, Location l)
+ : base (parent, name, l)
{
this.ReturnType = type;
- ModFlags = Modifiers.Check (AllowedModifiers, mod_flags, Modifiers.PUBLIC);
+ ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
+ IsTopLevel ? Modifiers.INTERNAL :
+ Modifiers.PRIVATE, l);
Parameters = param_list;
OptAttributes = attrs;
}
- public void DefineDelegate (object parent_builder)
+ public override TypeBuilder DefineType ()
{
TypeAttributes attr;
+
+ if (TypeBuilder != null)
+ return TypeBuilder;
- if (parent_builder is ModuleBuilder) {
- ModuleBuilder builder = (ModuleBuilder) parent_builder;
+ if (IsTopLevel) {
+ ModuleBuilder builder = CodeGen.ModuleBuilder;
attr = TypeAttributes.Public | TypeAttributes.Class | TypeAttributes.Sealed;
- TypeBuilder = builder.DefineType (Name, attr, TypeManager.delegate_type);
+ TypeBuilder = builder.DefineType (
+ Name, attr, TypeManager.multicast_delegate_type);
} else {
- TypeBuilder builder = (TypeBuilder) parent_builder;
+ TypeBuilder builder = Parent.TypeBuilder;
attr = TypeAttributes.NestedPublic | TypeAttributes.Class |
TypeAttributes.Sealed;
+ string name = Name.Substring (1 + Name.LastIndexOf ('.'));
TypeBuilder = builder.DefineNestedType (
- Name, attr, TypeManager.delegate_type);
+ name, attr, TypeManager.multicast_delegate_type);
}
- RootContext.TypeManager.AddDelegateType (Name, TypeBuilder, this);
+ TypeManager.AddDelegateType (Name, TypeBuilder, this);
+
+ return TypeBuilder;
}
- public override bool Define (TypeContainer parent)
+ public override bool DefineMembers (TypeContainer container)
{
+ return true;
+ }
+ public override bool Define (TypeContainer container)
+ {
MethodAttributes mattr;
int i;
-
+
// FIXME: POSSIBLY make this static, as it is always constant
- //
+ //
Type [] const_arg_types = new Type [2];
const_arg_types [0] = TypeManager.object_type;
const_arg_types [1] = TypeManager.intptr_type;
@@ -94,6 +108,8 @@ namespace Mono.CSharp {
CallingConventions.Standard,
const_arg_types);
+ ConstructorBuilder.DefineParameter (1, ParameterAttributes.None, "object");
+ ConstructorBuilder.DefineParameter (2, ParameterAttributes.None, "method");
//
// HACK because System.Reflection.Emit is lame
//
@@ -102,7 +118,7 @@ namespace Mono.CSharp {
Parameter [] fixed_pars = new Parameter [2];
fixed_pars [0] = new Parameter (null, null, Parameter.Modifier.NONE, null);
fixed_pars [1] = new Parameter (null, null, Parameter.Modifier.NONE, null);
- Parameters const_parameters = new Parameters (fixed_pars, null);
+ Parameters const_parameters = new Parameters (fixed_pars, null, Location);
TypeManager.RegisterMethod (
ConstructorBuilder,
@@ -111,27 +127,46 @@ namespace Mono.CSharp {
ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
-
- // Here the various methods like Invoke, BeginInvoke etc are defined
//
- // Invoke method
+ // Here the various methods like Invoke, BeginInvoke etc are defined
//
- param_types = Parameters.GetParameterInfo (parent);
+ // First, call the `out of band' special method for
+ // defining recursively any types we need:
+
+ if (!Parameters.ComputeAndDefineParameterTypes (this))
+ return false;
+
+ param_types = Parameters.GetParameterInfo (this);
if (param_types == null)
return false;
+ //
+ // Invoke method
+ //
+
// Check accessibility
foreach (Type partype in param_types)
- if (!TypeContainer.AsAccessible (partype, ModFlags))
+ if (!container.AsAccessible (partype, ModFlags)) {
+ Report.Error (59, Location,
+ "Inconsistent accessibility: parameter type `" +
+ TypeManager.CSharpName (partype) + "` is less " +
+ "accessible than delegate `" + Name + "'");
return false;
+ }
- ret_type = parent.LookupType (ReturnType, false);
+ ReturnType = ResolveTypeExpr (ReturnType, false, Location);
+ ret_type = ReturnType.Type;
if (ret_type == null)
return false;
- if (!TypeContainer.AsAccessible (ret_type, ModFlags))
+ if (!container.AsAccessible (ret_type, ModFlags)) {
+ Report.Error (58, Location,
+ "Inconsistent accessibility: return type `" +
+ TypeManager.CSharpName (ret_type) + "` is less " +
+ "accessible than delegate `" + Name + "'");
return false;
+ }
//
// We don't have to check any others because they are all
@@ -148,16 +183,29 @@ namespace Mono.CSharp {
ret_type,
param_types);
- for (i = 0 ; i < param_types.Length; i++) {
- Parameter p = Parameters.FixedParameters [i];
- string name = p.Name;
- ParameterBuilder pb = InvokeBuilder.DefineParameter (i+1, p.Attributes, name);
+ i = 0;
+ if (Parameters.FixedParameters != null){
+ int top = Parameters.FixedParameters.Length;
+ Parameter p;
+
+ for (; i < top; i++) {
+ p = Parameters.FixedParameters [i];
+
+ InvokeBuilder.DefineParameter (
+ i+1, p.Attributes, p.Name);
+ }
+ }
+ if (Parameters.ArrayParameter != null){
+ Parameter p = Parameters.ArrayParameter;
+
+ InvokeBuilder.DefineParameter (
+ i+1, p.Attributes, p.Name);
}
InvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
TypeManager.RegisterMethod (InvokeBuilder,
- new InternalParameters (parent, Parameters),
+ new InternalParameters (container, Parameters),
param_types);
//
@@ -171,8 +219,8 @@ namespace Mono.CSharp {
async_param_types [params_num] = TypeManager.asynccallback_type;
async_param_types [params_num + 1] = TypeManager.object_type;
- mattr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual |
- MethodAttributes.NewSlot;
+ mattr = MethodAttributes.Public | MethodAttributes.HideBySig |
+ MethodAttributes.Virtual | MethodAttributes.NewSlot;
BeginInvokeBuilder = TypeBuilder.DefineMethod ("BeginInvoke",
mattr,
@@ -180,29 +228,52 @@ namespace Mono.CSharp {
TypeManager.iasyncresult_type,
async_param_types);
- for (i = 0 ; i < param_types.Length; i++) {
- Parameter p = Parameters.FixedParameters [i];
- string name = p.Name;
- BeginInvokeBuilder.DefineParameter (i + 1, p.Attributes, name);
+ i = 0;
+ if (Parameters.FixedParameters != null){
+ int top = Parameters.FixedParameters.Length;
+ Parameter p;
+
+ for (i = 0 ; i < top; i++) {
+ p = Parameters.FixedParameters [i];
+
+ BeginInvokeBuilder.DefineParameter (
+ i+1, p.Attributes, p.Name);
+ }
}
-
+ if (Parameters.ArrayParameter != null){
+ Parameter p = Parameters.ArrayParameter;
+
+ BeginInvokeBuilder.DefineParameter (
+ i+1, p.Attributes, p.Name);
+ i++;
+ }
+
BeginInvokeBuilder.DefineParameter (i + 1, ParameterAttributes.None, "callback");
BeginInvokeBuilder.DefineParameter (i + 2, ParameterAttributes.None, "object");
BeginInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
Parameter [] async_params = new Parameter [params_num + 2];
- Parameters.FixedParameters.CopyTo (async_params, 0);
-
- async_params [params_num] = new Parameter ("System.AsyncCallback", "callback",
+ int n = 0;
+ if (Parameters.FixedParameters != null){
+ Parameters.FixedParameters.CopyTo (async_params, 0);
+ n = Parameters.FixedParameters.Length;
+ }
+ if (Parameters.ArrayParameter != null)
+ async_params [n] = Parameters.ArrayParameter;
+
+ async_params [params_num] = new Parameter (
+ TypeManager.system_asynccallback_expr, "callback",
Parameter.Modifier.NONE, null);
- async_params [params_num + 1] = new Parameter ("System.IAsyncResult", "object",
+ async_params [params_num + 1] = new Parameter (
+ TypeManager.system_object_expr, "object",
Parameter.Modifier.NONE, null);
+ Parameters async_parameters = new Parameters (async_params, null, Location);
+
+ async_parameters.ComputeAndDefineParameterTypes (this);
TypeManager.RegisterMethod (BeginInvokeBuilder,
- new InternalParameters (
- parent,
- new Parameters (async_params, null)),
+ new InternalParameters (container, async_parameters),
async_param_types);
//
@@ -221,12 +292,15 @@ namespace Mono.CSharp {
EndInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
Parameter [] end_params = new Parameter [1];
- end_params [0] = new Parameter ("System.IAsyncResult", "result",
+ end_params [0] = new Parameter (
+ TypeManager.system_iasyncresult_expr, "result",
Parameter.Modifier.NONE, null);
- TypeManager.RegisterMethod (EndInvokeBuilder,
- new InternalParameters (
- parent, new Parameters (end_params, null)),
+ TypeManager.RegisterMethod (
+ EndInvokeBuilder, new InternalParameters (
+ container,
+ new Parameters (
+ end_params, null, Location)),
end_param_types);
return true;
@@ -241,7 +315,10 @@ namespace Mono.CSharp {
{
ParameterData pd = Invocation.GetParameterData (mb);
- Expression ml = Expression.MemberLookup (ec, delegate_type, "Invoke", false, loc);
+ int pd_count = pd.Count;
+
+ Expression ml = Expression.MemberLookup (
+ ec, delegate_type, "Invoke", loc);
if (!(ml is MethodGroupExpr)) {
Report.Error (-100, loc, "Internal error : could not find Invoke method!");
@@ -252,46 +329,31 @@ namespace Mono.CSharp {
ParameterData invoke_pd = Invocation.GetParameterData (invoke_mb);
- bool mismatch = false;
- for (int i = pd.Count; i > 0; ) {
+ if (invoke_pd.Count != pd_count)
+ return null;
+
+ for (int i = pd_count; i > 0; ) {
i--;
if (invoke_pd.ParameterType (i) == pd.ParameterType (i))
continue;
- else {
- mismatch = true;
- break;
- }
- }
-
- if (mismatch) {
- Report.Error (
- 123, loc, "Method '" + Invocation.FullMethodDesc (mb) +
- "' does not match delegate '" +
- FullDelegateDesc (delegate_type, invoke_mb, invoke_pd) + "'");
- return null;
+ else
+ return null;
}
if (((MethodInfo) invoke_mb).ReturnType == ((MethodInfo) mb).ReturnType)
return mb;
else
- mismatch = true;
-
- if (mismatch) {
- Report.Error (123, loc, "Method '" + Invocation.FullMethodDesc (mb) +
- "' does not match delegate '" +
- FullDelegateDesc (delegate_type, invoke_mb, invoke_pd) + "'");
return null;
- }
-
- return null;
}
//
// Verifies whether the invocation arguments are compatible with the
// delegate's target method
//
- public static bool VerifyApplicability (EmitContext ec, Type delegate_type, ArrayList args,
+ public static bool VerifyApplicability (EmitContext ec,
+ Type delegate_type,
+ ArrayList args,
Location loc)
{
int arg_count;
@@ -301,7 +363,8 @@ namespace Mono.CSharp {
else
arg_count = args.Count;
- Expression ml = Expression.MemberLookup (ec, delegate_type, "Invoke", false, loc);
+ Expression ml = Expression.MemberLookup (
+ ec, delegate_type, "Invoke", loc);
if (!(ml is MethodGroupExpr)) {
Report.Error (-100, loc, "Internal error : could not find Invoke method!");
@@ -309,54 +372,31 @@ namespace Mono.CSharp {
}
MethodBase mb = ((MethodGroupExpr) ml).Methods [0];
-
ParameterData pd = Invocation.GetParameterData (mb);
-
- if (pd.Count != arg_count) {
+
+ int pd_count = pd.Count;
+
+ bool not_params_method = (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS);
+
+ if (not_params_method && pd_count != arg_count) {
Report.Error (1593, loc,
"Delegate '" + delegate_type.ToString ()
+ "' does not take '" + arg_count + "' arguments");
return false;
}
- for (int i = arg_count; i > 0;) {
- i--;
- Expression conv;
- Argument a = (Argument) args [i];
- Expression a_expr = a.Expr;
-
- if (pd.ParameterType (i) != a_expr.Type) {
-
- conv = Expression.ConvertImplicitStandard (ec, a_expr, pd.ParameterType (i), loc);
-
- if (conv == null) {
- Report.Error (1594, loc,
- "Delegate '" + delegate_type.ToString () +
- "' has some invalid arguments.");
-
- Report.Error (1503, loc,
- "Argument " + (i+1) +
- ": Cannot convert from '" +
- TypeManager.CSharpName (a_expr.Type)
- + "' to '" + TypeManager.CSharpName (pd.ParameterType (i)) + "'");
- return false;
- }
-
- if (a_expr != conv)
- a.Expr = conv;
- }
- }
-
- return true;
+ return Invocation.VerifyArgumentsCompat (ec, args, arg_count, mb, !not_params_method,
+ delegate_type, loc);
}
-
+
///
/// Verifies whether the delegate in question is compatible with this one in
/// order to determine if instantiation from the same is possible.
///
public static bool VerifyDelegate (EmitContext ec, Type delegate_type, Type probe_type, Location loc)
{
- Expression ml = Expression.MemberLookup (ec, delegate_type, "Invoke", false, loc);
+ Expression ml = Expression.MemberLookup (
+ ec, delegate_type, "Invoke", loc);
if (!(ml is MethodGroupExpr)) {
Report.Error (-100, loc, "Internal error : could not find Invoke method!");
@@ -366,7 +406,8 @@ namespace Mono.CSharp {
MethodBase mb = ((MethodGroupExpr) ml).Methods [0];
ParameterData pd = Invocation.GetParameterData (mb);
- Expression probe_ml = Expression.MemberLookup (ec, delegate_type, "Invoke", false, loc);
+ Expression probe_ml = Expression.MemberLookup (
+ ec, delegate_type, "Invoke", loc);
if (!(probe_ml is MethodGroupExpr)) {
Report.Error (-100, loc, "Internal error : could not find Invoke method!");
@@ -416,35 +457,38 @@ namespace Mono.CSharp {
}
// Hack around System.Reflection as found everywhere else
- public MemberInfo [] 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 ();
if ((mt & MemberTypes.Method) != 0) {
+ if (ConstructorBuilder != null)
if (filter (ConstructorBuilder, criteria))
members.Add (ConstructorBuilder);
+ if (InvokeBuilder != null)
if (filter (InvokeBuilder, criteria))
members.Add (InvokeBuilder);
+ if (BeginInvokeBuilder != null)
if (filter (BeginInvokeBuilder, criteria))
members.Add (BeginInvokeBuilder);
+ if (EndInvokeBuilder != null)
if (filter (EndInvokeBuilder, criteria))
members.Add (EndInvokeBuilder);
}
- int count = members.Count;
+ return new MemberList (members);
+ }
- if (count > 0) {
- MemberInfo [] mi = new MemberInfo [count];
- members.CopyTo (mi, 0);
- return mi;
+ public override MemberCache MemberCache {
+ get {
+ return null;
}
-
- return null;
}
-
+
public void CloseDelegate ()
{
TypeBuilder.CreateType ();
@@ -490,64 +534,91 @@ namespace Mono.CSharp {
MethodBase delegate_method;
Expression delegate_instance_expr;
- Location Location;
-
public NewDelegate (Type type, ArrayList Arguments, Location loc)
{
this.type = type;
this.Arguments = Arguments;
- this.Location = loc;
+ this.loc = loc;
}
public override Expression DoResolve (EmitContext ec)
{
if (Arguments == null) {
- Report.Error (-11, Location,
+ Report.Error (-11, loc,
"Delegate creation expression takes only one argument");
return null;
}
-
+
if (Arguments.Count != 1) {
- Report.Error (-11, Location,
+ Report.Error (-11, loc,
"Delegate creation expression takes only one argument");
return null;
}
- Expression ml = Expression.MemberLookup (ec, type, ".ctor", false, Location);
+ Expression ml = Expression.MemberLookup (
+ ec, type, ".ctor", loc);
if (!(ml is MethodGroupExpr)) {
- Report.Error (-100, Location, "Internal error : Could not find delegate constructor!");
+ Report.Error (-100, loc, "Internal error : Could not find delegate constructor!");
return null;
}
constructor_method = ((MethodGroupExpr) ml).Methods [0];
-
Argument a = (Argument) Arguments [0];
- if (!a.Resolve (ec, Location))
+ if (!a.ResolveMethodGroup (ec, Location))
return null;
Expression e = a.Expr;
-
+
+ Expression invoke_method = Expression.MemberLookup (
+ ec, type, "Invoke", MemberTypes.Method,
+ Expression.AllBindingFlags, loc);
+
+ if (invoke_method == null) {
+ Report.Error (-200, loc, "Internal error ! COuld not find Invoke method!");
+ return null;
+ }
+
if (e is MethodGroupExpr) {
MethodGroupExpr mg = (MethodGroupExpr) e;
-
- delegate_method = Delegate.VerifyMethod (ec, type, mg.Methods [0], Location);
-
- if (delegate_method == null)
+
+ foreach (MethodInfo mi in mg.Methods){
+ delegate_method = Delegate.VerifyMethod (ec, type, mi, loc);
+
+ if (delegate_method != null)
+ break;
+ }
+
+ if (delegate_method == null) {
+ string method_desc;
+ if (mg.Methods.Length > 1)
+ method_desc = mg.Methods [0].Name;
+ else
+ method_desc = Invocation.FullMethodDesc (mg.Methods [0]);
+
+ MethodBase dm = ((MethodGroupExpr) invoke_method).Methods [0];
+ ParameterData param = Invocation.GetParameterData (dm);
+ string delegate_desc = Delegate.FullDelegateDesc (type, dm, param);
+
+ Report.Error (123, loc, "Method '" + method_desc + "' does not " +
+ "match delegate '" + delegate_desc + "'");
+
return null;
-
+ }
+
if (mg.InstanceExpression != null)
delegate_instance_expr = mg.InstanceExpression.Resolve (ec);
- else
- delegate_instance_expr = null;
-
+ else {
+ if (!ec.IsStatic)
+ delegate_instance_expr = ec.This;
+ else
+ delegate_instance_expr = null;
+ }
+
if (delegate_instance_expr != null)
if (delegate_instance_expr.Type.IsValueType)
delegate_instance_expr = new BoxedCast (delegate_instance_expr);
-
- DictionaryEntry de = new DictionaryEntry (delegate_method, delegate_instance_expr);
- TypeManager.RegisterDelegateData (type, de);
eclass = ExprClass.Value;
return this;
@@ -556,7 +627,7 @@ namespace Mono.CSharp {
Type e_type = e.Type;
if (!TypeManager.IsDelegateType (e_type)) {
- Report.Error (-12, Location, "Cannot create a delegate from something " +
+ Report.Error (-12, loc, "Cannot create a delegate from something " +
"not a delegate or a method.");
return null;
}
@@ -564,16 +635,14 @@ namespace Mono.CSharp {
// This is what MS' compiler reports. We could always choose
// to be more verbose and actually give delegate-level specifics
- if (!Delegate.VerifyDelegate (ec, type, e_type, Location)) {
- Report.Error (29, Location, "Cannot implicitly convert type '" + e_type + "' " +
+ if (!Delegate.VerifyDelegate (ec, type, e_type, loc)) {
+ Report.Error (29, loc, "Cannot implicitly convert type '" + e_type + "' " +
"to type '" + type + "'");
return null;
}
-
- DictionaryEntry d = TypeManager.GetDelegateData (e_type);
-
- delegate_instance_expr = (Expression) d.Value;
- delegate_method = (MethodBase) d.Key;
+
+ delegate_instance_expr = e;
+ delegate_method = ((MethodGroupExpr) invoke_method).Methods [0];
eclass = ExprClass.Value;
return this;
@@ -581,12 +650,17 @@ namespace Mono.CSharp {
public override void Emit (EmitContext ec)
{
- if (delegate_instance_expr == null)
+ if (delegate_instance_expr == null ||
+ delegate_method.IsStatic)
ec.ig.Emit (OpCodes.Ldnull);
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);
}
}
@@ -595,7 +669,6 @@ namespace Mono.CSharp {
public Expression InstanceExpr;
public ArrayList Arguments;
- public Location Location;
MethodBase method;
@@ -603,40 +676,58 @@ namespace Mono.CSharp {
{
this.InstanceExpr = instance_expr;
this.Arguments = args;
- this.Location = loc;
+ this.loc = loc;
}
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;
if (Arguments != null){
- for (int i = Arguments.Count; i > 0;){
- --i;
- Argument a = (Argument) Arguments [i];
-
- if (!a.Resolve (ec, Location))
+ foreach (Argument a in Arguments){
+ if (!a.Resolve (ec, loc))
return null;
}
}
- if (!Delegate.VerifyApplicability (ec, del_type, Arguments, Location))
+ if (!Delegate.VerifyApplicability (ec, del_type, Arguments, loc))
return null;
- Expression ml = Expression.MemberLookup (ec, del_type, "Invoke", false, Location);
-
- if (!(ml is MethodGroupExpr)) {
- Report.Error (-100, Location, "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;
return this;
@@ -650,7 +741,7 @@ namespace Mono.CSharp {
// Invocation on delegates call the virtual Invoke member
// so we are always `instance' calls
//
- Invocation.EmitCall (ec, false, InstanceExpr, method, Arguments);
+ Invocation.EmitCall (ec, false, false, InstanceExpr, method, Arguments, loc);
}
public override void EmitStatement (EmitContext ec)