2009-11-03 Marek Safar <marek.safar@gmail.com>
authorMarek Safar <marek.safar@gmail.com>
Tue, 3 Nov 2009 19:00:46 +0000 (19:00 -0000)
committerMarek Safar <marek.safar@gmail.com>
Tue, 3 Nov 2009 19:00:46 +0000 (19:00 -0000)
* CSharpInvokeConstructorBinder.cs: Dynamic constructors.

svn path=/trunk/mcs/; revision=145311

mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs [new file with mode: 0644]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ChangeLog
mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources

index 51ffe6bcb43c4fa647e7f596f6669a830e49851e..6fa9d4e0b927236bdd18919a5cfad083f284f1a8 100644 (file)
@@ -31,6 +31,7 @@ using System.Dynamic;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace Microsoft.CSharp.RuntimeBinder
 {
@@ -63,7 +64,8 @@ namespace Microsoft.CSharp.RuntimeBinder
                
                public static CallSiteBinder InvokeConstructor (CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
                {
-                       throw new NotImplementedException ();
+                       // What are flags for here
+                       return new CSharpInvokeConstructorBinder (context, argumentInfo);
                }
                
                public static CallSiteBinder InvokeMember (CSharpBinderFlags flags, string name, IEnumerable<Type> typeArguments, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
index 8b8f50116de5a1881f8d77d207f4404894d6f2e2..22192ba8e213a109d3f54cca902fb8d0c1761559 100644 (file)
@@ -54,6 +54,9 @@ namespace Microsoft.CSharp.RuntimeBinder
                        var c_args = CSharpBinder.CreateCompilerArguments (argumentInfo.Skip (1), args);
                        expr = new Compiler.Invocation (expr, c_args);
 
+                       if ((flags & CSharpBinderFlags.ResultDiscarded) == 0)
+                               expr = new Compiler.Cast (new Compiler.TypeExpression (ReturnType, Compiler.Location.Null), expr);
+
                        var restrictions = CSharpBinder.CreateRestrictionsOnTarget (target).Merge (
                                CSharpBinder.CreateRestrictionsOnTarget (args));
 
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs
new file mode 100644 (file)
index 0000000..8ae992c
--- /dev/null
@@ -0,0 +1,70 @@
+//
+// CSharpInvokeConstructorBinder.cs
+//
+// Authors:
+//     Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2009 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.Dynamic;
+using System.Collections.Generic;
+using System.Linq;
+using Compiler = Mono.CSharp;
+
+namespace Microsoft.CSharp.RuntimeBinder
+{
+       class CSharpInvokeConstructorBinder : DynamicMetaObjectBinder
+       {
+               IList<CSharpArgumentInfo> argumentInfo;
+               Type callingContext;
+               Type target_return_type;
+
+               public CSharpInvokeConstructorBinder (Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
+               {
+                       this.callingContext = callingContext;
+                       this.argumentInfo = argumentInfo.ToReadOnly ();
+               }
+
+               public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args)
+               {
+                       var type = CSharpBinder.CreateCompilerExpression (argumentInfo [0], target);
+                       target_return_type = type.Type;
+
+                       var c_args = CSharpBinder.CreateCompilerArguments (argumentInfo.Skip (1), args);
+
+                       Compiler.Expression expr = new Compiler.New (type, c_args, Compiler.Location.Null);
+
+                       var restrictions = CSharpBinder.CreateRestrictionsOnTarget (target).Merge (
+                               CSharpBinder.CreateRestrictionsOnTarget (args));
+
+                       return CSharpBinder.Bind (this, expr, callingContext, restrictions, null);
+               }
+
+               public override Type ReturnType {
+                       get {
+                               return target_return_type;
+                       }
+               }
+       }
+}
index f792461af07740125a171171f8a866257dff2517..59540f11fb5c085f204595a154ccf3aecdd3578c 100644 (file)
@@ -60,13 +60,19 @@ namespace Microsoft.CSharp.RuntimeBinder
                
                public override DynamicMetaObject FallbackInvokeMember (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
                {
-                       var expr = CSharpBinder.CreateCompilerExpression (argumentInfo [0], target);
                        var c_args = CSharpBinder.CreateCompilerArguments (argumentInfo.Skip (1), args);
                        var t_args = typeArguments == null ?
                                null :
                                new Compiler.TypeArguments (typeArguments.Select (l => new Compiler.TypeExpression (l, Compiler.Location.Null)).ToArray ());
 
-                       expr = new Compiler.MemberAccess (expr, Name, t_args, Compiler.Location.Null);
+                       Compiler.Expression expr;
+                       if ((flags & CSharpBinderFlags.InvokeSimpleName) != 0) {
+                               expr = new Compiler.SimpleName (Name, t_args, Compiler.Location.Null);
+                       } else {
+                               expr = CSharpBinder.CreateCompilerExpression (argumentInfo [0], target);
+                               expr = new Compiler.MemberAccess (expr, Name, t_args, Compiler.Location.Null);
+                       }
+
                        expr = new Compiler.Invocation (expr, c_args);
 
                        if ((flags & CSharpBinderFlags.ResultDiscarded) == 0)
index c0a4c3faa8769d7f4c14446d179dafb7ea074f31..532924ea63f074b4d72afc51720f62a37663cb20 100644 (file)
@@ -1,3 +1,7 @@
+2009-11-03  Marek Safar  <marek.safar@gmail.com>
+
+       * CSharpInvokeConstructorBinder.cs: Dynamic constructors.
+
 2009-10-30  Marek Safar  <marek.safar@gmail.com>
 
        * CSharpBinder.cs, CSharpInvokeMemberBinder.cs,
index ac49015a61fdc6d8385e044203d92a9bea4bee1b..17f8a27190d933b6a78d7374fa1596e1790de4c5 100644 (file)
@@ -11,6 +11,7 @@ Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs
+Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs
 Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs