2008-07-22 Marek Safar <marek.safar@gmail.com>

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

diff --git a/mcs/mcs/lambda.cs b/mcs/mcs/lambda.cs
index b561487a33783739f9d9e3814bbaa76bfcb208a0..b11dc6000e254d2c8c6beec1f9ce9445c9891e56 100644 (file)
--- a/mcs/mcs/lambda.cs
+++ b/mcs/mcs/lambda.cs
@@ -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 (TypeContainer host, Parameters parameters, Location loc)
+                       : base (host, parameters, loc)
                {
                        if (parameters.Count > 0)
                                explicit_parameters = !(parameters.FixedParameters [0] is ImplicitLambdaParameter);
@@ -119,10 +116,10 @@ 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,
+                       return new LambdaMethod (Host,
+                               p, b, returnType,
                                delegateType, loc);
                }
 
@@ -132,15 +129,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 (TypeContainer host, 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 (host, parameters, block, return_type, delegate_type, loc)
                {
                }
 
@@ -152,7 +146,22 @@ namespace Mono.CSharp {
 
                public override Expression CreateExpressionTree (EmitContext ec)
                {
-                       return Block.CreateExpressionTree (ec);
+                       //
+                       // Remove IL method implementation when expression tree is requested
+                       //
+                       method.Parent.PartialContainer.RemoveMethod (method);
+
+                       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);
                }
        }
 
@@ -175,10 +184,13 @@ 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);
                }
 
                protected override bool DoResolve (EmitContext ec)
@@ -191,11 +203,8 @@ namespace Mono.CSharp {
                                if (Expr == null)
                                        return false;
                                
-                               if (Expr is ExpressionStatement) {
-                                       if (Expr is Invocation)
-                                               return TypeManager.IsEqual (Expr.Type, TypeManager.void_type);
+                               if (Expr is ExpressionStatement)
                                        return true;
-                               }
                                
                                Expr.Error_InvalidExpressionStatement ();
                                return false;