New tests.
[mono.git] / mcs / mcs / dynamic.cs
index 4061d2a83665bc6014dd68262aa94a98b78c481d..3a466401fb857036e2506f1ab314108f870ab70f 100644 (file)
@@ -9,12 +9,11 @@
 //
 
 using System;
-using System.Collections;
 using System.Reflection.Emit;
+using SLE = System.Linq.Expressions;
 
 #if NET_4_0
 using System.Dynamic;
-using SLE = System.Linq.Expressions;
 #endif
 
 namespace Mono.CSharp
@@ -62,30 +61,42 @@ namespace Mono.CSharp
                }
        }
 
+       #region Dynamic runtime binder expressions
+
        //
-       // Expression created from runtime dynamic object value
+       // Expression created from runtime dynamic object value by dynamic binder
        //
-       public class RuntimeValueExpression : Expression, IDynamicAssign
+       public class RuntimeValueExpression : Expression, IDynamicAssign, IMemoryLocation
        {
 #if !NET_4_0
-               public class DynamicMetaObject { public Type RuntimeType; }
+               public class DynamicMetaObject
+               {
+                       public TypeSpec RuntimeType;
+                       public TypeSpec LimitType;
+                       public SLE.Expression Expression;
+               }
 #endif
 
                readonly DynamicMetaObject obj;
 
-               public RuntimeValueExpression (DynamicMetaObject obj)
+               public RuntimeValueExpression (DynamicMetaObject obj, TypeSpec type)
                {
                        this.obj = obj;
-                       this.type = obj.RuntimeType;
+                       this.type = type;
                        this.eclass = ExprClass.Variable;
                }
 
+               public void AddressOf (EmitContext ec, AddressOp mode)
+               {
+                       throw new NotImplementedException ();
+               }
+
                public override Expression CreateExpressionTree (ResolveContext ec)
                {
                        throw new NotImplementedException ();
                }
 
-               public override Expression DoResolve (ResolveContext ec)
+               protected override Expression DoResolve (ResolveContext ec)
                {
                        return this;
                }
@@ -114,7 +125,6 @@ namespace Mono.CSharp
 
                #endregion
 
-#if NET_4_0
                public SLE.Expression MakeAssignExpression (BuilderContext ctx)
                {
                        return obj.Expression;
@@ -122,15 +132,44 @@ namespace Mono.CSharp
 
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
-                       return SLE.Expression.Convert (obj.Expression, type);
+                       return SLE.Expression.Convert (obj.Expression, type.GetMetaInfo ());
                }
-#endif
 
                public DynamicMetaObject MetaObject {
                        get { return obj; }
                }
        }
 
+       //
+       // Wraps runtime dynamic expression into expected type. Needed
+       // to satify expected type check by dynamic binder and no conversion
+       // is required (ResultDiscarded).
+       //
+       public class DynamicResultCast : ShimExpression
+       {
+               public DynamicResultCast (TypeSpec type, Expression expr)
+                       : base (expr)
+               {
+                       this.type = type;
+               }
+
+               protected override Expression DoResolve (ResolveContext ec)
+               {
+                       expr = expr.Resolve (ec);
+                       eclass = ExprClass.Value;
+                       return this;
+               }
+
+#if NET_4_0
+               public override SLE.Expression MakeExpression (BuilderContext ctx)
+               {
+                       return SLE.Expression.Block (expr.MakeExpression (ctx), SLE.Expression.Default (type.GetMetaInfo ()));
+               }
+#endif
+       }
+
+       #endregion
+
        //
        // Creates dynamic binder expression
        //
@@ -162,7 +201,6 @@ namespace Mono.CSharp
                                        new MemberName (CompilerGeneratedClass.MakeName (null, "c", "DynamicSites", 0)),
                                        Modifiers.INTERNAL | Modifiers.STATIC)
                        {
-                               ModFlags &= ~Modifiers.SEALED;
                        }
                }
 
@@ -177,15 +215,15 @@ namespace Mono.CSharp
                        CSharpBinderFlags flags;
 
                        public BinderFlags (CSharpBinderFlags flags, DynamicExpressionStatement statement)
-                               : base ()
+                               : base (statement.loc)
                        {
                                this.flags = flags;
                                this.statement = statement;
                        }
 
