2009-03-17 Marek Safar <marek.safar@gmail.com>
[mono.git] / mcs / mcs / statement.cs
index b7ad62e1a92f3c57cd400718c241be91ed30513e..f1ba2d191ecc0d568a0e45aabf20b5f40bf32209 100644 (file)
@@ -1074,6 +1074,8 @@ namespace Mono.CSharp {
                                return false;
                        }
 
+                       ec.CurrentBranching.CurrentUsageVector.Goto ();
+
                        expr = expr.Resolve (ec);
                        if (expr == null)
                                return false;
@@ -1085,21 +1087,18 @@ namespace Mono.CSharp {
                        }
 
                        Type type = ec.Switch.SwitchType;
-                       if (!Convert.ImplicitStandardConversionExists (c, type))
-                               Report.Warning (469, 2, loc, "The `goto case' value is not implicitly " +
-                                               "convertible to type `{0}'", TypeManager.CSharpName (type));
-
-                       bool fail = false;
-                       object val = c.GetValue ();
-                       if ((val != null) && (c.Type != type) && (c.Type != TypeManager.object_type))
-                               val = TypeManager.ChangeType (val, type, out fail);
-
-                       if (fail) {
-                               Report.Error (30, loc, "Cannot convert type `{0}' to `{1}'",
-                                             c.GetSignatureForError (), TypeManager.CSharpName (type));
+                       Constant res = c.TryReduce (ec, type, c.Location);
+                       if (res == null) {
+                               c.Error_ValueCannotBeConverted (ec, loc, type, true);
                                return false;
                        }
 
+                       if (!Convert.ImplicitStandardConversionExists (c, type))
+                               Report.Warning (469, 2, loc,
+                                       "The `goto case' value is not implicitly convertible to type `{0}'",
+                                       TypeManager.CSharpName (type));
+
+                       object val = res.GetValue ();
                        if (val == null)
                                val = SwitchLabel.NullStringCase;
                                        
@@ -1111,7 +1110,6 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       ec.CurrentBranching.CurrentUsageVector.Goto ();
                        return true;
                }
 
@@ -1149,25 +1147,17 @@ namespace Mono.CSharp {
                                return ec.CurrentBranching.CheckRethrow (loc);
                        }
 
-                       expr = expr.Resolve (ec);
+                       expr = expr.Resolve (ec, ResolveFlags.Type | ResolveFlags.VariableOrValue);
                        ec.CurrentBranching.CurrentUsageVector.Goto ();
 
                        if (expr == null)
                                return false;
 
-                       ExprClass eclass = expr.eclass;
-
-                       if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
-                             eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
-                               expr.Error_UnexpectedKind (ec.DeclContainer, "value, variable, property or indexer access ", loc);
-                               return false;
-                       }
-
                        Type t = expr.Type;
 
                        if ((t != TypeManager.exception_type) &&
                            !TypeManager.IsSubclassOf (t, TypeManager.exception_type) &&
-                           !(expr is NullLiteral)) {
+                           t != TypeManager.null_type) {
                                Error (155, "The type caught or thrown must be derived from System.Exception");
                                return false;
                        }
