2001-07-14 Jeffrey Stedfast <fejj@ximian.com>

	* String.cs: Apparently I needed to at least write stubs for the
	IConvertible interfaces. *sigh*

svn path=/trunk/mcs/; revision=137

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index a462bd935dd50ea79fc108f9f37714e0d30e7fbb..57ac6545bfb2a2a803e2485576d7edb04bff94a7 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
+
+       * String.cs: Apparently I needed to at least write stubs for the
+       IConvertible interfaces. *sigh*
+
 2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
 
        * String.cs: Many logic/other fixes and better usage of the

diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
index 194a83a48afcf7473216ff96c161f2fd2c964f50..568fa52a05693c78ad9b55cb205f62e98d62bc02 100644 (file)
--- a/mcs/class/corlib/System/String.cs
+++ b/mcs/class/corlib/System/String.cs
@@ -23,12 +23,14 @@
 
 using System;
 using System.Text;
+using System.Collections;
+using System.Globalization;
 
 namespace System {
 
-       public sealed class String : IComparable, IClonable, IConvertable, IEnumerable {
+       public sealed class String : IComparible, ICloneable, IConvertible, IEnumerable {
                public static readonly string Empty = "";
-               private char c_str[];
+               private char[] c_str;
                private int length;
 
                // Constructors
@@ -149,13 +151,13 @@ namespace System {
                        // FIXME: implement me
                }
 
-               protected ~String ()
+               ~String ()
                {
                        // FIXME: is there anything we need to do here?
                        base.Finalize ();
                }
 
-               protected string MemberwiseClone ()
+               protected override string MemberwiseClone ()
                {
                        // FIXME: implement me
                        return null;
@@ -184,7 +186,7 @@ namespace System {
                        // FIXME: if str.Length includes terminating null char, then return (str.Length - 1)
                        return str.Length;
                }
-               
+
                private char tolower (char c)
                {
                        // FIXME: make me unicode aware
@@ -213,7 +215,7 @@ namespace System {
                                return false;
                }
 
-               private int BoyerMoore (char haystack[], char needle[], int startIndex, int count)
+               private int BoyerMoore (char[] haystack, char[] needle, int startIndex, int count)
                {
                        /* (hopefully) Unicode-safe Boyer-Moore implementation */
                        char skiptable[65536];  /* our unicode-safe skip-table */
@@ -606,7 +608,7 @@ namespace System {
                        len = str0.Length + str1.Length + str2.Length;
                        if (len == 0)
                                return this.Empty;
-                       
+
                        concat = new string [len + 1];
                        for (i = 0; i < str0.Length; i++)
                                concat[i] = str0[i];
@@ -819,7 +821,7 @@ namespace System {
                                if (this.c_str[i] == value[0]) {
                                        bool equal = true;
                                        int j, offset;
-
+                                       
                                        offset = i - startIndex;
                                        for (j = 1; equal && value[j] != '\0' && offset + j < count; j++)
                                                equal = this.c_str[i + j] == value[j];
@@ -1065,6 +1067,7 @@ namespace System {
                                for (int j = 0; j < strlen (values); j++) {
                                        if (this.c_str[i] == values[j])
                                                return i;
+                               }
                        }
 
                        return -1;
@@ -1191,7 +1194,7 @@ namespace System {
                        return str;
                }
 
-               private int splitme (params char[] separators, int startIndex)
+               private int splitme (char[] separators, int startIndex)
                {
                        /* this is basically a customized IndexOfAny() for the Split() methods */
                        for (int i = startIndex; i < this.length, i++) {
@@ -1200,7 +1203,7 @@ namespace System {
                                                if (this.c_str[i] == sep)
                                                        return i - startIndex;
                                        }
-                               } else if (is_lwsp (this.c_str[i]))
+                               } else if (is_lwsp (this.c_str[i])) {
                                        return i - startIndex;
                                }
                        }
@@ -1260,7 +1263,7 @@ namespace System {
                        return strings;
                }
 
-               public string[] Split (params char[] separator, int maxCount)
+               public string[] Split (char[] separator, int maxCount)
                {
                        // FIXME: what to do if maxCount <= 0?
                        // FIXME: would using Queue be better than ArrayList?
@@ -1370,6 +1373,24 @@ namespace System {
                        return str;
                }
 
+               public override bool ToBoolean (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return false;
+               }
+
+               public override byte ToByte (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return '\0';
+               }
+
+               public override char ToChar (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return '\0';
+               }
+
                public char[] ToCharArray ()
                {
                        return ToCharArray (0, this.length);
@@ -1377,7 +1398,7 @@ namespace System {
 
                public char[] ToCharArray (int startIndex, int length)
                {
-                       char chars[];
+                       char[] chars;
                        int i, j;
 
                        if (startIndex < 0 || length < 0 || startIndex + length > this.length)
@@ -1392,6 +1413,42 @@ namespace System {
                        return chars;
                }
 
+               public override DateTime ToDateTime (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return null;
+               }
+
+               public override decimal ToDecimal (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return 0.0;
+               }
+
+               public override double ToDouble (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return 0.0;
+               }
+
+               public override short ToInt16 (IFormatProvider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
+               public override int ToInt32 (IFormatProvider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
+               public override long ToInt64 (IFormatProvider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
                public string ToLower ()
                {
                        string str;
@@ -1411,6 +1468,18 @@ namespace System {
                        return null;
                }
 
+               public override sbyte ToSByte (IFormatProvider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
+               public override float ToSingle (IFormatProvider)
+               {
+                       // FIXME: implement me
+                       return 0.0;
+               }
+
                public override string ToString ()
                {
                        return Substring (0, this.length);
@@ -1422,6 +1491,30 @@ namespace System {
                        return null;
                }
 
+               public override object ToType (Type conversionType, IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return null;
+               }
+
+               public override ushort ToUInt16 (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
+               public override uint ToUInt32 (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
+               public override ulong ToUInt64 (IFormatProvider provider)
+               {
+                       // FIXME: implement me
+                       return 0;
+               }
+
                public string ToUpper ()
                {
                        string str;
@@ -1521,4 +1614,15 @@ namespace System {
                        return Substring (begin, this.length - begin);
                }
        }
+
+       // Operators
+       public static bool operator ==(string a, string b)
+       {
+               return a == b;
+       }
+
+       public static bool operator !=(string a, string b)
+       {
+               return a != b;
+       }
 }