2002-08-21 Miguel de Icaza <miguel@ximian.com>

[mono.git] / mcs / class / corlib / System / Char.cs

diff --git a/mcs/class/corlib/System/Char.cs b/mcs/class/corlib/System/Char.cs
index 328e1a94211027218ae84d8aafa99e21ff090802..58e5dc33ab6b007959447b33e2e86857f7ff2914 100644 (file)
--- a/mcs/class/corlib/System/Char.cs
+++ b/mcs/class/corlib/System/Char.cs
@@ -19,7 +19,8 @@ using System.Runtime.CompilerServices;
 
 namespace System {
        
-       public struct Char : IComparable { //, IFormattable, IConvertible {
+       [Serializable]
+       public struct Char : IComparable, IConvertible { //, IFormattable {
                public const char MaxValue = (char) 0xffff;
                public const char MinValue = (char) 0;
                
@@ -278,13 +279,9 @@ namespace System {
                        if (str == null)
                                throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
 
-                       int len = str.Length;
-                       if (len != 1){
-                               if (len < 1)
-                                       throw new ArgumentNullException ();
-                               else
-                                       throw new FormatException ();
-                       }
+                       if (str.Length != 1)
+                               throw new FormatException ("string contains more than one character.");
+                       
                        return str [0];
                }
 
@@ -313,5 +310,90 @@ namespace System {
                {
                        return TypeCode.Char;
                }         
+
+               object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+               {
+                       return System.Convert.ToType(value, conversionType, provider);
+               }
+               
+               bool IConvertible.ToBoolean (IFormatProvider provider)
+               {
+                       throw new InvalidCastException();
+               }
+               
+               byte IConvertible.ToByte (IFormatProvider provider)
+               {
+                       return System.Convert.ToByte(value);
+               }
+               
+               char IConvertible.ToChar (IFormatProvider provider)
+               {
+                       return value;
+               }
+               
+               [CLSCompliant(false)]
+               DateTime IConvertible.ToDateTime (IFormatProvider provider)
+               {
+                       throw new InvalidCastException();
+               }
+               
+               decimal IConvertible.ToDecimal (IFormatProvider provider)
+               {
+                       throw new InvalidCastException();
+               }
+               
+               double IConvertible.ToDouble (IFormatProvider provider)
+               {
+                       throw new InvalidCastException();
+               }
+               
+               short IConvertible.ToInt16 (IFormatProvider provider)
+               {
+                       return System.Convert.ToInt16(value);
+               }
+               
+               int IConvertible.ToInt32 (IFormatProvider provider)
+               {
+                       return System.Convert.ToInt32(value);
+               }
+               
+               long IConvertible.ToInt64 (IFormatProvider provider)
+               {
+                       return System.Convert.ToInt64(value);
+               }
+               
+               [CLSCompliant(false)] 
+               sbyte IConvertible.ToSByte (IFormatProvider provider)
+               {
+                       return System.Convert.ToSByte(value);
+               }
+               
+               float IConvertible.ToSingle (IFormatProvider provider)
+               {
+                       throw new InvalidCastException();
+               }
+               
+               string IConvertible.ToString (IFormatProvider provider)
+               {
+                       return ToString(provider);
+               }
+
+               [CLSCompliant(false)]
+               ushort IConvertible.ToUInt16 (IFormatProvider provider)
+               {
+                       return System.Convert.ToUInt16(value);
+               }
+               
+               [CLSCompliant(false)]
+               uint IConvertible.ToUInt32 (IFormatProvider provider)
+               {
+                       return System.Convert.ToUInt32(value);
+               }
+               
+               [CLSCompliant(false)]
+               ulong IConvertible.ToUInt64 (IFormatProvider provider)
+               {
+                       return System.Convert.ToUInt64(value);
+               }
        }
 }