Author: atsushi
Date: 2005-11-28 00:10:05 -0500 (Mon, 28 Nov 2005)
New Revision: 53539
Modified:
trunk/mcs/class/corlib/System.Text/ChangeLog
trunk/mcs/class/corlib/System.Text/Encoding.cs
Log:
2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* Encoding.cs : added UTF32.
Modified: trunk/mcs/class/corlib/System.Text/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Text/ChangeLog 2005-11-28 04:33:46 UTC
(rev 53538)
+++ trunk/mcs/class/corlib/System.Text/ChangeLog 2005-11-28 05:10:05 UTC
(rev 53539)
@@ -1,5 +1,9 @@
2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * Encoding.cs : added UTF32.
+
+2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* UTF32Encoding.cs : surrogate pairs vanished in GetBytes() when the
endianness is big.
Modified: trunk/mcs/class/corlib/System.Text/Encoding.cs
===================================================================
--- trunk/mcs/class/corlib/System.Text/Encoding.cs 2005-11-28 04:33:46 UTC
(rev 53538)
+++ trunk/mcs/class/corlib/System.Text/Encoding.cs 2005-11-28 05:10:05 UTC
(rev 53539)
@@ -405,6 +405,11 @@
case UTF8Encoding.UTF8_CODE_PAGE:
return UTF8;
+#if NET_2_0
+ case UTF32Encoding.UTF32_CODE_PAGE:
+ return UTF32;
+#endif
+
case UnicodeEncoding.UNICODE_CODE_PAGE:
return Unicode;
@@ -514,6 +519,14 @@
UnicodeEncoding.BIG_UNICODE_CODE_PAGE,
"unicodefffe", "utf_16be",
+#if NET_2_0
+ UTF32Encoding.UTF32_CODE_PAGE,
+ "utf_32", "UTF_32LE", "ucs_4",
+
+ UTF32Encoding.BIG_UTF32_CODE_PAGE,
+ "UTF_32BE",
+#endif
+
Latin1Encoding.ISOLATIN_CODE_PAGE,
"iso_8859_1", "latin1"
};
@@ -707,7 +720,10 @@
static volatile Encoding unicodeEncoding;
static volatile Encoding isoLatin1Encoding;
static volatile Encoding unixConsoleEncoding;
-
+#if NET_2_0
+ static volatile Encoding utf32Encoding;
+#endif
+
static readonly object lockobj = new object ();
// Get the standard ASCII encoding object.
@@ -878,6 +894,25 @@
}
}
+#if NET_2_0
+ // Get the standard little-endian UTF-32 encoding object.
+ public static Encoding UTF32
+ {
+ get {
+ if (utf32Encoding == null) {
+ lock (lockobj) {
+ if (utf32Encoding == null) {
+ utf32Encoding = new
UTF32Encoding (false, true);
+ utf32Encoding.is_readonly =
true;
+ }
+ }
+ }
+
+ return utf32Encoding;
+ }
+ }
+#endif
+
// Forwarding decoder implementation.
private sealed class ForwardingDecoder : Decoder
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
