2005-12-23 Miguel de Icaza <miguel@novell.com>
[mono.git] / mcs / mcs / expression.cs
index c743eadf94d92fa9872cf0212e765a6b9ae56fe5..b2cb0c8f7aff2259f29db7959d0f70994b76f595 100644 (file)
@@ -3,6 +3,7 @@
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
+//   Marek Safar (marek.safar@seznam.cz)
 //
 // (C) 2001, 2002, 2003 Ximian, Inc.
 // (C) 2003, 2004 Novell, Inc.
@@ -1290,503 +1291,6 @@ namespace Mono.CSharp {
                                expr = value;
                        }
                }
-
-               bool CheckRange (EmitContext ec, long value, Type type, long min, long max)
-               {
-                       if (!ec.ConstantCheckState)
-                               return true;
-
-                       if ((value < min) || (value > max)) {
-                               Error (221, "Constant value `" + value + "' cannot be converted " +
-                                      "to a `" + TypeManager.CSharpName (type) + "' (use `unchecked' " +
-                                      "syntax to override)");
-                               return false;
-                       }
-
-                       return true;
-               }
-
-               bool CheckRange (EmitContext ec, ulong value, Type type, ulong max)
-               {
-                       if (!ec.ConstantCheckState)
-                               return true;
-
-                       if (value > max) {
-                               Error (221, "Constant value `" + value + "' cannot be converted " +
-                                      "to a `" + TypeManager.CSharpName (type) + "' (use `unchecked' " +
-                                      "syntax to override)");
-                               return false;
-                       }
-
-                       return true;
-               }
-
-               bool CheckUnsigned (EmitContext ec, long value, Type type)
-               {
-                       if (!ec.ConstantCheckState)
-                               return true;
-
-                       if (value < 0) {
-                               Error (221, "Constant value `" + value + "' cannot be converted " +
-                                      "to a `" + TypeManager.CSharpName (type) + "' (use `unchecked' " +
-                                      "syntax to override)");
-                               return false;
-                       }
-
-                       return true;
-               }
-
-               // TODO: move to constant
-               /// <summary>
-               ///   Attempts to do a compile-time folding of a constant cast.
-               /// </summary>
-               Expression TryReduce (EmitContext ec, Type target_type)
-               {
-                       if (expr.Type == target_type)
-                               return expr;
-
-                       if (TypeManager.IsEnumType (target_type) && TypeManager.EnumToUnderlying (target_type) == expr.Type)
-                               return new EnumConstant ((Constant)expr, target_type);
-
-                       Expression real_expr = expr;
-                       if (real_expr is EnumConstant)
-                               real_expr = ((EnumConstant) real_expr).Child;
-
-                       if (real_expr is ByteConstant){
-                               byte v = ((ByteConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type)
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               if (target_type == TypeManager.ushort_type)
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type)
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type)
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is SByteConstant){
-                               sbyte v = ((SByteConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type)
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               } if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               } if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is ShortConstant){
-                               short v = ((ShortConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MinValue, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is UShortConstant){
-                               ushort v = ((UShortConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MinValue, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, Int16.MinValue, Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type)
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is IntConstant){
-                               int v = ((IntConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MinValue, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, Int16.MinValue, Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt16.MinValue, UInt16.MaxValue))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.uint32_type) {
-                                       if (!CheckRange (ec, v, target_type, Int32.MinValue, Int32.MaxValue))
-                                               return null;
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is UIntConstant){
-                               uint v = ((UIntConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, Int16.MinValue, Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt16.MinValue, UInt16.MaxValue))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type) {
-                                       if (!CheckRange (ec, v, target_type, Int32.MinValue, Int32.MaxValue))
-                                               return null;
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is LongConstant){
-                               long v = ((LongConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MinValue, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, Int16.MinValue, Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt16.MinValue, UInt16.MaxValue))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type) {
-                                       if (!CheckRange (ec, v, target_type, Int32.MinValue, Int32.MaxValue))
-                                               return null;
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.uint32_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt32.MinValue, UInt32.MaxValue))
-                                               return null;
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.uint64_type) {
-                                       if (!CheckUnsigned (ec, v, target_type))
-                                               return null;
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is ULongConstant){
-                               ulong v = ((ULongConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, (ulong) SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, (ulong) Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.ushort_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt16.MaxValue))
-                                               return null;
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type) {
-                                       if (!CheckRange (ec, v, target_type, Int32.MaxValue))
-                                               return null;
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.uint32_type) {
-                                       if (!CheckRange (ec, v, target_type, UInt32.MaxValue))
-                                               return null;
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int64_type) {
-                                       if (!CheckRange (ec, v, target_type, (ulong) Int64.MaxValue))
-                                               return null;
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is FloatConstant){
-                               float v = ((FloatConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type)
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               if (target_type == TypeManager.sbyte_type)
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               if (target_type == TypeManager.short_type)
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               if (target_type == TypeManager.ushort_type)
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type)
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type)
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-                       if (real_expr is DoubleConstant){
-                               double v = ((DoubleConstant) real_expr).Value;
-       
-                               if (target_type == TypeManager.byte_type){
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               } if (target_type == TypeManager.sbyte_type)
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               if (target_type == TypeManager.short_type)
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               if (target_type == TypeManager.ushort_type)
-                                       return new UShortConstant ((ushort) v, real_expr.Location);
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type)
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type)
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-
-                       if (real_expr is CharConstant){
-                               char v = ((CharConstant) real_expr).Value;
-                               
-                               if (target_type == TypeManager.byte_type) {
-                                       if (!CheckRange (ec, v, target_type, Byte.MinValue, Byte.MaxValue))
-                                               return null;
-                                       return new ByteConstant ((byte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.sbyte_type) {
-                                       if (!CheckRange (ec, v, target_type, SByte.MinValue, SByte.MaxValue))
-                                               return null;
-                                       return new SByteConstant ((sbyte) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.short_type) {
-                                       if (!CheckRange (ec, v, target_type, Int16.MinValue, Int16.MaxValue))
-                                               return null;
-                                       return new ShortConstant ((short) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.int32_type)
-                                       return new IntConstant ((int) v, real_expr.Location);
-                               if (target_type == TypeManager.uint32_type)
-                                       return new UIntConstant ((uint) v, real_expr.Location);
-                               if (target_type == TypeManager.int64_type)
-                                       return new LongConstant ((long) v, real_expr.Location);
-                               if (target_type == TypeManager.uint64_type)
-                                       return new ULongConstant ((ulong) v, real_expr.Location);
-                               if (target_type == TypeManager.float_type)
-                                       return new FloatConstant ((float) v, real_expr.Location);
-                               if (target_type == TypeManager.double_type)
-                                       return new DoubleConstant ((double) v, real_expr.Location);
-                               if (target_type == TypeManager.char_type) {
-                                       if (!CheckRange (ec, v, target_type, Char.MinValue, Char.MaxValue))
-                                               return null;
-                                       return new CharConstant ((char) v, real_expr.Location);
-                               }
-                               if (target_type == TypeManager.decimal_type)
-                                       return new DecimalConstant ((decimal) v, real_expr.Location);
-                       }
-
-                       return null;
-               }
                
                public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
                {
@@ -1821,11 +1325,11 @@ namespace Mono.CSharp {
 
                        eclass = ExprClass.Value;
 
-                       if (expr is Constant){
-                               Expression e = TryReduce (ec, type);
-
-                               if (e != null)
-                                       return e;
+                       Constant c = expr as Constant;
+                       if (c != null) {
+                               c = c.TryReduce (ec, type, loc);
+                               if (c != null)
+                                       return c;
                        }
 
                        if (type.IsPointer && !ec.InUnsafe) {
@@ -1932,7 +1436,7 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Returns a stringified representation of the Operator
                /// </summary>
-               static string OperName (Operator oper)
+               public static string OperName (Operator oper)
                {
                        switch (oper){
                        case Operator.Multiply:
@@ -2070,7 +1574,7 @@ namespace Mono.CSharp {
                                                        if (ll >= 0)
                                                                right = new ULongConstant ((ulong) ll, right.Location);
                                                } else {
-                                                       e = Convert.ImplicitNumericConversion (ec, right, l, loc);
+                                                       e = Convert.ImplicitNumericConversion (ec, right, l);
                                                        if (e != null)
                                                                right = e;
                                                }
@@ -2087,7 +1591,7 @@ namespace Mono.CSharp {
                                                if (ll > 0)
                                                        left = new ULongConstant ((ulong) ll, right.Location);
                                        } else {
-                                               e = Convert.ImplicitNumericConversion (ec, left, r, loc);
+                                               e = Convert.ImplicitNumericConversion (ec, left, r);
                                                if (e != null)
                                                        left = e;
                                        }
@@ -2767,8 +2271,48 @@ namespace Mono.CSharp {
                        return this;
                }
 
+               Constant EnumLiftUp (EmitContext ec, Constant left, Constant right)
+               {
+                       switch (oper) {
+                               case Operator.BitwiseOr:
+                               case Operator.BitwiseAnd:
+                               case Operator.ExclusiveOr:
+                               case Operator.Equality:
+                               case Operator.Inequality:
+                               case Operator.LessThan:
+                               case Operator.LessThanOrEqual:
+                               case Operator.GreaterThan:
+                               case Operator.GreaterThanOrEqual:
+                                       if (left is EnumConstant)
+                                               return left;
+
+                                       if (left.IsZeroInteger)
+                                               return new EnumConstant (left, right.Type);
+
+                                       break;
+
+                               case Operator.Addition:
+                               case Operator.Subtraction:
+                                       return left;
+
+                               case Operator.Multiply:
+                               case Operator.Division:
+                               case Operator.Modulus:
+                               case Operator.LeftShift:
+                               case Operator.RightShift:
+                                       if (right is EnumConstant || left is EnumConstant)
+                                               break;
+                                       return left;
+                       }
+                       Error_OperatorCannotBeApplied (loc, Binary.OperName (oper), left.Type, right.Type);
+                       return null;
+               }
+
                public override Expression DoResolve (EmitContext ec)
                {
+                       if (left == null)
+                               return null;
+
                        if ((oper == Operator.Subtraction) && (left is ParenthesizedExpression)) {
                                left = ((ParenthesizedExpression) left).Expr;
                                left = left.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.Type);
@@ -2800,9 +2344,19 @@ namespace Mono.CSharp {
                                return null;
 
                        eclass = ExprClass.Value;
-
                        Constant rc = right as Constant;
 
+                       // The conversion rules are ignored in enum context but why
+                       if (!ec.InEnumContext && lc != null && rc != null && (TypeManager.IsEnumType (left.Type) || TypeManager.IsEnumType (right.Type))) {
+                               left = lc = EnumLiftUp (ec, lc, rc);
+                               if (lc == null)
+                                       return null;
+
+                               right = rc = EnumLiftUp (ec, rc, lc);
+                               if (rc == null)
+                                       return null;
+                       }
+
                        if (oper == Operator.BitwiseAnd) {
                                if (rc != null && rc.IsZeroInteger) {
                                        return lc is EnumConstant ?
@@ -2823,6 +2377,11 @@ namespace Mono.CSharp {
                                if (rc is EnumConstant &&
                                    lc != null && lc.IsZeroInteger)
                                        return rc;
+                       } else if (oper == Operator.LogicalAnd) {
+                               if (rc != null && rc.IsDefaultValue && rc.Type == TypeManager.bool_type)
+                                       return rc;
+                               if (lc != null && lc.IsDefaultValue && lc.Type == TypeManager.bool_type)
+                                       return lc;
                        }
 
                        if (rc != null && lc != null){
@@ -2833,15 +2392,15 @@ namespace Mono.CSharp {
                                        return e;
                        }
 
-                       // Check CS0652 warning here (before resolving operator).
-                       if (oper == Operator.Equality ||
-                           oper == Operator.Inequality ||
-                           oper == Operator.LessThanOrEqual ||
-                           oper == Operator.LessThan ||
-                           oper == Operator.GreaterThanOrEqual ||
-                           oper == Operator.GreaterThan){
-                               CheckUselessComparison (left as Constant, right.Type);
-                               CheckUselessComparison (right as Constant, left.Type);
+                       // Comparison warnings
+                       if (oper == Operator.Equality || oper == Operator.Inequality ||
+                           oper == Operator.LessThanOrEqual || oper == Operator.LessThan ||
+                           oper == Operator.GreaterThanOrEqual || oper == Operator.GreaterThan){
+                               if (left.Equals (right)) {
+                                       Report.Warning (1718, 3, loc, "Comparison made to same variable; did you mean to compare something else?");
+                               }
+                               CheckUselessComparison (lc, right.Type);
+                               CheckUselessComparison (rc, left.Type);
                        }
 
                        return ResolveOperator (ec);
@@ -4034,12 +3593,11 @@ namespace Mono.CSharp {
        ///   representation.
        /// </summary>
        public class ParameterReference : Expression, IAssignMethod, IMemoryLocation, IVariable {
-               Parameters pars;
-               String name;
+               Parameter par;
+               string name;
                int idx;
                Block block;
                VariableInfo vi;
-               public Parameter.Modifier mod;
                public bool is_ref, is_out, prepared;
 
                public bool IsOut {
@@ -4056,20 +3614,16 @@ namespace Mono.CSharp {
 
                LocalTemporary temp;
                
-               public ParameterReference (Parameters pars, Block block, int idx, string name, Location loc)
+               public ParameterReference (Parameter par, Block block, int idx, Location loc)
                {
-                       this.pars = pars;
+                       this.par = par;
+                       this.name = par.Name;
                        this.block = block;
                        this.idx  = idx;
-                       this.name = name;
                        this.loc = loc;
                        eclass = ExprClass.Variable;
                }
 
-               public ParameterReference (InternalParameters pars, Block block, int idx, Location loc)
-                       : this (pars.Parameters, block, idx, pars.ParameterName (idx), loc)
-               { }
-
                public VariableInfo VariableInfo {
                        get { return vi; }
                }
@@ -4077,7 +3631,7 @@ namespace Mono.CSharp {
                public bool VerifyFixed ()
                {
                        // A parameter is fixed if it's a value parameter (i.e., no modifier like out, ref, param).
-                       return mod == Parameter.Modifier.NONE;
+                       return par.ModFlags == Parameter.Modifier.NONE;
                }
 
                public bool IsAssigned (EmitContext ec, Location loc)
@@ -4086,7 +3640,7 @@ namespace Mono.CSharp {
                                return true;
 
                        Report.Error (269, loc,
-                                     "Use of unassigned out parameter `{0}'", name);
+                                     "Use of unassigned out parameter `{0}'", par.Name);
                        return false;
                }
 
@@ -4114,9 +3668,14 @@ namespace Mono.CSharp {
 
                protected void DoResolveBase (EmitContext ec)
                {
-                       type = pars.GetParameterInfo (ec, idx, out mod);
+                       if (!par.Resolve (ec)) {
+                               //TODO:
+                       }
+
+                       type = par.ParameterType;
+                       Parameter.Modifier mod = par.ModFlags;
                        is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
-                       is_out = (mod & Parameter.Modifier.OUT) != 0;
+                       is_out = (mod & Parameter.Modifier.OUT) == Parameter.Modifier.OUT;
                        eclass = ExprClass.Variable;
 
                        if (is_out)
@@ -4125,7 +3684,7 @@ namespace Mono.CSharp {
                        if (ec.CurrentAnonymousMethod != null){
                                if (is_ref){
                                        Report.Error (1628, Location, "Cannot use ref or out parameter `{0}' inside an anonymous method block",
-                                               name);
+                                               par.Name);
                                        return;
                                }
 
@@ -4230,11 +3789,8 @@ namespace Mono.CSharp {
                        ILGenerator ig = ec.ig;
                        int arg_idx = idx;
 
-                       if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
-                               if (leave_copy)
-                                       throw new InternalErrorException ();
-
-                               ec.EmitParameter (name);
+                       if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){                               
+                               ec.EmitParameter (name, leave_copy, prepared, ref temp);
                                return;
                        }
 
@@ -4266,15 +3822,16 @@ namespace Mono.CSharp {
                
                public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
                {
+                       prepared = prepare_for_load;
                        if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
-                               ec.EmitAssignParameter (name, source, leave_copy, prepare_for_load);
+                               ec.EmitAssignParameter (name, source, leave_copy, prepare_for_load, ref temp);
                                return;
                        }
 
                        ILGenerator ig = ec.ig;
                        int arg_idx = idx;
                        
-                       prepared = prepare_for_load;
+                       
                        
                        if (!ec.MethodIsStatic)
                                arg_idx++;
@@ -4330,6 +3887,10 @@ namespace Mono.CSharp {
                        }
                }
 
+               public override string ToString ()
+               {
+                       return "ParameterReference[" + name + "]";
+               }
        }
        
        /// <summary>
@@ -4372,10 +3933,10 @@ namespace Mono.CSharp {
                        get {
                                switch (ArgType) {
                                        case AType.Out:
-                                               return Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF;
+                                               return Parameter.Modifier.OUT;
 
                                        case AType.Ref:
-                                               return Parameter.Modifier.REF | Parameter.Modifier.ISBYREF;
+                                               return Parameter.Modifier.REF;
 
                                        default:
                                                return Parameter.Modifier.NONE;
@@ -4718,7 +4279,7 @@ namespace Mono.CSharp {
                         return !candidate_params && best_params;
                }
 
-               static bool IsOverride (MethodBase cand_method, MethodBase base_method)
+               internal static bool IsOverride (MethodBase cand_method, MethodBase base_method)
                {
                        if (!IsAncestralType (base_method.DeclaringType, cand_method.DeclaringType))
                                return false;
@@ -4804,26 +4365,18 @@ namespace Mono.CSharp {
                        return union;
                }
 
-               public static bool IsParamsMethodApplicable (EmitContext ec, MethodGroupExpr me,
+               public static bool IsParamsMethodApplicable (EmitContext ec,
                                                             ArrayList arguments, int arg_count,
-                                                            ref MethodBase candidate)
+                                                            MethodBase candidate)
                {
                        return IsParamsMethodApplicable (
-                               ec, me, arguments, arg_count, false, ref candidate) ||
+                               ec, arguments, arg_count, candidate, false) ||
                                IsParamsMethodApplicable (
-                                       ec, me, arguments, arg_count, true, ref candidate);
+                                       ec, arguments, arg_count, candidate, true);
 
 
                }
 
-               static bool IsParamsMethodApplicable (EmitContext ec, MethodGroupExpr me,
-                                                     ArrayList arguments, int arg_count,
-                                                     bool do_varargs, ref MethodBase candidate)
-               {
-                       return IsParamsMethodApplicable (
-                               ec, arguments, arg_count, candidate, do_varargs);
-               }
-
                /// <summary>
                ///   Determines if the candidate method, if a params method, is applicable
                ///   in its expanded form to the given set of arguments
@@ -4845,7 +4398,7 @@ namespace Mono.CSharp {
                                if (pd_count != arg_count)
                                        return false;
                        } else {
-                               if (pd.ParameterModifier (count) != Parameter.Modifier.PARAMS)
+                               if (!pd.HasParams)
                                        return false;
                        }
                        
@@ -4865,9 +4418,9 @@ namespace Mono.CSharp {
                                Argument a = (Argument) arguments [i];
 
                                Parameter.Modifier a_mod = a.Modifier & 
-                                       (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
+                                       (unchecked (~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK)));
                                Parameter.Modifier p_mod = pd.ParameterModifier (i) &
-                                       (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
+                                       (unchecked (~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK)));
 
                                if (a_mod == p_mod) {
 
@@ -4875,8 +4428,8 @@ namespace Mono.CSharp {
                                                if (!Convert.ImplicitConversionExists (ec,
                                                                                        a.Expr,
                                                                                        pd.ParameterType (i)))
-                                                       return false;
-                                                                               
+                               return false;
+
                                        if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
                                                Type pt = pd.ParameterType (i);
 
@@ -4911,19 +4464,12 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               public static bool IsApplicable (EmitContext ec, MethodGroupExpr me,
-                                                ArrayList arguments, int arg_count,
-                                                ref MethodBase candidate)
-               {
-                       return IsApplicable (ec, arguments, arg_count, candidate);
-               }
-
                /// <summary>
                ///   Determines if the candidate method is applicable (section 14.4.2.1)
                ///   to the given set of arguments
                /// </summary>
-               static bool IsApplicable (EmitContext ec, ArrayList arguments, int arg_count,
-                                         MethodBase candidate)
+               public static bool IsApplicable (EmitContext ec, ArrayList arguments, int arg_count,
+                       MethodBase candidate)
                {
                        ParameterData pd = TypeManager.GetParameterData (candidate);
 
@@ -4936,28 +4482,22 @@ namespace Mono.CSharp {
                                Argument a = (Argument) arguments [i];
 
                                Parameter.Modifier a_mod = a.Modifier &
-                                       unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
+                                       ~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK);
+
                                Parameter.Modifier p_mod = pd.ParameterModifier (i) &
-                                       unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
+                                       ~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK | Parameter.Modifier.PARAMS);
 
-                               if (a_mod == p_mod ||
-                                   (a_mod == Parameter.Modifier.NONE && p_mod == Parameter.Modifier.PARAMS)) {
-                                       if (a_mod == Parameter.Modifier.NONE) {
-                                                if (!Convert.ImplicitConversionExists (ec,
-                                                                                       a.Expr,
-                                                                                       pd.ParameterType (i)))
-                                                       return false;
-                                        }
-                                       
-                                       if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
-                                               Type pt = pd.ParameterType (i);
+                               if (a_mod == p_mod) {
+                                       Type pt = pd.ParameterType (i);
 
-                                               if (!pt.IsByRef)
-                                                       pt = TypeManager.GetReferenceType (pt);
-                                                
-                                               if (pt != a.Type)
+                                       if (a_mod == Parameter.Modifier.NONE) {
+                                               if (!Convert.ImplicitConversionExists (ec, a.Expr, pt))
                                                        return false;
+                                               continue;
                                        }
+                                       
+                                       if (pt != a.Type)
+                                               return false;
                                } else
                                        return false;
                        }
@@ -4965,7 +4505,7 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               static private bool IsAncestralType (Type first_type, Type second_type)
+               static internal bool IsAncestralType (Type first_type, Type second_type)
                {
                        return first_type != second_type &&
                                (second_type.IsSubclassOf (first_type) ||
@@ -5053,11 +4593,11 @@ namespace Mono.CSharp {
                                //   Is candidate applicable in normal form?
                                //
                                bool is_applicable = IsApplicable (
-                                       ec, me, Arguments, arg_count, ref methods [i]);
+                                       ec, Arguments, arg_count, methods [i]);
 
                                if (!is_applicable &&
                                        (IsParamsMethodApplicable (
-                                       ec, me, Arguments, arg_count, ref methods [i]))) {
+                                       ec, Arguments, arg_count, methods [i]))) {
                                        MethodBase candidate = methods [i];
                                        if (candidate_to_form == null)
                                                candidate_to_form = new PtrHashtable ();
@@ -5252,7 +4792,7 @@ namespace Mono.CSharp {
                public static void Error_WrongNumArguments (Location loc, String name, int arg_count)
                {
                        Report.Error (1501, loc, "No overload for method `{0}' takes `{1}' arguments",
-                               name, arg_count);
+                               name, arg_count.ToString ());
                }
 
                 static void Error_InvokeOnDelegate (Location loc)
@@ -5271,21 +4811,20 @@ namespace Mono.CSharp {
                                Report.Error (1594, loc, "Delegate `{0}' has some invalid arguments",
                                        TypeManager.CSharpName (delegate_type));
 
-                       string par_desc = expected_par.ParameterDesc (idx);
+                       Parameter.Modifier mod = expected_par.ParameterModifier (idx);
 
-                       if (a.Modifier != expected_par.ParameterModifier (idx)) {
-                               if ((expected_par.ParameterModifier (idx) & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) == 0)
+                       string index = (idx + 1).ToString ();
+                       if (mod != Parameter.Modifier.ARGLIST && mod != a.Modifier) {
+                               if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) == 0)
                                        Report.Error (1615, loc, "Argument `{0}' should not be passed with the `{1}' keyword",
-                                               idx + 1, Parameter.GetModifierSignature (a.Modifier));
+                                               index, Parameter.GetModifierSignature (a.Modifier));
                                else
                                        Report.Error (1620, loc, "Argument `{0}' must be passed with the `{1}' keyword",
-                                               idx + 1, Parameter.GetModifierSignature (expected_par.ParameterModifier (idx)));
-                               return;
+                                               index, Parameter.GetModifierSignature (mod));
+                       } else {
+                               Report.Error (1503, loc, "Argument {0}: Cannot convert from `{1}' to `{2}'",
+                                       index, Argument.FullDesc (a), expected_par.ParameterDesc (idx));
                        }
-
-                       Report.Error (1503, loc,
-                                     String.Format ("Argument {0}: Cannot convert from `{1}' to `{2}'",
-                                                    idx + 1, Argument.FullDesc (a), par_desc));
                }
                
                public static bool VerifyArgumentsCompat (EmitContext ec, ArrayList Arguments,
@@ -5306,15 +4845,18 @@ namespace Mono.CSharp {
                                if (pm == Parameter.Modifier.PARAMS){
                                        if ((pm & ~Parameter.Modifier.PARAMS) != a.Modifier) {
                                                if (!may_fail)
-                                                       Error_InvalidArguments (
-                                                               loc, j, method, delegate_type,
-                                                               a, pd);
+                                                       Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
                                                return false;
                                        }
 
                                        if (chose_params_expanded)
                                                parameter_type = TypeManager.GetElementType (parameter_type);
-                               } else if (pm == Parameter.Modifier.ARGLIST){
+                               } else if (pm == Parameter.Modifier.ARGLIST) {
+                                       if (!(a.Expr is Arglist)) {
+                                               if (!may_fail)
+                                                       Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
+                                               return false;
+                                       }
                                        continue;
                                } else {
                                        //
@@ -5322,9 +4864,7 @@ namespace Mono.CSharp {
                                        //
                                        if (pd.ParameterModifier (j) != a.Modifier){
                                                if (!may_fail)
-                                                       Error_InvalidArguments (
-                                                               loc, j, method, delegate_type,
-                                                               a, pd);
+                                                       Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
                                                return false;
                                        }
                                }
@@ -5548,33 +5088,12 @@ namespace Mono.CSharp {
                /// </summary>
                public static void EmitArguments (EmitContext ec, MethodBase mb, ArrayList arguments, bool dup_args, LocalTemporary this_arg)
                {
-                       ParameterData pd;
-                       if (mb != null)
-                               pd = TypeManager.GetParameterData (mb);
-                       else
-                               pd = null;
-                       
+                       ParameterData pd = mb == null ? null : TypeManager.GetParameterData (mb);
+                       int top = arguments == null ? 0 : arguments.Count;
                        LocalTemporary [] temps = null;
                        
-                       if (dup_args)
-                               temps = new LocalTemporary [arguments.Count];
-
-                       //
-                       // If we are calling a params method with no arguments, special case it
-                       //
-                       if (arguments == null){
-                               if (pd != null && pd.Count > 0 &&
-                                   pd.ParameterModifier (0) == Parameter.Modifier.PARAMS){
-                                       ILGenerator ig = ec.ig;
-
-                                       IntConstant.EmitInt (ig, 0);
-                                       ig.Emit (OpCodes.Newarr, TypeManager.GetElementType (pd.ParameterType (0)));
-                               }
-
-                               return;
-                       }
-
-                       int top = arguments.Count;
+                       if (dup_args && top != 0)
+                               temps = new LocalTemporary [top];
 
                        for (int i = 0; i < top; i++){
                                Argument a = (Argument) arguments [i];
@@ -5780,9 +5299,11 @@ namespace Mono.CSharp {
                                        }
 
                                        if (dup_args) {
-                                               this_arg = new LocalTemporary (ec, t);
                                                ig.Emit (OpCodes.Dup);
-                                               this_arg.Store (ec);
+                                               if (Arguments != null && Arguments.Count != 0) {
+                                                       this_arg = new LocalTemporary (ec, t);
+                                                       this_arg.Store (ec);
+                                               }
                                        }
                                }
                        }
@@ -6055,6 +5576,29 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               //
+               // Checks whether the type is an interface that has the
+               // [ComImport, CoClass] attributes and must be treated
+               // specially
+               //
+               public Expression CheckComImport (EmitContext ec)
+               {
+                       if (!type.IsInterface)
+                               return null;
+
+                       //
+                       // Turn the call into:
+                       // (the-interface-stated) (new class-referenced-in-coclassattribute ())
+                       //
+                       Type real_class = AttributeTester.GetCoClassAttribute (type);
+                       if (real_class == null)
+                               return null;
+
+                       New proxy = new New (new TypeExpression (real_class, loc), Arguments, loc);
+                       Cast cast = new Cast (new TypeExpression (type, loc), proxy, loc);
+                       return cast.Resolve (ec);
+               }
+               
                public override Expression DoResolve (EmitContext ec)
                {
                        //
@@ -6083,7 +5627,7 @@ namespace Mono.CSharp {
                                        return c;
                        }
 
-               if (TypeManager.IsDelegateType (type)) {
+                       if (TypeManager.IsDelegateType (type)) {
                                RequestedType = (new NewDelegate (type, Arguments, loc)).Resolve (ec);
                                if (RequestedType != null)
                                        if (!(RequestedType is DelegateCreation))
@@ -6098,6 +5642,10 @@ namespace Mono.CSharp {
                        }
 
                        if (type.IsInterface || type.IsAbstract){
+                               RequestedType = CheckComImport (ec);
+                               if (RequestedType != null)
+                                       return RequestedType;
+                               
                                Report.SymbolRelatedToPreviousError (type);
                                Report.Error (144, loc, "Cannot create an instance of the abstract class or interface `{0}'", TypeManager.CSharpName (type));
                                return null;
@@ -6343,16 +5891,21 @@ namespace Mono.CSharp {
                {
                        if (specified_dims) { 
                                Argument a = (Argument) arguments [idx];
-                               
+
                                if (!a.Resolve (ec, loc))
                                        return false;
-                               
-                               if (!(a.Expr is Constant)) {
-                                       Error (150, "A constant value is expected");
+
+                               Constant c = a.Expr as Constant;
+                               if (c != null) {
+                                       c = c.ToType (TypeManager.int32_type, a.Expr.Location);
+                               }
+
+                               if (c == null) {
+                                       Report.Error (150, a.Expr.Location, "A constant value is expected");
                                        return false;
                                }
-                               
-                               int value = (int) ((Constant) a.Expr).GetValue ();
+
+                               int value = (int) c.GetValue ();
                                
                                if (value != probe.Count) {
                                        Error_IncorrectArrayInitializer ();
@@ -6511,17 +6064,12 @@ namespace Mono.CSharp {
                        // Lookup the type
                        //
                        TypeExpr array_type_expr;
-                       array_type_expr = new ComposedCast (requested_base_type, array_qualifier.ToString ());
+                       array_type_expr = new ComposedCast (requested_base_type, array_qualifier.ToString (), loc);
                        array_type_expr = array_type_expr.ResolveAsTypeTerminal (ec, false);
                        if (array_type_expr == null)
                                return false;
 
-                       type = array_type_expr.ResolveType (ec);
-                       
-                       if (!type.IsArray) {
-                               Error (622, "Can only use array initializer expressions to assign to array types. Try using a new expression instead.");
-                               return false;
-                       }
+                       type = array_type_expr.ResolveType (ec);                
                        underlying_type = TypeManager.GetElementType (type);
                        dimensions = type.GetArrayRank ();
 
@@ -7358,7 +6906,7 @@ namespace Mono.CSharp {
                public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
                {
                        if (alias == "global")
-                               return new MemberAccess (Namespace.Root, identifier, loc).ResolveAsTypeStep (ec, silent);
+                               return new MemberAccess (RootNamespace.Global, identifier, loc).ResolveAsTypeStep (ec, silent);
 
                        int errors = Report.Errors;
                        FullNamedExpression fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
@@ -7379,7 +6927,7 @@ namespace Mono.CSharp {
                {
                        FullNamedExpression fne;
                        if (alias == "global") {
-                               fne = Namespace.Root;
+                               fne = RootNamespace.Global;
                        } else {
                                int errors = Report.Errors;
                                fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
@@ -7539,10 +7087,8 @@ namespace Mono.CSharp {
                {
                        FullNamedExpression new_expr = expr.ResolveAsTypeStep (ec, silent);
 
-                       if (new_expr == null) {
-                               Report.Error (234, "No such name or typespace {0}", expr);
+                       if (new_expr == null)
                                return null;
-                       }
 
                        if (new_expr is Namespace) {
                                Namespace ns = (Namespace) new_expr;
@@ -7811,11 +7357,10 @@ namespace Mono.CSharp {
                                                Report.Error (1708, loc, "Fixed size buffers can only be accessed through locals or fields");
                                                return null;
                                        }
-// TODO: not sure whether it is correct
-//                                     if (!ec.InFixedInitializer) {
-//                                             Error (1666, "You cannot use fixed sized buffers contained in unfixed expressions. Try using the fixed statement");
-//                                             return null;
-//                                     }
+                                       if (!ec.InFixedInitializer && ec.ContainerType.IsValueType) {
+                                               Error (1666, "You cannot use fixed size buffers contained in unfixed expressions. Try using the fixed statement");
+                                               return null;
+                                       }
                                        return MakePointerAccess (ec, ff.ElementType);
                                }
                        }
@@ -7868,7 +7413,7 @@ namespace Mono.CSharp {
                        Type t = ea.Expr.Type;
                        if (t.GetArrayRank () != ea.Arguments.Count){
                                Report.Error (22, ea.Location, "Wrong number of indexes `{0}' inside [], expected `{1}'",
-                                         ea.Arguments.Count, t.GetArrayRank ());
+                                         ea.Arguments.Count.ToString (), t.GetArrayRank ().ToString ());
                                return null;
                        }
 
@@ -8795,19 +8340,20 @@ namespace Mono.CSharp {
                }
 
                public override string Name {
-                       get {
-                               return left + dim;
-                       }
+                       get { return left + dim; }
                }
 
                public override string FullName {
-                       get {
-                               return type.FullName;
-                       }
+                       get { return type.FullName; }
+               }
+
+               public override string GetSignatureForError ()
+               {
+                       return left.GetSignatureForError () + dim;
                }
        }
 
-       public class FixedBufferPtr: Expression {
+       public class FixedBufferPtr : Expression {
                Expression array;
 
                public FixedBufferPtr (Expression array, Type array_type, Location l)