* TabControl.cs: Fix typo, emilinates an unneeded expose event.
[mono.git] / mcs / mcs / statement.cs
old mode 100755 (executable)
new mode 100644 (file)
index 709294b..421abe5
@@ -3,9 +3,10 @@
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
-//   Martin Baulig (martin@gnome.org)
+//   Martin Baulig (martin@ximian.com)
 //
 // (C) 2001, 2002, 2003 Ximian, Inc.
+// (C) 2003, 2004 Novell, Inc.
 //
 
 using System;
@@ -45,16 +46,14 @@ namespace Mono.CSharp {
                        // in unreachable code, for instance.
                        //
 
+                       if (warn && (RootContext.WarningLevel >= 2))
+                               Report.Warning (162, loc, "Unreachable code detected");
+
                        ec.StartFlowBranching (FlowBranching.BranchingType.Block, loc);
                        bool ok = Resolve (ec);
                        ec.KillFlowBranching ();
 
-                       if (!ok)
-                               return false;
-
-                       if (warn && (RootContext.WarningLevel >= 2))
-                               Report.Warning (162, loc, "Unreachable code detected");
-                       return true;
+                       return ok;
                }
                
                protected void CheckObsolete (Type type)
@@ -147,6 +146,11 @@ namespace Mono.CSharp {
                                return false;
                        }
 
+                       Assign ass = expr as Assign;
+                       if (ass != null && ass.Source is Constant) {
+                               Report.Warning (665, 3, loc, "Assignment in conditional expression is always constant; did you mean to use == instead of = ?");
+                       }
+
                        //
                        // Dead code elimination
                        //
