refactoring

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

diff --git a/mcs/class/System.Core/System.Linq.Expressions/MethodCallExpression.cs b/mcs/class/System.Core/System.Linq.Expressions/MethodCallExpression.cs
index c1a24ec6e18f80ec82ea0073ee189106aaf4aa06..02718ffa055d354d3ec44bdbd20edee520ca2293 100644 (file)
--- a/mcs/class/System.Core/System.Linq.Expressions/MethodCallExpression.cs
+++ b/mcs/class/System.Core/System.Linq.Expressions/MethodCallExpression.cs
@@ -1,3 +1,11 @@
+//
+// MethodCallExpression.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
@@ -5,71 +13,62 @@
 // 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
-//
-// Authors:
-//        Federico Di Gregorio <fog@initd.org>
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System;
 using System.Collections.ObjectModel;
 using System.Reflection;
-using System.Text;
+using System.Reflection.Emit;
+
+namespace System.Linq.Expressions {
+
+       public sealed class MethodCallExpression : Expression {
+
+               Expression obj;
+               MethodInfo method;
+               ReadOnlyCollection<Expression> arguments;
 
-namespace System.Linq.Expressions
-{
-    public sealed class MethodCallExpression : Expression
-    {
-        #region .ctor
-        internal MethodCallExpression(ExpressionType type, MethodInfo method, Expression obj, ReadOnlyCollection<Expression> arguments)
-            : base(type, method.ReturnType)
-        {
-            this.obj = obj;
-            this.method = method;
-            this.arguments = arguments;
-        }
-        #endregion
+               public Expression Object {
+                       get { return obj; }
+               }
 
-        #region Fields
-        private ReadOnlyCollection<Expression> arguments;
-        private MethodInfo method;
-        private Expression obj;
-        #endregion
+               public MethodInfo Method {
+                       get { return method; }
+               }
 
-        #region Properties
-        public ReadOnlyCollection<Expression> Arguments {
-            get { return arguments; }
-        }
+               public ReadOnlyCollection<Expression> Arguments {
+                       get { return arguments; }
+               }
 
-        public MethodInfo Method {
-            get { return method; }
-        }
+               internal MethodCallExpression (MethodInfo method, ReadOnlyCollection<Expression> arguments)
+                       : base (ExpressionType.Call, method.ReturnType)
+               {
+                       this.method = method;
+                       this.arguments = arguments;
+               }
 
-        public Expression Object {
-            get { return obj; }
-        }
-        #endregion
+               internal MethodCallExpression (Expression obj, MethodInfo method, ReadOnlyCollection<Expression> arguments)
+                       : base (ExpressionType.Call, method.ReturnType)
+               {
+                       this.obj = obj;
+                       this.method = method;
+                       this.arguments = arguments;
+               }
 
-        #region Internal Methods
-        internal override void BuildString(StringBuilder builder)
-        {
-            obj.BuildString(builder);
-            builder.Append (".").Append (method.Name).Append ("(");
-            for (int i=0 ; i < arguments.Count ; i++) {
-                arguments [i].BuildString (builder);
-                if (i < arguments.Count-1)
-                    builder.Append (", ");
-            }
-            builder.Append(")");
-        }
-        #endregion
-    }
+               internal override void Emit (EmitContext ec)
+               {
+                       ec.EmitCall (obj, arguments, method);
+               }
+       }
 }