TARGET_JVM icon support
[mono.git] / mcs / mcs / statement.cs
index 165219dae953efefa1691be6c2cab018821a3650..7d70945eca849c1b7146c0755aaf7a127d440dbb 100644 (file)
@@ -46,8 +46,8 @@ namespace Mono.CSharp {
                        // in unreachable code, for instance.
                        //
 
-                       if (warn && (RootContext.WarningLevel >= 2))
-                               Report.Warning (162, loc, "Unreachable code detected");
+                       if (warn)
+                               Report.Warning (162, 2, loc, "Unreachable code detected");
 
                        ec.StartFlowBranching (FlowBranching.BranchingType.Block, loc);
                        bool ok = Resolve (ec);
@@ -55,16 +55,7 @@ namespace Mono.CSharp {
 
                        return ok;
                }
-               
-               protected void CheckObsolete (Type type)
-               {
-                       ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
-                       if (obsolete_attr == null)
-                               return;
-
-                       AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, loc);
-               }
-               
+                               
                /// <summary>
                ///   Return value indicates whether all code paths emitted return.
                /// </summary>
@@ -80,7 +71,7 @@ namespace Mono.CSharp {
 
                public void Error (int error, string s)
                {
-                       if (!Location.IsNull (loc))
+                       if (!loc.IsNull)
                                Report.Error (error, loc, s);
                        else
                                Report.Error (error, s);
@@ -410,7 +401,7 @@ namespace Mono.CSharp {
                Expression Test;
                readonly Statement InitStatement;
                readonly Statement Increment;
-               readonly Statement Statement;
+               public readonly Statement Statement;
                bool infinite, empty;
                
                public For (Statement initStatement,
@@ -527,10 +518,10 @@ namespace Mono.CSharp {
        public class StatementExpression : Statement {
                ExpressionStatement expr;
                
-               public StatementExpression (ExpressionStatement expr, Location l)
+               public StatementExpression (ExpressionStatement expr)
                {
                        this.expr = expr;
-                       loc = l;
+                       loc = expr.Location;
                }
 
                public override bool Resolve (EmitContext ec)
@@ -800,21 +791,24 @@ namespace Mono.CSharp {
                        if (expr == null)
                                return false;
 
-                       if (!(expr is Constant)){
+                       Constant c = expr as Constant;
+                       if (c == null) {
                                Error (150, "A constant value is expected");
                                return false;
                        }
 
-                       object val = Expression.ConvertIntLiteral (
-                               (Constant) expr, ec.Switch.SwitchType, loc);
+                       c = c.ToType (ec.Switch.SwitchType, loc);
+                       if (c == null)
+                               return false;
 
+                       object val = c.GetValue ();
                        if (val == null)
-                               return false;
+                               val = SwitchLabel.NullStringCase;
                                        
                        sl = (SwitchLabel) ec.Switch.Elements [val];
 
                        if (sl == null){
-                               Report.Error (159, loc, "No such label `case {0}:' within the scope of the goto statement", val);
+                               Report.Error (159, loc, "No such label `case {0}:' within the scope of the goto statement", c.GetValue () == null ? "null" : val.ToString ());
                                return false;
                        }
 
@@ -947,7 +941,7 @@ namespace Mono.CSharp {
 
                public override bool Resolve (EmitContext ec)
                {
-                       if (!ec.CurrentBranching.InLoop () && !ec.CurrentBranching.InSwitch ()){
+                       if (!ec.CurrentBranching.InLoop ()){
                                Error (139, "No enclosing loop out of which to break or continue");
                                return false;
                        } else if (ec.InFinally) {
@@ -1245,7 +1239,7 @@ namespace Mono.CSharp {
                //
                // Keeps track of (name, type) pairs
                //
-               Hashtable variables;
+               IDictionary variables;
 
                //
                // Keeps track of constants
@@ -1315,10 +1309,10 @@ namespace Mono.CSharp {
                        get { return this_id; }
                }
 
-               protected Hashtable Variables {
+               protected IDictionary Variables {
                        get {
                                if (variables == null)
-                                       variables = new Hashtable ();
+                                       variables = new ListDictionary ();
                                return variables;
                        }
                }
@@ -1509,7 +1503,7 @@ namespace Mono.CSharp {
                        // treat it as if the variable declaration was in error.
                        //
                        Report.SymbolRelatedToPreviousError (loc, name);
-                       Error_AlreadyDeclared (kvi.Location, name, "child");
+                       Error_AlreadyDeclared (kvi.Location, name, "parent or current");
                        return false;
                }
 
@@ -1569,6 +1563,9 @@ namespace Mono.CSharp {
                                constants = new Hashtable ();
 
                        constants.Add (name, value);
+
+                       // A block is considered used if we perform an initialization in a local declaration, even if it is constant.
+                       Use ();
                        return true;
                }
 
@@ -1618,15 +1615,6 @@ namespace Mono.CSharp {
                        return null;
                }
                
-               /// <summary>
-               ///   True if the variable named @name is a constant
-               ///  </summary>
-               public bool IsConstant (string name)
-               {
-                       Expression e = GetConstantExpression (name);
-                       return e != null;
-               }
-
                public void AddStatement (Statement s)
                {
                        statements.Add (s);
@@ -1682,7 +1670,7 @@ namespace Mono.CSharp {
                ///   tc: is our typecontainer (to resolve type references)
                ///   ig: is the code generator:
                /// </remarks>
-               public void ResolveMeta (ToplevelBlock toplevel, EmitContext ec, InternalParameters ip)
+               public void ResolveMeta (ToplevelBlock toplevel, EmitContext ec, Parameters ip)
                {
                        bool old_unsafe = ec.InUnsafe;
 
@@ -1749,8 +1737,15 @@ namespace Mono.CSharp {
                                        if (cv == null)
                                                continue;
 
+                                       // Don't let 'const int Foo = Foo;' succeed.
+                                       // Removing the name from 'constants' ensures that we get a LocalVariableReference below,
+                                       // which in turn causes the 'must be constant' error to be triggered.
+                                       constants.Remove (name);
+
                                        ec.CurrentBlock = this;
                                        Expression e = cv.Resolve (ec);
+                                       if (e == null)
+                                               continue;
 
                                        Constant ce = e as Constant;
                                        if (ce == null){
@@ -1758,13 +1753,10 @@ namespace Mono.CSharp {
                                                continue;
                                        }
 
-                                       if (e.Type != variable_type){
-                                               e = Const.ChangeType (vi.Location, ce, variable_type);
-                                               if (e == null)
-                                                       continue;
-                                       }
+                                       e = ce.ToType (variable_type, vi.Location);
+                                       if (e == null)
+                                               continue;
 
-                                       constants.Remove (name);
                                        constants.Add (name, e);
                                }
                        }
@@ -1845,9 +1837,9 @@ namespace Mono.CSharp {
                                        name = (string) de.Key;
 
                                        if (vector.IsAssigned (vi.VariableInfo)){
-                                               Report.Warning (219, vi.Location, "The variable `{0}' is assigned but its value is never used", name);
+                                               Report.Warning (219, 3, vi.Location, "The variable `{0}' is assigned but its value is never used", name);
                                        } else {
-                                               Report.Warning (168, vi.Location, "The variable `{0}' is declared but never used", name);
+                                               Report.Warning (168, 3, vi.Location, "The variable `{0}' is declared but never used", name);
                                        }
                                }
                        }
@@ -1856,6 +1848,36 @@ namespace Mono.CSharp {
                bool unreachable_shown;
                bool unreachable;
 
+               private void CheckPossibleMistakenEmptyStatement (Statement s)
+               {
+                       Statement body;
+
+                       // Some statements are wrapped by a Block. Since
+                       // others' internal could be changed, here I treat
+                       // them as possibly wrapped by Block equally.
+                       Block b = s as Block;
+                       if (b != null && b.statements.Count == 1)
+                               s = (Statement) b.statements [0];
+
+                       if (s is Lock)
+                               body = ((Lock) s).Statement;
+                       else if (s is For)
+                               body = ((For) s).Statement;
+                       else if (s is Foreach)
+                               body = ((Foreach) s).Statement;
+                       else if (s is While)
+                               body = ((While) s).Statement;
+                       else if (s is Using)
+                               body = ((Using) s).Statement;
+                       else if (s is Fixed)
+                               body = ((Fixed) s).Statement;
+                       else
+                               return;
+
+                       if (body == null || body is EmptyStatement)
+                               Report.Warning (642, 3, s.loc, "Possible mistaken empty statement");
+               }
+
                public override bool Resolve (EmitContext ec)
                {
                        Block prev_block = ec.CurrentBlock;
@@ -1871,17 +1893,24 @@ namespace Mono.CSharp {
                        int statement_count = statements.Count;
                        for (int ix = 0; ix < statement_count; ix++){
                                Statement s = (Statement) statements [ix];
+                               // Check possible empty statement (CS0642)
+                               if (RootContext.WarningLevel >= 3 &&
+                                       ix + 1 < statement_count &&
+                                               statements [ix + 1] is Block)
+                                       CheckPossibleMistakenEmptyStatement (s);
 
                                //
                                // Warn if we detect unreachable code.
                                //
                                if (unreachable) {
+                                       if (s is EmptyStatement)
+                                               continue;
+
                                        if (s is Block)
                                                ((Block) s).unreachable = true;
 
-                                       if (!unreachable_shown && (RootContext.WarningLevel >= 2)) {
-                                               Report.Warning (
-                                                       162, loc, "Unreachable code detected");
+                                       if (!unreachable_shown) {
+                                               Report.Warning (162, 2, s.loc, "Unreachable code detected");
                                                unreachable_shown = true;
                                        }
                                }
@@ -1927,7 +1956,7 @@ namespace Mono.CSharp {
                        if ((labels != null) && (RootContext.WarningLevel >= 2)) {
                                foreach (LabeledStatement label in labels.Values)
                                        if (!label.HasBeenReferenced)
-                                               Report.Warning (164, label.loc,
+                                               Report.Warning (164, 2, label.loc,
                                                                "This label has not been referenced");
                        }
 
@@ -1951,8 +1980,8 @@ namespace Mono.CSharp {
                        unreachable_shown = true;
                        unreachable = true;
 
-                       if (warn && (RootContext.WarningLevel >= 2))
-                               Report.Warning (162, loc, "Unreachable code detected");
+                       if (warn)
+                               Report.Warning (162, 2, loc, "Unreachable code detected");
 
                        ec.StartFlowBranching (FlowBranching.BranchingType.Block, loc);
                        bool ok = Resolve (ec);
@@ -2178,7 +2207,7 @@ namespace Mono.CSharp {
                                Parameters pars = t.Parameters;
                                par = pars.GetParameterByName (name, out idx);
                                if (par != null)
-                                       return new ParameterReference (pars, this, idx, name, loc);
+                                       return new ParameterReference (par, this, idx, loc);
                        }
                        return null;
                }
@@ -2240,7 +2269,7 @@ namespace Mono.CSharp {
                        return this_variable == null || this_variable.IsThisAssigned (ec, loc);
                }
 
-               public bool ResolveMeta (EmitContext ec, InternalParameters ip)
+               public bool ResolveMeta (EmitContext ec, Parameters ip)
                {
                        int errors = Report.Errors;
 
@@ -2265,6 +2294,8 @@ namespace Mono.CSharp {
                Label il_label_code;
                bool  il_label_code_set;
 
+               public static readonly object NullStringCase = new object ();
+
                //
                // if expr == null, then it is the default case.
                //
@@ -2321,20 +2352,17 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       if (required_type == TypeManager.string_type) {
-                               if (c.Type == TypeManager.string_type) {
-                                       converted = c.GetValue ();
-                                       return true;
-                               }
-
-                               if (e is NullLiteral) {
-                                       converted = e;
-                                       return true;
-                               }
+                       if (required_type == TypeManager.string_type && c.GetValue () == null) {
+                               converted = NullStringCase;
+                               return true;
                        }
 
-                       converted = Expression.ConvertIntLiteral (c, required_type, loc);
-                       return converted != null;
+                       c = c.ToType (required_type, loc);
+                       if (c == null)
+                               return false;
+
+                       converted = c.GetValue ();
+                       return true;
                }
 
                public void Erorr_AlreadyOccurs ()
@@ -2342,7 +2370,7 @@ namespace Mono.CSharp {
                        string label;
                        if (converted == null)
                                label = "default";
-                       else if (converted is NullLiteral)
+                       else if (converted == NullStringCase)
                                label = "null";
                        else
                                label = converted.ToString ();
@@ -2823,7 +2851,7 @@ namespace Mono.CSharp {
 
                        ig.Emit (OpCodes.Ldloc, val);
                        
-                       if (Elements.Contains (NullLiteral.Null)){
+                       if (Elements.Contains (SwitchLabel.NullStringCase)){
                                ig.Emit (OpCodes.Brfalse, null_target);
                        } else
                                ig.Emit (OpCodes.Brfalse, default_target);
@@ -2862,7 +2890,7 @@ namespace Mono.CSharp {
                                        if (sl.Label != null){
                                                object lit = sl.Converted;
 
-                                               if (lit is NullLiteral){
+                                               if (lit == SwitchLabel.NullStringCase){
                                                        null_found = true;
                                                        if (label_count == 1)
                                                                ig.Emit (OpCodes.Br, next_test);
@@ -3053,8 +3081,8 @@ namespace Mono.CSharp {
 
        public class Lock : ExceptionStatement {
                Expression expr;
-               Statement Statement;
-               LocalBuilder temp;
+               public Statement Statement;
+               TemporaryVariable temp;
                        
                public Lock (Expression expr, Statement stmt, Location l)
                {
@@ -3071,8 +3099,8 @@ namespace Mono.CSharp {
 
                        if (expr.Type.IsValueType){
                                Report.Error (185, loc,
-                                       "`{0}' is not a reference type as required by the lock statement",
-                              TypeManager.CSharpName (expr.Type));
+                                             "`{0}' is not a reference type as required by the lock statement",
+                                             TypeManager.CSharpName (expr.Type));
                                return false;
                        }
 
@@ -3095,19 +3123,18 @@ namespace Mono.CSharp {
                                ec.NeedReturnLabel ();
                        }
 
+                       temp = new TemporaryVariable (expr.Type, loc);
+                       temp.Resolve (ec);
+                       
                        return true;
                }
                
                protected override void DoEmit (EmitContext ec)
                {
-                       Type type = expr.Type;
-                       
                        ILGenerator ig = ec.ig;
-                       temp = ig.DeclareLocal (type);
-                               
-                       expr.Emit (ec);
-                       ig.Emit (OpCodes.Dup);
-                       ig.Emit (OpCodes.Stloc, temp);
+
+                       temp.Store (ec, expr);
+                       temp.Emit (ec);
                        ig.Emit (OpCodes.Call, TypeManager.void_monitor_enter_object);
 
                        // try
@@ -3123,9 +3150,8 @@ namespace Mono.CSharp {
 
                public override void EmitFinally (EmitContext ec)
                {
-                       ILGenerator ig = ec.ig;
-                       ig.Emit (OpCodes.Ldloc, temp);
-                       ig.Emit (OpCodes.Call, TypeManager.void_monitor_exit_object);
+                       temp.Emit (ec);
+                       ec.ig.Emit (OpCodes.Call, TypeManager.void_monitor_exit_object);
                }
        }
 
@@ -3258,7 +3284,7 @@ namespace Mono.CSharp {
                        public abstract void EmitExit (ILGenerator ig);
                }
 
-               class ExpressionEmitter: Emitter {
+               class ExpressionEmitter : Emitter {
                        public ExpressionEmitter (Expression converted, LocalInfo li) :
                                base (converted, li)
                        {
@@ -3280,7 +3306,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               class StringEmitter: Emitter {
+               class StringEmitter : Emitter {
                        LocalBuilder pinned_string;
                        Location loc;
 
@@ -3324,6 +3350,10 @@ namespace Mono.CSharp {
                        loc = l;
                }
 
+               public Statement Statement {
+                       get { return statement; }
+               }
+
                public override bool Resolve (EmitContext ec)
                {
                        if (!ec.InUnsafe){
@@ -3337,8 +3367,6 @@ namespace Mono.CSharp {
 
                        expr_type = texpr.ResolveType (ec);
 
-                       CheckObsolete (expr_type);
-
                        data = new Emitter [declarators.Count];
 
                        if (!expr_type.IsPointer){
@@ -3396,6 +3424,11 @@ namespace Mono.CSharp {
                                        if (!TypeManager.VerifyUnManaged (child.Type, loc))
                                                return false;
 
+                                       if (!Convert.ImplicitConversionExists (ec, e, expr_type)) {
+                                               e.Error_ValueCannotBeConverted (e.Location, expr_type, false);
+                                               return false;
+                                       }
+
                                        data [i] = new ExpressionEmitter (e, vi);
                                        i++;
 
@@ -3514,7 +3547,7 @@ namespace Mono.CSharp {
                }
        }
        
-       public class Catch: Statement {
+       public class Catch : Statement {
                public readonly string Name;
                public readonly Block  Block;
 
@@ -3557,8 +3590,6 @@ namespace Mono.CSharp {
 
                                        type = te.ResolveType (ec);
 
-                                       CheckObsolete (type);
-
                                        if (type != TypeManager.exception_type && !type.IsSubclassOf (TypeManager.exception_type)){
                                                Error (155, "The type caught or thrown must be derived from System.Exception");
                                                return false;
@@ -3646,6 +3677,14 @@ namespace Mono.CSharp {
                        Report.Debug (1, "END OF CATCH BLOCKS", ec.CurrentBranching);
 
                        if (General != null){
+                               if (CodeGen.Assembly.WrapNonExceptionThrows) {
+                                       foreach (Catch c in Specific){
+                                               if (c.CatchType == TypeManager.exception_type) {
+                                                       Report.Warning (1058, 1, c.loc, "A previous catch clause already catches all exceptions. All non-exceptions thrown will be wrapped in a `System.Runtime.CompilerServices.RuntimeWrappedException'");
+                                               }
+                                       }
+                               }
+
                                ec.CurrentBranching.CreateSibling (
                                        General.Block, FlowBranching.SiblingType.Catch);
 
@@ -3717,12 +3756,15 @@ namespace Mono.CSharp {
                                        if (vi == null)
                                                throw new Exception ("Variable does not exist in this block");
 
-                                       ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
                                        if (vi.IsCaptured){
+                                               LocalBuilder e = ig.DeclareLocal (vi.VariableType);
+                                               ig.Emit (OpCodes.Stloc, e);
+                                               
                                                ec.EmitCapturedVariableInstance (vi);
-                                               ig.Emit (OpCodes.Ldloc, vi.LocalBuilder);
+                                               ig.Emit (OpCodes.Ldloc, e);
                                                ig.Emit (OpCodes.Stfld, vi.FieldBuilder);
-                                       }
+                                       } else
+                                               ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
                                } else
                                        ig.Emit (OpCodes.Pop);
                                
@@ -3756,11 +3798,10 @@ namespace Mono.CSharp {
 
        public class Using : ExceptionStatement {
                object expression_or_block;
-               Statement Statement;
+               public Statement Statement;
                ArrayList var_list;
                Expression expr;
                Type expr_type;
-               Expression conv;
                Expression [] resolved_vars;
                Expression [] converted_vars;
                ExpressionStatement [] assign;
@@ -3811,11 +3852,13 @@ namespace Mono.CSharp {
                                        continue;
                                }
 
-                               converted_vars [i] = Convert.ImplicitConversionRequired (
+                               converted_vars [i] = Convert.ImplicitConversion (
                                        ec, var, TypeManager.idisposable_type, loc);
 
-                               if (converted_vars [i] == null)
+                               if (converted_vars [i] == null) {
+                                       Error_IsNotConvertibleToIDisposable ();
                                        return false;
+                               }
 
                                i++;
                        }
@@ -3840,12 +3883,17 @@ namespace Mono.CSharp {
                        return true;
                }
 
+               void Error_IsNotConvertibleToIDisposable ()
+               {
+                       Report.Error (1674, loc, "`{0}': type used in a using statement must be implicitly convertible to `System.IDisposable'",
+                               TypeManager.CSharpName (expr_type));
+               }
+
                bool ResolveExpression (EmitContext ec)
                {
                        if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
                                if (Convert.ImplicitConversion (ec, expr, TypeManager.idisposable_type, loc) == null) {
-                                       Report.Error (1674, loc, "`{0}': type used in a using statement must be implicitly convertible to 'System.IDisposable'",
-                                               TypeManager.CSharpName (expr_type));
+                                       Error_IsNotConvertibleToIDisposable ();
                                        return false;
                                }
                        }
@@ -3898,7 +3946,7 @@ namespace Mono.CSharp {
                                                MethodInfo mi = null;
 
                                                foreach (MethodInfo mk in ((MethodGroupExpr) ml).Methods) {
-                                                       if (TypeManager.GetArgumentTypes (mk).Length == 0) {
+                                                       if (TypeManager.GetParameterData (mk).Count == 0) {
                                                                mi = mk;
                                                                break;
                                                        }
@@ -3933,10 +3981,8 @@ namespace Mono.CSharp {
                        //
                        ILGenerator ig = ec.ig;
                        local_copy = ig.DeclareLocal (expr_type);
-                       if (conv != null)
-                               conv.Emit (ec);
-                       else
-                               expr.Emit (ec);
+
+                       expr.Emit (ec);
                        ig.Emit (OpCodes.Stloc, local_copy);
 
                        if (emit_finally)
@@ -3970,7 +4016,7 @@ namespace Mono.CSharp {
                                        MethodInfo mi = null;
 
                                        foreach (MethodInfo mk in ((MethodGroupExpr) ml).Methods) {
-                                               if (TypeManager.GetArgumentTypes (mk).Length == 0) {
+                                               if (TypeManager.GetParameterData (mk).Count == 0) {
                                                        mi = mk;
                                                        break;
                                                }
@@ -4069,14 +4115,19 @@ namespace Mono.CSharp {
                        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 is NullLiteral) {
+                       Constant c = expr as Constant;
+                       if (c != null && c.GetValue () == null) {
                                Report.Error (186, loc, "Use of null is not valid in this context");
                                return false;
                        }
@@ -4087,6 +4138,12 @@ namespace Mono.CSharp {
 
                        Type var_type = texpr.Type;
 
+                       if (expr.eclass == ExprClass.MethodGroup || expr is AnonymousMethod) {
+                               Report.Error (446, expr.Location, "Foreach statement cannot operate on a `{0}'",
+                                       expr.ExprClassName);
+                               return false;
+                       }
+
                        //
                        // We need an instance variable.  Not sure this is the best
                        // way of doing this.
@@ -4096,7 +4153,7 @@ namespace Mono.CSharp {
                        //
                        if (!(expr.eclass == ExprClass.Variable || expr.eclass == ExprClass.Value ||
                              expr.eclass == ExprClass.PropertyAccess || expr.eclass == ExprClass.IndexerAccess)){
-                               collection.error1579 ();
+                               collection.Error_Enumerator ();
                                return false;
                        }
 
@@ -4127,92 +4184,6 @@ namespace Mono.CSharp {
                        ec.LoopEnd = old_end;
                }
 
-               protected class TemporaryVariable : Expression, IMemoryLocation
-               {
-                       LocalInfo li;
-
-                       public TemporaryVariable (Type type, Location loc)
-                       {
-                               this.type = type;
-                               this.loc = loc;
-                               eclass = ExprClass.Value;
-                       }
-
-                       public override Expression DoResolve (EmitContext ec)
-                       {
-                               if (li != null)
-                                       return this;
-
-                               TypeExpr te = new TypeExpression (type, loc);
-                               li = ec.CurrentBlock.AddTemporaryVariable (te, loc);
-                               if (!li.Resolve (ec))
-                                       return null;
-
-                               AnonymousContainer am = ec.CurrentAnonymousMethod;
-                               if ((am != null) && am.IsIterator)
-                                       ec.CaptureVariable (li);
-
-                               return this;
-                       }
-
-                       public override void Emit (EmitContext ec)
-                       {
-                               ILGenerator ig = ec.ig;
-
-                               if (li.FieldBuilder != null) {
-                                       ig.Emit (OpCodes.Ldarg_0);
-                                       ig.Emit (OpCodes.Ldfld, li.FieldBuilder);
-                               } else {
-                                       ig.Emit (OpCodes.Ldloc, li.LocalBuilder);
-                               }
-                       }
-
-                       public void EmitLoadAddress (EmitContext ec)
-                       {
-                               ILGenerator ig = ec.ig;
-
-                               if (li.FieldBuilder != null) {
-                                       ig.Emit (OpCodes.Ldarg_0);
-                                       ig.Emit (OpCodes.Ldflda, li.FieldBuilder);
-                               } else {
-                                       ig.Emit (OpCodes.Ldloca, li.LocalBuilder);
-                               }
-                       }
-
-                       public void Store (EmitContext ec, Expression right_side)
-                       {
-                               if (li.FieldBuilder != null)
-                                       ec.ig.Emit (OpCodes.Ldarg_0);
-
-                               right_side.Emit (ec);
-                               if (li.FieldBuilder != null) {
-                                       ec.ig.Emit (OpCodes.Stfld, li.FieldBuilder);
-                               } else {
-                                       ec.ig.Emit (OpCodes.Stloc, li.LocalBuilder);
-                               }
-                       }
-
-                       public void EmitThis (EmitContext ec)
-                       {
-                               if (li.FieldBuilder != null) {
-                                       ec.ig.Emit (OpCodes.Ldarg_0);
-                               }
-                       }
-
-                       public void EmitStore (ILGenerator ig)
-                       {
-                               if (li.FieldBuilder != null)
-                                       ig.Emit (OpCodes.Stfld, li.FieldBuilder);
-                               else
-                                       ig.Emit (OpCodes.Stloc, li.LocalBuilder);
-                       }
-
-                       public void AddressOf (EmitContext ec, AddressOp mode)
-                       {
-                               EmitLoadAddress (ec);
-                       }
-               }
-
                protected class ArrayCounter : TemporaryVariable
                {
                        public ArrayCounter (Location loc)
@@ -4281,7 +4252,7 @@ namespace Mono.CSharp {
                                        list.Add (counter [i]);
                                }
 
-                               access = new ElementAccess (copy, list, loc).Resolve (ec);
+                               access = new ElementAccess (copy, list).Resolve (ec);
                                if (access == null)
                                        return false;
 
@@ -4364,6 +4335,7 @@ namespace Mono.CSharp {
                        MethodInfo move_next;
                        Type var_type, enumerator_type;
                        bool is_disposable;
+                       bool enumerator_found;
 
                        public CollectionForeach (Type var_type, Expression var,
                                                  Expression expr, Statement stmt, Location l)
@@ -4377,20 +4349,9 @@ namespace Mono.CSharp {
 
                        bool GetEnumeratorFilter (EmitContext ec, MethodInfo mi)
                        {
-                               Type [] args = TypeManager.GetArgumentTypes (mi);
-                               if (args != null){
-                                       if (args.Length != 0)
-                                               return false;
-                               }
-
-                               if (TypeManager.IsOverride (mi))
-                                       return false;
-                       
-                               // Check whether GetEnumerator is public
-                               if ((mi.Attributes & MethodAttributes.Public) != MethodAttributes.Public)
-                                       return false;
+                               Type return_type = mi.ReturnType;
 
-                               if ((mi.ReturnType == TypeManager.ienumerator_type) && (mi.DeclaringType == TypeManager.string_type))
+                               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 
@@ -4404,8 +4365,7 @@ namespace Mono.CSharp {
                                // with this `GetEnumerator'
                                //
 
-                               Type return_type = mi.ReturnType;
-                               if (mi.ReturnType == TypeManager.ienumerator_type ||
+                               if (return_type == TypeManager.ienumerator_type ||
                                    TypeManager.ienumerator_type.IsAssignableFrom (return_type) ||
                                    (!RootContext.StdLib && TypeManager.ImplementsInterface (return_type, TypeManager.ienumerator_type))) {
                                        //
@@ -4436,11 +4396,11 @@ namespace Mono.CSharp {
                                        // find if they support the GetEnumerator pattern.
                                        //
 
-                                       if (!FetchMoveNext (ec, return_type))
-                                               return false;
-
-                                       if (!FetchGetCurrent (ec, return_type))
+                                       if (TypeManager.HasElementType (return_type) || !FetchMoveNext (ec, return_type) || !FetchGetCurrent (ec, return_type)) {
+                                               Report.Error (202, loc, "foreach statement requires that the return type `{0}' of `{1}' must have a suitable public MoveNext method and public Current property",
+                                                       TypeManager.CSharpName (return_type), TypeManager.CSharpSignature (mi));
                                                return false;
+                                       }
                                }
 
                                enumerator_type = return_type;
@@ -4467,10 +4427,8 @@ namespace Mono.CSharp {
 
                                foreach (MemberInfo m in move_next_list){
                                        MethodInfo mi = (MethodInfo) m;
-                                       Type [] args;
                                
-                                       args = TypeManager.GetArgumentTypes (mi);
-                                       if ((args != null) && (args.Length == 0) &&
+                                       if ((TypeManager.GetParameterData (mi).Count == 0) &&
                                            TypeManager.TypeToCoreType (mi.ReturnType) == TypeManager.bool_type) {
                                                move_next = mi;
                                                return true;
@@ -4511,10 +4469,8 @@ namespace Mono.CSharp {
 
                                foreach (MemberInfo m in dispose_list){
                                        MethodInfo mi = (MethodInfo) m;
-                                       Type [] args;
 
-                                       args = TypeManager.GetArgumentTypes (mi);
-                                       if (args != null && args.Length == 0){
+                                       if (TypeManager.GetParameterData (mi).Count == 0){
                                                if (mi.ReturnType == TypeManager.void_type)
                                                        return mi;
                                        }
@@ -4522,11 +4478,15 @@ namespace Mono.CSharp {
                                return null;
                        }
 
-                       public void error1579 ()
+                       public void Error_Enumerator ()
                        {
+                               if (enumerator_found) {
+                                       return;
+                               }
+
                            Report.Error (1579, loc,
-                               "foreach statement cannot operate on variables of type `{0}' because it does not contain a definition for `GetEnumerator' or is not accessible",
-                               TypeManager.CSharpName (expr.Type));
+                                       "foreach statement cannot operate on variables of type `{0}' because it does not contain a definition for `GetEnumerator' or is not accessible",
+                                       TypeManager.CSharpName (expr.Type));
                        }
 
                        bool TryType (EmitContext ec, Type t)
@@ -4538,6 +4498,18 @@ namespace Mono.CSharp {
                                        return false;
 
                                foreach (MethodBase mb in mg.Methods) {
+                                       if (TypeManager.GetParameterData (mb).Count != 0)
+                                               continue;
+                       
+                                       // Check whether GetEnumerator is public
+                                       if ((mb.Attributes & MethodAttributes.Public) != MethodAttributes.Public)
+                                               continue;
+
+                                       if (TypeManager.IsOverride (mb))
+                                               continue;
+
+                                       enumerator_found = true;
+
                                        if (!GetEnumeratorFilter (ec, (MethodInfo) mb))
                                                continue;
 
@@ -4600,14 +4572,14 @@ namespace Mono.CSharp {
                                is_disposable = true;
 
                                if (!ProbeCollectionType (ec, expr.Type)) {
-                                       error1579 ();
+                                       Error_Enumerator ();
                                        return false;
                                }
 
                                enumerator = new TemporaryVariable (enumerator_type, loc);
                                enumerator.Resolve (ec);
 
-                               init = new Invocation (get_enumerator, new ArrayList (), loc);
+                               init = new Invocation (get_enumerator, new ArrayList ());
                                init = init.Resolve (ec);
                                if (init == null)
                                        return false;
@@ -4618,7 +4590,7 @@ namespace Mono.CSharp {
                                        MethodGroupExpr mg = new MethodGroupExpr (mi, loc);
                                        mg.InstanceExpression = enumerator;
 
-                                       move_next_expr = new Invocation (mg, new ArrayList (), loc);
+                                       move_next_expr = new Invocation (mg, new ArrayList ());
                                }
 
                                get_current.InstanceExpression = enumerator;