2008-09-24 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / mcs / constant.cs

diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
index 915b813e03589d01064156f3673cf57990d45f23..dd4b3e993701e9e1087a19e6c0145ec15d7eb22e 100644 (file)
--- a/mcs/mcs/constant.cs
+++ b/mcs/mcs/constant.cs
@@ -78,9 +78,11 @@ namespace Mono.CSharp {
 
                public override void Error_ValueCannotBeConverted (EmitContext ec, Location loc, Type target, bool expl)
                {
-                       if (!expl && IsLiteral && TypeManager.IsPrimitiveType (target) && TypeManager.IsPrimitiveType (type)) {
+                       if (!expl && IsLiteral && 
+                               (TypeManager.IsPrimitiveType (target) || type == TypeManager.decimal_type) &&
+                               (TypeManager.IsPrimitiveType (type) || type == TypeManager.decimal_type)) {
                                Report.Error (31, loc, "Constant value `{0}' cannot be converted to a `{1}'",
-                                       GetValue ().ToString (), TypeManager.CSharpName (target));
+                                       AsString (), TypeManager.CSharpName (target));
                        } else {
                                base.Error_ValueCannotBeConverted (ec, loc, target, expl);
                        }
@@ -186,9 +188,14 @@ namespace Mono.CSharp {
                                return TryReduce (ec, target_type);
                        }
                        catch (OverflowException) {
-                               Report.Error (221, loc, "Constant value `{0}' cannot be converted to a `{1}' (use `unchecked' syntax to override)",
-                                       GetValue ().ToString (), TypeManager.CSharpName (target_type));
-                               return null;
+                               if (ec.ConstantCheckState) {                            
+                                       Report.Error (221, loc, "Constant value `{0}' cannot be converted to a `{1}' (use `unchecked' syntax to override)",
+                                               GetValue ().ToString (), TypeManager.CSharpName (target_type));
+                               } else {
+                                       Error_ValueCannotBeConverted (ec, loc, target_type, false);
+                               }
+
+                               return New.Constantify (target_type);
                        }
                }
 
@@ -1443,56 +1450,56 @@ namespace Mono.CSharp {
                {
                        if (target_type == TypeManager.byte_type) {
                                if (in_checked_context){
-                                       if (Value < byte.MinValue || Value > byte.MaxValue)
+                                       if (Value < byte.MinValue || Value > byte.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ByteConstant ((byte) Value, Location);
                        }
                        if (target_type == TypeManager.sbyte_type) {
                                if (in_checked_context){
-                                       if (Value <  sbyte.MinValue || Value > sbyte.MaxValue)
+                                       if (Value < sbyte.MinValue || Value > sbyte.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new SByteConstant ((sbyte) Value, Location);
                        }
                        if (target_type == TypeManager.short_type) {
                                if (in_checked_context){
-                                       if (Value < short.MinValue || Value > short.MaxValue)
+                                       if (Value < short.MinValue || Value > short.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ShortConstant ((short) Value, Location);
                        }
                        if (target_type == TypeManager.ushort_type) {
                                if (in_checked_context){
-                                       if (Value < ushort.MinValue || Value > ushort.MaxValue)
+                                       if (Value < ushort.MinValue || Value > ushort.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new UShortConstant ((ushort) Value, Location);
                        }
                        if (target_type == TypeManager.int32_type) {
                                if (in_checked_context){
-                                       if (Value < int.MinValue || Value > int.MaxValue)
+                                       if (Value < int.MinValue || Value > int.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new IntConstant ((int) Value, Location);
                        }
                        if (target_type == TypeManager.uint32_type) {
                                if (in_checked_context){
-                                       if (Value < uint.MinValue || Value > uint.MaxValue)
+                                       if (Value < uint.MinValue || Value > uint.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new UIntConstant ((uint) Value, Location);
                        }
                        if (target_type == TypeManager.int64_type) {
                                if (in_checked_context){
-                                       if (Value < long.MinValue || Value > long.MaxValue)
+                                       if (Value < long.MinValue || Value > long.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new LongConstant ((long) Value, Location);
                        }
                        if (target_type == TypeManager.uint64_type) {
                                if (in_checked_context){
-                                       if (Value < ulong.MinValue || Value > ulong.MaxValue)
+                                       if (Value < ulong.MinValue || Value > ulong.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ULongConstant ((ulong) Value, Location);
@@ -1501,7 +1508,7 @@ namespace Mono.CSharp {
                                return new DoubleConstant ((double) Value, Location);
                        if (target_type == TypeManager.char_type) {
                                if (in_checked_context){
-                                       if (Value < (float) char.MinValue || Value > (float) char.MaxValue)
+                                       if (Value < (float) char.MinValue || Value > (float) char.MaxValue || float.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new CharConstant ((char) Value, Location);
@@ -1561,56 +1568,56 @@ namespace Mono.CSharp {
                {
                        if (target_type == TypeManager.byte_type) {
                                if (in_checked_context){
-                                       if (Value < Byte.MinValue || Value > Byte.MaxValue)
+                                       if (Value < Byte.MinValue || Value > Byte.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ByteConstant ((byte) Value, Location);
                        }
                        if (target_type == TypeManager.sbyte_type) {
                                if (in_checked_context){
-                                       if (Value < SByte.MinValue || Value > SByte.MaxValue)
+                                       if (Value < SByte.MinValue || Value > SByte.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new SByteConstant ((sbyte) Value, Location);
                        }
                        if (target_type == TypeManager.short_type) {
                                if (in_checked_context){
-                                       if (Value < short.MinValue || Value > short.MaxValue)
+                                       if (Value < short.MinValue || Value > short.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ShortConstant ((short) Value, Location);
                        }
                        if (target_type == TypeManager.ushort_type) {
                                if (in_checked_context){
-                                       if (Value < ushort.MinValue || Value > ushort.MaxValue)
+                                       if (Value < ushort.MinValue || Value > ushort.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new UShortConstant ((ushort) Value, Location);
                        }
                        if (target_type == TypeManager.int32_type) {
                                if (in_checked_context){
-                                       if (Value < int.MinValue || Value > int.MaxValue)
+                                       if (Value < int.MinValue || Value > int.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new IntConstant ((int) Value, Location);
                        }
                        if (target_type == TypeManager.uint32_type) {
                                if (in_checked_context){
-                                       if (Value < uint.MinValue || Value > uint.MaxValue)
+                                       if (Value < uint.MinValue || Value > uint.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new UIntConstant ((uint) Value, Location);
                        }
                        if (target_type == TypeManager.int64_type) {
                                if (in_checked_context){
-                                       if (Value < long.MinValue || Value > long.MaxValue)
+                                       if (Value < long.MinValue || Value > long.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new LongConstant ((long) Value, Location);
                        }
                        if (target_type == TypeManager.uint64_type) {
                                if (in_checked_context){
-                                       if (Value < ulong.MinValue || Value > ulong.MaxValue)
+                                       if (Value < ulong.MinValue || Value > ulong.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new ULongConstant ((ulong) Value, Location);
@@ -1619,7 +1626,7 @@ namespace Mono.CSharp {
                                return new FloatConstant ((float) Value, Location);
                        if (target_type == TypeManager.char_type) {
                                if (in_checked_context){
-                                       if (Value < (double) char.MinValue || Value > (double) char.MaxValue)
+                                       if (Value < (double) char.MinValue || Value > (double) char.MaxValue || double.IsNaN (Value))
                                                throw new OverflowException ();
                                }
                                return new CharConstant ((char) Value, Location);
@@ -1645,7 +1652,7 @@ namespace Mono.CSharp {
 
                override public string AsString ()
                {
-                       return Value.ToString ();
+                       return Value.ToString () + "M";
                }
 
                public override object GetValue ()