typo
[mono.git] / mcs / mcs / convert.cs
index d3476b18a5a2223a8581973d17c82c81e16d6dc8..931fe82665de4c930e87dc52bccbbcfcb7dc54ec 100644 (file)
@@ -6,7 +6,8 @@
 //   Ravi Pratap (ravi@ximian.com)
 //   Marek Safar (marek.safar@gmail.com)
 //
-// (C) 2001, 2002, 2003 Ximian, Inc.
+// Copyright 2001, 2002, 2003 Ximian, Inc.
+// Copyright 2003-2008 Novell, Inc.
 //
 
 namespace Mono.CSharp {
@@ -51,18 +52,15 @@ namespace Mono.CSharp {
                }
 #endif
 
-               //
-               // From a one-dimensional array-type S[] to System.Collections.IList<S> and base
-               // interfaces of this interface.
                //
                // From a one-dimensional array-type S[] to System.Collections.IList<T> and base
                // interfaces of this interface, provided there is an implicit reference conversion
                // from S to T.
                //
-               static bool Array_To_IList (Type array, Type list)
+               static bool Array_To_IList (Type array, Type list, bool isExplicit)
                {
 #if GMCS_SOURCE
-                       if (!array.IsArray || (array.GetArrayRank () != 1) || !list.IsGenericType)
+                       if ((array.GetArrayRank () != 1) || !list.IsGenericType)
                                return false;
 
                        Type gt = list.GetGenericTypeDefinition ();
@@ -77,6 +75,9 @@ namespace Mono.CSharp {
                        if (element_type == arg_type)
                                return true;
 
+                       if (isExplicit)
+                               return ExplicitReferenceConversionExists (element_type, arg_type);
+
                        if (MyEmptyExpr == null)
                                MyEmptyExpr = new EmptyExpression ();
                        MyEmptyExpr.SetType (TypeManager.GetElementType (array));
@@ -159,37 +160,57 @@ namespace Mono.CSharp {
                        return null;
                }
 
-               static bool ExplicitTypeParameterConversionExists (Type source_type, Type target_type)
+               static bool ImplicitTypeParameterBoxingConversion (Type expr_type, Type target_type,
+                                                                  out bool use_class_cast)
                {
 #if GMCS_SOURCE
-                       if (target_type.IsInterface)
-                               return true;
+                       GenericConstraints gc = TypeManager.GetTypeParameterConstraints (expr_type);
 
-                       if (TypeManager.IsGenericParameter (target_type)) {
-                               GenericConstraints gc = TypeManager.GetTypeParameterConstraints (target_type);
-                               if (gc == null)
-                                       return false;
+                       if (gc == null) {
+                               use_class_cast = false;
+                               return target_type == TypeManager.object_type;
+                       }
 
-                               foreach (Type iface in gc.InterfaceConstraints) {
-                                       if (!TypeManager.IsGenericParameter (iface))
-                                               continue;
+                       use_class_cast = true;
 
-                                       if (TypeManager.IsSubclassOf (source_type, iface))
+                       if (!gc.HasReferenceTypeConstraint)
+                               return false;
+
+                       // We're converting from a type parameter which is known to be a reference type.
+                       Type base_type = TypeParam_EffectiveBaseType (gc);
+
+                       if (TypeManager.IsSubclassOf (base_type, target_type))
+                               return true;
+
+                       if (target_type.IsInterface) {
+                               if (TypeManager.ImplementsInterface (base_type, target_type))
+                                       return true;
+
+                               foreach (Type t in gc.InterfaceConstraints) {
+                                       if (TypeManager.IsSubclassOf (t, target_type))
+                                               return true;
+                                       if (TypeManager.ImplementsInterface (t, target_type))
                                                return true;
                                }
                        }
+
+                       foreach (Type t in gc.InterfaceConstraints) {
+                               if (!TypeManager.IsGenericParameter (t))
+                                       continue;
+                               if (TypeManager.IsSubclassOf (t, target_type))
+                                       return true;
+                               if (TypeManager.ImplementsInterface (t, target_type))
+                                       return true;
+                       }
 #endif
+
+                       use_class_cast = false;
                        return false;
                }
 
-               static Expression ExplicitTypeParameterConversion (Expression source, Type target_type)
+               static Expression ExplicitTypeParameterConversion (Expression source, Type source_type, Type target_type)
                {
 #if GMCS_SOURCE
-                       Type source_type = source.Type;
-
-                       if (target_type.IsInterface)
-                               return new ClassCast (source, target_type);
-
                        if (TypeManager.IsGenericParameter (target_type)) {
                                GenericConstraints gc = TypeManager.GetTypeParameterConstraints (target_type);
                                if (gc == null)
@@ -200,15 +221,18 @@ namespace Mono.CSharp {
                                                continue;
 
                                        if (TypeManager.IsSubclassOf (source_type, iface))
-                                               return new ClassCast (source, target_type);
+                                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
                                }
                        }
+
+                       if (target_type.IsInterface)
+                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 #endif
                        return null;
                }
 
                static EmptyExpression MyEmptyExpr;
-               static public Expression ImplicitReferenceConversion (Expression expr, Type target_type)
+               static Expression ImplicitReferenceConversion (Expression expr, Type target_type, bool explicit_cast)
                {
                        Type expr_type = expr.Type;
 
@@ -224,6 +248,52 @@ namespace Mono.CSharp {
                        if (TypeManager.IsGenericParameter (expr_type))
                                return ImplicitTypeParameterConversion (expr, target_type);
 
+                       //
+                       // from the null type to any reference-type.
+                       //
+                       NullLiteral nl = expr as NullLiteral;
+                       if (nl != null) {
+                               return nl.ConvertImplicitly(target_type);
+                       }
+
+                       if (ImplicitReferenceConversionExists (expr, target_type)) {
+                               // 
+                               // Reduce implicit reference conversion to object
+                               //
+                               if (!explicit_cast && target_type == TypeManager.object_type)
+                                       return expr;
+
+                               return EmptyCast.Create (expr, target_type);
+                       }
+
+                       bool use_class_cast;
+                       if (ImplicitBoxingConversionExists (expr, target_type, out use_class_cast)) {
+                               if (use_class_cast)
+                                       return new ClassCast (expr, target_type);
+                               else
+                                       return new BoxedCast (expr, target_type);
+                       }
+
+                       return null;
+               }
+
+               //
+               // 6.1.6 Implicit reference conversions
+               //
+               public static bool ImplicitReferenceConversionExists (Expression expr, Type target_type)
+               {
+                       if (target_type.IsValueType)
+                               return false;
+
+                       Type expr_type = expr.Type;
+
+                       // from the null type to any reference-type.
+                       if (expr_type == TypeManager.null_type)
+                               return target_type != TypeManager.anonymous_method_type;
+
+                       if (TypeManager.IsGenericParameter (expr_type))
+                               return ImplicitTypeParameterConversion (expr, target_type) != null;
+
                        //
                        // notice that it is possible to write "ValueType v = 1", the ValueType here
                        // is an abstract class, and not really a value type, so we apply the same rules.
@@ -233,34 +303,27 @@ namespace Mono.CSharp {
                                // A pointer type cannot be converted to object
                                //
                                if (expr_type.IsPointer)
-                                       return null;
+                                       return false;
 
                                if (TypeManager.IsValueType (expr_type))
-                                       return new BoxedCast (expr, target_type);
+                                       return false;
                                if (expr_type.IsClass || expr_type.IsInterface || expr_type == TypeManager.enum_type){
-                                       if (expr_type == TypeManager.anonymous_method_type)
-                                               return null;
-                                       return new EmptyCast (expr, target_type);
+                                       return expr_type != TypeManager.anonymous_method_type;
                                }
 
-                               return null;
+                               return false;
                        } else if (target_type == TypeManager.value_type) {
-                               if (TypeManager.IsValueType (expr_type))
-                                       return new BoxedCast (expr, target_type);
-                               if (expr_type == TypeManager.null_type)
-                                       return new EmptyConstantCast ((Constant)expr, target_type);
-
-                               return null;
+                               return expr_type == TypeManager.enum_type;
                        } else if (TypeManager.IsSubclassOf (expr_type, target_type)) {
                                //
                                // Special case: enumeration to System.Enum.
                                // System.Enum is not a value type, it is a class, so we need
                                // a boxing conversion
                                //
-                               if (expr_type.IsEnum || TypeManager.IsGenericParameter (expr_type))
-                                       return new BoxedCast (expr, target_type);
-
-                               return new EmptyCast (expr, target_type);
+                               if (target_type == TypeManager.enum_type || TypeManager.IsGenericParameter (expr_type))
+                                       return false;
+                               
+                               return true;
                        }
 
                        // This code is kind of mirrored inside ImplicitStandardConversionExists
@@ -268,187 +331,128 @@ namespace Mono.CSharp {
                        //
                        // Always ensure that the code here and there is in sync
 
-                       // from the null type to any reference-type.
-                       if (expr_type == TypeManager.null_type) {
-                               NullConstant nc = (NullConstant)expr;
-                               return nc.ConvertImplicitly(target_type);
-                       }
-
                        // from any class-type S to any interface-type T.
                        if (target_type.IsInterface) {
-                               if (target_type != TypeManager.iconvertible_type &&
-                                   expr_type.IsValueType && (expr is Constant) &&
-                                   !(expr is IntLiteral || expr is BoolLiteral ||
-                                     expr is FloatLiteral || expr is DoubleLiteral ||
-                                     expr is LongLiteral || expr is CharLiteral ||
-                                     expr is StringLiteral || expr is DecimalLiteral ||
-                                     expr is UIntLiteral || expr is ULongLiteral)) {
-                                       return null;
-                               }
-
                                if (TypeManager.ImplementsInterface (expr_type, target_type)){
-                                       if (TypeManager.IsGenericParameter (expr_type) || TypeManager.IsValueType (expr_type))
-                                               return new BoxedCast (expr, target_type);
-                                       else
-                                               return new EmptyCast (expr, target_type);
+                                       return !TypeManager.IsGenericParameter (expr_type) &&
+                                               !TypeManager.IsValueType (expr_type);
                                }
                        }
 
-                       // from any interface type S to interface-type T.
-                       if (expr_type.IsInterface && target_type.IsInterface) {
-                               if (TypeManager.ImplementsInterface (expr_type, target_type))
-                                       return new EmptyCast (expr, target_type);
-                               else
-                                       return null;
-                       }
-
-                       // from an array-type S to an array-type of type T
-                       if (expr_type.IsArray && target_type.IsArray) {
-                               if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
+                       if (expr_type.IsArray) {
+                               // from an array-type S to an array-type of type T
+                               if (target_type.IsArray && expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
 
+                                       //
+                                       // Both SE and TE are reference-types
+                                       //
                                        Type expr_element_type = TypeManager.GetElementType (expr_type);
+                                       if (!TypeManager.IsReferenceType (expr_element_type))
+                                               return false;
+
+                                       Type target_element_type = TypeManager.GetElementType (target_type);
+                                       if (!TypeManager.IsReferenceType (target_element_type))
+                                               return false;
 
                                        if (MyEmptyExpr == null)
                                                MyEmptyExpr = new EmptyExpression ();
 
                                        MyEmptyExpr.SetType (expr_element_type);
-                                       Type target_element_type = TypeManager.GetElementType (target_type);
 
-                                       if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
-                                               if (ImplicitStandardConversionExists (MyEmptyExpr,
-                                                                                     target_element_type))
-                                                       return new EmptyCast (expr, target_type);
+                                       return ImplicitStandardConversionExists (MyEmptyExpr, target_element_type);
                                }
-                       }
 
-                       // from an array-type to System.Array
-                       if (expr_type.IsArray && target_type == TypeManager.array_type)
-                               return new EmptyCast (expr, target_type);
+                               // from an array-type to System.Array
+                               if (target_type == TypeManager.array_type)
+                                       return true;
 
-                       // from an array-type of type T to IList<T>
-                       if (expr_type.IsArray && Array_To_IList (expr_type, target_type))
-                               return new EmptyCast (expr, target_type);
+                               // from an array-type of type T to IList<T>
+                               if (Array_To_IList (expr_type, target_type, false))
+                                       return true;
 
-                       // from any delegate type to System.Delegate
-                       if ((expr_type == TypeManager.delegate_type || TypeManager.IsDelegateType (expr_type)) &&
-                           target_type == TypeManager.delegate_type)
-                               return new EmptyCast (expr, target_type);
+                               return false;
+                       }
 
-                       // from any array-type or delegate type into System.ICloneable.
-                       if (expr_type.IsArray ||
-                           expr_type == TypeManager.delegate_type || TypeManager.IsDelegateType (expr_type))
-                               if (target_type == TypeManager.icloneable_type)
-                                       return new EmptyCast (expr, target_type);
+                       // from any interface type S to interface-type T.
+                       if (expr_type.IsInterface && target_type.IsInterface) {
+                               return TypeManager.ImplementsInterface (expr_type, target_type);
+                       }
+
+                       // from any delegate type to System.Delegate
+                       if (target_type == TypeManager.delegate_type &&
+                               (expr_type == TypeManager.delegate_type || TypeManager.IsDelegateType (expr_type)))
+                               return true;
 
                        // from a generic type definition to a generic instance.
                        if (TypeManager.IsEqual (expr_type, target_type))
-                               return new EmptyCast (expr, target_type);
+                               return true;
 
-                       return null;
+                       return false;
                }
 
-               //
-               // Tests whether an implicit reference conversion exists between expr_type
-               // and target_type
-               //
-               public static bool ImplicitReferenceConversionExists (Expression expr, Type target_type)
+               static public bool ImplicitBoxingConversionExists (Expression expr, Type target_type,
+                                                                  out bool use_class_cast)
                {
-                       if (target_type.IsValueType)
-                               return false;
-
                        Type expr_type = expr.Type;
-
-                       if (TypeManager.IsGenericParameter (expr_type))
-                               return ImplicitTypeParameterConversion (expr, target_type) != null;
-
+                       use_class_cast = false;
+                       
                        //
-                       // This is the boxed case.
+                       // From any value-type to the type object.
                        //
                        if (target_type == TypeManager.object_type) {
-                               if (expr_type.IsClass || TypeManager.IsValueType (expr_type) ||
-                                   expr_type.IsInterface || expr_type == TypeManager.enum_type)
-                                       if (target_type != TypeManager.anonymous_method_type)
-                                       return true;
-
-                               return false;
-                       } else if (TypeManager.IsSubclassOf (expr_type, target_type))
-                               return true;
-
-                       // Please remember that all code below actually comes
-                       // from ImplicitReferenceConversion so make sure code remains in sync
-
-                       // from any class-type S to any interface-type T.
-                       if (target_type.IsInterface) {
-                               if (target_type != TypeManager.iconvertible_type &&
-                                   expr_type.IsValueType && (expr is Constant) &&
-                                   !(expr is IntLiteral || expr is BoolLiteral ||
-                                     expr is FloatLiteral || expr is DoubleLiteral ||
-                                     expr is LongLiteral || expr is CharLiteral ||
-                                     expr is StringLiteral || expr is DecimalLiteral ||
-                                     expr is UIntLiteral || expr is ULongLiteral)) {
+                               //
+                               // A pointer type cannot be converted to object
+                               //
+                               if (expr_type.IsPointer)
                                        return false;
-                               }
 
-                               if (TypeManager.ImplementsInterface (expr_type, target_type))
-                                       return true;
+                               return TypeManager.IsValueType (expr_type);
                        }
+                       
+                       //
+                       // From any value-type to the type System.ValueType.
+                       //
+                       if (target_type == TypeManager.value_type)
+                               return TypeManager.IsValueType (expr_type);
 
-                       // from any interface type S to interface-type T.
-                       if (expr_type.IsInterface && target_type.IsInterface)
-                               if (TypeManager.ImplementsInterface (expr_type, target_type))
+                       if (target_type == TypeManager.enum_type) {
+                               //
+                               // From any enum-type to the type System.Enum.
+                               //
+                               if (expr_type.IsEnum)
                                        return true;
-
-                       // from an array-type S to an array-type of type T
-                       if (expr_type.IsArray && target_type.IsArray) {
-                               if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
-
-                                       Type expr_element_type = expr_type.GetElementType ();
-
-                                       if (MyEmptyExpr == null)
-                                               MyEmptyExpr = new EmptyExpression ();
-
-                                       MyEmptyExpr.SetType (expr_element_type);
-                                       Type target_element_type = TypeManager.GetElementType (target_type);
-
-                                       if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
-                                               if (ImplicitStandardConversionExists (MyEmptyExpr,
-                                                                                     target_element_type))
-                                                       return true;
-                               }
+                               //
+                               // From any nullable-type with an underlying enum-type to the type System.Enum
+                               //
+                               if (TypeManager.IsNullableType (expr_type))
+                                       return TypeManager.GetTypeArguments (expr_type) [0].IsEnum;
                        }
 
-                       // from an array-type to System.Array
-                       if (expr_type.IsArray && (target_type == TypeManager.array_type))
-                               return true;
-
-                       // from an array-type of type T to IList<T>
-                       if (expr_type.IsArray && Array_To_IList (expr_type, target_type))
-                               return true;
-
-                       // from any delegate type to System.Delegate
-                       if ((expr_type == TypeManager.delegate_type || TypeManager.IsDelegateType (expr_type)) &&
-                           target_type == TypeManager.delegate_type)
-                               if (target_type.IsAssignableFrom (expr_type))
+                       if (TypeManager.IsSubclassOf (expr_type, target_type)) {
+                               //
+                               // Don't box same type arguments
+                               //
+                               if (TypeManager.IsGenericParameter (expr_type) && expr_type != target_type)
                                        return true;
 
-                       // from any array-type or delegate type into System.ICloneable.
-                       if (expr_type.IsArray ||
-                           expr_type == TypeManager.delegate_type || TypeManager.IsDelegateType (expr_type))
-                               if (target_type == TypeManager.icloneable_type)
-                                       return true;
+                               return false;
+                       }
 
-                       // from the null type to any reference-type.
-                       if (expr_type == TypeManager.null_type){
-                               if (target_type.IsPointer)
-                                       return true;
+                       // This code is kind of mirrored inside ImplicitStandardConversionExists
+                       // with the small distinction that we only probe there
+                       //
+                       // Always ensure that the code here and there is in sync
 
-                               if (!target_type.IsValueType)
-                                       return true;
+                       // from any class-type S to any interface-type T.
+                       if (target_type.IsInterface) {
+                               if (TypeManager.ImplementsInterface (expr_type, target_type))
+                                       return TypeManager.IsGenericParameter (expr_type) ||
+                                               TypeManager.IsValueType (expr_type);
                        }
 
-                       // from a generic type definition to a generic instance.
-                       if (TypeManager.IsEqual (expr_type, target_type))
-                               return true;
+                       if (TypeManager.IsGenericParameter (expr_type))
+                               return ImplicitTypeParameterBoxingConversion (
+                                       expr_type, target_type, out use_class_cast);
 
                        return false;
                }
@@ -485,11 +489,9 @@ namespace Mono.CSharp {
                                //
                                // From byte to short, ushort, int, uint, long, ulong, float, double, decimal
                                //
-                               if ((real_target_type == TypeManager.short_type) ||
-                                   (real_target_type == TypeManager.ushort_type) ||
-                                   (real_target_type == TypeManager.int32_type) ||
-                                   (real_target_type == TypeManager.uint32_type))
-                                       return new EmptyCast (expr, target_type);
+                               if (real_target_type == TypeManager.int32_type || real_target_type == TypeManager.uint32_type ||
+                                   real_target_type == TypeManager.short_type || real_target_type == TypeManager.ushort_type)
+                                       return EmptyCast.Create (expr, target_type);
 
                                if (real_target_type == TypeManager.uint64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
@@ -507,7 +509,7 @@ namespace Mono.CSharp {
                                // From short to int, long, float, double, decimal
                                //
                                if (real_target_type == TypeManager.int32_type)
-                                       return new EmptyCast (expr, target_type);
+                                       return EmptyCast.Create (expr, target_type);
                                if (real_target_type == TypeManager.int64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
                                if (real_target_type == TypeManager.double_type)
@@ -521,13 +523,11 @@ namespace Mono.CSharp {
                                //
                                // From ushort to int, uint, long, ulong, float, double, decimal
                                //
-                               if (real_target_type == TypeManager.uint32_type)
-                                       return new EmptyCast (expr, target_type);
-
+                               if (real_target_type == TypeManager.int32_type || real_target_type == TypeManager.uint32_type)
+                                       return EmptyCast.Create (expr, target_type);
+                               
                                if (real_target_type == TypeManager.uint64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
-                               if (real_target_type == TypeManager.int32_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
                                if (real_target_type == TypeManager.int64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
                                if (real_target_type == TypeManager.double_type)
@@ -557,11 +557,9 @@ namespace Mono.CSharp {
                                if (real_target_type == TypeManager.uint64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
                                if (real_target_type == TypeManager.double_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
-                                                              OpCodes.Conv_R8);
+                                       return new OpcodeCast (new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un), target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
-                                                              OpCodes.Conv_R4);
+                                       return new OpcodeCast (new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un), target_type, OpCodes.Conv_R4);
                                if (real_target_type == TypeManager.decimal_type)
                                        return new CastToDecimal (expr);
                        } else if (expr_type == TypeManager.int64_type){
@@ -579,11 +577,9 @@ namespace Mono.CSharp {
                                // From ulong to float, double
                                //
                                if (real_target_type == TypeManager.double_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
-                                                              OpCodes.Conv_R8);
+                                       return new OpcodeCast (new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un), target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
-                                                              OpCodes.Conv_R4);
+                                       return new OpcodeCast (new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un), target_type, OpCodes.Conv_R4);
                                if (real_target_type == TypeManager.decimal_type)
                                        return new CastToDecimal (expr);
                        } else if (expr_type == TypeManager.char_type){
@@ -593,7 +589,7 @@ namespace Mono.CSharp {
                                if ((real_target_type == TypeManager.ushort_type) ||
                                    (real_target_type == TypeManager.int32_type) ||
                                    (real_target_type == TypeManager.uint32_type))
-                                       return new EmptyCast (expr, target_type);
+                                       return EmptyCast.Create (expr, target_type);
                                if (real_target_type == TypeManager.uint64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
                                if (real_target_type == TypeManager.int64_type)
@@ -633,6 +629,15 @@ namespace Mono.CSharp {
                        if (ImplicitStandardConversionExists (expr, target_type))
                                return true;
 
+                       if (expr.Type == TypeManager.anonymous_method_type) {
+                               if (!TypeManager.IsDelegateType (target_type) &&
+                                       TypeManager.DropGenericTypeArguments (target_type) != TypeManager.expression_type)
+                                       return false;
+
+                               AnonymousMethodExpression ame = (AnonymousMethodExpression) expr;
+                               return ame.ImplicitStandardConversionExists (ec, target_type);
+                       }
+
                        return ImplicitUserConversion (ec, expr, target_type, Location.Null) != null;
                }
 
@@ -668,6 +673,17 @@ namespace Mono.CSharp {
                        if (expr_type == TypeManager.void_type)
                                return false;
 
+                       if (expr.eclass == ExprClass.MethodGroup) {
+                               if (TypeManager.IsDelegateType (target_type) && RootContext.Version != LanguageVersion.ISO_1) {
+                                       MethodGroupExpr mg = expr as MethodGroupExpr;
+                                       if (mg != null) {
+                                               return DelegateCreation.ImplicitStandardConversionExists (mg, target_type) != null;
+                                       }
+                               }
+
+                               return false;
+                       }
+
                        //Console.WriteLine ("Expr is {0}", expr);
                        //Console.WriteLine ("{0} -> {1} ?", expr_type, target_type);
                        if (TypeManager.IsEqual (expr_type, target_type))
@@ -780,18 +796,13 @@ namespace Mono.CSharp {
                                        return true;
                        }
 
-                       if (expr.eclass == ExprClass.MethodGroup){
-                               if (TypeManager.IsDelegateType (target_type) && RootContext.Version != LanguageVersion.ISO_1){
-                                       MethodGroupExpr mg = expr as MethodGroupExpr;
-                                       if (mg != null){
-                                               return DelegateCreation.ImplicitStandardConversionExists (mg, target_type) != null;
-                                       }
-                               }
-                       }
-
                        if (ImplicitReferenceConversionExists (expr, target_type))
                                return true;
 
+                       bool use_class_cast;
+                       if (ImplicitBoxingConversionExists (expr, target_type, out use_class_cast))
+                               return true;
+
                        //
                        // Implicit Constant Expression Conversions
                        //
@@ -848,14 +859,6 @@ namespace Mono.CSharp {
                        if (target_type == TypeManager.void_ptr_type && expr_type.IsPointer)
                                return true;
 
-                       if (expr_type == TypeManager.anonymous_method_type){
-                               if (!TypeManager.IsDelegateType (target_type))
-                                       return false;
-
-                               AnonymousMethodExpression ame = (AnonymousMethodExpression) expr;
-                               return ame.ImplicitStandardConversionExists (target_type);
-                       }
-
                        return false;
                }
 
@@ -958,8 +961,8 @@ namespace Mono.CSharp {
                        //
                        Type source_type = source.Type;
                        foreach (MethodBase mb in list){
-                               ParameterData pd = TypeManager.GetParameterData (mb);
-                               Type param_type = pd.ParameterType (0);
+                               AParametersCollection pd = TypeManager.GetParameterData (mb);
+                               Type param_type = pd.Types [0];
 
                                if (param_type == source_type)
                                        return param_type;
@@ -1003,7 +1006,7 @@ namespace Mono.CSharp {
                        // If any operator converts to T then Tx = T
                        //
                        foreach (MethodInfo mi in list){
-                               Type ret_type = mi.ReturnType;
+                               Type ret_type = TypeManager.TypeToCoreType (mi.ReturnType);
                                if (ret_type == target)
                                        return ret_type;
 
@@ -1046,7 +1049,11 @@ namespace Mono.CSharp {
                static public Expression ImplicitUserConversion (EmitContext ec, Expression source,
                                                                 Type target, Location loc)
                {
-                       return UserDefinedConversion (ec, source, target, loc, false);
+                       Expression expr = UserDefinedConversion (ec, source, target, loc, false);
+                       if (expr != null && !TypeManager.IsEqual (expr.Type, target))
+                               expr = ImplicitConversionStandard (ec, expr, target, loc);
+
+                       return expr;
                }
 
                /// <summary>
@@ -1055,7 +1062,11 @@ namespace Mono.CSharp {
                static public Expression ExplicitUserConversion (EmitContext ec, Expression source,
                                                                 Type target, Location loc)
                {
-                       return UserDefinedConversion (ec, source, target, loc, true);
+                       Expression expr = UserDefinedConversion (ec, source, target, loc, true);
+                       if (expr != null && !TypeManager.IsEqual (expr.Type, target))
+                               expr = ExplicitConversionStandard (ec, expr, target, loc);
+
+                       return expr;
                }
 
                static void AddConversionOperators (ArrayList list,
@@ -1068,10 +1079,24 @@ namespace Mono.CSharp {
 
                        Type source_type = source.Type;
                        EmptyExpression expr = EmptyExpression.Grab ();
+
+                       //
+                       // LAMESPEC: Undocumented IntPtr/UIntPtr conversions
+                       // IntPtr -> uint uses int
+                       // UIntPtr -> long uses ulong
+                       //
+                       if (source_type == TypeManager.intptr_type) {
+                               if (target_type == TypeManager.uint32_type)
+                                       target_type = TypeManager.int32_type;
+                       } else if (source_type == TypeManager.uintptr_type) {
+                               if (target_type == TypeManager.int64_type)
+                                       target_type = TypeManager.uint64_type;
+                       }
+
                        foreach (MethodInfo m in mg.Methods) {
-                               ParameterData pd = TypeManager.GetParameterData (m);
-                               Type return_type = m.ReturnType;
-                               Type arg_type = pd.ParameterType (0);
+                               AParametersCollection pd = TypeManager.GetParameterData (m);
+                               Type return_type = TypeManager.TypeToCoreType (m.ReturnType);
+                               Type arg_type = pd.Types [0];
 
                                if (source_type != arg_type) {
                                        if (!ImplicitStandardConversionExists (source, arg_type)) {
@@ -1094,6 +1119,10 @@ namespace Mono.CSharp {
                                        }
                                }
 
+                               // See LAMESPEC: Exclude IntPtr -> int conversion
+                               if (source_type == TypeManager.uintptr_type && return_type == TypeManager.uint32_type)
+                                       continue;
+
                                list.Add (m);
                        }
 
@@ -1144,9 +1173,9 @@ namespace Mono.CSharp {
                        MethodInfo method = null;
 
                        foreach (MethodInfo m in ops) {
-                               if (m.ReturnType != most_specific_target)
+                               if (TypeManager.TypeToCoreType (m.ReturnType) != most_specific_target)
                                        continue;
-                               if (TypeManager.GetParameterData (m).ParameterType (0) != most_specific_source)
+                               if (TypeManager.GetParameterData (m).Types [0] != most_specific_source)
                                        continue;
                                // Ambiguous: more than one conversion operator satisfies the signature.
                                if (method != null)
@@ -1171,7 +1200,16 @@ namespace Mono.CSharp {
                        MethodInfo method = null;
 
                        object o;
-                       DoubleHash hash = look_for_explicit ? explicit_conv : implicit_conv;
+                       DoubleHash hash;
+                       if (look_for_explicit) {
+                               hash = explicit_conv;
+                       } else {
+                               // Implicit user operators cannot convert to interfaces
+                               if (target.IsInterface)
+                                       return null;
+
+                               hash = implicit_conv;
+                       }                       
 
                        if (!(source is Constant) && hash.Lookup (source_type, target, out o)) {
                                method = (MethodInfo) o;
@@ -1184,7 +1222,7 @@ namespace Mono.CSharp {
                        if (method == null)
                                return null;
 
-                       Type most_specific_source = TypeManager.GetParameterData (method).ParameterType (0);
+                       Type most_specific_source = TypeManager.GetParameterData (method).Types [0];
 
                        //
                        // This will do the conversion to the best match that we
@@ -1200,16 +1238,7 @@ namespace Mono.CSharp {
                        if (source == null)
                                return null;
 
-                       Expression e;
-                       e =  new UserCast (method, source, loc);
-                       if (e.Type != target){
-                               if (!look_for_explicit)
-                                       e = ImplicitConversionStandard (ec, e, target, loc);
-                               else
-                                       e = ExplicitConversionStandard (ec, e, target, loc);
-                       }
-
-                       return e;
+                       return new UserCast (method, source, loc).DoResolve (ec);
                }
 
                /// <summary>
@@ -1249,28 +1278,36 @@ namespace Mono.CSharp {
                /// </summary>
                static public Expression ImplicitConversionStandard (EmitContext ec, Expression expr,
                                                                     Type target_type, Location loc)
+               {
+                       return ImplicitConversionStandard (ec, expr, target_type, loc, false);
+               }
+
+               static Expression ImplicitConversionStandard (EmitContext ec, Expression expr, Type target_type, Location loc, bool explicit_cast)
                {
                        Type expr_type = expr.Type;
                        Expression e;
+                       
 #if GMCS_SOURCE
-                       // TODO: refactor to be a part of constant infrastructure
-                       if (expr is NullLiteral) {
-                           if (TypeManager.IsNullableType (target_type))
-                               return new Nullable.NullableLiteral (target_type, loc);
-                       }
-
                        if (TypeManager.IsNullableType (target_type)) {
+                               //
+                               // From null to any nullable type
+                               //
+                               if (expr_type == TypeManager.null_type)
+                                       return Nullable.LiftedNull.Create (target_type, loc);
+                               
                                Type target = TypeManager.GetTypeArguments (target_type) [0];
 
-                               if (TypeManager.IsNullableType (expr.Type)) {
-                                       e = new Nullable.LiftedConversion (
+                               if (TypeManager.IsNullableType (expr_type)) {
+                                       Type etype = TypeManager.GetTypeArguments (expr_type) [0];
+                                       if (TypeManager.IsEqual (etype, target))
+                                               return expr;
+
+                                       return new Nullable.LiftedConversion (
                                                expr, target_type, false, false, loc).Resolve (ec);
-                                       if (e != null)
-                                               return e;
                                } else {
                                        e = ImplicitConversion (ec, expr, target, loc);
                                        if (e != null)
-                                               return Nullable.Wrap.Create (e, ec);
+                                               return Nullable.Wrap.Create (e, target_type);
                                }
                        }
 #endif
@@ -1290,8 +1327,11 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       if (expr_type.Equals (target_type) && !TypeManager.IsNullType (expr_type))
-                               return expr;
+                       if (expr_type.Equals (target_type)) {
+                               if (expr_type != TypeManager.null_type && expr_type != TypeManager.anonymous_method_type)
+                                       return expr;
+                               return null;
+                       }
 
                        //
                        // Attempt to do the implicit constant expression conversions
@@ -1319,21 +1359,27 @@ namespace Mono.CSharp {
                        if (e != null)
                                return e;
 
-                       e = ImplicitReferenceConversion (expr, target_type);
+                       e = ImplicitReferenceConversion (expr, target_type, explicit_cast);
                        if (e != null)
                                return e;
 
-                       if (TypeManager.IsEnumType (target_type) && expr is IntLiteral){
-                               IntLiteral i = (IntLiteral) expr;
-
-                               if (i.Value == 0)
-                                       return new EnumConstant ((Constant) expr, target_type);
+                       if (expr is IntConstant && TypeManager.IsEnumType (target_type)){
+                               Constant i = (Constant) expr;
+                               //
+                               // LAMESPEC: Conversion from any 0 constant is allowed
+                               //
+                               // An implicit enumeration conversion permits the decimal-integer-literal 0
+                               // to be converted to any enum-type and to any nullable-type whose underlying
+                               // type is an enum-type
+                               //
+                               if (i.IsDefaultValue)
+                                       return new EnumConstant (i, target_type);
                        }
 
                        if (ec.InUnsafe) {
                                if (expr_type.IsPointer){
                                        if (target_type == TypeManager.void_ptr_type)
-                                               return new EmptyCast (expr, target_type);
+                                               return EmptyCast.Create (expr, target_type);
 
                                        //
                                        // yep, comparing pointer types cant be done with
@@ -1348,25 +1394,14 @@ namespace Mono.CSharp {
                                }
 
                                if (expr_type == TypeManager.null_type && target_type.IsPointer)
-                                       return new EmptyCast (NullPointer.Null, target_type);
+                                       return EmptyCast.Create (new NullPointer (loc), target_type);
                        }
 
                        if (expr_type == TypeManager.anonymous_method_type){
                                AnonymousMethodExpression ame = (AnonymousMethodExpression) expr;
-
-                               int errors = Report.Errors;
-
-                               Expression conv = ame.Compatible (ec, target_type);
-                               if (conv != null)
-                                       return conv;
-                               
-                               //
-                               // We return something instead of null, to avoid
-                               // the duplicate error, since am.Compatible would have
-                               // reported that already
-                               //
-                               if (errors != Report.Errors)
-                                       return new EmptyCast (expr, target_type);
+                               Expression am = ame.Compatible (ec, target_type);
+                               if (am != null)
+                                       return am.DoResolve (ec);
                        }
 
                        return null;
@@ -1562,7 +1597,7 @@ namespace Mono.CSharp {
 
                                // One of the built-in conversions that belonged in the class library
                                if (real_target_type == TypeManager.intptr_type){
-                                       return new OperatorCast (new EmptyCast (expr, TypeManager.int64_type),
+                                       return new OperatorCast (EmptyCast.Create (expr, TypeManager.int64_type),
                                                                 TypeManager.intptr_type, true);
                                }
                        } else if (expr_type == TypeManager.char_type){
@@ -1644,12 +1679,12 @@ namespace Mono.CSharp {
                                        return new ConvCast (uint32e, TypeManager.sbyte_type, ConvCast.Mode.U4_I2);
                                }
                                if (real_target_type == TypeManager.int32_type){
-                                       return new EmptyCast (new OperatorCast (expr, TypeManager.uint32_type, true),
+                                       return EmptyCast.Create (new OperatorCast (expr, TypeManager.uint32_type, true),
                                                              TypeManager.int32_type);
                                }
                        } else if (expr_type == TypeManager.intptr_type){
                                if (real_target_type == TypeManager.uint64_type){
-                                       return new EmptyCast (new OperatorCast (expr, TypeManager.int64_type, true),
+                                       return EmptyCast.Create (new OperatorCast (expr, TypeManager.int64_type, true),
                                                              TypeManager.uint64_type);
                                }
                        } else if (expr_type == TypeManager.decimal_type) {
@@ -1664,172 +1699,62 @@ namespace Mono.CSharp {
                /// </summary>
                public static bool ExplicitReferenceConversionExists (Type source_type, Type target_type)
                {
-                       bool target_is_type_param = TypeManager.IsGenericParameter (target_type);
-                       bool target_is_value_type = target_type.IsValueType;
-
-                       if (source_type == target_type)
-                               return true;
-
-                       //
-                       // From generic parameter to any type
-                       //
-                       if (TypeManager.IsGenericParameter (source_type))
-                               return ExplicitTypeParameterConversionExists (source_type, target_type);
-
-                       //
-                       // From object to a generic parameter
-                       //
-                       if (source_type == TypeManager.object_type && target_is_type_param)
-                               return true;
-
-                       //
-                       // From object to any reference type
-                       //
-                       if (source_type == TypeManager.object_type && !target_is_value_type)
-                               return true;
-
-                       //
-                       // From any class S to any class-type T, provided S is a base class of T
-                       //
-                       if (TypeManager.IsSubclassOf (target_type, source_type))
-                               return true;
-
-                       //
-                       // From any interface type S to any interface T provided S is not derived from T
-                       //
-                       if (source_type.IsInterface && target_type.IsInterface){
-                               if (!TypeManager.IsSubclassOf (target_type, source_type))
-                                       return true;
-                       }
-
-                       //
-                       // From any class type S to any interface T, provided S is not sealed
-                       // and provided S does not implement T.
-                       //
-                       if (target_type.IsInterface && !source_type.IsSealed &&
-                           !TypeManager.ImplementsInterface (source_type, target_type))
-                               return true;
-
-                       //
-                       // From any interface-type S to to any class type T, provided T is not
-                       // sealed, or provided T implements S.
-                       //
-                       if (source_type.IsInterface &&
-                           (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type)))
-                               return true;
-
-
-                       if (source_type.IsInterface && IList_To_Array (source_type, target_type))
-                               return true;
-
-                       // From an array type S with an element type Se to an array type T with an
-                       // element type Te provided all the following are true:
-                       //     * S and T differe only in element type, in other words, S and T
-                       //       have the same number of dimensions.
-                       //     * Both Se and Te are reference types
-                       //     * An explicit referenc conversions exist from Se to Te
-                       //
-                       if (source_type.IsArray && target_type.IsArray) {
-                               if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
-
-                                       Type source_element_type = TypeManager.GetElementType (source_type);
-                                       Type target_element_type = TypeManager.GetElementType (target_type);
-
-                                       if (TypeManager.IsGenericParameter (source_element_type) ||
-                                           (!source_element_type.IsValueType && !target_element_type.IsValueType))
-                                               if (ExplicitReferenceConversionExists (source_element_type,
-                                                                                      target_element_type))
-                                                       return true;
-                               }
-                       }
-
-
-                       // From System.Array to any array-type
-                       if (source_type == TypeManager.array_type &&
-                           target_type.IsArray){
-                               return true;
-                       }
-
-                       //
-                       // From System delegate to any delegate-type
-                       //
-                       if (source_type == TypeManager.delegate_type &&
-                           TypeManager.IsDelegateType (target_type))
-                               return true;
+                       Expression e = ExplicitReferenceConversion (null, source_type, target_type);
+                       if (e == null)
+                               return false;
 
-                       //
-                       // From ICloneable to Array or Delegate types
-                       //
-                       if (source_type == TypeManager.icloneable_type &&
-                           (target_type == TypeManager.array_type ||
-                            target_type == TypeManager.delegate_type))
+                       if (e == EmptyExpression.Null)
                                return true;
 
-                       return false;
+                       throw new InternalErrorException ("Invalid probing conversion result");
                }
 
                /// <summary>
                ///   Implements Explicit Reference conversions
                /// </summary>
-               static Expression ExplicitReferenceConversion (Expression source, Type target_type)
+               static Expression ExplicitReferenceConversion (Expression source, Type source_type, Type target_type)
                {
-                       Type source_type = source.Type;
-                       bool target_is_type_param = TypeManager.IsGenericParameter (target_type);
                        bool target_is_value_type = target_type.IsValueType;
 
                        //
                        // From object to a generic parameter
                        //
-                       if (source_type == TypeManager.object_type && target_is_type_param)
-                               return new UnboxCast (source, target_type);
+                       if (source_type == TypeManager.object_type && TypeManager.IsGenericParameter (target_type))
+                               return source == null ? EmptyExpression.Null : new UnboxCast (source, target_type);
 
                        //
                        // Explicit type parameter conversion.
                        //
-
                        if (TypeManager.IsGenericParameter (source_type))
-                               return ExplicitTypeParameterConversion (source, target_type);
+                               return ExplicitTypeParameterConversion (source, source_type, target_type);
 
                        //
                        // From object to any reference type
                        //
                        if (source_type == TypeManager.object_type && !target_is_value_type)
-                               return new ClassCast (source, target_type);
+                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
                        //
                        // Unboxing conversion.
                        //
                        if (((source_type == TypeManager.enum_type &&
-                               !(source is EmptyCast)) ||
+                               !(source is TypeCast)) ||
                                source_type == TypeManager.value_type) && target_is_value_type)
-                               return new UnboxCast (source, target_type);
+                               return source == null ? EmptyExpression.Null : new UnboxCast (source, target_type);
 
                        //
                        // From any class S to any class-type T, provided S is a base class of T
                        //
                        if (TypeManager.IsSubclassOf (target_type, source_type))
-                               return new ClassCast (source, target_type);
-
-                       //
-                       // From any interface type S to any interface T provided S is not derived from T
-                       //
-                       if (source_type.IsInterface && target_type.IsInterface){
-                               if (TypeManager.ImplementsInterface (source_type, target_type))
-                                       return null;
-                               else
-                                       return new ClassCast (source, target_type);
-                       }
+                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
                        //
                        // From any class type S to any interface T, provides S is not sealed
                        // and provided S does not implement T.
                        //
-                       if (target_type.IsInterface && !source_type.IsSealed) {
-                               if (TypeManager.ImplementsInterface (source_type, target_type))
-                                       return null;
-                               else
-                                       return new ClassCast (source, target_type);
-
+                       if (target_type.IsInterface && !source_type.IsSealed &&
+                               !TypeManager.ImplementsInterface (source_type, target_type)) {
+                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
                        }
 
                        //
@@ -1839,9 +1764,9 @@ namespace Mono.CSharp {
                        if (source_type.IsInterface) {
                                if (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type)) {
                                        if (target_type.IsClass)
-                                               return new ClassCast (source, target_type);
-                                       else
-                                               return new UnboxCast (source, target_type);
+                                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
+
+                                       return source == null ? EmptyExpression.Null : new UnboxCast (source, target_type);
                                }
 
                                //
@@ -1849,52 +1774,59 @@ namespace Mono.CSharp {
                                // array type S[], provided there is an implicit or explicit reference conversion from S to T.
                                //
                                if (IList_To_Array (source_type, target_type))
-                                       return new ClassCast (source, target_type);
+                                       return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
                                return null;
                        }
 
-                       // From an array type S with an element type Se to an array type T with an
-                       // element type Te provided all the following are true:
-                       //     * S and T differe only in element type, in other words, S and T
-                       //       have the same number of dimensions.
-                       //     * Both Se and Te are reference types
-                       //     * An explicit referenc conversions exist from Se to Te
-                       //
-                       if (source_type.IsArray && target_type.IsArray) {
-                               if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
+                       if (source_type.IsArray) {
+                               if (target_type.IsArray) {
+                                       //
+                                       // From System.Array to any array-type
+                                       //
+                                       if (source_type == TypeManager.array_type)
+                                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
-                                       Type source_element_type = TypeManager.GetElementType (source_type);
-                                       Type target_element_type = TypeManager.GetElementType (target_type);
+                                       //
+                                       // From an array type S with an element type Se to an array type T with an
+                                       // element type Te provided all the following are true:
+                                       //     * S and T differe only in element type, in other words, S and T
+                                       //       have the same number of dimensions.
+                                       //     * Both Se and Te are reference types
+                                       //     * An explicit reference conversions exist from Se to Te
+                                       //
+                                       if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
 
-                                       if (!source_element_type.IsValueType && !target_element_type.IsValueType)
-                                               if (ExplicitReferenceConversionExists (source_element_type,
-                                                                                      target_element_type))
-                                                       return new ClassCast (source, target_type);
+                                               source_type = TypeManager.GetElementType (source_type);
+                                               if (!TypeManager.IsReferenceType (source_type))
+                                                       return null;
+
+                                               Type target_type_element = TypeManager.GetElementType (target_type);
+                                               if (!TypeManager.IsReferenceType (target_type_element))
+                                                       return null;
+
+                                               if (ExplicitReferenceConversionExists (source_type, target_type_element))
+                                                       return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
+                                                       
+                                               return null;
+                                       }
                                }
-                       }
 
+                               //
+                               // From a single-dimensional array type S[] to System.Collections.Generic.IList<T> and its base interfaces, 
+                               // provided that there is an explicit reference conversion from S to T
+                               //
+                               if (Array_To_IList (source_type, target_type, true))
+                                       return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
-                       // From System.Array to any array-type
-                       if (source_type == TypeManager.array_type &&
-                           target_type.IsArray) {
-                               return new ClassCast (source, target_type);
+                               return null;
                        }
 
                        //
                        // From System delegate to any delegate-type
                        //
-                       if (source_type == TypeManager.delegate_type &&
-                           TypeManager.IsDelegateType (target_type))
-                               return new ClassCast (source, target_type);
-
-                       //
-                       // From ICloneable to Array or Delegate types
-                       //
-                       if (source_type == TypeManager.icloneable_type &&
-                           (target_type == TypeManager.array_type ||
-                            target_type == TypeManager.delegate_type))
-                               return new ClassCast (source, target_type);
+                       if (source_type == TypeManager.delegate_type && TypeManager.IsDelegateType (target_type))
+                               return source == null ? EmptyExpression.Null : new ClassCast (source, target_type);
 
                        return null;
                }
@@ -1909,7 +1841,7 @@ namespace Mono.CSharp {
                        Type expr_type = expr.Type;
 
                        // Explicit conversion includes implicit conversion and it used for enum underlying types too
-                       Expression ne = ImplicitConversionStandard (ec, expr, target_type, loc);
+                       Expression ne = ImplicitConversionStandard (ec, expr, target_type, loc, true);
                        if (ne != null)
                                return ne;
 
@@ -1920,19 +1852,32 @@ namespace Mono.CSharp {
                                return new UnboxCast (expr, target_type);
 
                        if (TypeManager.IsEnumType (expr_type)) {
-                               if (expr is EnumConstant)
-                                       return ExplicitConversionCore (ec, ((EnumConstant) expr).Child, target_type, loc);
+                               Expression underlying = EmptyCast.Create (expr, TypeManager.GetEnumUnderlyingType (expr_type));
+                               expr = ExplicitConversionCore (ec, underlying, target_type, loc);
+                               if (expr != null)
+                                       return expr;
 
-                               return ExplicitConversionCore (ec, new EmptyCast (expr, TypeManager.EnumToUnderlying (expr_type)), target_type, loc);
+                               return ExplicitUserConversion (ec, underlying, target_type, loc);                               
                        }
 
                        if (TypeManager.IsEnumType (target_type)){
                                if (expr_type == TypeManager.enum_type)
                                        return new UnboxCast (expr, target_type);
 
-                               Expression ce = ExplicitConversionCore (ec, expr, TypeManager.EnumToUnderlying (target_type), loc);
+                               Expression ce = ExplicitConversionCore (ec, expr, TypeManager.GetEnumUnderlyingType (target_type), loc);
                                if (ce != null)
-                                       return new EmptyCast (ce, target_type);
+                                       return EmptyCast.Create (ce, target_type);
+                               
+                               //
+                               // LAMESPEC: IntPtr and UIntPtr conversion to any Enum is allowed
+                               //
+                               if (expr_type == TypeManager.intptr_type || expr_type == TypeManager.uintptr_type) {
+                                       ne = ExplicitUserConversion (ec, expr, TypeManager.GetEnumUnderlyingType (target_type), loc);
+                                       if (ne != null)
+                                               return ExplicitConversionCore (ec, ne, target_type, loc);
+                               }
+                               
+                               return null;
                        }
 
                        ne = ExplicitNumericConversion (expr, target_type);
@@ -1945,7 +1890,7 @@ namespace Mono.CSharp {
                        // null literal explicitly
                        //
                        if (expr_type != TypeManager.null_type){
-                               ne = ExplicitReferenceConversion (expr, target_type);
+                               ne = ExplicitReferenceConversion (expr, expr_type, target_type);
                                if (ne != null)
                                        return ne;
                        }
@@ -1955,11 +1900,7 @@ namespace Mono.CSharp {
                                if (ne != null)
                                        return ne;
                        }
-
-                       ne = ExplicitUserConversion (ec, expr, target_type, loc);
-                       if (ne != null)
-                               return ne;
-
+                       
                        return null;
                }
 
@@ -1969,17 +1910,16 @@ namespace Mono.CSharp {
 
                        if (target_type.IsPointer){
                                if (expr_type.IsPointer)
-                                       return new EmptyCast (expr, target_type);
+                                       return EmptyCast.Create (expr, target_type);
 
                                if (expr_type == TypeManager.sbyte_type ||
                                        expr_type == TypeManager.short_type ||
-                                       expr_type == TypeManager.int32_type ||
-                                       expr_type == TypeManager.int64_type)
+                                       expr_type == TypeManager.int32_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I);
 
                                if (expr_type == TypeManager.ushort_type ||
                                        expr_type == TypeManager.uint32_type ||
-                                       expr_type == TypeManager.uint64_type ||
+                                       expr_type == TypeManager.uint64_type || expr_type == TypeManager.int64_type ||
                                        expr_type == TypeManager.byte_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U);
                        }
@@ -1997,11 +1937,8 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
                                else if (target_type == TypeManager.uint32_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
-                               else if (target_type == TypeManager.uint64_type)
+                               else if (target_type == TypeManager.uint64_type || target_type == TypeManager.int64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
-                               else if (target_type == TypeManager.int64_type){
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
-                               }
                        }
                        return null;
                }
@@ -2024,12 +1961,12 @@ namespace Mono.CSharp {
                        if (ne != null)
                                return ne;
 
-                       ne = ExplicitReferenceConversion (expr, target_type);
+                       ne = ExplicitReferenceConversion (expr, expr.Type, target_type);
                        if (ne != null)
                                return ne;
 
                        if (ec.InUnsafe && expr.Type == TypeManager.void_ptr_type && target_type.IsPointer)
-                               return new EmptyCast (expr, target_type);
+                               return EmptyCast.Create (expr, target_type);
 
                        expr.Error_ValueCannotBeConverted (ec, l, target_type, true);
                        return null;
@@ -2058,20 +1995,28 @@ namespace Mono.CSharp {
 
                                        e = ExplicitConversionCore (ec, expr, target, loc);
                                        if (e != null)
-                                               return Nullable.Wrap.Create (e, ec);
+                                               return Nullable.Wrap.Create (e, target_type);
                                }
                        } else if (TypeManager.IsNullableType (expr_type)) {
-                               Expression source = Nullable.Unwrap.Create (expr, ec);
-                               if (source != null) {
-                                       e = ExplicitConversionCore (ec, source, target_type, loc);
-                                       if (e != null)
-                                               return e;
-                               }
+                               e = Nullable.Unwrap.Create (expr, ec);
+
+                               bool use_class_cast;
+                               if (ImplicitBoxingConversionExists (e, target_type, out use_class_cast))
+                                       return new BoxedCast (expr, target_type);
+                               
+                               e = ExplicitConversion (ec, e, target_type, loc);
+                               if (e != null)
+                                       e = EmptyCast.Create (e, target_type);
+                               return e;
                        }
 #endif
                        e = ExplicitConversionCore (ec, expr, target_type, loc);
                        if (e != null)
                                return e;
+                       
+                       e = ExplicitUserConversion (ec, expr, target_type, loc);
+                       if (e != null)
+                               return e;                       
 
                        expr.Error_ValueCannotBeConverted (ec, loc, target_type, true);
                        return null;