New tests, update.

[mono.git] / mcs / class / System.Core / System.Linq.Expressions / InvocationExpression.cs

diff --git a/mcs/class/System.Core/System.Linq.Expressions/InvocationExpression.cs b/mcs/class/System.Core/System.Linq.Expressions/InvocationExpression.cs
index d216226f0fa358e94bbcc5d9f4d4abffabf9fc7d..13994a13202c076824b8c274e15757a0edddb1a9 100644 (file)
--- a/mcs/class/System.Core/System.Linq.Expressions/InvocationExpression.cs
+++ b/mcs/class/System.Core/System.Linq.Expressions/InvocationExpression.cs
@@ -1,54 +1,61 @@
-using System.Text;
+//
+// InvocationExpression.cs
+//
+// Author:
+//   Jb Evain (jbevain@novell.com)
+//
+// (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Text;
 
-namespace System.Linq.Expressions
-{
-    public sealed class InvocationExpression : Expression
-    {
-        #region .ctor
-        internal InvocationExpression(Expression lambda, Type returnType, ReadOnlyCollection<Expression> arguments)
-            : base(ExpressionType.Invoke, returnType)
-        {
-            this.lambda = lambda;
-            this.arguments = arguments;
-        }
-        #endregion
-
-        #region Fields
-        private Expression lambda;
-        private ReadOnlyCollection<Expression> arguments;
-        #endregion
-
-        #region Properties
-        public ReadOnlyCollection<Expression> Arguments
-        {
-            get { return arguments; }
-        }
-
-        public new Expression Lambda
-        {
-            get { return lambda; }
-        }
-        #endregion
-
-        #region Internal Methods
-        internal override void BuildString(StringBuilder builder)
-        {
-            builder.Append("invoke(");
-
-            // build the lamba expression first
-            lambda.BuildString(builder);
-
-            int argc = arguments.Count;
-            for (int i = 0; i < argc; i++)
-            {
-                arguments[i].BuildString(builder);
-                if (i < argc - 1)
-                    builder.Append(", ");
-            }
-
-            builder.Append(")");
-        }
-        #endregion
-    }
-}
\ No newline at end of file
+namespace System.Linq.Expressions {
+
+       public sealed class InvocationExpression : Expression {
+
+               Expression expression;
+               ReadOnlyCollection<Expression> arguments;
+
+               public Expression Expression {
+                       get { return expression; }
+               }
+
+               public ReadOnlyCollection<Expression> Arguments {
+                       get { return arguments; }
+               }
+
+               internal InvocationExpression (Expression expression, Type type, ReadOnlyCollection<Expression> arguments)
+                       : base (ExpressionType.Invoke, type)
+               {
+                       this.expression = expression;
+                       this.arguments = arguments;
+               }
+
+               internal override void Emit (EmitContext ec)
+               {
+                       ec.EmitCall (expression, arguments, expression.Type.GetInvokeMethod ());
+               }
+       }
+}