2008-09-24 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / mcs / lambda.cs

diff --git a/mcs/mcs/lambda.cs b/mcs/mcs/lambda.cs
index c500d323bdff91cb8e5900cccbc1f9e3254f0470..794572c1b87820a1d3316a9693ef0b7c9e6e9c88 100644 (file)
--- a/mcs/mcs/lambda.cs
+++ b/mcs/mcs/lambda.cs
@@ -4,9 +4,9 @@
 // Authors: Miguel de Icaza (miguel@gnu.org)
 //          Marek Safar (marek.safar@gmail.com)
 //
-// Licensed under the terms of the GNU GPL
+// Dual licensed under the terms of the MIT X11 or GNU GPL
 //
-// (C) 2007 Novell, Inc
+// Copyright 2007-2008 Novell, Inc
 //
 
 using System;
@@ -24,11 +24,8 @@ namespace Mono.CSharp {
                //    A list of Parameters (explicitly typed parameters)
                //    An ImplicitLambdaParameter
                //
-               public LambdaExpression (AnonymousMethodExpression parent,
-                                        GenericMethod generic, TypeContainer host,
-                                        Parameters parameters, Block container,
-                                        Location loc)
-                       : base (parent, generic, host, parameters, container, loc)
+               public LambdaExpression (Parameters parameters, Location loc)
+                       : base (parameters, loc)
                {
                        if (parameters.Count > 0)
                                explicit_parameters = !(parameters.FixedParameters [0] is ImplicitLambdaParameter);
@@ -63,7 +60,7 @@ namespace Mono.CSharp {
                        if (!TypeManager.IsDelegateType (delegateType))
                                return null;
 
-                       ParameterData d_params = TypeManager.GetDelegateParameters (delegateType);
+                       AParametersCollection d_params = TypeManager.GetDelegateParameters (delegateType);
 
                        if (explicit_parameters) {
                                if (!VerifyExplicitParameters (delegateType, d_params, ec.IsInProbingMode))
@@ -79,12 +76,10 @@ namespace Mono.CSharp {
                        if (!VerifyParameterCompatibility (delegateType, d_params, ec.IsInProbingMode))
                                return null;
 
-                       if (Parameters.Types == null)
-                               Parameters.Types = new Type [Parameters.Count];
-
+                       Type [] ptypes = new Type [Parameters.Count];
                        for (int i = 0; i < d_params.Count; i++) {
                                // D has no ref or out parameters
-                               if ((d_params.ParameterModifier (i) & Parameter.Modifier.ISBYREF) != 0)
+                               if ((d_params.FixedParameters [i].ModFlags & Parameter.Modifier.ISBYREF) != 0)
                                        return null;
 
                                Type d_param = d_params.Types [i];
@@ -94,13 +89,18 @@ namespace Mono.CSharp {
                                if (d_param.IsGenericParameter)
                                        d_param = delegateType.GetGenericArguments () [d_param.GenericParameterPosition];
 #endif
-                               // When inferred context exists all generics parameters have type replacements
+                               //
+                               // When type inference context exists try to apply inferred type arguments
+                               //
                                if (tic != null) {
                                        d_param = tic.InflateGenericArgument (d_param);
                                }
 
-                               Parameters.Types [i] = Parameters.FixedParameters[i].ParameterType = d_param;
+                               ptypes [i] = d_param;
+                               ((ImplicitLambdaParameter) Parameters.FixedParameters [i]).Type = d_param;
                        }
+
+                       Parameters.Types = ptypes;
                        return Parameters;
                }
 
@@ -119,11 +119,9 @@ namespace Mono.CSharp {
                        return this;
                }
 
-               protected override AnonymousMethod CompatibleMethodFactory (Type returnType, Type delegateType, Parameters p, ToplevelBlock b)
+               protected override AnonymousMethodBody CompatibleMethodFactory (Type returnType, Type delegateType, Parameters p, ToplevelBlock b)
                {
-                       return new LambdaMethod (RootScope, Host,
-                               GenericMethod, p, Container, b, returnType,
-                               delegateType, loc);
+                       return new LambdaMethod (p, b, returnType, delegateType, loc);
                }
 
                public override string GetSignatureForError ()
@@ -132,15 +130,12 @@ namespace Mono.CSharp {
                }
        }
 
-       public class LambdaMethod : AnonymousMethod
+       public class LambdaMethod : AnonymousMethodBody
        {
-               public LambdaMethod (RootScopeInfo root_scope,
-                                       DeclSpace host, GenericMethod generic,
-                                       Parameters parameters, Block container,
+               public LambdaMethod (Parameters parameters,
                                        ToplevelBlock block, Type return_type, Type delegate_type,
                                        Location loc)
-                       : base (root_scope, host, generic, parameters, container, block,
-                               return_type, delegate_type, loc)
+                       : base (parameters, block, return_type, delegate_type, loc)
                {
                }
 
@@ -149,6 +144,21 @@ namespace Mono.CSharp {
                                return "lambda expression";
                        }
                }
+
+               public override Expression CreateExpressionTree (EmitContext ec)
+               {
+                       Expression args = parameters.CreateExpressionTree (ec, loc);
+                       Expression expr = Block.CreateExpressionTree (ec);
+                       if (expr == null)
+                               return null;
+
+                       ArrayList arguments = new ArrayList (2);
+                       arguments.Add (new Argument (expr));
+                       arguments.Add (new Argument (args));
+                       return CreateExpressionFactoryCall ("Lambda",
+                               new TypeArguments (loc, new TypeExpression (type, loc)),
+                               arguments);
+               }
        }
 
        //
@@ -170,13 +180,16 @@ namespace Mono.CSharp {
 
                public override void Emit (EmitContext ec)
                {
-                       if (ec.ReturnType == TypeManager.void_type)
+                       if (ec.ReturnType == TypeManager.void_type) {
                                ((ExpressionStatement) Expr).EmitStatement (ec);
-                       else
-                               base.Emit (ec);
+                               ec.ig.Emit (OpCodes.Ret);
+                               return;
+                       }
+
+                       base.Emit (ec);
                }
 
-               public override bool Resolve (EmitContext ec)
+               protected override bool DoResolve (EmitContext ec)
                {       
                        //
                        // When delegate returns void, only expression statements can be used
@@ -193,7 +206,7 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       return base.Resolve (ec);
+                       return base.DoResolve (ec);
                }
        }
 }