2004-06-14 Atsushi Enomoto <atsushi@ximian.com>

* FloatingPointFormatter.cs : Recognize '%' and '\u2030' and replace them with matching NumberFormatInfo properties. svn path=/trunk/mcs/; revision=29487
baulig · Jun 14, 2004 · acb6944 · acb6944
1 parent 39782ca
commit acb6944
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-14  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* FloatingPointFormatter.cs : Recognize '%' and '\u2030' and replace
+	  them with matching NumberFormatInfo properties.
+
 2004-06-14  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* Double.cs : Use IFormatProvider.GetFormat() instead of literal '-'.

diff --git a/mcs/class/corlib/System/FloatingPointFormatter.cs b/mcs/class/corlib/System/FloatingPointFormatter.cs
@@ -877,6 +877,10 @@ private string FormatCustomParser (Format formatData, double value,
 					else if (format[i] == '\\') {
 						sb.Append(format[++i]);
 					}
+					else if (format [i] == '%')
+						sb.Append (nfi.PercentSymbol);
+					else if (format [i] == '\u2030')
+						sb.Append (nfi.PerMilleSymbol);
 					else {
 						sb.Append(format[i]);
 					}
@@ -904,6 +908,10 @@ private string FormatCustomParser (Format formatData, double value,
 						}
 					}
 				}
+				else if (format [i] == '%')
+					sb.Insert (0, nfi.PercentSymbol);
+				else if (format [i] == '\u2030')
+					sb.Insert (0, nfi.PerMilleSymbol);
 				else if (format[i] != ',') {
 					sb.Insert(0, format[i]);
 				}
@@ -931,7 +939,11 @@ private string FormatCustomParser (Format formatData, double value,
 				mantissa /= 10;
 			}
 			for (int i = f.FirstFormatPos - 1; i >= 0; i--) {
-				if (format [i] != '.')
+				if (format [i] == '%')
+					sb.Insert (0, nfi.PercentSymbol);
+				else if (format [i] == '\u2030')
+					sb.Insert (0, nfi.PerMilleSymbol);
+				else if (format [i] != '.')
 					sb.Insert(0, format[i]);
 			}
 			return sb.ToString();