* corlib.dll.sources: Removed DecimalFormatter.cs.

* DecimalFormatter.cs: Removed obsolete class, as it has been replaced
by NumberFormatter.
* DoubleFormatter.cs: Same.
* SingleFormatter.cs: Same.

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

5 files changed, 11 insertions, 521 deletions

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index f284f39a611..aacff607c2c 100644
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-26  Gert Driesen  <drieseng@users.sourceforge.net>
+
+	* corlib.dll.sources: Removed DecimalFormatter.cs.
+
 2006-02-14  Ankit Jain  <jankit@novell.com>
 
 	* corlib_test.dll.sources: Add ArraySegmentTest.cs
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 1741e94a1ac..a725b277a6e 100644
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-26  Gert Driesen  <drieseng@users.souceforge.net>
+
+	* DecimalFormatter.cs: Removed obsolete class, as it has been replaced
+	by NumberFormatter.
+	* DoubleFormatter.cs: Same.
+	* SingleFormatter.cs: Same.
+
 2006-02-21  Marek Safar  <marek.safar@seznam.cz>
 
 	* String.cs (Equals): Optimized for speed.
diff --git a/mcs/class/corlib/System/DecimalFormatter.cs b/mcs/class/corlib/System/DecimalFormatter.cs
deleted file mode 100644
index 959b86745e0..00000000000
--- a/mcs/class/corlib/System/DecimalFormatter.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-//
-// System.DecimalFormatter.cs
-//
-// Author:
-//   Martin Weindel (martin.weindel@t-online.de)
-//
-// (C) Martin Weindel, Derek Holden  dholden@draper.com
-//
-
-//
-// 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.
-//
-
-//
-// Internal class for formatting decimal numbers. 
-
-using System.Globalization;
-using System.Text;
-using System;
-
-namespace System 
-{
-
-    internal sealed class DecimalFormatter 
-    {
-
-        private static bool ParseFormat (string format, out char specifier,  out int precision)
-        {		 		 
-            precision = -1;
-            specifier = '\0';
-		    
-            int length = format.Length;
-            if (length < 1 || length > 3)
-                return false;
-		    
-            char[] chars = format.ToCharArray ();
-            specifier = Char.ToUpperInvariant(chars[0]);
-
-            if (length == 1) 
-                return true;
-		    
-            if (length == 2) 
-            {
-                if (chars[1] < '0' || chars[1] > '9')
-                    return false;
-			    
-                precision = chars[1] - '0';
-            } 
-            else 
-            {
-                if (chars[1] < '0' || chars[2] < '0' || chars[1] > '9' || chars[2] > '9')
-                    return false;
-			    
-                precision = (chars[1] - '0') * 10 + (chars[2] - '0');
-            }
-		    
-            return true;
-        }	 
-
-        public static string NumberToString(string format, NumberFormatInfo nfi, Decimal value)
-        {
-            char specifier;
-            int precision;
-	    format = format.Trim ();
-            if (!DecimalFormatter.ParseFormat(format, out specifier, out precision)) 
-            {
-                throw new FormatException (Locale.GetText ("The specified format is invalid"));
-            }
-
-            int digits = -1;
-            int decimals = 0;
-            // first calculate number of digits or decimals needed for format
-            switch (specifier)
-            {
-                case 'C':
-                    decimals = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;
-                    break;
-                case 'F': goto case 'N'; 
-                case 'N':
-                    decimals = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
-                    break;
-                case 'G':
-                    digits = (precision >= 0) ? precision : 0;
-                    break;
-                case 'E': 
-                    digits = (precision >= 0) ? precision+1 : 7;
-                    break;
-                case 'P': 
-                    decimals = (precision >= 0) ? precision+2 : nfi.PercentDecimalDigits+2;
-                    break;
-                case 'Z':
-                    digits = 0;
-                    break;
-            }
-
-            // get digit string
-            const int bufSize = 40;
-            int decPos = 0, sign = 0;
-            char[] buf = new char[bufSize];
-            if (Decimal.decimal2string(ref value, digits, decimals, buf, bufSize, out decPos, out sign) != 0) 
-            {
-                throw new FormatException(); // should never happen 
-            }
-
-		string TempString = new String(buf);
-		TempString = TempString.Trim(new char[] {(char)0x0});
-		StringBuilder sb = new StringBuilder(TempString, TempString.Length);
-
-	    if (sb.ToString () == String.Empty && decPos > 0 && sign == 0)
-		    sb.Append ('0');
-
-            // now build the format
-            switch (specifier)
-            {
-                case 'C': return FormatCurrency(nfi, sb, decimals, decPos, sign);
-                case 'N': return FormatNumber(nfi, sb, decimals, decPos, sign);
-                case 'F': return FormatFixedPoint(nfi, sb, decimals, decPos, sign);
-                case 'G': return FormatGeneral(nfi, sb, digits, decPos, sign, format[0]);
-                case 'E': return FormatExponential(nfi, sb, digits, decPos, sign, format[0], true);
-                case 'P': return FormatPercent(nfi, sb, decimals, decPos, sign);
-                case 'Z': return FormatNormalized(nfi, sb, digits, decPos, sign);
-                default: 
-                    throw new FormatException (Locale.GetText ("The specified format is invalid"));
-            }
-        }
-
-        private static string FormatFixedPoint(NumberFormatInfo nfi, StringBuilder sb, 
-            int decimals, int decPos, int sign)
-        {
-            if (decimals > 0)
-            {
-                sb.Insert((decPos <= 0) ? 1 : decPos, nfi.NumberDecimalSeparator);
-            }
-
-            if (sign != 0) 
-            {
-                sb.Insert(0, nfi.NegativeSign);
-            }
-
-            return sb.ToString();
-        }
-
-        private static string FormatExponential(NumberFormatInfo nfi, StringBuilder sb, 
-            int digits, int decPos, int sign, char echar, bool exp3flag)
-        {
-            // insert decimal separator
-            if (digits > 1 || (digits == 0 && sb.Length > 1)) 
-            {
-                sb.Insert(1, nfi.NumberDecimalSeparator);
-            }
-
-            // insert sign
-            if (sign != 0)
-            {
-                sb.Insert(0, nfi.NegativeSign);
-            }
-
-            // append exponent
-            sb.Append(echar);
-            decPos--;
-            sb.Append((decPos >= 0) ? nfi.PositiveSign : nfi.NegativeSign);
-            if (decPos < 0) decPos *= -1;
-            if (exp3flag) sb.Append('0');
-            sb.Append((char)('0' + decPos/10));
-            sb.Append((char)('0' + decPos%10));
-
-            return sb.ToString();
-        }
-
-        private static string FormatGeneral(NumberFormatInfo nfi, StringBuilder sb, 
-            int digits, int decPos, int sign, char gchar)
-        {
-		int dig = digits;
-#if NET_1_0
-		bool bFix = (digits == 0 && decPos >= -3) || (digits >= decPos && decPos >= -3 && digits != 0);
-#else
-		bool bFix = ((digits == 0) || ((digits >= decPos) && (digits != 0)));
-#endif
-		if (digits > 0) {
-			// remove trailing digits
-			while (sb.Length > 1 && (sb.Length > decPos || !bFix) && sb [sb.Length-1] == '0') {
-				sb.Remove (sb.Length-1, 1);
-				if (dig != 0)
-					dig--;
-			}
-		}
-
-		if (bFix) {
-			while (decPos <= 0) {
-				sb.Insert (0, '0');
-				if (dig != 0 && decPos != 0)
-					dig++;
-				decPos++;
-			}
-			return FormatFixedPoint(nfi, sb, sb.Length - decPos, decPos, sign);
-		}
-		else {
-			return FormatExponential(nfi, sb, dig, decPos, sign, (char)(gchar-2), false);
-		}
-        }
-
-        private static string FormatGroupAndDec(StringBuilder sb, int decimals, int decPos, 
-            int[] groupSizes, string groupSeparator, string decSeparator)
-        {
-            int offset = 0;
-
-            // Groups
-            if (decPos > 0) 
-            {
-                if (groupSizes != null) 
-                {
-                    int lastSize = 0;
-                    int digitCount = 0;
-                    for (int i = 0; i < groupSizes.GetLength(0); i++) 
-                    {
-                        int size = groupSizes[i];
-                        if (size > 0) 
-                        {
-                            digitCount += size;
-                            if (digitCount < decPos) 
-                            {
-                                sb.Insert(decPos - digitCount, groupSeparator);
-                                offset += groupSeparator.Length;
-                            }
-                        }
-                        lastSize = size;
-                    }
-
-                    if (lastSize > 0) 
-                    {
-                        while (true) 
-                        {
-                            digitCount +=lastSize;
-                            if (digitCount >= decPos) break;
-                            sb.Insert(decPos - digitCount, groupSeparator);
-                            offset += groupSeparator.Length;
-                        }
-                    }
-                }
-            }
-
-            if ((decimals > 0) && (decPos+offset < sb.Length))
-            {
-                sb.Insert(offset + ((decPos <= 0) ? 1 : decPos), decSeparator);
-            }
-
-            return sb.ToString();
-        }
-
-        private static string FormatNumber(NumberFormatInfo nfi, StringBuilder sb, 
-            int decimals, int decPos, int sign)
-        {
-            string s = FormatGroupAndDec(sb, decimals, decPos,
-                nfi.NumberGroupSizes, nfi.NumberGroupSeparator, nfi.NumberDecimalSeparator);
-
-            // sign
-            if (sign != 0) 
-            {
-                switch (nfi.NumberNegativePattern)
-                {
-                    case 0:
-                        return "(" + s + ")";
-                    case 1:
-                        return nfi.NegativeSign + s;
-                    case 2:
-                        return nfi.NegativeSign + " " + s;
-                    case 3:
-                        return s + nfi.NegativeSign;
-                    case 4:
-                        return s + " " + nfi.NegativeSign;
-                    default:
-                        throw new ArgumentException(Locale.GetText ("Invalid NumberNegativePattern"));
-                }
-            } 
-            else 
-            {
-                return s;
-            }
-        }
-
-        private static string FormatCurrency(NumberFormatInfo nfi, StringBuilder sb, 
-            int decimals, int decPos, int sign)
-        {
-            string s = FormatGroupAndDec(sb, decimals, decPos,
-                nfi.CurrencyGroupSizes, nfi.CurrencyGroupSeparator, nfi.CurrencyDecimalSeparator);
-
-            if (sign != 0) 
-            { // negative
-                switch (nfi.CurrencyNegativePattern) 
-                {
-                    case 0:
-                        return "(" + nfi.CurrencySymbol + s + ")";
-                    case 1:
-                        return nfi.NegativeSign + nfi.CurrencySymbol + s;
-                    case 2:
-                        return nfi.CurrencySymbol + nfi.NegativeSign + s;
-                    case 3:
-                        return nfi.CurrencySymbol + s + nfi.NegativeSign;
-                    case 4:
-                        return "(" + s + nfi.CurrencySymbol + ")";
-                    case 5:
-                        return nfi.NegativeSign + s + nfi.CurrencySymbol;
-                    case 6:
-                        return s + nfi.NegativeSign + nfi.CurrencySymbol;
-                    case 7:
-                        return s + nfi.CurrencySymbol + nfi.NegativeSign;
-                    case 8:
-                        return nfi.NegativeSign + s + " " + nfi.CurrencySymbol;
-                    case 9:
-                        return nfi.NegativeSign + nfi.CurrencySymbol + " " + s;
-                    case 10:
-                        return s + " " + nfi.CurrencySymbol + nfi.NegativeSign;
-                    case 11:
-                        return nfi.CurrencySymbol + " " + s + nfi.NegativeSign;
-                    case 12:
-                        return nfi.CurrencySymbol + " " + nfi.NegativeSign + s;
-                    case 13:
-                        return s + nfi.NegativeSign + " " + nfi.CurrencySymbol;
-                    case 14:
-                        return "(" + nfi.CurrencySymbol + " " + s + ")";
-                    case 15:
-                        return "(" + s + " " + nfi.CurrencySymbol + ")";
-                    default:
-                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyNegativePattern"));
-                }
-            }
-            else 
-            {
-                switch (nfi.CurrencyPositivePattern) 
-                {
-                    case 0:
-                        return nfi.CurrencySymbol + s;
-                    case 1:
-                        return s + nfi.CurrencySymbol;
-                    case 2:
-                        return nfi.CurrencySymbol + " " + s;
-                    case 3:
-                        return s + " " + nfi.CurrencySymbol;
-                    default:
-                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyPositivePattern"));
-                }
-            }
-        }
-
-        private static string FormatPercent(NumberFormatInfo nfi, StringBuilder sb, 
-            int decimals, int decPos, int sign)
-        {
-            string s = FormatGroupAndDec(sb, decimals, decPos+2, 
-                nfi.PercentGroupSizes, nfi.PercentGroupSeparator, nfi.PercentDecimalSeparator);
-
-            if (sign != 0) 
-            { // negative
-                switch (nfi.PercentNegativePattern) 
-                {
-                    case 0:
-                        return nfi.NegativeSign + s + " " + nfi.PercentSymbol;
-                    case 1:
-                        return nfi.NegativeSign + s + nfi.PercentSymbol;
-                    case 2:
-                        return nfi.NegativeSign + nfi.PercentSymbol + s;
-                    default:
-                        throw new ArgumentException(Locale.GetText ("Invalid PercentNegativePattern"));
-                }
-            }
-            else 
-            {
-                switch (nfi.PercentPositivePattern) 
-                {
-                    case 0:
-                        return s + " " + nfi.PercentSymbol;
-                    case 1:
-                        return s + nfi.PercentSymbol;
-                    case 2:
-                        return nfi.PercentSymbol + s;
-                    default:
-                        throw new ArgumentException("Invalid PercentPositivePattern");
-                }
-            }
-        }
-
-	[MonoTODO]
-        private static string FormatNormalized(NumberFormatInfo nfi, StringBuilder sb, 
-            int digits, int decPos, int sign)
-        {
-            //LAMESPEC: how should this format look like ? Is this a fixed point format ?
-	    throw new NotImplementedException ();
-        }
-    }
-}
diff --git a/mcs/class/corlib/System/DoubleFormatter.cs b/mcs/class/corlib/System/DoubleFormatter.cs
deleted file mode 100644
index 25e35798b97..00000000000
--- a/mcs/class/corlib/System/DoubleFormatter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.DoubleFormatter.cs
-//
-// Author:
-//   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.Text;
-using System.Collections;
-using System.Globalization;
-
-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;
-
-		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);
-		}
-	}
-}
diff --git a/mcs/class/corlib/System/SingleFormatter.cs b/mcs/class/corlib/System/SingleFormatter.cs
deleted file mode 100644
index a2e071d1ad6..00000000000
--- a/mcs/class/corlib/System/SingleFormatter.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// System.SingleFormatter.cs
-//
-// Author:
-//   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.Globalization;
-
-namespace System {
-
-	internal class SingleFormatter {
-
-		private static FloatingPointFormatter fpf;
-
-		const double p = 1000000.0d;
-		const double p10 = 10000000.0;
-		const int dec_len = 6;
-		const int dec_len_min = -14;
-
-		const double p2 = 10000000.0d;
-		const double p102 = 100000000.0;
-		const int dec_len2 = 7;
-		const int dec_len_min2 = -16;
-
-		public static string NumberToString (string format, NumberFormatInfo nfi, float 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);
-		}
-	}
-}