@@ -1280,7 +1270,7 @@ namespace Mono.CSharp {
        // The information about a user-perceived local variable
        //
        public class LocalInfo : IKnownVariable, ILocalVariable {
-               public readonly Expression Type;
+               public readonly FullNamedExpression Type;
 
                public Type VariableType;
                public readonly string Name;
@@ -1310,8 +1300,8 @@ namespace Mono.CSharp {
                Flags flags;
                ReadOnlyContext ro_context;
                LocalBuilder builder;
-               
-               public LocalInfo (Expression type, string name, Block block, Location l)
+
+               public LocalInfo (FullNamedExpression type, string name, Block block, Location l)
                {
                        Type = type;
                        Name = name;
@@ -1397,11 +1387,6 @@ namespace Mono.CSharp {
                        if (TypeManager.IsGenericParameter (VariableType))
                                return true;
 
-                       if (VariableType == TypeManager.void_type) {
-                               Expression.Error_VoidInvalidInTheContext (Location);
-                               return false;
-                       }
-
                        if (VariableType.IsAbstract && VariableType.IsSealed) {
                                FieldBase.Error_VariableOfStaticClass (Location, Name, VariableType);
                                return false;
@@ -1455,12 +1440,12 @@ namespace Mono.CSharp {
                                throw new InternalErrorException ("Variable is not readonly");
 
                        switch (ro_context) {
-                               case ReadOnlyContext.Fixed:
-                                       return "fixed variable";
-                               case ReadOnlyContext.Foreach:
-                                       return "foreach iteration variable";
-                               case ReadOnlyContext.Using:
-                                       return "using variable";
+                       case ReadOnlyContext.Fixed:
+                               return "fixed variable";
+                       case ReadOnlyContext.Foreach:
+                               return "foreach iteration variable";
+                       case ReadOnlyContext.Using:
+                               return "using variable";
                        }
                        throw new NotImplementedException ();
                }
@@ -1493,7 +1478,7 @@ namespace Mono.CSharp {
                        // Variables in anonymous block are not resolved yet
                        //
                        if (VariableType == null)
-                               return new LocalInfo (Type.Clone (clonectx), Name, clonectx.LookupBlock (Block), Location);
+                               return new LocalInfo ((FullNamedExpression) Type.Clone (clonectx), Name, clonectx.LookupBlock (Block), Location);
 
                        //
                        // Variables in method block are resolved
@@ -1520,7 +1505,7 @@ namespace Mono.CSharp {
        /// </remarks>
        public class Block : Statement {
                public Block    Parent;
-               public readonly Location  StartLocation;
+               public Location StartLocation;
                public Location EndLocation = Location.Null;
 
                public ExplicitBlock Explicit;
@@ -1532,10 +1517,10 @@ namespace Mono.CSharp {
                        BlockUsed = 2,
                        VariablesInitialized = 4,
                        HasRet = 8,
-                       IsDestructor = 16,
-                       Unsafe = 32,
-                       IsIterator = 64,
-                       HasStoreyAccess = 128
+                       Unsafe = 16,
+                       IsIterator = 32,
+                       HasCapturedVariable = 64,
+                       HasCapturedThis = 128
                }
                protected Flags flags;
 
@@ -1572,7 +1557,6 @@ namespace Mono.CSharp {
                // Keeps track of (name, type) pairs
                //
                IDictionary variables;
-               protected IDictionary range_variables;
 
                //
                // Keeps track of constants
@@ -1588,7 +1572,7 @@ namespace Mono.CSharp {
                //
                Block switch_block;
 
-               ArrayList scope_initializers;
+               protected ArrayList scope_initializers;
 
                ArrayList anonymous_children;
 
@@ -1612,6 +1596,20 @@ namespace Mono.CSharp {
                        : this (parent, (Flags) 0, start, end)
                { }
 
+               //
+               // Useful when TopLevel block is downgraded to normal block
+               //
+               public Block (ToplevelBlock parent, ToplevelBlock source)
+                       : this (parent, source.flags, source.StartLocation, source.EndLocation)
+               {
+                       statements = source.statements;
+                       children = source.children;
+                       labels = source.labels;
+                       variables = source.variables;
+                       constants = source.constants;
+                       switch_block = source.switch_block;
+               }
+
                public Block (Block parent, Flags flags, Location start, Location end)
                {
                        if (parent != null) {
@@ -1824,35 +1822,45 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               public LocalInfo AddVariable (Expression type, string name, Location l)
+               protected virtual bool CheckParentConflictName (ToplevelBlock block, string name, Location l)
                {
                        LocalInfo vi = GetLocalInfo (name);
                        if (vi != null) {
                                Report.SymbolRelatedToPreviousError (vi.Location, name);
                                if (Explicit == vi.Block.Explicit) {
-                                       if (type == Linq.ImplicitQueryParameter.ImplicitType.Instance && type == vi.Type)
-                                               Error_AlreadyDeclared (l, name);
-                                       else
-                                               Error_AlreadyDeclared (l, name, null);
+                                       Error_AlreadyDeclared (l, name, null);
                                } else {
-                                       Error_AlreadyDeclared (l, name, "parent");
+                                       Error_AlreadyDeclared (l, name, this is ToplevelBlock ?
+                                               "parent or current" : "parent");
                                }
-                               return null;
+                               return false;
                        }
 
-                       ToplevelParameterInfo pi = Toplevel.GetParameterInfo (name);
-                       if (pi != null) {
-                               Report.SymbolRelatedToPreviousError (pi.Location, name);
-                               Error_AlreadyDeclared (loc, name,
-                                       pi.Block == Toplevel ? "method argument" : "parent or current");
-                               return null;
+                       if (block != null) {
+                               Expression e = block.GetParameterReference (name, Location.Null);
+                               if (e != null) {
+                                       ParameterReference pr = e as ParameterReference;
+                                       if (this is Linq.QueryBlock && (pr != null && pr.Parameter is Linq.QueryBlock.ImplicitQueryParameter || e is MemberAccess))
+                                               Error_AlreadyDeclared (loc, name);
+                                       else
+                                               Error_AlreadyDeclared (loc, name, "parent or current");
+                                       return false;
+                               }
                        }
-                       
+
+                       return true;
+               }
+
+               public LocalInfo AddVariable (Expression type, string name, Location l)
+               {
+                       if (!CheckParentConflictName (Toplevel, name, l))
+                               return null;
+
                        if (Toplevel.GenericMethod != null) {
                                foreach (TypeParameter tp in Toplevel.GenericMethod.CurrentTypeParameters) {
                                        if (tp.Name == name) {
                                                Report.SymbolRelatedToPreviousError (tp);
-                                               Error_AlreadyDeclaredTypeParameter (loc, name);
+                                               Error_AlreadyDeclaredTypeParameter (loc, name, "local variable");
                                                return null;
                                        }
                                }
@@ -1865,7 +1873,7 @@ namespace Mono.CSharp {
                                return null;
                        }
 
-                       vi = new LocalInfo (type, name, this, l);
+                       LocalInfo vi = new LocalInfo ((FullNamedExpression) type, name, this, l);
                        AddVariable (vi);
 
                        if ((flags & Flags.VariablesInitialized) != 0)
@@ -1899,10 +1907,11 @@ namespace Mono.CSharp {
                                "A local variable named `{0}' is already defined in this scope", name);
                }
                                        
-               protected virtual void Error_AlreadyDeclaredTypeParameter (Location loc, string name)
+               public virtual void Error_AlreadyDeclaredTypeParameter (Location loc, string name, string conflict)
                {
-                       GenericMethod.Error_ParameterNameCollision (loc, name, "local variable");
-               }                                       
+                       Report.Error (412, loc, "The type parameter name `{0}' is the same as `{1}'",
+                               name, conflict);
+               }
 
                public bool AddConstant (Expression type, string name, Expression value, Location l)
                {
@@ -1946,12 +1955,6 @@ namespace Mono.CSharp {
                                        if (ret != null)
                                                return ret;
                                }
-
-                               if (b.range_variables != null) {
-                                       ret = (LocalInfo) b.range_variables [name];
-                                       if (ret != null)
-                                               return ret;
-                               }
                        }
 
                        return null;
@@ -1979,7 +1982,7 @@ namespace Mono.CSharp {
                // It should be used by expressions which require to
                // register a statement during resolve process.
                //
-               public void AddScopeStatement (StatementExpression s)
+               public void AddScopeStatement (Statement s)
                {
                        if (scope_initializers == null)
                                scope_initializers = new ArrayList ();
@@ -2006,15 +2009,6 @@ namespace Mono.CSharp {
                        get { return (flags & Flags.HasRet) != 0; }
                }
 
-               public bool IsDestructor {
-                       get { return (flags & Flags.IsDestructor) != 0; }
-               }
-
-               public void SetDestructor ()
-               {
-                       flags |= Flags.IsDestructor;
-               }
-
                public int AssignableSlots {
                        get {
 // TODO: Re-enable                     
@@ -2086,8 +2080,8 @@ namespace Mono.CSharp {
 
                                e = ce.ConvertImplicitly (variable_type);
                                if (e == null) {
-                                       if (!variable_type.IsValueType && variable_type != TypeManager.string_type && !ce.IsDefaultValue)
-                                               Const.Error_ConstantCanBeInitializedWithNullOnly (vi.Location, vi.Name);
+                                       if (TypeManager.IsReferenceType (variable_type))
+                                               Const.Error_ConstantCanBeInitializedWithNullOnly (variable_type, vi.Location, vi.Name);
                                        else
                                                ce.Error_ValueCannotBeConverted (ec, vi.Location, variable_type, false);
                                        continue;
@@ -2223,7 +2217,7 @@ namespace Mono.CSharp {
                                // Check possible empty statement (CS0642)
                                if (Report.WarningLevel >= 3 &&
                                        ix + 1 < statement_count &&
-                                               statements [ix + 1] is Block)
+                                               statements [ix + 1] is ExplicitBlock)
                                        CheckPossibleMistakenEmptyStatement (s);
 
                                //
@@ -2326,17 +2320,8 @@ namespace Mono.CSharp {
                        Block prev_block = ec.CurrentBlock;
                        ec.CurrentBlock = this;
 
-                       if (scope_initializers != null) {
-                               SymbolWriter.OpenCompilerGeneratedBlock (ec.ig);
-
-                               bool omit_debug_info = ec.OmitDebuggingInfo;
-                               ec.OmitDebuggingInfo = true;
-                               foreach (StatementExpression s in scope_initializers)
-                                       s.Emit (ec);
-                               ec.OmitDebuggingInfo = omit_debug_info;
-
-                               SymbolWriter.CloseCompilerGeneratedBlock (ec.ig);
-                       }
+                       if (scope_initializers != null)
+                               EmitScopeInitializers (ec);
 
                        ec.Mark (StartLocation);
                        DoEmit (ec);
@@ -2347,6 +2332,18 @@ namespace Mono.CSharp {
                        ec.CurrentBlock = prev_block;
                }
 
+               protected void EmitScopeInitializers (EmitContext ec)
+               {
+                       SymbolWriter.OpenCompilerGeneratedBlock (ec.ig);
+
+                       using (ec.Set (EmitContext.Flags.OmitDebuggingInfo)) {
+                               foreach (Statement s in scope_initializers)
+                                       s.Emit (ec);
+                       }
+
+                       SymbolWriter.CloseCompilerGeneratedBlock (ec.ig);
+               }
+
                protected virtual void EmitSymbolInfo (EmitContext ec)
                {
                        if (variables != null) {
@@ -2360,6 +2357,11 @@ namespace Mono.CSharp {
                {
                        MutateVariables (storey);
 
+                       if (scope_initializers != null) {
+                               foreach (Statement s in scope_initializers)
+                                       s.MutateHoistedGenericType (storey);
+                       }
+
                        foreach (Statement s in statements)
                                s.MutateHoistedGenericType (storey);
                }
@@ -2465,7 +2467,6 @@ namespace Mono.CSharp {
                        // When referencing a variable in iterator storey from children anonymous method
                        //
                        if (Toplevel.am_storey is IteratorStorey) {
-                               ec.CurrentAnonymousMethod.AddStoreyReference (Toplevel.am_storey);
                                return Toplevel.am_storey;
                        }
 
@@ -2480,26 +2481,18 @@ namespace Mono.CSharp {
                                GenericMethod gm = mc == null ? null : mc.GenericMethod;
 
                                //
-                               // Create anonymous method storey for this block
+                               // Creates anonymous method storey for this block
                                //
                                am_storey = new AnonymousMethodStorey (this, ec.TypeContainer, mc, gm, "AnonStorey");
                        }
 
-                       //
-                       // Creates a link between this block and the anonymous method
-                       //
-                       // An anonymous method can reference variables from any outer block, but they are
-                       // hoisted in their own ExplicitBlock. When more than one block is referenced we
-                       // need to create another link between those variable storeys
-                       //
-                       ec.CurrentAnonymousMethod.AddStoreyReference (am_storey);
                        return am_storey;
                }
 
                public override void Emit (EmitContext ec)
                {
                        if (am_storey != null)
-                               am_storey.EmitHoistedVariables (ec);
+                               am_storey.EmitStoreyInstantiation (ec);
 
                        bool emit_debug_info = SymbolWriter.HasSymbolWriter && Parent != null && !(am_storey is IteratorStorey);
                        if (emit_debug_info)
@@ -2518,24 +2511,49 @@ namespace Mono.CSharp {
                        //
                        if (am_storey != null) {
                                if (ec.CurrentAnonymousMethod != null && ec.CurrentAnonymousMethod.Storey != null) {
+                                       //
+                                       // Creates parent storey reference when hoisted this is accessible
+                                       //
+                                       if (am_storey.OriginalSourceBlock.Explicit.HasCapturedThis) {
+                                               ExplicitBlock parent = Toplevel.Parent.Explicit;
+
+                                               //
+                                               // Hoisted this exists in top-level parent storey only
+                                               //
+                                               while (parent.am_storey == null || parent.am_storey.Parent is AnonymousMethodStorey)
+                                                       parent = parent.Parent.Explicit;
+
+                                               am_storey.AddParentStoreyReference (parent.am_storey);
+                                       }
+
                                        am_storey.ChangeParentStorey (ec.CurrentAnonymousMethod.Storey);
                                }
 
                                am_storey.DefineType ();
-                               am_storey.ResolveType ();                               
-                               am_storey.DefineMembers ();
+                               am_storey.ResolveType ();
+                               am_storey.Define ();
                                am_storey.Parent.PartialContainer.AddCompilerGeneratedClass (am_storey);
-                       }
 
-                       base.EmitMeta (ec);
-               }
+                               ArrayList ref_blocks = am_storey.ReferencesFromChildrenBlock;
+                               if (ref_blocks != null) {
+                                       foreach (ExplicitBlock ref_block in ref_blocks) {
+                                               for (ExplicitBlock b = ref_block.Explicit; b != this; b = b.Parent.Explicit) {
+                                                       if (b.am_storey != null) {
+                                                               b.am_storey.AddParentStoreyReference (am_storey);
 
-               protected override void EmitSymbolInfo (EmitContext ec)
-               {
-                       if (am_storey != null)
-                               SymbolWriter.DefineScopeVariable (am_storey.ID);
+                                                               // Stop propagation inside same top block
+                                                               if (b.Toplevel == Toplevel)
+                                                                       break;
 
-                       base.EmitSymbolInfo (ec);
+                                                               b = b.Toplevel;
+                                                   }
+                                                       b.HasCapturedVariable = true;
+                                               }
+                                       }
+                               }
+                       }
+
+                       base.EmitMeta (ec);
                }
 
                internal IKnownVariable GetKnownVariable (string name)
@@ -2543,29 +2561,16 @@ namespace Mono.CSharp {
                        return known_variables == null ? null : (IKnownVariable) known_variables [name];
                }
 
-               public void PropagateStoreyReference (AnonymousMethodStorey s)
+               public bool HasCapturedThis
                {
-                       if (Parent != null && am_storey != s) {
-                               if (am_storey != null)
-                                       am_storey.AddParentStoreyReference (s);
-
-                               Parent.Explicit.PropagateStoreyReference (s);
-                       }
+                       set { flags = value ? flags | Flags.HasCapturedThis : flags & ~Flags.HasCapturedThis; }
+                       get { return (flags & Flags.HasCapturedThis) != 0; }
                }
 
-               public override bool Resolve (EmitContext ec)
+               public bool HasCapturedVariable
                {
-                       bool ok = base.Resolve (ec);
-
-                       //
-                       // Discard an anonymous method storey when this block has no hoisted variables
-                       //
-                       if (am_storey != null && !am_storey.HasHoistedVariables) {
-                               am_storey.Undo ();
-                               am_storey = null;
-                       }
-
-                       return ok;
+                       set { flags = value ? flags | Flags.HasCapturedVariable : flags & ~Flags.HasCapturedVariable; }
+                       get { return (flags & Flags.HasCapturedVariable) != 0; }
                }
 
                protected override void CloneTo (CloneContext clonectx, Statement t)
@@ -2587,6 +2592,11 @@ namespace Mono.CSharp {
                public Parameter Parameter {
                        get { return Block.Parameters [Index]; }
                }
+
+               public Type ParameterType {
+                       get { return Block.Parameters.Types [Index]; }
+               }
+
                public Location Location {
                        get { return Parameter.Location; }
                }
@@ -2606,10 +2616,60 @@ namespace Mono.CSharp {
        // In particular, this was introduced when the support for Anonymous
        // Methods was implemented. 
        // 
-       public class ToplevelBlock : ExplicitBlock {
+       public class ToplevelBlock : ExplicitBlock
+       {
+               // 
+               // Block is converted to an expression
+               //
+               sealed class BlockScopeExpression : Expression
+               {
+                       Expression child;
+                       readonly ToplevelBlock block;
+
+                       public BlockScopeExpression (Expression child, ToplevelBlock block)
+                       {
+                               this.child = child;
+                               this.block = block;
+                       }
+
+                       public override Expression CreateExpressionTree (EmitContext ec)
+                       {
+                               throw new NotSupportedException ();
+                       }
+
+                       public override Expression DoResolve (EmitContext ec)
+                       {
+                               if (child == null)
+                                       return null;
+                               
+                               block.ResolveMeta (ec, ParametersCompiled.EmptyReadOnlyParameters);
+                               child = child.Resolve (ec);
+                               if (child == null)
+                                       return null;
+
+                               eclass = child.eclass;
+                               type = child.Type;
+                               return this;
+                       }
+
+                       public override void Emit (EmitContext ec)
+                       {
+                               block.EmitMeta (ec);
+                               block.EmitScopeInitializers (ec);
+                               child.Emit (ec);
+                       }
+
+                       public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
+                       {
+                               type = storey.MutateType (type);
+                               child.MutateHoistedGenericType (storey);
+                               block.MutateHoistedGenericType (storey);
+                       }
+               }
+
                GenericMethod generic;
                FlowBranchingToplevel top_level_branching;
-               Parameters parameters;
+               protected ParametersCompiled parameters;
                ToplevelParameterInfo[] parameter_info;
                LocalInfo this_variable;
 
@@ -2618,7 +2678,7 @@ namespace Mono.CSharp {
                //
                // The parameters for the block.
                //
-               public Parameters Parameters {
+               public ParametersCompiled Parameters {
                        get { return parameters; }
                }
 
@@ -2626,53 +2686,49 @@ namespace Mono.CSharp {
                        get { return generic; }
                }
 
-               public bool HasStoreyAccess {
-                       set { flags = value ? flags | Flags.HasStoreyAccess : flags & ~Flags.HasStoreyAccess; }
-                       get { return (flags & Flags.HasStoreyAccess) != 0;  }
-               }
-
                public ToplevelBlock Container {
                        get { return Parent == null ? null : Parent.Toplevel; }
                }
 
-               public ToplevelBlock (Block parent, Parameters parameters, Location start) :
+               public ToplevelBlock (Block parent, ParametersCompiled parameters, Location start) :
                        this (parent, (Flags) 0, parameters, start)
                {
                }
 
-               public ToplevelBlock (Block parent, Parameters parameters, GenericMethod generic, Location start) :
+               public ToplevelBlock (Block parent, ParametersCompiled parameters, GenericMethod generic, Location start) :
                        this (parent, parameters, start)
                {
                        this.generic = generic;
                }
                
-               public ToplevelBlock (Parameters parameters, Location start) :
+               public ToplevelBlock (ParametersCompiled parameters, Location start) :
                        this (null, (Flags) 0, parameters, start)
                {
                }
 
-               ToplevelBlock (Flags flags, Parameters parameters, Location start) :
+               ToplevelBlock (Flags flags, ParametersCompiled parameters, Location start) :
                        this (null, flags, parameters, start)
                {
                }
 
                // We use 'Parent' to hook up to the containing block, but don't want to register the current block as a child.
                // So, we use a two-stage setup -- first pass a null parent to the base constructor, and then override 'Parent'.
-               public ToplevelBlock (Block parent, Flags flags, Parameters parameters, Location start) :
+               public ToplevelBlock (Block parent, Flags flags, ParametersCompiled parameters, Location start) :
                        base (null, flags, start, Location.Null)
                {
                        this.Toplevel = this;
 
-                       this.parameters = parameters == null ? Parameters.EmptyReadOnlyParameters : parameters;
+                       this.parameters = parameters;
                        this.Parent = parent;
                        if (parent != null)
                                parent.AddAnonymousChild (this);
 
-                       if (!this.parameters.Empty)
+                       if (!this.parameters.IsEmpty)
                                ProcessParameters ();
                }
 
-               public ToplevelBlock (Location loc) : this (null, (Flags) 0, null, loc)
+               public ToplevelBlock (Location loc)
+                       : this (null, (Flags) 0, ParametersCompiled.EmptyReadOnlyParameters, loc)
                {
                }
 
@@ -2704,15 +2760,11 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               public virtual Expression GetTransparentIdentifier (string name)
-               {
-                       return null;
-               }
-
                void ProcessParameters ()
                {
                        int n = parameters.Count;
                        parameter_info = new ToplevelParameterInfo [n];
+                       ToplevelBlock top_parent = Parent == null ? null : Parent.Toplevel;
                        for (int i = 0; i < n; ++i) {
                                parameter_info [i] = new ToplevelParameterInfo (this, i);
 
@@ -2721,21 +2773,8 @@ namespace Mono.CSharp {
                                        continue;
 
                                string name = p.Name;
-                               LocalInfo vi = GetLocalInfo (name);
-                               if (vi != null) {
-                                       Report.SymbolRelatedToPreviousError (vi.Location, name);
-                                       Error_AlreadyDeclared (loc, name, "parent or current");
-                                       continue;
-                               }
-
-                               ToplevelParameterInfo pi = Parent == null ? null : Parent.Toplevel.GetParameterInfo (name);
-                               if (pi != null) {
-                                       Report.SymbolRelatedToPreviousError (pi.Location, name);
-                                       Error_AlreadyDeclared (loc, name, "parent or current");
-                                       continue;
-                               }
-
-                               AddKnownVariable (name, parameter_info [i]);
+                               if (CheckParentConflictName (top_parent, name, loc))
+                                       AddKnownVariable (name, parameter_info [i]);
                        }
 
                        // mark this block as "used" so that we create local declarations in a sub-block
@@ -2757,8 +2796,13 @@ namespace Mono.CSharp {
 
                public override Expression CreateExpressionTree (EmitContext ec)
                {
-                       if (statements.Count == 1)
-                               return ((Statement) statements [0]).CreateExpressionTree (ec);
+                       if (statements.Count == 1) {
+                               Expression expr = ((Statement) statements[0]).CreateExpressionTree (ec);
+                               if (scope_initializers != null)
+                                       expr = new BlockScopeExpression (expr, this);
+
+                               return expr;
+                       }
 
                        return base.CreateExpressionTree (ec);
                }
@@ -2768,16 +2812,10 @@ namespace Mono.CSharp {
                //
                public IteratorStorey ChangeToIterator (Iterator iterator, ToplevelBlock source)
                {
-                       // Create block with original statements
-                       ExplicitBlock iter_block = new ExplicitBlock (this, flags, StartLocation, EndLocation);
                        IsIterator = true;
 
-                       // TODO: Change to iter_block.statements = statements;
-                       foreach (Statement stmt in source.statements)
-                               iter_block.AddStatement (stmt);
-                       labels = source.labels;
-                       
-                       AddStatement (new IteratorStatement (iterator, iter_block));
+                       // Creates block with original statements
+                       AddStatement (new IteratorStatement (iterator, new Block (this, source)));
 
                        source.statements = new ArrayList (1);
                        source.AddStatement (new Return (iterator, iterator.Location));
@@ -2793,26 +2831,27 @@ namespace Mono.CSharp {
                }
 
                //
-               // Returns a `ParameterReference' for the given name, or null if there
-               // is no such parameter
+               // Returns a parameter reference expression for the given name,
+               // or null if there is no such parameter
                //
-               public ParameterReference GetParameterReference (string name, Location loc)
+               public Expression GetParameterReference (string name, Location loc)
                {
-                       ToplevelParameterInfo p = GetParameterInfo (name);
-                       return p == null ? null : new ParameterReference (this, p, loc);
-               }
-
-               public ToplevelParameterInfo GetParameterInfo (string name)
-               {
-                       int idx;
                        for (ToplevelBlock t = this; t != null; t = t.Container) {
-                               Parameter par = t.Parameters.GetParameterByName (name, out idx);
-                               if (par != null)
-                                       return t.parameter_info [idx];
+                               Expression expr = t.GetParameterReferenceExpression (name, loc);
+                               if (expr != null)
+                                       return expr;
                        }
+
                        return null;
                }
 
+               protected virtual Expression GetParameterReferenceExpression (string name, Location loc)
+               {
+                       int idx = parameters.GetParameterIndexByName (name);
+                       return idx < 0 ?
+                               null : new ParameterReference (parameter_info [idx], loc);
+               }
+
                // <summary>
                //   Returns the "this" instance variable of this block.
                //   See AddThisVariable() for more information.
@@ -2851,7 +2890,7 @@ namespace Mono.CSharp {
                        return this_variable == null || this_variable.IsThisAssigned (ec);
                }
 
-               public bool ResolveMeta (EmitContext ec, Parameters ip)
+               public bool ResolveMeta (EmitContext ec, ParametersCompiled ip)
                {
                        int errors = Report.Errors;
                        int orig_count = parameters.Count;
@@ -2869,7 +2908,7 @@ namespace Mono.CSharp {
                        int offset = Parent == null ? 0 : Parent.AssignableSlots;
 
                        for (int i = 0; i < orig_count; ++i) {
-                               Parameter.Modifier mod = parameters.ParameterModifier (i);
+                               Parameter.Modifier mod = parameters.FixedParameters [i].ModFlags;
 
                                if ((mod & Parameter.Modifier.OUT) != Parameter.Modifier.OUT)
                                        continue;
@@ -2921,6 +2960,15 @@ namespace Mono.CSharp {
                        base.EmitMeta (ec);
                }
 
+               protected override void EmitSymbolInfo (EmitContext ec)
+               {
+                       AnonymousExpression ae = ec.CurrentAnonymousMethod;
+                       if ((ae != null) && (ae.Storey != null))
+                               SymbolWriter.DefineScopeVariable (ae.Storey.ID);
+
+                       base.EmitSymbolInfo (ec);
+               }
+
                public override void Emit (EmitContext ec)
                {
                        base.Emit (ec);
@@ -3025,8 +3073,6 @@ namespace Mono.CSharp {
                                label = "default";
                        else if (converted == NullStringCase)
                                label = "null";
-                       else if (TypeManager.IsEnumType (switch_type)) 
-                               label = TypeManager.CSharpEnumValue (switch_type, converted);
                        else
                                label = converted.ToString ();
                        
@@ -3556,6 +3602,7 @@ namespace Mono.CSharp {
                public static void Reset ()
                {
                        unique_counter = 0;
+                       allowed_types = null;
                }
 
                public override bool Resolve (EmitContext ec)
@@ -3568,7 +3615,7 @@ namespace Mono.CSharp {
 
 #if GMCS_SOURCE
                        if ((new_expr == null) && TypeManager.IsNullableType (Expr.Type)) {
-                               unwrap = Nullable.Unwrap.Create (Expr, ec);
+                               unwrap = Nullable.Unwrap.Create (Expr, false);
                                if (unwrap == null)
                                        return false;
 
@@ -3663,7 +3710,7 @@ namespace Mono.CSharp {
                                new QualifiedAliasMember (QualifiedAliasMember.GlobalAlias, "System", loc), "Collections", loc), "Generic", loc);
 
                        string_dictionary_type = new MemberAccess (system_collections_generic, "Dictionary",
-                               new TypeArguments (loc,
+                               new TypeArguments (
                                        new TypeExpression (TypeManager.string_type, loc),
                                        new TypeExpression (TypeManager.int32_type, loc)), loc);
 #else
@@ -3674,7 +3721,7 @@ namespace Mono.CSharp {
 #endif
                        Field field = new Field (ec.TypeContainer, string_dictionary_type,
                                Modifiers.STATIC | Modifiers.PRIVATE | Modifiers.COMPILER_GENERATED,
-                               CompilerGeneratedClass.MakeName (null, "f", "switch$map", unique_counter++), null, loc);
+                               new MemberName (CompilerGeneratedClass.MakeName (null, "f", "switch$map", unique_counter++), loc), null);
                        if (!field.Define ())
                                return;
                        ec.TypeContainer.PartialContainer.AddField (field);
@@ -4034,7 +4081,7 @@ namespace Mono.CSharp {
                        if (expr == null)
                                return false;
 
-                       if (expr.Type.IsValueType){
+                       if (!TypeManager.IsReferenceType (expr.Type)){
                                Report.Error (185, loc,
                                              "`{0}' is not a reference type as required by the lock statement",
                                              TypeManager.CSharpName (expr.Type));
@@ -4253,81 +4300,51 @@ namespace Mono.CSharp {
                        }
                }
 
-               class StringEmitter : Emitter {
-                       class StringPtr : Expression
-                       {
-                               LocalBuilder b;
-
-                               public StringPtr (LocalBuilder b, Location l)
-                               {
-                                       this.b = b;
-                                       eclass = ExprClass.Value;
-                                       type = TypeManager.char_ptr_type;
-                                       loc = l;
-                               }
-
-                               public override Expression CreateExpressionTree (EmitContext ec)
-                               {
-                                       throw new NotSupportedException ("ET");
-                               }
-
-                               public override Expression DoResolve (EmitContext ec)
-                               {
-                                       // This should never be invoked, we are born in fully
-                                       // initialized state.
-
-                                       return this;
-                               }
-
-                               public override void Emit (EmitContext ec)
-                               {
-                                       if (TypeManager.int_get_offset_to_string_data == null) {
-                                               // TODO: Move to resolve !!
-                                               TypeManager.int_get_offset_to_string_data = TypeManager.GetPredefinedMethod (
-                                                       TypeManager.runtime_helpers_type, "get_OffsetToStringData", loc, Type.EmptyTypes);
-                                       }
-
-                                       ILGenerator ig = ec.ig;
-
-                                       ig.Emit (OpCodes.Ldloc, b);
-                                       ig.Emit (OpCodes.Conv_I);
-                                       ig.Emit (OpCodes.Call, TypeManager.int_get_offset_to_string_data);
-                                       ig.Emit (OpCodes.Add);
-                               }
-                       }
-
-                       LocalBuilder pinned_string;
-                       Location loc;
+               class StringEmitter : Emitter
+               {
+                       LocalInfo pinned_string;
 
                        public StringEmitter (Expression expr, LocalInfo li, Location loc):
                                base (expr, li)
                        {
-                               this.loc = loc;
+                               pinned_string = new LocalInfo (new TypeExpression (TypeManager.string_type, loc), null, null, loc);
+                               pinned_string.Pinned = true;
                        }
 
                        public override void Emit (EmitContext ec)
                        {
-                               ILGenerator ig = ec.ig;
-                               pinned_string = TypeManager.DeclareLocalPinned (ig, TypeManager.string_type);
-                                       
+                               pinned_string.Resolve (ec);
+                               pinned_string.ResolveVariable (ec);
+
                                converted.Emit (ec);
-                               ig.Emit (OpCodes.Stloc, pinned_string);
+                               pinned_string.EmitAssign (ec);
 
-                               Expression sptr = new StringPtr (pinned_string, loc);
-                               converted = Convert.ImplicitConversionRequired (
-                                       ec, sptr, vi.VariableType, loc);
-                                       
-                               if (converted == null)
-                                       return;
+                               PropertyInfo p = TypeManager.int_get_offset_to_string_data;
+                               if (p == null) {
+                                       // TODO: Move to resolve
+                                       p = TypeManager.int_get_offset_to_string_data = TypeManager.GetPredefinedProperty (
+                                               TypeManager.runtime_helpers_type, "OffsetToStringData", pinned_string.Location, TypeManager.int32_type);
 
-                               converted.Emit (ec);
+                                       if (p == null)
+                                               return;
+                               }
+
+                               // TODO: Should use Binary::Add
+                               pinned_string.Emit (ec);
+                               ec.ig.Emit (OpCodes.Conv_I);
+
+                               PropertyExpr pe = new PropertyExpr (pinned_string.VariableType, p, pinned_string.Location);
+                               //pe.InstanceExpression = pinned_string;
+                               pe.Resolve (ec).Emit (ec);
+
+                               ec.ig.Emit (OpCodes.Add);
                                vi.EmitAssign (ec);
                        }
 
                        public override void EmitExit (EmitContext ec)
                        {
                                ec.ig.Emit (OpCodes.Ldnull);
-                               ec.ig.Emit (OpCodes.Stloc, pinned_string);
+                               pinned_string.EmitAssign (ec);
                        }
                }
 
@@ -4426,7 +4443,7 @@ namespace Mono.CSharp {
                                        converted = new Conditional (new Binary (Binary.Operator.LogicalOr,
                                                new Binary (Binary.Operator.Equality, e, new NullLiteral (loc)),
                                                new Binary (Binary.Operator.Equality, new MemberAccess (e, "Length"), new IntConstant (0, loc))),
-                                                       NullPointer.Null,
+                                                       new NullPointer (loc),
                                                        converted);
 
                                        converted = converted.Resolve (ec);                                     
@@ -4458,7 +4475,7 @@ namespace Mono.CSharp {
                                Unary u = e as Unary;
                                if (u != null && u.Oper == Unary.Operator.AddressOf) {
                                        IVariableReference vr = u.Expr as IVariableReference;
-                                       if (vr == null || !vr.IsFixedVariable) {
+                                       if (vr == null || !vr.IsFixed) {
                                                data [i] = new ExpressionEmitter (e, vi);
                                        }
                                }
@@ -4752,7 +4769,9 @@ namespace Mono.CSharp {
                                Type resolved_type = c.CatchType;
                                for (int ii = 0; ii < last_index; ++ii) {
                                        if (resolved_type == prev_catches [ii] || TypeManager.IsSubclassOf (resolved_type, prev_catches [ii])) {
-                                               Report.Error (160, c.loc, "A previous catch clause already catches all exceptions of this or a super type `{0}'", prev_catches [ii].FullName);
+                                               Report.Error (160, c.loc,
+                                                       "A previous catch clause already catches all exceptions of this or a super type `{0}'",
+                                                       TypeManager.CSharpName (prev_catches [ii]));
                                                ok = false;
                                        }
                                }
@@ -4836,6 +4855,7 @@ namespace Mono.CSharp {
                }
        }
 
+       // FIXME: Why is it almost exact copy of Using ??
        public class UsingTemporary : ExceptionStatement {
                TemporaryVariable local_copy;
                public Statement Statement;
@@ -4896,7 +4916,7 @@ namespace Mono.CSharp {
                protected override void EmitFinallyBody (EmitContext ec)
                {
                        ILGenerator ig = ec.ig;
-                       if (!expr_type.IsValueType) {
+                       if (!TypeManager.IsStruct (expr_type)) {
                                Label skip = ig.DefineLabel ();
                                local_copy.Emit (ec);
                                ig.Emit (OpCodes.Brfalse, skip);
@@ -4960,7 +4980,6 @@ namespace Mono.CSharp {
                Expression var;
                Expression init;
 
-               Expression converted_var;
                ExpressionStatement assign;
 
                public Using (Expression var, Expression init, Statement stmt, Location l)
@@ -4971,31 +4990,6 @@ namespace Mono.CSharp {
                        loc = l;
                }
 
-               bool ResolveVariable (EmitContext ec)
-               {
-                       ExpressionStatement a = new SimpleAssign (var, init, loc);
-                       a = a.ResolveStatement (ec);
-                       if (a == null)
-                               return false;
-
-                       assign = a;
-
-                       if (TypeManager.ImplementsInterface (a.Type, TypeManager.idisposable_type)) {
-                               converted_var = var;
-                               return true;
-                       }
-
-                       Expression e = Convert.ImplicitConversionStandard (ec, a, TypeManager.idisposable_type, var.Location);
-                       if (e == null) {
-                               Error_IsNotConvertibleToIDisposable (var);
-                               return false;
-                       }
-
-                       converted_var = e;
-
-                       return true;
-               }
-
                static public void Error_IsNotConvertibleToIDisposable (Expression expr)
                {
                        Report.SymbolRelatedToPreviousError (expr.Type);
@@ -5016,42 +5010,18 @@ namespace Mono.CSharp {
                protected override void EmitFinallyBody (EmitContext ec)
                {
                        ILGenerator ig = ec.ig;
+                       Label skip = ig.DefineLabel ();
 
-                       if (!var.Type.IsValueType) {
-                               Label skip = ig.DefineLabel ();
+                       bool emit_null_check = !TypeManager.IsValueType (var.Type);
+                       if (emit_null_check) {
                                var.Emit (ec);
                                ig.Emit (OpCodes.Brfalse, skip);
-                               converted_var.Emit (ec);
-                               ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                               ig.MarkLabel (skip);
-                       } else {
-                               Expression ml = Expression.MemberLookup(ec.ContainerType, TypeManager.idisposable_type, var.Type, "Dispose", Mono.CSharp.Location.Null);
-
-                               if (!(ml is MethodGroupExpr)) {
-                                       var.Emit (ec);
-                                       ig.Emit (OpCodes.Box, var.Type);
-                                       ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                               } else {
-                                       MethodInfo mi = null;
-
-                                       foreach (MethodInfo mk in ((MethodGroupExpr) ml).Methods) {
-                                               if (TypeManager.GetParameterData (mk).Count == 0) {
-                                                       mi = mk;
-                                                       break;
-                                               }
-                                       }
-
-                                       if (mi == null) {
-                                               Report.Error(-100, Mono.CSharp.Location.Null, "Internal error: No Dispose method which takes 0 parameters.");
-                                               return;
-                                       }
+                       }
 
-                                       IMemoryLocation mloc = (IMemoryLocation) var;
+                       Invocation.EmitCall (ec, false, var, TypeManager.void_dispose_void, new ArrayList (0), loc);
 
-                                       mloc.AddressOf (ec, AddressOp.Load);
-                                       ig.Emit (OpCodes.Call, mi);
-                               }
-                       }
+                       if (emit_null_check)
+                               ig.MarkLabel (skip);
                }
 
                public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
@@ -5082,6 +5052,27 @@ namespace Mono.CSharp {
                        return ok;
                }
 
+               bool ResolveVariable (EmitContext ec)
+               {
+                       assign = new SimpleAssign (var, init, loc);
+                       assign = assign.ResolveStatement (ec);
+                       if (assign == null)
+                               return false;
+
+                       if (assign.Type == TypeManager.idisposable_type ||
+                               TypeManager.ImplementsInterface (assign.Type, TypeManager.idisposable_type)) {
+                               return true;
+                       }
+
+                       Expression e = Convert.ImplicitConversionStandard (ec, assign, TypeManager.idisposable_type, var.Location);
+                       if (e == null) {
+                               Error_IsNotConvertibleToIDisposable (var);
+                               return false;
+                       }
+
+                       throw new NotImplementedException ("covariance?");
+               }
+
                protected override void CloneTo (CloneContext clonectx, Statement t)
                {
                        Using target = (Using) t;
@@ -5096,108 +5087,56 @@ namespace Mono.CSharp {
        ///   Implementation of the foreach C# statement
        /// </summary>
        public class Foreach : Statement {
-               Expression type;
-               Expression variable;
-               Expression expr;
-               Statement statement;
-               
-               public Foreach (Expression type, LocalVariableReference var, Expression expr,
-                               Statement stmt, Location l)
-               {
-                       this.type = type;
-                       this.variable = var;
-                       this.expr = expr;
-                       statement = stmt;
-                       loc = l;
-               }
-
-               public Statement Statement {
-                       get { return statement; }
-               }
-
-               public override bool Resolve (EmitContext ec)
-               {
-                       expr = expr.Resolve (ec);
-                       if (expr == null)
-                               return false;
-
-                       if (expr.IsNull) {
-                               Report.Error (186, loc, "Use of null is not valid in this context");
-                               return false;
-                       }
 
-                       if (expr.eclass == ExprClass.MethodGroup || expr is AnonymousMethodExpression) {
-                               Report.Error (446, expr.Location, "Foreach statement cannot operate on a `{0}'",
-                                       expr.ExprClassName);
-                               return false;
-                       }
-
-                       if (expr.Type.IsArray) {
-                               statement = new ArrayForeach (type, variable, expr, statement, loc);
-                       } else {
-                               statement = new CollectionForeach (type, variable, expr, statement, loc);
-                       }
-                       
-                       return statement.Resolve (ec);
-               }
-
-               protected override void DoEmit (EmitContext ec)
+               sealed class ArrayForeach : Statement
                {
-                       ILGenerator ig = ec.ig;
-                       
-                       Label old_begin = ec.LoopBegin, old_end = ec.LoopEnd;
-                       ec.LoopBegin = ig.DefineLabel ();
-                       ec.LoopEnd = ig.DefineLabel ();
-
-                       statement.Emit (ec);
-                       
-                       ec.LoopBegin = old_begin;
-                       ec.LoopEnd = old_end;
-               }
+                       class ArrayCounter : TemporaryVariable
+                       {
+                               StatementExpression increment;
 
-               protected class ArrayCounter : TemporaryVariable
-               {
-                       StatementExpression increment;
+                               public ArrayCounter (Location loc)
+                                       : base (TypeManager.int32_type, loc)
+                               {
+                               }
 
-                       public ArrayCounter (Location loc)
-                               : base (TypeManager.int32_type, loc)
-                       {
-                       }
+                               public void ResolveIncrement (EmitContext ec)
+                               {
+                                       increment = new StatementExpression (new UnaryMutator (UnaryMutator.Mode.PostIncrement, this));
+                                       increment.Resolve (ec);
+                               }
 
-                       public void ResolveIncrement (EmitContext ec)
-                       {
-                               increment = new StatementExpression (new UnaryMutator (UnaryMutator.Mode.PostIncrement, this, loc));
-                               increment.Resolve (ec);
+                               public void EmitIncrement (EmitContext ec)
+                               {
+                                       increment.Emit (ec);
+                               }
                        }
 
-                       public void EmitIncrement (EmitContext ec)
-                       {
-                               increment.Emit (ec);
-                       }
-               }
+                       readonly Foreach for_each;
+                       readonly Statement statement;
 
-               protected class ArrayForeach : Statement
-               {
-                       Expression variable, expr, conv;
-                       Statement statement;
-                       Type array_type;
-                       Expression var_type;
+                       Expression conv;
                        TemporaryVariable[] lengths;
+                       Expression [] length_exprs;
                        ArrayCounter[] counter;
-                       int rank;
 
                        TemporaryVariable copy;
                        Expression access;
-                       Expression[] length_exprs;
 
-                       public ArrayForeach (Expression var_type, Expression var,
-                                            Expression expr, Statement stmt, Location l)
+                       public ArrayForeach (Foreach @foreach, int rank)
                        {
-                               this.var_type = var_type;
-                               this.variable = var;
-                               this.expr = expr;
-                               statement = stmt;
-                               loc = l;
+                               for_each = @foreach;
+                               statement = for_each.statement;
+                               loc = @foreach.loc;
+
+                               counter = new ArrayCounter [rank];
+                               length_exprs = new Expression [rank];
+
+                               //
+                               // Only use temporary length variables when dealing with
+                               // multi-dimensional arrays
+                               //
+                               if (rank > 1)
+                                       lengths = new TemporaryVariable [rank];
                        }
 
                        protected override void CloneTo (CloneContext clonectx, Statement target)
@@ -5207,27 +5146,21 @@ namespace Mono.CSharp {
 
                        public override bool Resolve (EmitContext ec)
                        {
-                               array_type = expr.Type;
-                               rank = array_type.GetArrayRank ();
-
-                               copy = new TemporaryVariable (array_type, loc);
+                               copy = new TemporaryVariable (for_each.expr.Type, loc);
                                copy.Resolve (ec);
 
-                               counter = new ArrayCounter [rank];
-                               lengths = new TemporaryVariable [rank];
-                               length_exprs = new Expression [rank];
-
+                               int rank = length_exprs.Length;
                                ArrayList list = new ArrayList (rank);
                                for (int i = 0; i < rank; i++) {
                                        counter [i] = new ArrayCounter (loc);
                                        counter [i].ResolveIncrement (ec);                                      
 
-                                       lengths [i] = new TemporaryVariable (TypeManager.int32_type, loc);
-                                       lengths [i].Resolve (ec);
-
                                        if (rank == 1) {
                                                length_exprs [i] = new MemberAccess (copy, "Length").Resolve (ec);
                                        } else {
+                                               lengths [i] = new TemporaryVariable (TypeManager.int32_type, loc);
+                                               lengths [i].Resolve (ec);
+
                                                ArrayList args = new ArrayList (1);
                                                args.Add (new Argument (new IntConstant (i, loc)));
                                                length_exprs [i] = new Invocation (new MemberAccess (copy, "GetLength"), args).Resolve (ec);
@@ -5240,6 +5173,7 @@ namespace Mono.CSharp {
                                if (access == null)
                                        return false;
 
+                               Expression var_type = for_each.type;
                                VarExpr ve = var_type as VarExpr;
                                if (ve != null) {
                                        // Infer implicitly typed local variable from foreach array type
@@ -5259,8 +5193,8 @@ namespace Mono.CSharp {
                                ec.StartFlowBranching (FlowBranching.BranchingType.Loop, loc);
                                ec.CurrentBranching.CreateSibling ();
 
-                               variable = variable.ResolveLValue (ec, conv, loc);
-                               if (variable == null)
+                               for_each.variable = for_each.variable.ResolveLValue (ec, conv, loc);
+                               if (for_each.variable == null)
                                        ok = false;
 
                                ec.StartFlowBranching (FlowBranching.BranchingType.Embedded, loc);
@@ -5280,8 +5214,9 @@ namespace Mono.CSharp {
                        {
                                ILGenerator ig = ec.ig;
 
-                               copy.EmitAssign (ec, expr);
+                               copy.EmitAssign (ec, for_each.expr);
 
+                               int rank = length_exprs.Length;
                                Label[] test = new Label [rank];
                                Label[] loop = new Label [rank];
 
@@ -5289,7 +5224,8 @@ namespace Mono.CSharp {
                                        test [i] = ig.DefineLabel ();
                                        loop [i] = ig.DefineLabel ();
 
-                                       lengths [i].EmitAssign (ec, length_exprs [i]);
+                                       if (lengths != null)
+                                               lengths [i].EmitAssign (ec, length_exprs [i]);
                                }
 
                                IntConstant zero = new IntConstant (0, loc);
@@ -5300,7 +5236,7 @@ namespace Mono.CSharp {
                                        ig.MarkLabel (loop [i]);
                                }
 
-                               ((IAssignMethod) variable).EmitAssign (ec, conv, false, false);
+                               ((IAssignMethod) for_each.variable).EmitAssign (ec, conv, false, false);
 
                                statement.Emit (ec);
 
@@ -5311,7 +5247,12 @@ namespace Mono.CSharp {
 
                                        ig.MarkLabel (test [i]);
                                        counter [i].Emit (ec);
-                                       lengths [i].Emit (ec);
+
+                                       if (lengths != null)
+                                               lengths [i].Emit (ec);
+                                       else
+                                               length_exprs [i].Emit (ec);
+
                                        ig.Emit (OpCodes.Blt, loop [i]);
                                }
 
@@ -5320,20 +5261,78 @@ namespace Mono.CSharp {
 
                        public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
                        {
+                               for_each.expr.MutateHoistedGenericType (storey);
+
                                copy.MutateHoistedGenericType (storey);
                                conv.MutateHoistedGenericType (storey);
-                               variable.MutateHoistedGenericType (storey);
                                statement.MutateHoistedGenericType (storey);
 
-                               for (int i = 0; i < rank; i++) {
+                               for (int i = 0; i < counter.Length; i++) {
                                        counter [i].MutateHoistedGenericType (storey);
-                                       lengths [i].MutateHoistedGenericType (storey);
+                                       if (lengths != null)
+                                               lengths [i].MutateHoistedGenericType (storey);
                                }
                        }
                }
 
-               protected class CollectionForeach : Statement
+               sealed class CollectionForeach : Statement
                {
+                       class CollectionForeachStatement : Statement
+                       {
+                               Type type;
+                               Expression variable, current, conv;
+                               Statement statement;
+                               Assign assign;
+
+                               public CollectionForeachStatement (Type type, Expression variable,
+                                                                  Expression current, Statement statement,
+                                                                  Location loc)
+                               {
+                                       this.type = type;
+                                       this.variable = variable;
+                                       this.current = current;
+                                       this.statement = statement;
+                                       this.loc = loc;
+                               }
+
+                               protected override void CloneTo (CloneContext clonectx, Statement target)
+                               {
+                                       throw new NotImplementedException ();
+                               }
+
+                               public override bool Resolve (EmitContext ec)
+                               {
+                                       current = current.Resolve (ec);
+                                       if (current == null)
+                                               return false;
+
+                                       conv = Convert.ExplicitConversion (ec, current, type, loc);
+                                       if (conv == null)
+                                               return false;
+
+                                       assign = new SimpleAssign (variable, conv, loc);
+                                       if (assign.Resolve (ec) == null)
+                                               return false;
+
+                                       if (!statement.Resolve (ec))
+                                               return false;
+
+                                       return true;
+                               }
+
+                               protected override void DoEmit (EmitContext ec)
+                               {
+                                       assign.EmitStatement (ec);
+                                       statement.Emit (ec);
+                               }
+
+                               public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
+                               {
+                                       assign.MutateHoistedGenericType (storey);
+                                       statement.MutateHoistedGenericType (storey);
+                               }
+                       }
+
                        Expression variable, expr;
                        Statement statement;
 
@@ -5368,23 +5367,13 @@ namespace Mono.CSharp {
                        {
                                Type return_type = mi.ReturnType;
 
-                               if ((return_type == TypeManager.ienumerator_type) && (mi.DeclaringType == TypeManager.string_type))
-                                       //
-                                       // Apply the same optimization as MS: skip the GetEnumerator
-                                       // returning an IEnumerator, and use the one returning a 
-                                       // CharEnumerator instead. This allows us to avoid the 
-                                       // try-finally block and the boxing.
-                                       //
-                                       return false;
-
                                //
                                // Ok, we can access it, now make sure that we can do something
                                // with this `GetEnumerator'
                                //
 
                                if (return_type == TypeManager.ienumerator_type ||
-                                   TypeManager.ienumerator_type.IsAssignableFrom (return_type) ||
-                                   (!RootContext.StdLib && TypeManager.ImplementsInterface (return_type, TypeManager.ienumerator_type))) {
+                                       TypeManager.ImplementsInterface (return_type, TypeManager.ienumerator_type)) {
                                        //
                                        // If it is not an interface, lets try to find the methods ourselves.
                                        // For example, if we have:
@@ -5456,14 +5445,10 @@ namespace Mono.CSharp {
                        //
                        bool FetchMoveNext (Type t)
                        {
-                               MemberList move_next_list;
-
-                               move_next_list = TypeContainer.FindMembers (
-                                       t, MemberTypes.Method,
+                               MemberInfo[] move_next_list = TypeManager.MemberLookup (null, null, t,
+                                       MemberTypes.Method,
                                        BindingFlags.Public | BindingFlags.Instance,
-                                       Type.FilterName, "MoveNext");
-                               if (move_next_list.Count == 0)
-                                       return false;
+                                       "MoveNext", null);
 
                                foreach (MemberInfo m in move_next_list){
                                        MethodInfo mi = (MethodInfo) m;
@@ -5493,31 +5478,6 @@ namespace Mono.CSharp {
                                return true;
                        }
 
-                       // 
-                       // Retrieves a `public void Dispose ()' method from the Type `t'
-                       //
-                       static MethodInfo FetchMethodDispose (Type t)
-                       {
-                               MemberList dispose_list;
-
-                               dispose_list = TypeContainer.FindMembers (
-                                       t, MemberTypes.Method,
-                                       BindingFlags.Public | BindingFlags.Instance,
-                                       Type.FilterName, "Dispose");
-                               if (dispose_list.Count == 0)
-                                       return null;
-
-                               foreach (MemberInfo m in dispose_list){
-                                       MethodInfo mi = (MethodInfo) m;
-
-                                       if (TypeManager.GetParameterData (mi).Count == 0){
-                                               if (mi.ReturnType == TypeManager.void_type)
-                                                       return mi;
-                                       }
-                               }
-                               return null;
-                       }
-
                        void Error_Enumerator ()
                        {
                                if (enumerator_found) {
@@ -5660,9 +5620,6 @@ namespace Mono.CSharp {
                                        return false;
                                }
 
-                               bool is_disposable = !enumerator_type.IsSealed ||
-                                       TypeManager.ImplementsInterface (enumerator_type, TypeManager.idisposable_type);
-
                                VarExpr ve = var_type as VarExpr;
                                if (ve != null) {
                                        // Infer implicitly typed local variable from foreach enumerable type
@@ -5697,9 +5654,14 @@ namespace Mono.CSharp {
 
                                loop = new While (move_next_expr, block, loc);
 
-                               wrapper = is_disposable ?
-                                       (Statement) new DisposableWrapper (this) :
-                                       (Statement) new NonDisposableWrapper (this);
+
+                               bool implements_idisposable = TypeManager.ImplementsInterface (enumerator_type, TypeManager.idisposable_type);
+                               if (implements_idisposable || !enumerator_type.IsSealed) {
+                                       wrapper = new DisposableWrapper (this, implements_idisposable);
+                               } else {
+                                       wrapper = new NonDisposableWrapper (this);
+                               }
+
                                return wrapper.Resolve (ec);
                        }
 
@@ -5738,12 +5700,15 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       class DisposableWrapper : ExceptionStatement {
+                       sealed class DisposableWrapper : ExceptionStatement
+                       {
                                CollectionForeach parent;
+                               bool implements_idisposable;
 
-                               internal DisposableWrapper (CollectionForeach parent)
+                               internal DisposableWrapper (CollectionForeach parent, bool implements)
                                {
                                        this.parent = parent;
+                                       this.implements_idisposable = implements;
                                }
 
                                protected override void CloneTo (CloneContext clonectx, Statement target)
@@ -5783,7 +5748,30 @@ namespace Mono.CSharp {
 
                                protected override void EmitFinallyBody (EmitContext ec)
                                {
-                                       parent.EmitFinallyBody (ec);
+                                       Expression instance = parent.enumerator;
+                                       if (!TypeManager.IsValueType (parent.enumerator_type)) {
+                                               ILGenerator ig = ec.ig;
+
+                                               parent.enumerator.Emit (ec);
+
+                                               Label call_dispose = ig.DefineLabel ();
+
+                                               if (!implements_idisposable) {
+                                                       ec.ig.Emit (OpCodes.Isinst, TypeManager.idisposable_type);
+                                                       LocalTemporary temp = new LocalTemporary (TypeManager.idisposable_type);
+                                                       temp.Store (ec);
+                                                       temp.Emit (ec);
+                                                       instance = temp;
+                                               }
+                                               
+                                               ig.Emit (OpCodes.Brtrue_S, call_dispose);
+
+                                               // using 'endfinally' to empty the evaluation stack
+                                               ig.Emit (OpCodes.Endfinally);
+                                               ig.MarkLabel (call_dispose);
+                                       }
+
+                                       Invocation.EmitCall (ec, false, instance, TypeManager.void_dispose_void, new ArrayList (0), loc);
                                }
 
                                public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
@@ -5807,37 +5795,6 @@ namespace Mono.CSharp {
                                loop.Emit (ec);
                        }
 
-                       void EmitFinallyBody (EmitContext ec)
-                       {
-                               ILGenerator ig = ec.ig;
-
-                               if (enumerator_type.IsValueType) {
-                                       MethodInfo mi = FetchMethodDispose (enumerator_type);
-                                       if (mi != null) {
-                                               enumerator.AddressOf (ec, AddressOp.Load);
-                                               ig.Emit (OpCodes.Call, mi);
-                                       } else {
-                                               enumerator.Emit (ec);
-                                               ig.Emit (OpCodes.Box, enumerator_type);
-                                               ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                                       }
-                               } else {
-                                       Label call_dispose = ig.DefineLabel ();
-
-                                       enumerator.Emit (ec);
-                                       ig.Emit (OpCodes.Isinst, TypeManager.idisposable_type);
-                                       ig.Emit (OpCodes.Dup);
-                                       ig.Emit (OpCodes.Brtrue_S, call_dispose);
-
-                                       // 'endfinally' empties the evaluation stack, and can appear anywhere inside a finally block
-                                       // (Partition III, Section 3.35)
-                                       ig.Emit (OpCodes.Endfinally);
-
-                                       ig.MarkLabel (call_dispose);
-                                       ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
-                               }
-                       }
-
                        public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
                        {
                                enumerator_type = storey.MutateType (enumerator_type);
@@ -5846,60 +5803,65 @@ namespace Mono.CSharp {
                        }
                }
 
-               protected class CollectionForeachStatement : Statement
+               Expression type;
+               Expression variable;
+               Expression expr;
+               Statement statement;
+
+               public Foreach (Expression type, LocalVariableReference var, Expression expr,
+                               Statement stmt, Location l)
                {
-                       Type type;
-                       Expression variable, current, conv;
-                       Statement statement;
-                       Assign assign;
+                       this.type = type;
+                       this.variable = var;
+                       this.expr = expr;
+                       statement = stmt;
+                       loc = l;
+               }
 
-                       public CollectionForeachStatement (Type type, Expression variable,
-                                                          Expression current, Statement statement,
-                                                          Location loc)
-                       {
-                               this.type = type;
-                               this.variable = variable;
-                               this.current = current;
-                               this.statement = statement;
-                               this.loc = loc;
-                       }
+               public Statement Statement {
+                       get { return statement; }
+               }
 
-                       protected override void CloneTo (CloneContext clonectx, Statement target)
-                       {
-                               throw new NotImplementedException ();
+               public override bool Resolve (EmitContext ec)
+               {
+                       expr = expr.Resolve (ec);
+                       if (expr == null)
+                               return false;
+
+                       if (expr.IsNull) {
+                               Report.Error (186, loc, "Use of null is not valid in this context");
+                               return false;
                        }
 
-                       public override bool Resolve (EmitContext ec)
-                       {
-                               current = current.Resolve (ec);
-                               if (current == null)
+                       if (expr.Type == TypeManager.string_type) {
+                               statement = new ArrayForeach (this, 1);
+                       } else if (expr.Type.IsArray) {
+                               statement = new ArrayForeach (this, expr.Type.GetArrayRank ());
+                       } else {
+                               if (expr.eclass == ExprClass.MethodGroup || expr is AnonymousMethodExpression) {
+                                       Report.Error (446, expr.Location, "Foreach statement cannot operate on a `{0}'",
+                                               expr.ExprClassName);
                                        return false;
+                               }
 
-                               conv = Convert.ExplicitConversion (ec, current, type, loc);
-                               if (conv == null)
-                                       return false;
+                               statement = new CollectionForeach (type, variable, expr, statement, loc);
+                       }
 
-                               assign = new SimpleAssign (variable, conv, loc);
-                               if (assign.Resolve (ec) == null)
-                                       return false;
+                       return statement.Resolve (ec);
+               }
 
-                               if (!statement.Resolve (ec))
-                                       return false;
+               protected override void DoEmit (EmitContext ec)
+               {
+                       ILGenerator ig = ec.ig;
 
-                               return true;
-                       }
+                       Label old_begin = ec.LoopBegin, old_end = ec.LoopEnd;
+                       ec.LoopBegin = ig.DefineLabel ();
+                       ec.LoopEnd = ig.DefineLabel ();
 
-                       protected override void DoEmit (EmitContext ec)
-                       {
-                               assign.EmitStatement (ec);
-                               statement.Emit (ec);
-                       }
+                       statement.Emit (ec);
 
-                       public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
-                       {
-                               assign.MutateHoistedGenericType (storey);
-                               statement.MutateHoistedGenericType (storey);
-                       }
+                       ec.LoopBegin = old_begin;
+                       ec.LoopEnd = old_end;
                }
 
                protected override void CloneTo (CloneContext clonectx, Statement t)