-                       public override Expression DoResolve (ResolveContext ec)
+                       protected override Expression DoResolve (ResolveContext ec)
                        {
-                               Child = new IntConstant ((int) (flags | statement.flags), statement.loc);
+                               Child = new IntConstant ((int) (flags | statement.flags), statement.loc).Resolve (ec);
 
                                type = TypeManager.binder_flags;
                                eclass = Child.eclass;
@@ -199,7 +237,7 @@ namespace Mono.CSharp
 
                readonly Arguments arguments;
                protected IDynamicBinder binder;
-               Expression binder_expr;
+               protected Expression binder_expr;
 
                // Used by BinderFlags
                protected CSharpBinderFlags flags;
@@ -222,11 +260,9 @@ namespace Mono.CSharp
                        if (global_site_container == null) {
                                global_site_container = new StaticDataClass ();
                                RootContext.ToplevelTypes.AddCompilerGeneratedClass (global_site_container);
+                               global_site_container.CreateType ();
                                global_site_container.DefineType ();
                                global_site_container.Define ();
-//                             global_site_container.EmitType ();
-
-                               RootContext.RegisterCompilerGeneratedType (global_site_container.TypeBuilder);
                        }
 
                        return global_site_container;
@@ -245,32 +281,40 @@ namespace Mono.CSharp
 
                public override Expression CreateExpressionTree (ResolveContext ec)
                {
-                       throw new NotImplementedException ();
+                       ec.Report.Error (1963, loc, "An expression tree cannot contain a dynamic operation");
+                       return null;
                }
 
-               public override Expression DoResolve (ResolveContext ec)
+               protected override Expression DoResolve (ResolveContext ec)
                {
-                       if (eclass != ExprClass.Invalid)
-                               return this;
+                       if (DoResolveCore (ec))
+                               binder_expr = binder.CreateCallSiteBinder (ec, arguments);
 
-                       if (TypeManager.call_site_type == null)
-                               TypeManager.call_site_type = TypeManager.CoreLookupType (ec.Compiler,
-                                       "System.Runtime.CompilerServices", "CallSite", Kind.Class, true);
+                       return this;
+               }
 
-                       if (TypeManager.generic_call_site_type == null)
-                               TypeManager.generic_call_site_type = TypeManager.CoreLookupType (ec.Compiler,
-                                       "System.Runtime.CompilerServices", "CallSite`1", Kind.Class, true);
+               protected bool DoResolveCore (ResolveContext rc)
+               {
+                       int errors = rc.Report.Errors;
 
                        if (TypeManager.binder_type == null) {
-                               var t = TypeManager.CoreLookupType (ec.Compiler,
-                                       "Microsoft.CSharp.RuntimeBinder", "Binder", Kind.Class, true);
+                               var t = TypeManager.CoreLookupType (rc.Compiler,
+                                       "Microsoft.CSharp.RuntimeBinder", "Binder", MemberKind.Class, true);
                                if (t != null)
                                        TypeManager.binder_type = new TypeExpression (t, Location.Null);
                        }
 
+                       if (TypeManager.call_site_type == null)
+                               TypeManager.call_site_type = TypeManager.CoreLookupType (rc.Compiler,
+                                       "System.Runtime.CompilerServices", "CallSite", MemberKind.Class, true);
+
+                       if (TypeManager.generic_call_site_type == null)
+                               TypeManager.generic_call_site_type = TypeManager.CoreLookupType (rc.Compiler,
+                                       "System.Runtime.CompilerServices", "CallSite", 1, MemberKind.Class, true);
+
                        if (TypeManager.binder_flags == null) {
-                               TypeManager.binder_flags = TypeManager.CoreLookupType (ec.Compiler,
-                                       "Microsoft.CSharp.RuntimeBinder", "CSharpBinderFlags", Kind.Enum, true);
+                               TypeManager.binder_flags = TypeManager.CoreLookupType (rc.Compiler,
+                                       "Microsoft.CSharp.RuntimeBinder", "CSharpBinderFlags", MemberKind.Enum, true);
                        }
 
                        eclass = ExprClass.Value;
@@ -278,36 +322,39 @@ namespace Mono.CSharp
                        if (type == null)
                                type = InternalType.Dynamic;
 
-                       // TODO: If any core type fails to load, skip this ?
-                       binder_expr = binder.CreateCallSiteBinder (ec, arguments);
-                       return this;
+                       if (rc.Report.Errors == errors)
+                               return true;
+
+                       rc.Report.Error (1969, loc,
+                               "Dynamic operation cannot be compiled without `Microsoft.CSharp.dll' assembly reference");
+                       return false;
                }
 
                public override void Emit (EmitContext ec)
                {
-                       EmitCall (ec,  false);
+                       EmitCall (ec, binder_expr, arguments,  false);
                }
 
                public override void EmitStatement (EmitContext ec)
                {
-                       EmitCall (ec, true);
+                       EmitCall (ec, binder_expr, arguments, true);
                }
 
-               void EmitCall (EmitContext ec, bool isStatement)
+               protected void EmitCall (EmitContext ec, Expression binder, Arguments arguments, bool isStatement)
                {
                        int dyn_args_count = arguments == null ? 0 : arguments.Count;
-                       TypeExpr site_type = CreateSiteType (RootContext.ToplevelTypes.Compiler, dyn_args_count, isStatement);
-                       FieldExpr site_field_expr = new FieldExpr (CreateSiteField (site_type).FieldBuilder, loc);
+                       TypeExpr site_type = CreateSiteType (RootContext.ToplevelTypes.Compiler, arguments, dyn_args_count, isStatement);
+                       FieldExpr site_field_expr = new FieldExpr (CreateSiteField (site_type), loc);
 
-                       SymbolWriter.OpenCompilerGeneratedBlock (ec.ig);
+                       SymbolWriter.OpenCompilerGeneratedBlock (ec);
 
                        Arguments args = new Arguments (1);
-                       args.Add (new Argument (binder_expr));
+                       args.Add (new Argument (binder));
                        StatementExpression s = new StatementExpression (new SimpleAssign (site_field_expr, new Invocation (new MemberAccess (site_type, "Create"), args)));
                        
                        BlockContext bc = new BlockContext (ec.MemberContext, null, TypeManager.void_type);             
                        if (s.Resolve (bc)) {
-                               Statement init = new If (new Binary (Binary.Operator.Equality, site_field_expr, new NullLiteral (loc)), s, loc);
+                               Statement init = new If (new Binary (Binary.Operator.Equality, site_field_expr, new NullLiteral (loc), loc), s, loc);
                                init.Emit (ec);
                        }
 
@@ -329,7 +376,7 @@ namespace Mono.CSharp
                        if (target != null)
                                target.Emit (ec);
 
-                       SymbolWriter.CloseCompilerGeneratedBlock (ec.ig);
+                       SymbolWriter.CloseCompilerGeneratedBlock (ec);
                }
 
                public static MemberAccess GetBinderNamespace (Location loc)
@@ -343,7 +390,7 @@ namespace Mono.CSharp
                        return new MemberAccess (TypeManager.binder_type, name, loc);
                }
 
