2003-04-22 Nick Drochak <ndrochak@gol.com>

	* Double.cs (ToString):
	* Single.cs (ToString): Handle case where param is a CultureInfo.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 0cc48691e74adc9be336de8629e68c34247fc1be..5b635e7d53b824b34d25923b4ef891ba6424a330 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-22  Nick Drochak  <ndrochak@gol.com>
+
+       * Double.cs (ToString):
+       * Single.cs (ToString): Handle case where param is a CultureInfo.
+
 2003-04-18  Zoltan Varga  <vargaz@freemail.hu>
 
        * Object.cs ValueType.cs: Make the Object::GetHashCode() and 

diff --git a/mcs/class/corlib/System/Double.cs b/mcs/class/corlib/System/Double.cs
index 337fa5907b4cd2b389f9e140da800b7af6a6a1f9..6240ca1d71f2b4f8248a568c8e8b5d23b25a30da 100644 (file)
--- a/mcs/class/corlib/System/Double.cs
+++ b/mcs/class/corlib/System/Double.cs
@@ -341,7 +341,12 @@ namespace System {
 
                public string ToString (string format, IFormatProvider fp)
                {
-                       return DoubleFormatter.NumberToString(format,
+//Console.WriteLine ("calling DoubleFormatter...{0}", fp);
+                       if (fp is CultureInfo)
+                               return DoubleFormatter.NumberToString(format,
+                               ((CultureInfo)fp).NumberFormat, value);
+                       else
+                               return DoubleFormatter.NumberToString(format,
                                (NumberFormatInfo)fp, value);
                }
 

diff --git a/mcs/class/corlib/System/Single.cs b/mcs/class/corlib/System/Single.cs
index cc86061f8a6ad572b39d333863d444be66e01cc1..403c612e692d7b1571c57cf538136343a82720ab 100644 (file)
--- a/mcs/class/corlib/System/Single.cs
+++ b/mcs/class/corlib/System/Single.cs
@@ -126,7 +126,11 @@ namespace System {
 
                public string ToString (string format, IFormatProvider fp)
                {
-                       return SingleFormatter.NumberToString(format,
+                       if (fp is CultureInfo)
+                               return SingleFormatter.NumberToString(format,
+                               ((CultureInfo)fp).NumberFormat, value);
+                       else
+                               return SingleFormatter.NumberToString(format,
                                (NumberFormatInfo)fp, value);
                }