* MenuAPI.cs: On instance of MenuTracker check if source control is

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

diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
index ca2ed1e38b40fd78b70eb054b9d7ea4555d55683..6a5c34d2872608c9e0fd04f861a618fff99ed553 100644 (file)
--- a/mcs/mcs/assign.cs
+++ b/mcs/mcs/assign.cs
@@ -282,6 +282,12 @@ namespace Mono.CSharp {
                {
                        this.is_embedded = true;
                }
+               
+               public override Expression CreateExpressionTree (EmitContext ec)
+               {
+                       Report.Error (832, loc, "An expression tree cannot contain an assignment operator");
+                       return null;
+               }
 
                protected virtual Assign GetEmbeddedAssign (Location loc)
                {
@@ -325,6 +331,7 @@ namespace Mono.CSharp {
                                source = embedded = ((Assign) source).GetEmbeddedAssign (loc);
 
                        real_source = source = source.Resolve (ec);
+                                               
                        if (source == null) {
                                // Ensure that we don't propagate the error as spurious "uninitialized variable" errors.
                                target = target.ResolveLValue (ec, EmptyExpression.Null, Location);
@@ -359,12 +366,12 @@ namespace Mono.CSharp {
                        // local variable as source.
                        if (embedded != null)
                                source = (embedded.temp != null) ? embedded.temp : embedded.source;
-
+                       
                        target = target.ResolveLValue (ec, source, Location);
 
                        if (target == null)
                                return null;
-
+                       
                        bool same_assignment = (embedded != null) ? embedded.Target.Equals(target) : source.Equals (target);
                        if (same_assignment) {
                                Report.Warning (1717, 3, loc, "Assignment made to same variable; did you mean to assign something else?");
@@ -422,15 +429,18 @@ namespace Mono.CSharp {
 
                        }
 
-                       if (target_type == source_type){
-                               if (source is New && target_type.IsValueType &&
-                                   (target.eclass != ExprClass.IndexerAccess) && (target.eclass != ExprClass.PropertyAccess)){
-                                       New n = (New) source;
+                       if (target_type == source_type) {
+                               if (target.eclass == ExprClass.Variable) {
+                                       New n = source as New;
+                                       if (n == null)
+                                               return this;
 
-                                       if (n.SetValueTypeVariable (target))
+                                       if (n.HasInitializer) {
+                                               n.SetTargetVariable (target);
+                                       } else if (target_type.IsValueType) {
+                                               n.SetTargetVariable (target);
                                                return n;
-                                       else
-                                               return null;
+                                       }
                                }
 
                                return this;
@@ -583,12 +593,12 @@ namespace Mono.CSharp {
                        Emit (ec, true);
                }
 
-               protected override void CloneTo (Expression t)
+               protected override void CloneTo (CloneContext clonectx, Expression t)
                {
                        Assign _target = (Assign) t;
 
-                       _target.target = target.Clone ();
-                       _target.source = source.Clone ();
+                       _target.target = target.Clone (clonectx);
+                       _target.source = source.Clone (clonectx);
                }
        }
 
@@ -596,16 +606,41 @@ namespace Mono.CSharp {
        // This class implements fields and events class initializers
        public class FieldInitializer : Assign
        {
-               public readonly DeclSpace TypeContainer;
+               //
+               // Keep resolved value because field initializers have their own rules
+               //
+               ExpressionStatement resolved;
 
-               public FieldInitializer (FieldBuilder field, Expression expression, DeclSpace container)
+               public FieldInitializer (FieldBuilder field, Expression expression)
                        : base (new FieldExpr (field, expression.Location, true), expression)
                {
-                       this.TypeContainer = container;
                        if (!field.IsStatic)
                                ((FieldExpr)target).InstanceExpression = CompilerGeneratedThis.Instance;
                }
 
+               public override Expression DoResolve (EmitContext ec)
+               {
+                       // Field initializer can be resolved (fail) many times
+                       if (Source == null)
+                               return null;
+
+                       if (resolved == null)
+                               resolved = base.DoResolve (ec) as ExpressionStatement;
+
+                       return resolved;
+               }
+
+               public override void EmitStatement (EmitContext ec)
+               {
+                       if (resolved == null)
+                               return;
+                       
+                       if (resolved != this)
+                               resolved.EmitStatement (ec);
+                       else
+                               base.EmitStatement (ec);
+               }
+               
                public bool IsComplexInitializer {
                        get {
                                if (embedded != null)
@@ -659,7 +694,10 @@ namespace Mono.CSharp {
                        if (original_source == null)
                                return null;
 
-                       target = target.Resolve (ec);
+                       using (ec.Set (EmitContext.Flags.InCompoundAssignment)) {
+                               target = target.Resolve (ec);
+                       }
+                       
                        if (target == null)
                                return null;
 
@@ -672,15 +710,15 @@ namespace Mono.CSharp {
                        // into a tree, to guarantee that we do not have side
                        // effects.
                        //
-                       source = new Binary (op, target, original_source);
+                       source = new Binary (op, target, original_source, true);
                        return base.DoResolve (ec);
                }
 
-               protected override void CloneTo (Expression t)
+               protected override void CloneTo (CloneContext clonectx, Expression t)
                {
                        CompoundAssign target = (CompoundAssign) t;
 
-                       target.original_source = original_source.Clone ();
+                       target.original_source = original_source.Clone (clonectx);
                }
        }
 }