-               TypeExpr CreateSiteType (CompilerContext ctx, int dyn_args_count, bool is_statement)
+               TypeExpr CreateSiteType (CompilerContext ctx, Arguments arguments, int dyn_args_count, bool is_statement)
                {
                        int default_args = is_statement ? 1 : 2;
 
@@ -351,12 +398,12 @@ namespace Mono.CSharp
                        FullNamedExpression[] targs = new FullNamedExpression[dyn_args_count + default_args];
                        targs [0] = new TypeExpression (TypeManager.call_site_type, loc);
                        for (int i = 0; i < dyn_args_count; ++i) {
-                               Type arg_type;
+                               TypeSpec arg_type;
                                Argument a = arguments [i];
                                if (a.Type == TypeManager.null_type)
                                        arg_type = TypeManager.object_type;
                                else
-                                       arg_type = TypeManager.TypeToReflectionType (a.Type);
+                                       arg_type = a.Type;
 
                                if (a.ArgType == Argument.AType.Out || a.ArgType == Argument.AType.Ref)
                                        has_ref_out_argument = true;
@@ -366,12 +413,12 @@ namespace Mono.CSharp
 
                        TypeExpr del_type = null;
                        if (!has_ref_out_argument) {
-                               string d_name = is_statement ? "Action`" : "Func`";
+                               string d_name = is_statement ? "Action" : "Func";
 
-                               Type t = TypeManager.CoreLookupType (ctx, "System", d_name + (dyn_args_count + default_args), Kind.Delegate, false);
+                               TypeSpec t = TypeManager.CoreLookupType (ctx, "System", d_name, dyn_args_count + default_args, MemberKind.Delegate, false);
                                if (t != null) {
                                        if (!is_statement)
-                                               targs [targs.Length - 1] = new TypeExpression (TypeManager.TypeToReflectionType (type), loc);
+                                               targs [targs.Length - 1] = new TypeExpression (type, loc);
 
                                        del_type = new GenericTypeExpr (t, new TypeArguments (targs), loc);
                                }
@@ -381,7 +428,7 @@ namespace Mono.CSharp
                        // Create custom delegate when no appropriate predefined one is found
                        //
                        if (del_type == null) {
-                               Type rt = is_statement ? TypeManager.void_type : type;
+                               TypeSpec rt = is_statement ? TypeManager.void_type : type;
                                Parameter[] p = new Parameter [dyn_args_count + 1];
                                p[0] = new Parameter (targs [0], "p0", Parameter.Modifier.NONE, null, loc);
 
@@ -389,16 +436,18 @@ namespace Mono.CSharp
                                        p[i] = new Parameter (targs[i], "p" + i.ToString ("X"), arguments[i - 1].Modifier, null, loc);
 
                                TypeContainer parent = CreateSiteContainer ();
-                               Delegate d = new Delegate (parent.NamespaceEntry, parent, new TypeExpression (TypeManager.TypeToReflectionType (rt), loc),
+                               Delegate d = new Delegate (parent.NamespaceEntry, parent, new TypeExpression (rt, loc),
                                        Modifiers.INTERNAL | Modifiers.COMPILER_GENERATED,
                                        new MemberName ("Container" + container_counter++.ToString ("X")),
-                                       new ParametersCompiled (p), null);
+                                       new ParametersCompiled (ctx, p), null);
 
+                               d.CreateType ();
                                d.DefineType ();
                                d.Define ();
+                               d.Emit ();
 
                                parent.AddDelegate (d);
-                               del_type = new TypeExpression (d.TypeBuilder, loc);
+                               del_type = new TypeExpression (d.Definition, loc);
                        }
 
                        TypeExpr site_type = new GenericTypeExpr (TypeManager.generic_call_site_type, new TypeArguments (del_type), loc);
@@ -418,25 +467,28 @@ namespace Mono.CSharp
        class DynamicEventCompoundAssign : DynamicExpressionStatement, IDynamicBinder
        {
                string name;
-               ExpressionStatement assignment;
-               ExpressionStatement invoke;
+               Statement condition;
 
                public DynamicEventCompoundAssign (string name, Arguments args, ExpressionStatement assignment, ExpressionStatement invoke, Location loc)
                        : base (null, args, loc)
                {
                        this.name = name;
-                       this.assignment = assignment;
-                       this.invoke = invoke;
                        base.binder = this;
 
                        // Used by += or -= only
                        type = TypeManager.bool_type;
+
+                       condition = new If (
+                               new Binary (Binary.Operator.Equality, this, new BoolLiteral (true, loc), loc),
+                               new StatementExpression (invoke), new StatementExpression (assignment),
+                               loc);
                }
 
                public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
                {
-                       Arguments binder_args = new Arguments (2);
+                       Arguments binder_args = new Arguments (3);
 
+                       binder_args.Add (new Argument (new BinderFlags (0, this)));
                        binder_args.Add (new Argument (new StringLiteral (name, loc)));
                        binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));
 
@@ -445,18 +497,13 @@ namespace Mono.CSharp
 
                public override void EmitStatement (EmitContext ec)
                {
-                       Statement cond = new If (
-                               new Binary (Binary.Operator.Equality, this, new BoolLiteral (true, loc)),
-                               new StatementExpression (invoke),
-                               new StatementExpression (assignment),
-                               loc);
-                       cond.Emit (ec);
+                       condition.Emit (ec);
                }
        }
 
        class DynamicConversion : DynamicExpressionStatement, IDynamicBinder
        {
-               public DynamicConversion (Type targetType, CSharpBinderFlags flags, Arguments args, Location loc)
+               public DynamicConversion (TypeSpec targetType, CSharpBinderFlags flags, Arguments args, Location loc)
                        : base (null, args, loc)
                {
                        type = targetType;
@@ -466,25 +513,24 @@ namespace Mono.CSharp
 
                public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
                {
-                       Arguments binder_args = new Arguments (2);
+                       Arguments binder_args = new Arguments (3);
 
                        flags |= ec.HasSet (ResolveContext.Options.CheckedScope) ? CSharpBinderFlags.CheckedContext : 0;
 
                        binder_args.Add (new Argument (new BinderFlags (flags, this)));
+                       binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));                                            
                        binder_args.Add (new Argument (new TypeOf (new TypeExpression (type, loc), loc)));
                        return new Invocation (GetBinder ("Convert", loc), binder_args);
                }
        }
 
-       class DynamicIndexBinder : DynamicExpressionStatement, IDynamicBinder, IAssignMethod
+       class DynamicConstructorBinder : DynamicExpressionStatement, IDynamicBinder
        {
-               readonly bool isSet;
-
-               public DynamicIndexBinder (bool isSet, Arguments args, Location loc)
+               public DynamicConstructorBinder (TypeSpec type, Arguments args, Location loc)
                        : base (null, args, loc)
                {
+                       this.type = type;
                        base.binder = this;
-                       this.isSet = isSet;
                }
 
                public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
@@ -493,27 +539,29 @@ namespace Mono.CSharp
 
                        binder_args.Add (new Argument (new BinderFlags (0, this)));
                        binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));
