Mon Dec 5 15:14:59 CET 2005 Paolo Molaro <lupus@ximian.com>

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

diff --git a/mcs/class/corlib/System/DoubleFormatter.cs b/mcs/class/corlib/System/DoubleFormatter.cs
index 92fa5c87e0cfca0b7b5625462dd00917ce741f4b..25e35798b975587e6e27514083dfb9eabc638210 100644 (file)
--- a/mcs/class/corlib/System/DoubleFormatter.cs
+++ b/mcs/class/corlib/System/DoubleFormatter.cs
@@ -5,30 +5,53 @@
 //   Pedro Martinez Juliá  <yoros@wanadoo.es>
 //
 // Copyright (C) 2003 Pedro Martínez Juliá <yoros@wanadoo.es>
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Text;
 using System.Collections;
 using System.Globalization;
 
-
-namespace System {
-
-       internal class DoubleFormatter {
+namespace System
+{
+       internal class DoubleFormatter
+       {
+               private static FloatingPointFormatter fpf;
 
                const double p = 100000000000000.0d;
                const double p10 = 1000000000000000.0;
                const int dec_len = 14;
                const int dec_len_min = -30;
+               const double p2 = 10000000000000000.0d;
+               const double p102 = 100000000000000000.0;
+               const int dec_len2 = 16;
+               const int dec_len_min2 = -34;
 
-               public static string NumberToString (string format,
-                               NumberFormatInfo nfi, double value) {
-                       FloatingPointFormatter fpf = new FloatingPointFormatter(format,
-                                       nfi, value, p, p10, dec_len, dec_len_min);
-                       return fpf.String;
+               internal static string NumberToString (string format, NumberFormatInfo nfi, double value)
+               {
+                       if (fpf == null) {
+                               fpf = new FloatingPointFormatter (p, p10, dec_len, dec_len_min, p2, p102, dec_len2, dec_len_min2);
+                       }
+                       return fpf.GetStringFrom (format, nfi, value);
                }
-               
        }
-
 }