@@ -526,7 +530,8 @@ namespace Mono.CSharp {
 
                public override bool Resolve (EmitContext ec)
                {
-                       expr = expr.ResolveStatement (ec);
+                       if (expr != null)
+                               expr = expr.ResolveStatement (ec);
                        return expr != null;
                }
                
@@ -559,6 +564,11 @@ namespace Mono.CSharp {
                {
                        if (ec.ReturnType == null){
                                if (Expr != null){
+                                       if (ec.CurrentAnonymousMethod != null){
+                                               Report.Error (1662, loc, String.Format (
+                                                       "Anonymous method could not be converted to delegate " +
+                                                       "since the return value does not match the delegate value"));
+                                       }
                                        Error (127, "Return with a value not allowed here");
                                        return false;
                                }
@@ -570,6 +580,12 @@ namespace Mono.CSharp {
                                        return false;
                                }
 
+                               if (ec.InIterator) {
+                                       Report.Error (1622, loc, "Cannot return a value from iterators. Use the yield return " +
+                                               "statement to return a value, or yield break to end the iteration");
+                                       return false;
+                               }
+
                                Expr = Expr.Resolve (ec);
                                if (Expr == null)
                                        return false;
@@ -598,6 +614,9 @@ namespace Mono.CSharp {
                        } else
                                vector.CheckOutParameters (ec.CurrentBranching);
 
+                       if (in_exc)
+                               ec.NeedReturnLabel ();
+
                        ec.CurrentBranching.CurrentUsageVector.Return ();
                        return true;
                }
@@ -611,12 +630,10 @@ namespace Mono.CSharp {
                                        ec.ig.Emit (OpCodes.Stloc, ec.TemporaryReturn ());
                        }
 
-                       if (in_exc) {
-                               ec.NeedReturnLabel ();
+                       if (in_exc)
                                ec.ig.Emit (OpCodes.Leave, ec.ReturnLabel);
-                       } else {
+                       else
                                ec.ig.Emit (OpCodes.Ret);
-                       }
                }
        }
 
@@ -636,6 +653,7 @@ namespace Mono.CSharp {
                                label.AddUsageVector (ec.CurrentBranching.CurrentUsageVector);
 
                        ec.CurrentBranching.CurrentUsageVector.Goto ();
+                       label.AddReference ();
 
                        return true;
                }
@@ -665,6 +683,7 @@ namespace Mono.CSharp {
                bool defined;
                bool referenced;
                Label label;
+               ILGenerator ig;
 
                FlowBranching.UsageVector vectors;
                
@@ -677,6 +696,7 @@ namespace Mono.CSharp {
                {
                        if (defined)
                                return label;
+                       ig = ec.ig;
                        label = ec.ig.DefineLabel ();
                        defined = true;
 
@@ -706,16 +726,23 @@ namespace Mono.CSharp {
                {
                        ec.CurrentBranching.Label (vectors);
 
-                       referenced = true;
-
                        return true;
                }
 
                protected override void DoEmit (EmitContext ec)
                {
+                       if (ig != null && ig != ec.ig) {
+                               Report.Error (1632, "Control cannot leave body of anonymous method");
+                               return;
+                       }
                        LabelTarget (ec);
                        ec.ig.MarkLabel (label);
                }
+
+               public void AddReference ()
+               {
+                       referenced = true;
+               }
        }
        
 
@@ -755,7 +782,7 @@ namespace Mono.CSharp {
        /// </summary>
        public class GotoCase : Statement {
                Expression expr;
-               Label label;
+               SwitchLabel sl;
                
                public GotoCase (Expression e, Location l)
                {
@@ -785,7 +812,7 @@ namespace Mono.CSharp {
                        if (val == null)
                                return false;
                                        
-                       SwitchLabel sl = (SwitchLabel) ec.Switch.Elements [val];
+                       sl = (SwitchLabel) ec.Switch.Elements [val];
 
                        if (sl == null){
                                Report.Error (
@@ -794,15 +821,13 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       label = sl.ILLabelCode;
-
                        ec.CurrentBranching.CurrentUsageVector.Goto ();
                        return true;
                }
 
                protected override void DoEmit (EmitContext ec)
                {
-                       ec.ig.Emit (OpCodes.Br, label);
+                       ec.ig.Emit (OpCodes.Br, sl.GetILLabelCode (ec));
                }
        }
        
@@ -817,7 +842,6 @@ namespace Mono.CSharp {
 
                public override bool Resolve (EmitContext ec)
                {
-                       bool in_catch = ec.CurrentBranching.InCatch ();
                        ec.CurrentBranching.CurrentUsageVector.Throw ();
 
                        if (expr != null){
@@ -828,28 +852,33 @@ namespace Mono.CSharp {
                                ExprClass eclass = expr.eclass;
 
                                if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
-                                     eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
-                                       expr.Error_UnexpectedKind ("value, variable, property or indexer access ");
+                                       eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
+                                       expr.Error_UnexpectedKind ("value, variable, property or indexer access ", loc);
                                        return false;
                                }
 
                                Type t = expr.Type;
                                
                                if ((t != TypeManager.exception_type) &&
-                                   !t.IsSubclassOf (TypeManager.exception_type) &&
-                                   !(expr is NullLiteral)) {
+                                       !t.IsSubclassOf (TypeManager.exception_type) &&
+                                       !(expr is NullLiteral)) {
                                        Error (155,
-                                              "The type caught or thrown must be derived " +
-                                              "from System.Exception");
+                                               "The type caught or thrown must be derived " +
+                                               "from System.Exception");
                                        return false;
                                }
-                       } else if (!in_catch) {
-                               Error (156,
-                                      "A throw statement with no argument is only " +
-                                      "allowed in a catch clause");
+                               return true;
+                       }
+
+                       if (ec.CurrentBranching.InFinally (true)) {
+                               Error (724, "A throw statement with no argument is only allowed in a catch clause nested inside of the innermost catch clause");
                                return false;
                        }
 
+                       if (!ec.CurrentBranching.InCatch ()) {
+                               Error (156, "A throw statement with no argument is only allowed in a catch clause");
+                               return false;
+                       }
                        return true;
                }
                        
@@ -891,6 +920,9 @@ namespace Mono.CSharp {
 
                        crossing_exc = ec.CurrentBranching.BreakCrossesTryCatchBoundary ();
 
+                       if (!crossing_exc)
+                               ec.NeedReturnLabel ();
+
                        ec.CurrentBranching.CurrentUsageVector.Break ();
                        return true;
                }
@@ -902,7 +934,6 @@ namespace Mono.CSharp {
                        if (crossing_exc)
                                ig.Emit (OpCodes.Leave, ec.LoopEnd);
                        else {
-                               ec.NeedReturnLabel ();
                                ig.Emit (OpCodes.Br, ec.LoopEnd);
                        }
                }
@@ -945,13 +976,17 @@ namespace Mono.CSharp {
                }
        }
 
+       //
+       // The information about a user-perceived local variable
+       //
        public class LocalInfo {
                public Expression Type;
 
                //
                // Most of the time a variable will be stored in a LocalBuilder
                //
-               // But sometimes, it will be stored in a field.  The context of the field will
+               // But sometimes, it will be stored in a field (variables that have been
+               // hoisted by iterators or by anonymous methods).  The context of the field will
                // be stored in the EmitContext
                //
                //
@@ -969,7 +1004,9 @@ namespace Mono.CSharp {
                        Used = 1,
                        ReadOnly = 2,
                        Pinned = 4,
-                       IsThis = 8      
+                       IsThis = 8,
+                       Captured = 16,
+                       AddressTaken = 32
                }
 
                Flags flags;
@@ -1010,8 +1047,13 @@ namespace Mono.CSharp {
 
                public bool Resolve (EmitContext ec)
                {
-                       if (VariableType == null)
-                               VariableType = ec.DeclSpace.ResolveType (Type, false, Location);
+                       if (VariableType == null) {
+                               TypeExpr texpr = Type.ResolveAsTypeTerminal (ec, false);
+                               if (texpr == null)
+                                       return false;
+                               
+                               VariableType = texpr.ResolveType (ec);
+                       }
 
                        if (VariableType == TypeManager.void_type) {
                                Report.Error (1547, Location,
@@ -1019,9 +1061,6 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       if (VariableType == null)
-                               return false;
-
                        if (VariableType.IsAbstract && VariableType.IsSealed) {
                                Report.Error (723, Location, "Cannot declare variable of static type '{0}'", TypeManager.CSharpName (VariableType));
                                return false;
@@ -1045,6 +1084,26 @@ namespace Mono.CSharp {
                        }
                }
 
+               public bool IsCaptured {
+                       get {
+                               return (flags & Flags.Captured) != 0;
+                       }
+
+                       set {
+                               flags |= Flags.Captured;
+                       }
+               }
+
+               public bool AddressTaken {
+                       get {
+                               return (flags & Flags.AddressTaken) != 0;
+                       }
+
+                       set {
+                               flags |= Flags.AddressTaken;
+                       }
+               }
+
                public override string ToString ()
                {
                        return String.Format ("LocalInfo ({0},{1},{2},{3})",
@@ -1056,7 +1115,7 @@ namespace Mono.CSharp {
                                return (flags & Flags.Used) != 0;
                        }
                        set {
-                               flags = value ? (flags | Flags.Used) : (flags & ~Flags.Used);
+                               flags = value ? (flags | Flags.Used) : (unchecked (flags & ~Flags.Used));
                        }
                }
 
@@ -1065,7 +1124,7 @@ namespace Mono.CSharp {
                                return (flags & Flags.ReadOnly) != 0;
                        }
                        set {
-                               flags = value ? (flags | Flags.ReadOnly) : (flags & ~Flags.ReadOnly);
+                               flags = value ? (flags | Flags.ReadOnly) : (unchecked (flags & ~Flags.ReadOnly));
                        }
                }
 
@@ -1107,19 +1166,21 @@ namespace Mono.CSharp {
        ///   they contain extra information that is not necessary on normal blocks.
        /// </remarks>
        public class Block : Statement {
-               public readonly Block     Parent;
+               public Block    Parent;
                public readonly Location  StartLocation;
-               public Location           EndLocation = Location.Null;
+               public Location EndLocation = Location.Null;
 
                [Flags]
-               public enum Flags : byte {
+               public enum Flags {
                        Implicit  = 1,
                        Unchecked = 2,
                        BlockUsed = 4,
                        VariablesInitialized = 8,
                        HasRet = 16,
                        IsDestructor = 32,
-                       HasVarargs = 64 
+                       HasVarargs = 64,
+                       IsToplevel = 128,
+                       Unsafe = 256
                }
                Flags flags;
 
@@ -1138,6 +1199,15 @@ namespace Mono.CSharp {
                        }
                }
 
+               public bool Unsafe {
+                       get {
+                               return (flags & Flags.Unsafe) != 0;
+                       }
+                       set {
+                               flags |= Flags.Unsafe;
+                       }
+               }
+
                public bool HasVarargs {
                        get {
                                if (Parent != null)
@@ -1179,12 +1249,17 @@ namespace Mono.CSharp {
                // Keeps track of constants
                Hashtable constants;
 
+               //
+               // The parameters for the block, this is only needed on the toplevel block really
+               // TODO: move `parameters' into ToplevelBlock
+               Parameters parameters;
+               
                //
                // If this is a switch section, the enclosing switch block.
                //
                Block switch_block;
 
-               static int id;
+               protected static int id;
 
                int this_id;
                
@@ -1369,12 +1444,12 @@ namespace Mono.CSharp {
                // </summary>
                public LocalInfo ThisVariable {
                        get {
-                               if (this_variable != null)
-                                       return this_variable;
-                               else if (Parent != null)
-                                       return Parent.ThisVariable;
-                               else
-                                       return null;
+                               for (Block b = this; b != null; b = b.Parent) {
+                                       if (b.this_variable != null)
+                                               return b.this_variable;
+                               }
+                               
+                               return null;
                        }
                }
 
@@ -1390,8 +1465,7 @@ namespace Mono.CSharp {
                        if (child_variable_names == null)
                                child_variable_names = new Hashtable ();
 
-                       if (!child_variable_names.Contains (name))
-                               child_variable_names.Add (name, true);
+                       child_variable_names [name] = null;
                }
 
                // <summary>
@@ -1434,9 +1508,16 @@ namespace Mono.CSharp {
                        if (variables == null)
                                variables = new Hashtable ();
 
+                       Block cur = this;
+                       while (cur != null && cur.Implicit)
+                               cur = cur.Parent;
+
                        LocalInfo vi = GetLocalInfo (name);
                        if (vi != null) {
-                               if (vi.Block != this)
+                               Block var = vi.Block;
+                               while (var != null && var.Implicit)
+                                       var = var.Parent;
+                               if (var != cur)
                                        Report.Error (136, l, "A local variable named `" + name + "' " +
                                                      "cannot be declared in this scope since it would " +
                                                      "give a different meaning to `" + name + "', which " +
@@ -1475,9 +1556,6 @@ namespace Mono.CSharp {
                        variables.Add (name, vi);
 
                        // Mark 'name' as "used by a child block" in every surrounding block
-                       Block cur = this;
-                       while (cur != null && cur.Implicit) 
-                               cur = cur.Parent;
                        if (cur != null)
                                for (Block par = cur.Parent; par != null; par = par.Parent)
                                        par.AddChildVariableName (name);
@@ -1552,17 +1630,76 @@ namespace Mono.CSharp {
                        
                        return e != null;
                }
-               
-               Parameters parameters = null;
-               public Parameters Parameters {
-                       get {
-                               Block b = this;
-                               while (b.Parent != null)
-                                       b = b.Parent;
-                               return b.parameters;
-                       }
+
+               //
+               // Returns a `ParameterReference' for the given name, or null if there
+               // is no such parameter
+               //
+               public ParameterReference GetParameterReference (string name, Location loc)
+               {
+                       Block b = this;
+
+                       do {
+                               Parameters pars = b.parameters;
+                               
+                               if (pars != null){
+                                       Parameter par;
+                                       int idx;
+                                       
+                                       par = pars.GetParameterByName (name, out idx);
+                                       if (par != null){
+                                               return new ParameterReference (pars, this, idx, name, loc);
+                                       }
+                               }
+                               b = b.Parent;
+                       } while (b != null);
+                       return null;
+               }
+
+               //
+               // Whether the parameter named `name' is local to this block, 
+               // or false, if the parameter belongs to an encompassing block.
+               //
+               public bool IsLocalParameter (string name)
+               {
+                       Block b = this;
+                       int toplevel_count = 0;
+
+                       do {
+                               if (this is ToplevelBlock)
+                                       toplevel_count++;
+
+                               Parameters pars = b.parameters;
+                               if (pars != null){
+                                       if (pars.GetParameterByName (name) != null)
+                                               return true;
+                                       return false;
+                               }
+                               if (toplevel_count > 0)
+                                       return false;
+                               b = b.Parent;
+                       } while (b != null);
+                       return false;
                }
+               
+               //
+               // Whether the `name' is a parameter reference
+               //
+               public bool IsParameterReference (string name)
+               {
+                       Block b = this;
 
+                       do {
+                               Parameters pars = b.parameters;
+                               
+                               if (pars != null)
+                                       if (pars.GetParameterByName (name) != null)
+                                               return true;
+                               b = b.Parent;
+                       } while (b != null);
+                       return false;
+               }
+               
                /// <returns>
                ///   A list of labels that were not used within this block
                /// </returns>
@@ -1611,7 +1748,7 @@ namespace Mono.CSharp {
                public VariableMap ParameterMap {
                        get {
                                if ((flags & Flags.VariablesInitialized) == 0)
-                                       throw new Exception ();
+                                       throw new Exception ("Variables have not been initialized yet");
 
                                return param_map;
                        }
@@ -1620,17 +1757,12 @@ namespace Mono.CSharp {
                public VariableMap LocalMap {
                        get {
                                if ((flags & Flags.VariablesInitialized) == 0)
-                                       throw new Exception ();
+                                       throw new Exception ("Variables have not been initialized yet");
 
                                return local_map;
                        }
                }
 
-               public bool LiftVariable (LocalInfo local_info)
-               {
-                       return false;
-               }
-               
                /// <summary>
                ///   Emits the variable declarations and labels.
                /// </summary>
@@ -1638,9 +1770,13 @@ namespace Mono.CSharp {
                ///   tc: is our typecontainer (to resolve type references)
                ///   ig: is the code generator:
                /// </remarks>
-               public void EmitMeta (EmitContext ec, InternalParameters ip)
+               public void ResolveMeta (ToplevelBlock toplevel, EmitContext ec, InternalParameters ip)
                {
-                       ILGenerator ig = ec.ig;
+                       bool old_unsafe = ec.InUnsafe;
+
+                       // If some parent block was unsafe, we remain unsafe even if this block
+                       // isn't explicitly marked as such.
+                       ec.InUnsafe |= Unsafe;
 
                        //
                        // Compute the VariableMap's.
@@ -1669,8 +1805,7 @@ namespace Mono.CSharp {
 
                        bool old_check_state = ec.ConstantCheckState;
                        ec.ConstantCheckState = (flags & Flags.Unchecked) == 0;
-                       bool remap_locals = ec.RemapToProxy;
-                               
+                       
                        //
                        // Process this block variables
                        //
@@ -1695,6 +1830,7 @@ namespace Mono.CSharp {
                                                        continue;
                                        }
 
+#if false
                                        if (remap_locals)
                                                vi.FieldBuilder = ec.MapVariable (name, vi.VariableType);
                                        else if (vi.Pinned)
@@ -1705,6 +1841,7 @@ namespace Mono.CSharp {
                                                vi.LocalBuilder = TypeManager.DeclareLocalPinned (ig, vi.VariableType);
                                        else if (!vi.IsThis)
                                                vi.LocalBuilder = ig.DeclareLocal (vi.VariableType);
+#endif
 
                                        if (constants == null)
                                                continue;
@@ -1743,7 +1880,46 @@ namespace Mono.CSharp {
                        //
                        if (children != null){
                                foreach (Block b in children)
-                                       b.EmitMeta (ec, ip);
+                                       b.ResolveMeta (toplevel, ec, ip);
+                       }
+                       ec.InUnsafe = old_unsafe;
+               }
+
+               //
+               // Emits the local variable declarations for a block
+               //
+               public void EmitMeta (EmitContext ec)
+               {
+                       ILGenerator ig = ec.ig;
+                       
+                       if (variables != null){
+                               bool have_captured_vars = ec.HaveCapturedVariables ();
+                               bool remap_locals = ec.RemapToProxy;
+                               
+                               foreach (DictionaryEntry de in variables){
+                                       LocalInfo vi = (LocalInfo) de.Value;
+
+                                       if (have_captured_vars && ec.IsCaptured (vi))
+                                               continue;
+
+                                       if (remap_locals){
+                                               vi.FieldBuilder = ec.MapVariable (vi.Name, vi.VariableType);
+                                       } else {
+                                               if (vi.Pinned)
+                                                       //
+                                                       // This is needed to compile on both .NET 1.x and .NET 2.x
+                                                       // the later introduced `DeclareLocal (Type t, bool pinned)'
+                                                       //
+                                                       vi.LocalBuilder = TypeManager.DeclareLocalPinned (ig, vi.VariableType);
+                                               else if (!vi.IsThis)
+                                                       vi.LocalBuilder = ig.DeclareLocal (vi.VariableType);
+                                       }
+                               }
+                       }
+
+                       if (children != null){
+                               foreach (Block b in children)
+                                       b.EmitMeta (ec);
                        }
                }
 
@@ -1783,7 +1959,7 @@ namespace Mono.CSharp {
 
                        Report.Debug (4, "RESOLVE BLOCK", StartLocation, ec.CurrentBranching);
 
-                       bool unreachable = false;
+                       bool unreachable = unreachable_shown;
 
                        int statement_count = statements.Count;
                        for (int ix = 0; ix < statement_count; ix++){
@@ -1801,8 +1977,10 @@ namespace Mono.CSharp {
                                        else
                                                s.loc = Location.Null;
 
-                                       statements [ix] = EmptyStatement.Value;
-                                       continue;
+                                       if (ok && !(s is Block)) {
+                                               statements [ix] = EmptyStatement.Value;
+                                               continue;
+                                       }
                                }
 
                                if (s.Resolve (ec) == false) {
@@ -1859,7 +2037,18 @@ namespace Mono.CSharp {
                public override bool ResolveUnreachable (EmitContext ec, bool warn)
                {
                        unreachable_shown = true;
-                       return base.ResolveUnreachable (ec, warn);
+
+                       if (warn && (RootContext.WarningLevel >= 2))
+                               Report.Warning (162, loc, "Unreachable code detected");
+
+                       if (Implicit)
+                               return Resolve (ec);
+
+                       ec.StartFlowBranching (FlowBranching.BranchingType.Block, loc);
+                       bool ok = Resolve (ec);
+                       ec.KillFlowBranching ();
+
+                       return ok;
                }
                
                protected override void DoEmit (EmitContext ec)
@@ -1870,7 +2059,7 @@ namespace Mono.CSharp {
                                // Check whether we are the last statement in a
                                // top-level block.
 
-                               if ((Parent == null) && (ix+1 == num_statements))
+                               if (((Parent == null) || Implicit) && (ix+1 == num_statements) && !(s is Block))
                                        ec.IsLastStatement = true;
                                else
                                        ec.IsLastStatement = false;
@@ -1890,7 +2079,7 @@ namespace Mono.CSharp {
 
                        if (emit_debug_info) {
                                if (is_lexical_block)
-                                       ec.ig.BeginScope ();
+                                       ec.BeginScope ();
 
                                if (variables != null) {
                                        foreach (DictionaryEntry de in variables) {
@@ -1910,32 +2099,130 @@ namespace Mono.CSharp {
                        ec.Mark (EndLocation, true); 
 
                        if (emit_debug_info && is_lexical_block)
-                               ec.ig.EndScope ();
+                               ec.EndScope ();
 
                        ec.CurrentBlock = prev_block;
                }
+
+               public ToplevelBlock Toplevel {
+                       get {
+                               Block b = this;
+                               while (b.Parent != null){
+                                       if ((b.flags & Flags.IsToplevel) != 0)
+                                               break;
+                                       b = b.Parent;
+                               }
+
+                               return (ToplevelBlock) b;
+                       }
+               }
+
+               //
+               // Returns true if we ar ea child of `b'.
+               //
+               public bool IsChildOf (Block b)
+               {
+                       Block current = this;
+                       
+                       do {
+                               if (current.Parent == b)
+                                       return true;
+                               current = current.Parent;
+                       } while (current != null);
+                       return false;
+               }
        }
 
        //
+       // A toplevel block contains extra information, the split is done
+       // only to separate information that would otherwise bloat the more
+       // lightweight Block.
+       //
+       // In particular, this was introduced when the support for Anonymous
+       // Methods was implemented. 
        // 
        public class ToplevelBlock : Block {
+               //
+               // Pointer to the host of this anonymous method, or null
+               // if we are the topmost block
+               //
+               public ToplevelBlock Container;
+               CaptureContext capture_context;
+
+               Hashtable capture_contexts;
+
+               static int did = 0;
+               
+                       
+               public void RegisterCaptureContext (CaptureContext cc)
+               {
+                       if (capture_contexts == null)
+                               capture_contexts = new Hashtable ();
+                       capture_contexts [cc] = cc;
+               }
+
+               public void CompleteContexts ()
+               {
+                       if (capture_contexts == null)
+                               return;
+
+                       foreach (CaptureContext cc in capture_contexts.Keys){
+                               cc.AdjustScopes ();
+                       }
+               }
+               
+               public CaptureContext ToplevelBlockCaptureContext {
+                       get {
+                               return capture_context;
+                       }
+               }
+               
+               //
+               // Parent is only used by anonymous blocks to link back to their
+               // parents
+               //
+               public ToplevelBlock (ToplevelBlock container, Parameters parameters, Location start) :
+                       base (null, Flags.IsToplevel, parameters, start, Location.Null)
+               {
+                       Container = container;
+               }
+               
                public ToplevelBlock (Parameters parameters, Location start) :
-                       base (null, parameters, start, Location.Null)
+                       base (null, Flags.IsToplevel, parameters, start, Location.Null)
                {
                }
 
                public ToplevelBlock (Flags flags, Parameters parameters, Location start) :
-                       base (null, flags, parameters, start, Location.Null)
+                       base (null, flags | Flags.IsToplevel, parameters, start, Location.Null)
+               {
+               }
+
+               public ToplevelBlock (Location loc) : base (null, Flags.IsToplevel, loc, loc)
                {
                }
+
+               public void SetHaveAnonymousMethods (Location loc, AnonymousMethod host)
+               {
+                       if (capture_context == null)
+                               capture_context = new CaptureContext (this, loc, host);
+               }
+
+               public CaptureContext CaptureContext {
+                       get {
+                               return capture_context;
+                       }
+               }
        }
        
        public class SwitchLabel {
                Expression label;
                object converted;
                public Location loc;
-               public Label ILLabel;
-               public Label ILLabelCode;
+
+               Label il_label;
+               bool  il_label_set;
+               Label il_label_code;
+               bool  il_label_code_set;
 
                //
                // if expr == null, then it is the default case.
@@ -1958,15 +2245,30 @@ namespace Mono.CSharp {
                        }
                }
 
+               public Label GetILLabel (EmitContext ec)
+               {
+                       if (!il_label_set){
+                               il_label = ec.ig.DefineLabel ();
+                               il_label_set = true;
+                       }
+                       return il_label;
+               }
+
+               public Label GetILLabelCode (EmitContext ec)
+               {
+                       if (!il_label_code_set){
+                               il_label_code = ec.ig.DefineLabel ();
+                               il_label_code_set = true;
+                       }
+                       return il_label_code;
+               }                               
+               
                //
                // Resolves the expression, reduces it to a literal if possible
                // and then converts it to the requested type.
                //
                public bool ResolveAndReduce (EmitContext ec, Type required_type)
                {
-                       ILLabel = ec.ig.DefineLabel ();
-                       ILLabelCode = ec.ig.DefineLabel ();
-
                        if (label == null)
                                return true;
                        
@@ -1983,7 +2285,6 @@ namespace Mono.CSharp {
                        if (e is StringConstant || e is NullLiteral){
                                if (required_type == TypeManager.string_type){
                                        converted = e;
-                                       ILLabel = ec.ig.DefineLabel ();
                                        return true;
                                }
                        }
@@ -2080,12 +2381,12 @@ namespace Mono.CSharp {
 
                        if (allowed_types == null){
                                allowed_types = new Type [] {
+                                       TypeManager.int32_type,
+                                       TypeManager.uint32_type,
                                        TypeManager.sbyte_type,
                                        TypeManager.byte_type,
                                        TypeManager.short_type,
                                        TypeManager.ushort_type,
-                                       TypeManager.int32_type,
-                                       TypeManager.uint32_type,
                                        TypeManager.int64_type,
                                        TypeManager.uint64_type,
                                        TypeManager.char_type,
@@ -2108,22 +2409,34 @@ namespace Mono.CSharp {
                                if (e == null)
                                        continue;
 
+                               //
+                               // Ignore over-worked ImplicitUserConversions that do
+                               // an implicit conversion in addition to the user conversion.
+                               // 
+                               if (e is UserCast){
+                                       UserCast ue = e as UserCast;
+
+                                       if (ue.Source != Expr)
+                                               e = null;
+                               }
+                               
                                if (converted != null){
-                                       Report.Error (-12, loc, "More than one conversion to an integral " +
-                                                     " type exists for type `" +
-                                                     TypeManager.CSharpName (Expr.Type)+"'");
+                                       Report.ExtraInformation (
+                                               loc,
+                                               String.Format ("reason: more than one conversion to an integral type exist for type {0}",
+                                                              TypeManager.CSharpName (Expr.Type)));
                                        return null;
-                               } else
+                               } else {
                                        converted = e;
+                               }
                        }
                        return converted;
                }
 
-               void error152 (string n)
-               {
-                       Report.Error (
-                               152, "The label `" + n + ":' " +
-                               "is already present on this switch statement");
+               static string Error152 {
+                       get {
+                               return "The label '{0}:' already occurs in this switch statement";
+                       }
                }
                
                //
@@ -2155,7 +2468,7 @@ namespace Mono.CSharp {
 
                                        if (sl.Label == null){
                                                if (got_default){
-                                                       error152 ("default");
+                                                       Report.Error (152, sl.loc, Error152, "default");
                                                        error = true;
                                                }
                                                got_default = true;
@@ -2262,8 +2575,8 @@ namespace Mono.CSharp {
                                                                     SwitchType + " " + compare_type);
                                        }
 
-                                       if (lname != null){
-                                               error152 ("case + " + lname);
+                                       if (lname != null) {
+                                               Report.Error (152, sl.loc, Error152, "case " + lname);
                                                error = true;
                                        }
                                }
@@ -2451,7 +2764,7 @@ namespace Mono.CSharp {
                                                ig.Emit (OpCodes.Ldloc, val);
                                                EmitObjectInteger (ig, key);
                                                SwitchLabel sl = (SwitchLabel) Elements [key];
-                                               ig.Emit (OpCodes.Beq, sl.ILLabel);
+                                               ig.Emit (OpCodes.Beq, sl.GetILLabel (ec));
                                        }
                                }
                                else
@@ -2507,7 +2820,7 @@ namespace Mono.CSharp {
                                                if (System.Convert.ToInt64 (key) == kb.nFirst + iJump)
                                                {
                                                        SwitchLabel sl = (SwitchLabel) Elements [key];
-                                                       rgLabels [iJump] = sl.ILLabel;
+                                                       rgLabels [iJump] = sl.GetILLabel (ec);
                                                        iKey++;
                                                }
                                                else
@@ -2535,8 +2848,8 @@ namespace Mono.CSharp {
                        {
                                foreach (SwitchLabel sl in ss.Labels)
                                {
-                                       ig.MarkLabel (sl.ILLabel);
-                                       ig.MarkLabel (sl.ILLabelCode);
+                                       ig.MarkLabel (sl.GetILLabel (ec));
+                                       ig.MarkLabel (sl.GetILLabelCode (ec));
                                        if (sl.Label == null)
                                        {
                                                ig.MarkLabel (lblDefault);
@@ -2594,7 +2907,7 @@ namespace Mono.CSharp {
                                null_found = false;
                                for (int label = 0; label < label_count; label++){
                                        SwitchLabel sl = (SwitchLabel) ss.Labels [label];
-                                       ig.MarkLabel (sl.ILLabel);
+                                       ig.MarkLabel (sl.GetILLabel (ec));
                                        
                                        if (!first_test){
                                                ig.MarkLabel (next_test);
@@ -2636,7 +2949,7 @@ namespace Mono.CSharp {
                                        ig.MarkLabel (null_target);
                                ig.MarkLabel (sec_begin);
                                foreach (SwitchLabel sl in ss.Labels)
-                                       ig.MarkLabel (sl.ILLabelCode);
+                                       ig.MarkLabel (sl.GetILLabelCode (ec));
 
                                if (mark_default)
                                        ig.MarkLabel (default_target);
@@ -2974,6 +3287,7 @@ namespace Mono.CSharp {
                public Unsafe (Block b)
                {
                        Block = b;
+                       Block.Unsafe = true;
                }
 
                public override bool Resolve (EmitContext ec)
@@ -3006,15 +3320,81 @@ namespace Mono.CSharp {
                ArrayList declarators;
                Statement statement;
                Type expr_type;
-               FixedData[] data;
+               Emitter[] data;
                bool has_ret;
 
-               struct FixedData {
-                       public bool is_object;
-                       public LocalInfo vi;
-                       public Expression expr;
-                       public Expression converted;
-               }                       
+               abstract class Emitter
+               {
+                       protected LocalInfo vi;
+                       protected Expression converted;
+
+                       protected Emitter (Expression expr, LocalInfo li)
+                       {
+                               converted = expr;
+                               vi = li;
+                       }
+
+                       public abstract void Emit (EmitContext ec);
+                       public abstract void EmitExit (ILGenerator ig);
+               }
+
+               class ExpressionEmitter: Emitter {
+                       public ExpressionEmitter (Expression converted, LocalInfo li) :
+                               base (converted, li)
+                       {
+                       }
+
+                       public override void Emit (EmitContext ec) {
+                               //
+                               // Store pointer in pinned location
+                               //
+                               converted.Emit (ec);
+                               ec.ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+                       }
+
+                       public override void EmitExit (ILGenerator ig)
+                       {
+                               ig.Emit (OpCodes.Ldc_I4_0);
+                               ig.Emit (OpCodes.Conv_U);
+                               ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+                       }
+               }
+
+               class StringEmitter: Emitter {
+                       LocalBuilder pinned_string;
+                       Location loc;
+
+                       public StringEmitter (Expression expr, LocalInfo li, Location loc):
+                               base (expr, li)
+                       {
+                               this.loc = loc;
+                       }
+
+                       public override void Emit (EmitContext ec)
+                       {
+                               ILGenerator ig = ec.ig;
+                               pinned_string = TypeManager.DeclareLocalPinned (ig, TypeManager.string_type);
+                                       
+                               converted.Emit (ec);
+                               ig.Emit (OpCodes.Stloc, pinned_string);
+
+                               Expression sptr = new StringPtr (pinned_string, loc);
+                               converted = Convert.ImplicitConversionRequired (
+                                       ec, sptr, vi.VariableType, loc);
+                                       
+                               if (converted == null)
+                                       return;
+
+                               converted.Emit (ec);
+                               ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+                       }
+
+                       public override void EmitExit(ILGenerator ig)
+                       {
+                               ig.Emit (OpCodes.Ldnull);
+                               ig.Emit (OpCodes.Stloc, pinned_string);
+                       }
+               }
 
                public Fixed (Expression type, ArrayList decls, Statement stmt, Location l)
                {
@@ -3031,10 +3411,12 @@ namespace Mono.CSharp {
                                return false;
                        }
                        
-                       expr_type = ec.DeclSpace.ResolveType (type, false, loc);
-                       if (expr_type == null)
+                       TypeExpr texpr = type.ResolveAsTypeTerminal (ec, false);
+                       if (texpr == null)
                                return false;
 
+                       expr_type = texpr.ResolveType (ec);
+
                        CheckObsolete (expr_type);
 
                        if (ec.RemapToProxy){
@@ -3042,7 +3424,7 @@ namespace Mono.CSharp {
                                return false;
                        }
                        
-                       data = new FixedData [declarators.Count];
+                       data = new Emitter [declarators.Count];
 
                        if (!expr_type.IsPointer){
                                Report.Error (209, loc, "Variables in a fixed statement must be pointers");
@@ -3054,7 +3436,7 @@ namespace Mono.CSharp {
                                LocalInfo vi = (LocalInfo) p.First;
                                Expression e = (Expression) p.Second;
 
-                               vi.VariableInfo = null;
+                               vi.VariableInfo.SetAssigned (ec);
                                vi.ReadOnly = true;
 
                                //
@@ -3099,10 +3481,7 @@ namespace Mono.CSharp {
                                        if (!TypeManager.VerifyUnManaged (child.Type, loc))
                                                return false;
 
-                                       data [i].is_object = true;
-                                       data [i].expr = e;
-                                       data [i].converted = null;
-                                       data [i].vi = vi;
+                                       data [i] = new ExpressionEmitter (e, vi);
                                        i++;
 
                                        continue;
@@ -3130,17 +3509,14 @@ namespace Mono.CSharp {
                                        // and T* is implicitly convertible to the
                                        // pointer type given in the fixed statement.
                                        //
-                                       ArrayPtr array_ptr = new ArrayPtr (e, loc);
+                                       ArrayPtr array_ptr = new ArrayPtr (e, array_type, loc);
                                        
                                        Expression converted = Convert.ImplicitConversionRequired (
                                                ec, array_ptr, vi.VariableType, loc);
                                        if (converted == null)
                                                return false;
 
-                                       data [i].is_object = false;
-                                       data [i].expr = e;
-                                       data [i].converted = converted;
-                                       data [i].vi = vi;
+                                       data [i] = new ExpressionEmitter (converted, vi);
                                        i++;
 
                                        continue;
@@ -3150,14 +3526,30 @@ namespace Mono.CSharp {
                                // Case 3: string
                                //
                                if (e.Type == TypeManager.string_type){
-                                       data [i].is_object = false;
-                                       data [i].expr = e;
-                                       data [i].converted = null;
-                                       data [i].vi = vi;
+                                       data [i] = new StringEmitter (e, vi, loc);
                                        i++;
                                        continue;
                                }
 
+                               // Case 4: fixed buffer
+                               FieldExpr fe = e as FieldExpr;
+                               if (fe != null) {
+                                       IFixedBuffer ff = AttributeTester.GetFixedBuffer (fe.FieldInfo);
+                                       if (ff != null) {
+                                               Expression fixed_buffer_ptr = new FixedBufferPtr (fe, ff.ElementType, loc);
+                                       
+                                               Expression converted = Convert.ImplicitConversionRequired (
+                                                       ec, fixed_buffer_ptr, vi.VariableType, loc);
+                                               if (converted == null)
+                                                       return false;
+
+                                               data [i] = new ExpressionEmitter (converted, vi);
+                                               i++;
+
+                                               continue;
+                                       }
+                               }
+
                                //
                                // For other cases, flag a `this is already fixed expression'
                                //
@@ -3187,60 +3579,8 @@ namespace Mono.CSharp {
                
                protected override void DoEmit (EmitContext ec)
                {
-                       ILGenerator ig = ec.ig;
-
-                       LocalBuilder [] clear_list = new LocalBuilder [data.Length];
-                       
                        for (int i = 0; i < data.Length; i++) {
-                               LocalInfo vi = data [i].vi;
-
-                               //
-                               // Case 1: & object.
-                               //
-                               if (data [i].is_object) {
-                                       //
-                                       // Store pointer in pinned location
-                                       //
-                                       data [i].expr.Emit (ec);
-                                       ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
-                                       clear_list [i] = vi.LocalBuilder;
-                                       continue;
-                               }
-
-                               //
-                               // Case 2: Array
-                               //
-                               if (data [i].expr.Type.IsArray){
-                                       //
-                                       // Store pointer in pinned location
-                                       //
-                                       data [i].converted.Emit (ec);
-                                       
-                                       ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
-                                       clear_list [i] = vi.LocalBuilder;
-                                       continue;
-                               }
-
-                               //
-                               // Case 3: string
-                               //
-                               if (data [i].expr.Type == TypeManager.string_type){
-                                       LocalBuilder pinned_string = TypeManager.DeclareLocalPinned (ig, TypeManager.string_type);
-                                       clear_list [i] = pinned_string;
-                                       
-                                       data [i].expr.Emit (ec);
-                                       ig.Emit (OpCodes.Stloc, pinned_string);
-
-                                       Expression sptr = new StringPtr (pinned_string, loc);
-                                       Expression converted = Convert.ImplicitConversionRequired (
-                                               ec, sptr, vi.VariableType, loc);
-                                       
-                                       if (converted == null)
-                                               continue;
-
-                                       converted.Emit (ec);
-                                       ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
-                               }
+                               data [i].Emit (ec);
                        }
 
                        statement.Emit (ec);
@@ -3248,18 +3588,13 @@ namespace Mono.CSharp {
                        if (has_ret)
                                return;
 
+                       ILGenerator ig = ec.ig;
+
                        //
                        // Clear the pinned variable
                        //
                        for (int i = 0; i < data.Length; i++) {
-                               if (data [i].is_object || data [i].expr.Type.IsArray) {
-                                       ig.Emit (OpCodes.Ldc_I4_0);
-                                       ig.Emit (OpCodes.Conv_U);
-                                       ig.Emit (OpCodes.Stloc, clear_list [i]);
-                               } else if (data [i].expr.Type == TypeManager.string_type){
-                                       ig.Emit (OpCodes.Ldnull);
-                                       ig.Emit (OpCodes.Stloc, clear_list [i]);
-                               }
+                               data [i].EmitExit (ig);
                        }
                }
        }
@@ -3298,10 +3633,12 @@ namespace Mono.CSharp {
                public override bool Resolve (EmitContext ec)
                {
                        if (type_expr != null) {
-                               type = ec.DeclSpace.ResolveType (type_expr, false, loc);
-                               if (type == null)
+                               TypeExpr te = type_expr.ResolveAsTypeTerminal (ec, false);
+                               if (te == null)
                                        return false;
 
+                               type = te.ResolveType (ec);
+
                                CheckObsolete (type);
 
                                if (type != TypeManager.exception_type && !type.IsSubclassOf (TypeManager.exception_type)){
@@ -3500,12 +3837,14 @@ namespace Mono.CSharp {
                //
                bool ResolveLocalVariableDecls (EmitContext ec)
                {
-                       expr_type = ec.DeclSpace.ResolveType (expr, false, loc);
                        int i = 0;
 
-                       if (expr_type == null)
+                       TypeExpr texpr = expr.ResolveAsTypeTerminal (ec, false);
+                       if (texpr == null)
                                return false;
 
+                       expr_type = texpr.ResolveType (ec);
+
                        //
                        // The type must be an IDisposable or an implicit conversion
                        // must exist.
@@ -3598,7 +3937,7 @@ namespace Mono.CSharp {
                        ILGenerator ig = ec.ig;
 
                        int i = assign.Length;
-                       foreach (DictionaryEntry e in var_list){
+                       for (int ii = 0; ii < var_list.Count; ++ii){
                                Expression var = resolved_vars [--i];
                                Label skip = ig.DefineLabel ();
 
@@ -3672,12 +4011,39 @@ namespace Mono.CSharp {
                void EmitExpressionFinally (EmitContext ec)
                {
                        ILGenerator ig = ec.ig;
-                       Label skip = ig.DefineLabel ();
-                       ig.Emit (OpCodes.Ldloc, local_copy);
-                       ig.Emit (OpCodes.Brfalse, skip);
-                       ig.Emit (OpCodes.Ldloc, local_copy);
-                       ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                       ig.MarkLabel (skip);
+                       if (!local_copy.LocalType.IsValueType) {
+                               Label skip = ig.DefineLabel ();
+                               ig.Emit (OpCodes.Ldloc, local_copy);
+                               ig.Emit (OpCodes.Brfalse, skip);
+                               ig.Emit (OpCodes.Ldloc, local_copy);
+                               ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+                               ig.MarkLabel (skip);
+                       } else {
+                               Expression ml = Expression.MemberLookup(ec, TypeManager.idisposable_type, local_copy.LocalType, "Dispose", Mono.CSharp.Location.Null);
+
+                               if (!(ml is MethodGroupExpr)) {
+                                       ig.Emit (OpCodes.Ldloc, local_copy);
+                                       ig.Emit (OpCodes.Box, local_copy.LocalType);
+                                       ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+                               } else {
+                                       MethodInfo mi = null;
+
+                                       foreach (MethodInfo mk in ((MethodGroupExpr) ml).Methods) {
+                                               if (TypeManager.GetArgumentTypes (mk).Length == 0) {
+                                                       mi = mk;
+                                                       break;
+                                               }
+                                       }
+
+                                       if (mi == null) {
+                                               Report.Error(-100, Mono.CSharp.Location.Null, "Internal error: No Dispose method which takes 0 parameters.");
+                                               return;
+                                       }
+
+                                       ig.Emit (OpCodes.Ldloca, local_copy);
+                                       ig.Emit (OpCodes.Call, mi);
+                               }
+                       }
                }
                
                public override bool Resolve (EmitContext ec)
@@ -3772,9 +4138,16 @@ namespace Mono.CSharp {
                        if (expr == null)
                                return false;
 
-                       var_type = ec.DeclSpace.ResolveType (type, false, loc);
-                       if (var_type == null)
+                       if (expr is NullLiteral) {
+                               Report.Error (186, expr.Location, "Use of null is not valid in this context");
+                               return false;
+                       }
+
+                       TypeExpr texpr = type.ResolveAsTypeTerminal (ec, false);
+                       if (texpr == null)
                                return false;
+
+                       var_type = texpr.ResolveType (ec);
                        
                        //
                        // We need an instance variable.  Not sure this is the best
@@ -3799,8 +4172,12 @@ namespace Mono.CSharp {
                                if (hm == null){
                                        error1579 (expr.Type);
                                        return false;
-                               }                       
+                               }
 
+                               // When ProbeCollection reported error
+                               if (hm.move_next == null)
+                                       return false;
+       
                                array_type = expr.Type;
                                element_type = hm.element_type;
 
@@ -3937,10 +4314,12 @@ namespace Mono.CSharp {
                        public Type element_type;
                        public Type enumerator_type;
                        public bool is_disposable;
+                       public readonly Location Location;
 
-                       public ForeachHelperMethods (EmitContext ec)
+                       public ForeachHelperMethods (EmitContext ec, Location loc)
                        {
                                this.ec = ec;
+                               this.Location = loc;
                                this.element_type = TypeManager.object_type;
                                this.enumerator_type = TypeManager.ienumerator_type;
                                this.is_disposable = true;
@@ -3965,7 +4344,6 @@ namespace Mono.CSharp {
                                        return false;
                        }
                        ForeachHelperMethods hm = (ForeachHelperMethods) criteria;
-                       EmitContext ec = hm.ec;
 
                        // Check whether GetEnumerator is public
                        if ((mi.Attributes & MethodAttributes.Public) != MethodAttributes.Public)
@@ -4015,6 +4393,16 @@ namespace Mono.CSharp {
 
                        } else {
 
+                               if (return_type.IsPointer || return_type.IsArray) {
+                                       Report.SymbolRelatedToPreviousError (mi);
+                                       Type t = return_type.GetElementType ();
+                                       Report.SymbolRelatedToPreviousError (t);
+                                       Report.Error (202, hm.Location, "foreach requires that the return type '{0}' of '{1}' must have a suitable public MoveNext method and public Current property", 
+                                               TypeManager.CSharpName (return_type), TypeManager.GetFullNameSignature (m));
+                                       hm.get_enumerator = mi;
+                                       return false;
+                               }
+
                                //
                                // Ok, so they dont return an IEnumerable, we will have to
                                // find if they support the GetEnumerator pattern.
@@ -4079,7 +4467,7 @@ namespace Mono.CSharp {
                //
                ForeachHelperMethods ProbeCollectionType (EmitContext ec, Type t)
                {
-                       ForeachHelperMethods hm = new ForeachHelperMethods (ec);
+                       ForeachHelperMethods hm = new ForeachHelperMethods (ec, loc);
 
                        for (Type tt = t; tt != null && tt != TypeManager.object_type;){
                                if (TryType (tt, hm))
@@ -4122,7 +4510,7 @@ namespace Mono.CSharp {
                        ILGenerator ig = ec.ig;
 
                        enumerator = new VariableStorage (ec, hm.enumerator_type);
-                       enumerator.EmitThis ();
+                       enumerator.EmitThis (ig);
                        //
                        // Instantiate the enumerator
                        //
@@ -4154,7 +4542,7 @@ namespace Mono.CSharp {
                                expr.Emit (ec);
                                ig.Emit (OpCodes.Callvirt, hm.get_enumerator);
                        }
-                       enumerator.EmitStore ();
+                       enumerator.EmitStore (ig);
 
                        //
                        // Protect the code in a try/finalize block, so that
@@ -4167,17 +4555,18 @@ namespace Mono.CSharp {
                        
                        ig.MarkLabel (ec.LoopBegin);
                        
-                       enumerator.EmitCall (hm.move_next);
+                       enumerator.EmitCall (ig, hm.move_next);
                        
                        ig.Emit (OpCodes.Brfalse, end_try);
+
                        if (ec.InIterator)
-                               ec.EmitThis ();
+                               ig.Emit (OpCodes.Ldarg_0);
                        
-                       enumerator.EmitCall (hm.get_current);
+                       enumerator.EmitCall (ig, hm.get_current);
 
                        if (ec.InIterator){
                                conv.Emit (ec);
-                               ig.Emit (OpCodes.Stfld, ((FieldExpr) variable).FieldInfo);
+                               ig.Emit (OpCodes.Stfld, ((LocalVariableReference) variable).local_info.FieldBuilder);
                        } else 
                                ((IAssignMethod)variable).EmitAssign (ec, conv, false, false);
                                
@@ -4203,30 +4592,36 @@ namespace Mono.CSharp {
                        ILGenerator ig = ec.ig;
 
                        if (hm.enumerator_type.IsValueType) {
-                               enumerator.EmitThis ();
+                               enumerator.EmitThis (ig);
 
                                MethodInfo mi = FetchMethodDispose (hm.enumerator_type);
                                if (mi != null) {
-                                       enumerator.EmitLoadAddress ();
+                                       enumerator.EmitLoadAddress (ig);
                                        ig.Emit (OpCodes.Call, mi);
                                } else {
-                                       enumerator.EmitLoad ();
+                                       enumerator.EmitLoad (ig);
                                        ig.Emit (OpCodes.Box, hm.enumerator_type);
                                        ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                               }                                       
+                               }
                        } else {
                                Label call_dispose = ig.DefineLabel ();
 
-                               enumerator.EmitThis ();
-                               enumerator.EmitLoad ();
+                               enumerator.EmitThis (ig);
+                               enumerator.EmitLoad (ig);
                                ig.Emit (OpCodes.Isinst, TypeManager.idisposable_type);
                                ig.Emit (OpCodes.Dup);
                                ig.Emit (OpCodes.Brtrue_S, call_dispose);
                                ig.Emit (OpCodes.Pop);
-                               ig.Emit (OpCodes.Endfinally);
+
+                               Label end_finally = ig.DefineLabel ();
+                               ig.Emit (OpCodes.Br, end_finally);
 
                                ig.MarkLabel (call_dispose);
                                ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+                               ig.MarkLabel (end_finally);
+
+                               if (emit_finally)
+                                       ig.Emit (OpCodes.Endfinally);
                        }
                }
 
@@ -4244,18 +4639,18 @@ namespace Mono.CSharp {
                        //
                        // Make our copy of the array
                        //
-                       copy.EmitThis ();
+                       copy.EmitThis (ig);
                        expr.Emit (ec);
-                       copy.EmitStore ();
+                       copy.EmitStore (ig);
                        
                        if (rank == 1){
                                VariableStorage counter = new VariableStorage (ec,TypeManager.int32_type);
 
                                Label loop, test;
 
-                               counter.EmitThis ();
+                               counter.EmitThis (ig);
                                ig.Emit (OpCodes.Ldc_I4_0);
-                               counter.EmitStore ();
+                               counter.EmitStore (ig);
                                test = ig.DefineLabel ();
                                ig.Emit (OpCodes.Br, test);
 
@@ -4263,12 +4658,12 @@ namespace Mono.CSharp {
                                ig.MarkLabel (loop);
 
                                if (ec.InIterator)
-                                       ec.EmitThis ();
+                                       ig.Emit (OpCodes.Ldarg_0);
                                
-                               copy.EmitThis ();
-                               copy.EmitLoad ();
-                               counter.EmitThis ();
-                               counter.EmitLoad ();
+                               copy.EmitThis (ig);
+                               copy.EmitLoad (ig);
+                               counter.EmitThis (ig);
+                               counter.EmitLoad (ig);
 
                                //
                                // Load the value, we load the value using the underlying type,
@@ -4277,25 +4672,25 @@ namespace Mono.CSharp {
                                ArrayAccess.EmitLoadOpcode (ig, element_type);
                                if (ec.InIterator){
                                        conv.Emit (ec);
-                                       ig.Emit (OpCodes.Stfld, ((FieldExpr) variable).FieldInfo);
+                                       ig.Emit (OpCodes.Stfld, ((LocalVariableReference) variable).local_info.FieldBuilder);
                                } else 
                                        ((IAssignMethod)variable).EmitAssign (ec, conv, false, false);
 
                                statement.Emit (ec);
 
                                ig.MarkLabel (ec.LoopBegin);
-                               counter.EmitThis ();
-                               counter.EmitThis ();
-                               counter.EmitLoad ();
+                               counter.EmitThis (ig);
+                               counter.EmitThis (ig);
+                               counter.EmitLoad (ig);
                                ig.Emit (OpCodes.Ldc_I4_1);
                                ig.Emit (OpCodes.Add);
-                               counter.EmitStore ();
+                               counter.EmitStore (ig);
 
                                ig.MarkLabel (test);
-                               counter.EmitThis ();
-                               counter.EmitLoad ();
-                               copy.EmitThis ();
-                               copy.EmitLoad ();
+                               counter.EmitThis (ig);
+                               counter.EmitLoad (ig);
+                               copy.EmitThis (ig);
+                               copy.EmitLoad (ig);
                                ig.Emit (OpCodes.Ldlen);
                                ig.Emit (OpCodes.Conv_I4);
                                ig.Emit (OpCodes.Blt, loop);
@@ -4314,30 +4709,31 @@ namespace Mono.CSharp {
                                }
                                        
                                for (dim = 0; dim < rank; dim++){
-                                       dim_len [dim].EmitThis ();
-                                       copy.EmitThis ();
-                                       copy.EmitLoad ();
+                                       dim_len [dim].EmitThis (ig);
+                                       copy.EmitThis (ig);
+                                       copy.EmitLoad (ig);
                                        IntLiteral.EmitInt (ig, dim);
                                        ig.Emit (OpCodes.Callvirt, TypeManager.int_getlength_int);
-                                       dim_len [dim].EmitStore ();
+                                       dim_len [dim].EmitStore (ig);
                                        
                                }
 
                                for (dim = 0; dim < rank; dim++){
-                                       dim_count [dim].EmitThis ();
+                                       dim_count [dim].EmitThis (ig);
                                        ig.Emit (OpCodes.Ldc_I4_0);
-                                       dim_count [dim].EmitStore ();
+                                       dim_count [dim].EmitStore (ig);
                                        ig.Emit (OpCodes.Br, test [dim]);
                                        ig.MarkLabel (loop [dim]);
                                }
 
                                if (ec.InIterator)
-                                       ec.EmitThis ();
-                               copy.EmitThis ();
-                               copy.EmitLoad ();
+                                       ig.Emit (OpCodes.Ldarg_0);
+                               
+                               copy.EmitThis (ig);
+                               copy.EmitLoad (ig);
                                for (dim = 0; dim < rank; dim++){
-                                       dim_count [dim].EmitThis ();
-                                       dim_count [dim].EmitLoad ();
+                                       dim_count [dim].EmitThis (ig);
+                                       dim_count [dim].EmitLoad (ig);
                                }
 
                                //
@@ -4357,24 +4753,24 @@ namespace Mono.CSharp {
                                ig.Emit (OpCodes.Call, get);
                                if (ec.InIterator){
                                        conv.Emit (ec);
-                                       ig.Emit (OpCodes.Stfld, ((FieldExpr) variable).FieldInfo);
+                                       ig.Emit (OpCodes.Stfld, ((LocalVariableReference) variable).local_info.FieldBuilder);
                                } else 
                                        ((IAssignMethod)variable).EmitAssign (ec, conv, false, false);
                                statement.Emit (ec);
                                ig.MarkLabel (ec.LoopBegin);
                                for (dim = rank - 1; dim >= 0; dim--){
-                                       dim_count [dim].EmitThis ();
-                                       dim_count [dim].EmitThis ();
-                                       dim_count [dim].EmitLoad ();
+                                       dim_count [dim].EmitThis (ig);
+                                       dim_count [dim].EmitThis (ig);
+                                       dim_count [dim].EmitLoad (ig);
                                        ig.Emit (OpCodes.Ldc_I4_1);
                                        ig.Emit (OpCodes.Add);
-                                       dim_count [dim].EmitStore ();
+                                       dim_count [dim].EmitStore (ig);
 
                                        ig.MarkLabel (test [dim]);
-                                       dim_count [dim].EmitThis ();
-                                       dim_count [dim].EmitLoad ();
-                                       dim_len [dim].EmitThis ();
-                                       dim_len [dim].EmitLoad ();
+                                       dim_count [dim].EmitThis (ig);
+                                       dim_count [dim].EmitLoad (ig);
+                                       dim_len [dim].EmitThis (ig);
+                                       dim_len [dim].EmitLoad (ig);
                                        ig.Emit (OpCodes.Blt, loop [dim]);
                                }
                        }
@@ -4386,7 +4782,7 @@ namespace Mono.CSharp {
                protected override void DoEmit (EmitContext ec)
                {
                        ILGenerator ig = ec.ig;
-                       
+
                        Label old_begin = ec.LoopBegin, old_end = ec.LoopEnd;
                        ec.LoopBegin = ig.DefineLabel ();
                        ec.LoopEnd = ig.DefineLabel ();