-                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (), loc)));
+                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (ec), loc)));
 
-                       return new Invocation (GetBinder (isSet ? "SetIndex" : "GetIndex", loc), binder_args);
+                       return new Invocation (GetBinder ("InvokeConstructor", loc), binder_args);
                }
+       }
 
-               #region IAssignMethod Members
-
-               public void Emit (EmitContext ec, bool leave_copy)
+       class DynamicIndexBinder : DynamicMemberAssignable
+       {
+               public DynamicIndexBinder (Arguments args, Location loc)
+                       : base (args, loc)
                {
-                       throw new NotImplementedException ();
                }
 
-               public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
+               protected override Expression CreateCallSiteBinder (ResolveContext ec, Arguments args, bool isSet)
                {
-                       if (leave_copy)
-                               Emit (ec);
-                       else
-                               EmitStatement (ec);
-               }
+                       Arguments binder_args = new Arguments (3);
 
-               #endregion
+                       binder_args.Add (new Argument (new BinderFlags (0, this)));
+                       binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));
+                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (ec), loc)));
+
+                       return new Invocation (GetBinder (isSet ? "SetIndex" : "GetIndex", loc), binder_args);
+               }
        }
 
        class DynamicInvocation : DynamicExpressionStatement, IDynamicBinder
@@ -527,13 +575,20 @@ namespace Mono.CSharp
                        this.member = member;
                }
 
