* 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 4065e7e2737f789b76acc3de3c80673bb99a9c96..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)
                {
@@ -600,6 +606,11 @@ namespace Mono.CSharp {
        // This class implements fields and events class initializers
        public class FieldInitializer : Assign
        {
+               //
+               // Keep resolved value because field initializers have their own rules
+               //
+               ExpressionStatement resolved;
+
                public FieldInitializer (FieldBuilder field, Expression expression)
                        : base (new FieldExpr (field, expression.Location, true), expression)
                {
@@ -613,7 +624,21 @@ namespace Mono.CSharp {
                        if (Source == null)
                                return null;
 
-                       return base.DoResolve (ec);
+                       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 {
@@ -669,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;