-               public DynamicInvocation (ATypeNameExpression member, Arguments args, Type type, Location loc)
+               public DynamicInvocation (ATypeNameExpression member, Arguments args, TypeSpec type, Location loc)
                        : this (member, args, loc)
                {
                        // When a return type is known not to be dynamic
                        this.type = type;
                }
 
+               public static DynamicInvocation CreateSpecialNameInvoke (ATypeNameExpression member, Arguments args, Location loc)
+               {
+                       return new DynamicInvocation (member, args, loc) {
+                               flags = CSharpBinderFlags.InvokeSpecialName
+                       };
+               }
+
                public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
                {
                        Arguments binder_args = new Arguments (member != null ? 5 : 3);
@@ -555,8 +610,8 @@ namespace Mono.CSharp
                        if (member != null && member.HasTypeArguments) {
                                TypeArguments ta = member.TypeArguments;
                                if (ta.Resolve (ec)) {
-                                       ArrayList targs = new ArrayList (ta.Count);
-                                       foreach (Type t in ta.Arguments)
+                                       var targs = new ArrayInitializer (ta.Count, loc);
+                                       foreach (TypeSpec t in ta.Arguments)
                                                targs.Add (new TypeOf (new TypeExpression (t, loc), loc));
 
                                        binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", targs, loc)));
@@ -570,9 +625,11 @@ namespace Mono.CSharp
                        Expression real_args;
                        if (args == null) {
                                // Cannot be null because .NET trips over
-                               real_args = new ArrayCreation (new MemberAccess (GetBinderNamespace (loc), "CSharpArgumentInfo", loc), "[]", new ArrayList (0), loc);
+                               real_args = new ArrayCreation (
+                                       new MemberAccess (GetBinderNamespace (loc), "CSharpArgumentInfo", loc), "[]",
+                                       new ArrayInitializer (0, loc), loc);
                        } else {
-                               real_args = new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (), loc);
+                               real_args = new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (ec), loc);
                        }
 
                        binder_args.Add (new Argument (real_args));
@@ -582,35 +639,93 @@ namespace Mono.CSharp
 
                public override void EmitStatement (EmitContext ec)
                {
-                       flags = CSharpBinderFlags.ResultDiscarded;
+                       flags |= CSharpBinderFlags.ResultDiscarded;
                        base.EmitStatement (ec);
                }
        }
 
-       class DynamicMemberBinder : DynamicExpressionStatement, IDynamicBinder, IAssignMethod
+       class DynamicMemberBinder : DynamicMemberAssignable
        {
-               readonly bool isSet;
                readonly string name;
 
-               public DynamicMemberBinder (bool isSet, string name, Arguments args, Location loc)
-                       : base (null, args, loc)
+               public DynamicMemberBinder (string name, Arguments args, Location loc)
+                       : base (args, loc)
                {
-                       base.binder = this;
-                       this.isSet = isSet;
                        this.name = name;
                }
 
-               public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
+               protected override Expression CreateCallSiteBinder (ResolveContext ec, Arguments args, bool isSet)
                {
                        Arguments binder_args = new Arguments (4);
 
                        binder_args.Add (new Argument (new BinderFlags (0, this)));
                        binder_args.Add (new Argument (new StringLiteral (name, loc)));
                        binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));
-                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (), loc)));
+                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (ec), loc)));
 
                        return new Invocation (GetBinder (isSet ? "SetMember" : "GetMember", loc), binder_args);
                }
+       }
+
+       //
+       // Any member binder which can be source and target of assignment
+       //
+       abstract class DynamicMemberAssignable : DynamicExpressionStatement, IDynamicBinder, IAssignMethod
+       {
+               Expression setter;
+               Arguments setter_args;
+
+               protected DynamicMemberAssignable (Arguments args, Location loc)
+                       : base (null, args, loc)
+               {
+                       base.binder = this;
+               }
+
+               public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
+               {
+                       //
+                       // DoResolve always uses getter
+                       //
+                       return CreateCallSiteBinder (ec, args, false);
+               }
+
+               protected abstract Expression CreateCallSiteBinder (ResolveContext ec, Arguments args, bool isSet);
+
+               public override Expression DoResolveLValue (ResolveContext rc, Expression right_side)
+               {
+                       if (right_side == EmptyExpression.OutAccess.Instance) {
+                               right_side.DoResolveLValue (rc, this);
+                               return null;
+                       }
+
+                       if (DoResolveCore (rc)) {
+                               setter_args = new Arguments (Arguments.Count + 1);
+                               setter_args.AddRange (Arguments);
+                               setter_args.Add (new Argument (right_side));
+                               setter = CreateCallSiteBinder (rc, setter_args, true);
+                       }
+
+                       eclass = ExprClass.Variable;
+                       return this;
+               }
+
+               public override void Emit (EmitContext ec)
+               {
+                       // It's null for ResolveLValue used without assignment
+                       if (binder_expr == null)
+                               EmitCall (ec, setter, Arguments, false);
+                       else
+                               base.Emit (ec);
+               }
+
+               public override void EmitStatement (EmitContext ec)
+               {
+                       // It's null for ResolveLValue used without assignment
+                       if (binder_expr == null)
+                               EmitCall (ec, setter, Arguments, true);
+                       else
+                               base.EmitStatement (ec);
+               }
 
                #region IAssignMethod Members
 
@@ -621,10 +736,7 @@ namespace Mono.CSharp
 
                public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
                {
-                       if (leave_copy)
-                               Emit (ec);
-                       else
-                               EmitStatement (ec);
+                       EmitCall (ec, setter, setter_args, !leave_copy);
                }
 
                #endregion
@@ -645,7 +757,7 @@ namespace Mono.CSharp
 
                public Expression CreateCallSiteBinder (ResolveContext ec, Arguments args)
                {
-                       Arguments binder_args = new Arguments (3);
+                       Arguments binder_args = new Arguments (4);
 
                        MemberAccess sle = new MemberAccess (new MemberAccess (
                                new QualifiedAliasMember (QualifiedAliasMember.GlobalAlias, "System", loc), "Linq", loc), "Expressions", loc);
@@ -654,7 +766,8 @@ namespace Mono.CSharp
 
                        binder_args.Add (new Argument (new BinderFlags (flags, this)));
                        binder_args.Add (new Argument (new MemberAccess (new MemberAccess (sle, "ExpressionType", loc), name, loc)));
-                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (), loc)));
+                       binder_args.Add (new Argument (new TypeOf (new TypeExpression (ec.CurrentType, loc), loc)));
+                       binder_args.Add (new Argument (new ImplicitlyTypedArrayCreation ("[]", args.CreateDynamicBinderArguments (ec), loc)));
 
                        return new Invocation (GetBinder ("UnaryOperation", loc), binder_args);
                }