* UTF8Encoding.cs - Implementation of the "System.Text.UTF8Encoding" class.
*
* Copyright (c) 2001, 2002 Southern Storm Software, Pty Ltd
+ * 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"),
using System;
[Serializable]
+[MonoTODO ("Fix serialization compatibility with MS.NET")]
+#if NET_2_0
+[MonoTODO ("EncoderFallback is not handled")]
+#endif
public class UTF8Encoding : Encoding
{
// Magic number used by Windows for UTF-8.
// Internal state.
private bool emitIdentifier;
+#if !NET_2_0
private bool throwOnInvalid;
+#endif
// Constructors.
public UTF8Encoding () : this (false, false) {}
: base (UTF8_CODE_PAGE)
{
emitIdentifier = encoderShouldEmitUTF8Identifier;
+#if NET_2_0
+ if (throwOnInvalidBytes)
+ SetFallbackInternal (null, new DecoderExceptionFallback ());
+ else
+ SetFallbackInternal (null, new DecoderReplacementFallback (String.Empty));
+#else
throwOnInvalid = throwOnInvalidBytes;
+#endif
web_name = body_name = header_name = "utf-8";
encoding_name = "Unicode (UTF-8)";
windows_code_page = UnicodeEncoding.UNICODE_CODE_PAGE;
}
+ #region GetByteCount()
+
// Internal version of "GetByteCount" which can handle a rolling
// state between multiple calls to this method.
- private static int InternalGetByteCount (char[] chars, int index, int count, uint leftOver, bool flush)
+ private static int InternalGetByteCount (char[] chars, int index, int count, ref char leftOver, bool flush)
{
// Validate the parameters.
if (chars == null) {
throw new ArgumentOutOfRangeException ("count", _("ArgRange_Array"));
}
+ if (index == chars.Length) {
+ if (flush && leftOver != '\0') {
+ // Flush the left-over surrogate pair start.
+ leftOver = '\0';
+ return 3;
+ }
+ return 0;
+ }
+
+ unsafe {
+ fixed (char* cptr = chars) {
+ return InternalGetByteCount (cptr + index, count, ref leftOver, flush);
+ }
+ }
+ }
+
+
+ private unsafe static int InternalGetByteCount (char* chars, int count, ref char leftOver, bool flush)
+ {
+ int index = 0;
+
// Determine the lengths of all characters.
char ch;
int length = 0;
- uint pair = leftOver;
+ char pair = leftOver;
while (count > 0) {
ch = chars[index];
if (pair == 0) {
length += 2;
} else if (ch >= '\uD800' && ch <= '\uDBFF') {
// This is the start of a surrogate pair.
- pair = (uint)ch;
+ pair = ch;
} else {
length += 3;
}
} else if (ch >= '\uDC00' && ch <= '\uDFFF') {
- // We have a surrogate pair.
- length += 4;
- pair = 0;
+ if (pair != 0) {
+ // We have a surrogate pair.
+ length += 4;
+ pair = '\0';
+ } else {
+ // We have a surrogate tail without
+ // leading surrogate. In NET_2_0 it
+ // uses fallback. In NET_1_1 we output
+ // wrong surrogate.
+ length += 3;
+ pair = '\0';
+ }
} else {
// We have a surrogate start followed by a
// regular character. Technically, this is
// We write out the surrogate start and then
// re-visit the current character again.
length += 3;
- pair = 0;
+ pair = '\0';
continue;
}
++index;
--count;
}
- if (flush && pair != 0) {
- // Flush the left-over surrogate pair start.
- length += 3;
+ if (flush) {
+ if (pair != '\0')
+ // Flush the left-over surrogate pair start.
+ length += 3;
+ leftOver = '\0';
}
+ else
+ leftOver = pair;
// Return the final length to the caller.
return length;
// Get the number of bytes needed to encode a character buffer.
public override int GetByteCount (char[] chars, int index, int count)
{
- return InternalGetByteCount (chars, index, count, 0, true);
+ char dummy = '\0';
+ return InternalGetByteCount (chars, index, count, ref dummy, true);
}
// Convenience wrappers for "GetByteCount".
throw new ArgumentNullException ("s");
}
- // Determine the lengths of all characters.
- char ch;
- int index = 0;
- int count = s.Length;
- int length = 0;
- uint pair;
- while (count > 0) {
- ch = s[index++];
- if (ch < '\u0080') {
- ++length;
- } else if (ch < '\u0800') {
- length += 2;
- } else if (ch >= '\uD800' && ch <= '\uDBFF' && count > 1) {
- // This may be the start of a surrogate pair.
- pair = (uint)(s[index]);
- if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
- length += 4;
- ++index;
- --count;
- } else {
- length += 3;
- }
- } else {
- length += 3;
+ unsafe {
+ fixed (char* cptr = s) {
+ char dummy = '\0';
+ return InternalGetByteCount (cptr, s.Length, ref dummy, true);
}
- --count;
}
-
- // Return the final length to the caller.
- return length;
}
+ #endregion
+
+ #region GetBytes()
+
// Internal version of "GetBytes" which can handle a rolling
// state between multiple calls to this method.
private static int InternalGetBytes (char[] chars, int charIndex,
int charCount, byte[] bytes,
- int byteIndex, ref uint leftOver,
+ int byteIndex, ref char leftOver,
bool flush)
{
// Validate the parameters.
throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
}
+ if (charIndex == chars.Length) {
+ if (flush && leftOver != 0) {
+ // Flush the left-over surrogate pair start.
+ bytes [byteIndex++] = 0xEF;
+ bytes [byteIndex++] = 0xBB;
+ bytes [byteIndex++] = 0xBF;
+ leftOver = '\0';
+ return 3;
+ }
+ return 0;
+ }
+
+ unsafe {
+ fixed (char* cptr = chars) {
+ fixed (byte *bptr = bytes) {
+ return InternalGetBytes (
+ cptr + charIndex, charCount,
+ bptr + byteIndex, bytes.Length - byteIndex,
+ ref leftOver, flush);
+ }
+ }
+ }
+ }
+
+ private unsafe static int InternalGetBytes (char* chars, int charCount,
+ byte* bytes, int byteCount,
+ ref char leftOver, bool flush)
+ {
+ int charIndex = 0;
+ int byteIndex = 0;
+
+ // Convert the characters into bytes.
// Convert the characters into bytes.
char ch;
- int length = bytes.Length;
- uint pair;
- uint left = leftOver;
+ int length = byteCount;
+ char pair = leftOver;
int posn = byteIndex;
+ int code = 0;
+
while (charCount > 0) {
// Fetch the next UTF-16 character pair value.
- ch = chars[charIndex++];
- --charCount;
- if (left == 0) {
- if (ch >= '\uD800' && ch <= '\uDBFF') {
- // This is the start of a surrogate pair.
- left = (uint)ch;
+ ch = chars [charIndex];
+ if (pair == '\0') {
+ if (ch < '\uD800' || ch >= '\uE000')
+ code = ch;
+ else if (ch < '\uDC00') {
+ // surrogate start
+ pair = ch;
+ ++charIndex;
+ --charCount;
+ continue;
+ } else { // ch <= '\uDFFF'
+ // We have a surrogate tail without leading
+ // surrogate. In NET_2_0 it uses fallback.
+ // In NET_1_1 we output wrong surrogate.
+ if ((posn + 3) > length) {
+ throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+ }
+ bytes [posn++] = (byte) (0xE0 | (ch >> 12));
+ bytes [posn++] = (byte) (0x80 | ((ch >> 6) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | (ch & 0x3F));
+ ++charIndex;
+ --charCount;
continue;
- } else {
- // This is a regular character.
- pair = (uint)ch;
}
- } else if (ch >= '\uDC00' && ch <= '\uDFFF') {
- // We have a surrogate pair.
- pair = ((left - (uint)0xD800) << 10) +
- (((uint)ch) - (uint)0xDC00) +
- (uint)0x10000;
- left = 0;
} else {
- // We have a surrogate start followed by a
- // regular character. Technically, this is
- // invalid, but we have to do something.
- // We write out the surrogate start and then
- // re-visit the current character again.
- pair = (uint)left;
- left = 0;
- --charIndex;
- ++charCount;
+ if ('\uDC00' <= ch && ch <= '\uDFFF')
+ code = 0x10000 + (int) ch - 0xDC00 +
+ (((int) pair - 0xD800) << 10);
+ else {
+ // We have a surrogate start followed by a
+ // regular character. Technically, this is
+ // invalid, but we have to do something.
+ // We write out the surrogate start and then
+ // re-visit the current character again.
+ if ((posn + 3) > length) {
+ throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+ }
+ bytes [posn++] = (byte) (0xE0 | (pair >> 12));
+ bytes [posn++] = (byte) (0x80 | ((pair >> 6) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | (pair & 0x3F));
+ pair = '\0';
+ continue;
+ }
+ pair = '\0';
}
+ ++charIndex;
+ --charCount;
// Encode the character pair value.
- if (pair < (uint)0x0080) {
- if (posn >= length) {
+ if (code < 0x0080) {
+ if (posn >= length)
throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)pair;
- } else if (pair < (uint)0x0800) {
- if ((posn + 2) > length) {
+ bytes [posn++] = (byte)code;
+ } else if (code < 0x0800) {
+ if ((posn + 2) > length)
throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)(0xC0 | (pair >> 6));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
- } else if (pair < (uint)0x10000) {
- if ((posn + 3) > length) {
+ bytes [posn++] = (byte) (0xC0 | (code >> 6));
+ bytes [posn++] = (byte) (0x80 | (code & 0x3F));
+ } else if (code < 0x10000) {
+ if ((posn + 3) > length)
throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)(0xE0 | (pair >> 12));
- bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+ bytes [posn++] = (byte) (0xE0 | (code >> 12));
+ bytes [posn++] = (byte) (0x80 | ((code >> 6) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | (code & 0x3F));
} else {
- if ((posn + 4) > length) {
+ if ((posn + 4) > length)
throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)(0xF0 | (pair >> 18));
- bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
- bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+ bytes [posn++] = (byte) (0xF0 | (code >> 18));
+ bytes [posn++] = (byte) (0x80 | ((code >> 12) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | ((code >> 6) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | (code & 0x3F));
}
}
- if (flush && left != 0) {
- // Flush the left-over surrogate pair start.
- if ((posn + 3) > length) {
- throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+
+ if (flush) {
+ if (pair != '\0') {
+ // Flush the left-over incomplete surrogate.
+ if ((posn + 3) > length) {
+ throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+ }
+ bytes [posn++] = (byte) (0xE0 | (pair >> 12));
+ bytes [posn++] = (byte) (0x80 | ((pair >> 6) & 0x3F));
+ bytes [posn++] = (byte) (0x80 | (pair & 0x3F));
}
- bytes[posn++] = (byte)(0xE0 | (left >> 12));
- bytes[posn++] = (byte)(0x80 | ((left >> 6) & 0x3F));
- bytes[posn++] = (byte)(0x80 | (left & 0x3F));
- left = 0;
+ leftOver = '\0';
}
- leftOver = left;
// Return the final count to the caller.
return posn - byteIndex;
}
+ private unsafe int Fallback (byte* bytes, int byteCount, char lead, char tail)
+ {
+ throw new NotImplementedException ();
+ }
+
// Get the bytes that result from encoding a character buffer.
public override int GetBytes (char[] chars, int charIndex, int charCount,
byte[] bytes, int byteIndex)
{
- uint leftOver = 0;
+ char leftOver = '\0';
return InternalGetBytes (chars, charIndex, charCount, bytes, byteIndex, ref leftOver, true);
}
throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
}
- // Convert the characters into bytes.
- char ch;
- int length = bytes.Length;
- uint pair;
- int posn = byteIndex;
- while (charCount > 0) {
- // Fetch the next UTF-16 character pair value.
- ch = s[charIndex++];
- if (ch >= '\uD800' && ch <= '\uDBFF' && charCount > 1) {
- // This may be the start of a surrogate pair.
- pair = (uint)(s[charIndex]);
- if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
- pair = (pair - (uint)0xDC00) +
- ((((uint)ch) - (uint)0xD800) << 10) +
- (uint)0x10000;
- ++charIndex;
- --charCount;
- } else {
- pair = (uint)ch;
- }
- } else {
- pair = (uint)ch;
- }
- --charCount;
+ if (charIndex == s.Length)
+ return 0;
- // Encode the character pair value.
- if (pair < (uint)0x0080) {
- if (posn >= length) {
- throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)pair;
- } else if (pair < (uint)0x0800) {
- if ((posn + 2) > length) {
- throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)(0xC0 | (pair >> 6));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
- } else if (pair < (uint)0x10000) {
- if ((posn + 3) > length) {
- throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+ unsafe {
+ fixed (char* cptr = s) {
+ fixed (byte *bptr = bytes) {
+ char dummy = '\0';
+ return InternalGetBytes (
+ cptr + charIndex, charCount,
+ bptr + byteIndex, bytes.Length - byteIndex,
+ ref dummy, true);
}
- bytes[posn++] = (byte)(0xE0 | (pair >> 12));
- bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
- } else {
- if ((posn + 4) > length) {
- throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
- }
- bytes[posn++] = (byte)(0xF0 | (pair >> 18));
- bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
- bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
- bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
}
}
-
- // Return the final count to the caller.
- return posn - byteIndex;
}
+ #endregion
+
+ // Internal version of "GetCharCount" which can handle a rolling
+ // state between multiple calls to this method.
+#if NET_2_0
// Internal version of "GetCharCount" which can handle a rolling
// state between multiple calls to this method.
- private static int InternalGetCharCount (byte[] bytes, int index, int count,
- uint leftOverBits,
- uint leftOverCount,
- bool throwOnInvalid, bool flush)
+ private static int InternalGetCharCount (
+ byte[] bytes, int index, int count, uint leftOverBits,
+ uint leftOverCount, object provider,
+ ref DecoderFallbackBuffer fallbackBuffer, bool flush)
+#else
+ private static int InternalGetCharCount (
+ byte[] bytes, int index, int count, uint leftOverBits,
+ uint leftOverCount, bool throwOnInvalid, bool flush)
+#endif
{
// Validate the parameters.
if (bytes == null) {
throw new ArgumentOutOfRangeException ("count", _("ArgRange_Array"));
}
+ int length = 0;
+
+ if (leftOverCount == 0) {
+ int end = index + count;
+ for (; index < end; index++, count--) {
+ if (bytes [index] < 0x80)
+ length++;
+ else
+ break;
+ }
+ }
+
// Determine the number of characters that we have.
uint ch;
- int length = 0;
uint leftBits = leftOverBits;
uint leftSoFar = (leftOverCount & (uint)0x0F);
uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
leftBits = (ch & (uint)0x03);
leftSoFar = 1;
leftSize = 5;
- } else if ((ch & (uint)0xFC) == (uint)0xFC) {
+ } else if ((ch & (uint)0xFE) == (uint)0xFC) {
// Six-byte UTF-8 character.
leftBits = (ch & (uint)0x03);
leftSoFar = 1;
leftSize = 6;
} else {
// Invalid UTF-8 start character.
- if (throwOnInvalid) {
+#if NET_2_0
+ length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
+#else
+ if (throwOnInvalid)
throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
- }
+#endif
}
} else {
// Process an extra byte in a multi-byte sequence.
if (++leftSoFar >= leftSize) {
// We have a complete character now.
if (leftBits < (uint)0x10000) {
- if (leftBits != (uint)0xFEFF) {
- // is it an overlong ?
- bool overlong = false;
- switch (leftSize) {
- case 2:
- overlong = (leftBits <= 0x7F);
- break;
- case 3:
- overlong = (leftBits <= 0x07FF);
- break;
- case 4:
- overlong = (leftBits <= 0xFFFF);
- break;
- case 5:
- overlong = (leftBits <= 0x1FFFFF);
- break;
- case 6:
- overlong = (leftBits <= 0x03FFFFFF);
- break;
- }
- if (overlong) {
- if (throwOnInvalid)
- throw new ArgumentException (_("Overlong"), leftBits.ToString ());
- }
- else
- ++length;
+ // is it an overlong ?
+ bool overlong = false;
+ switch (leftSize) {
+ case 2:
+ overlong = (leftBits <= 0x7F);
+ break;
+ case 3:
+ overlong = (leftBits <= 0x07FF);
+ break;
+ case 4:
+ overlong = (leftBits <= 0xFFFF);
+ break;
+ case 5:
+ overlong = (leftBits <= 0x1FFFFF);
+ break;
+ case 6:
+ overlong = (leftBits <= 0x03FFFFFF);
+ break;
}
+ if (overlong) {
+#if NET_2_0
+ length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Overlong"), leftBits.ToString ());
+#endif
+ }
+ else
+ ++length;
} else if (leftBits < (uint)0x110000) {
length += 2;
- } else if (throwOnInvalid) {
- throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+ } else {
+#if NET_2_0
+ length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#endif
}
leftSize = 0;
}
} else {
// Invalid UTF-8 sequence: clear and restart.
- if (throwOnInvalid) {
+#if NET_2_0
+ length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
+#else
+ if (throwOnInvalid)
throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
- }
+#endif
leftSize = 0;
--index;
++count;
}
}
}
- if (flush && leftSize != 0 && throwOnInvalid) {
+ if (flush && leftSize != 0) {
// We had left-over bytes that didn't make up
// a complete UTF-8 character sequence.
- throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#if NET_2_0
+ length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#endif
}
// Return the final length to the caller.
return length;
}
+#if NET_2_0
+ // for GetCharCount()
+ static int Fallback (object provider, ref DecoderFallbackBuffer buffer, byte [] bytes, int index)
+ {
+ if (buffer == null) {
+ DecoderFallback fb = provider as DecoderFallback;
+ if (fb != null)
+ buffer = fb.CreateFallbackBuffer ();
+ else
+ buffer = ((Decoder) provider).FallbackBuffer;
+ }
+ buffer.Fallback (bytes, index - 1);
+ return buffer.Remaining;
+ }
+
+ // for GetChars()
+ static void Fallback (object provider, ref DecoderFallbackBuffer buffer, byte [] bytes, int byteIndex,
+ char [] chars, ref int charIndex)
+ {
+ if (buffer == null) {
+ DecoderFallback fb = provider as DecoderFallback;
+ if (fb != null)
+ buffer = fb.CreateFallbackBuffer ();
+ else
+ buffer = ((Decoder) provider).FallbackBuffer;
+ }
+ buffer.Fallback (bytes, byteIndex - 1);
+ while (buffer.Remaining > 0)
+ chars [charIndex++] = buffer.GetNextChar ();
+ }
+#endif
+
// Get the number of characters needed to decode a byte buffer.
public override int GetCharCount (byte[] bytes, int index, int count)
{
+#if NET_2_0
+ DecoderFallbackBuffer buf = null;
+ return InternalGetCharCount (bytes, index, count, 0, 0, DecoderFallback, ref buf, true);
+#else
return InternalGetCharCount (bytes, index, count, 0, 0, throwOnInvalid, true);
+#endif
}
// Get the characters that result from decoding a byte buffer.
- private static int InternalGetChars (byte[] bytes, int byteIndex,
- int byteCount, char[] chars,
- int charIndex, ref uint leftOverBits,
- ref uint leftOverCount,
- bool throwOnInvalid, bool flush)
+#if NET_2_0
+ private static int InternalGetChars (
+ byte[] bytes, int byteIndex, int byteCount, char[] chars,
+ int charIndex, ref uint leftOverBits, ref uint leftOverCount,
+ object provider,
+ ref DecoderFallbackBuffer fallbackBuffer, bool flush)
+#else
+ private static int InternalGetChars (
+ byte[] bytes, int byteIndex, int byteCount, char[] chars,
+ int charIndex, ref uint leftOverBits, ref uint leftOverCount,
+ bool throwOnInvalid, bool flush)
+#endif
{
// Validate the parameters.
if (bytes == null) {
throw new ArgumentOutOfRangeException ("charIndex", _("ArgRange_Array"));
}
+ if (charIndex == chars.Length)
+ return 0;
+
+ int posn = charIndex;
+
+ if (leftOverCount == 0) {
+ int end = byteIndex + byteCount;
+ for (; byteIndex < end; posn++, byteIndex++, byteCount--) {
+ if (bytes [byteIndex] < 0x80)
+ chars [posn] = (char) bytes [byteIndex];
+ else
+ break;
+ }
+ }
+
// Convert the bytes into the output buffer.
uint ch;
int length = chars.Length;
- int posn = charIndex;
uint leftBits = leftOverBits;
uint leftSoFar = (leftOverCount & (uint)0x0F);
uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
- while (byteCount > 0) {
+
+ int byteEnd = byteIndex + byteCount;
+ if (byteEnd < 0 || byteEnd > bytes.Length)
+ throw new SystemException (String.Format ("INTERNAL ERROR: should not happen: {0} {1} {2}", byteIndex, byteCount, byteEnd));
+
+ for(; byteIndex < byteEnd; byteIndex++) {
// Fetch the next character from the byte buffer.
- ch = (uint)(bytes[byteIndex++]);
- --byteCount;
+ ch = (uint)(bytes[byteIndex]);
if (leftSize == 0) {
// Process a UTF-8 start character.
if (ch < (uint)0x0080) {
leftBits = (ch & (uint)0x03);
leftSoFar = 1;
leftSize = 5;
- } else if ((ch & (uint)0xFC) == (uint)0xFC) {
+ } else if ((ch & (uint)0xFE) == (uint)0xFC) {
// Six-byte UTF-8 character.
leftBits = (ch & (uint)0x03);
leftSoFar = 1;
leftSize = 6;
} else {
// Invalid UTF-8 start character.
- if (throwOnInvalid) {
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
- }
+#endif
}
} else {
// Process an extra byte in a multi-byte sequence.
if (++leftSoFar >= leftSize) {
// We have a complete character now.
if (leftBits < (uint)0x10000) {
- if (leftBits != (uint)0xFEFF) {
+ // is it an overlong ?
+ bool overlong = false;
+ switch (leftSize) {
+ case 2:
+ overlong = (leftBits <= 0x7F);
+ break;
+ case 3:
+ overlong = (leftBits <= 0x07FF);
+ break;
+ case 4:
+ overlong = (leftBits <= 0xFFFF);
+ break;
+ case 5:
+ overlong = (leftBits <= 0x1FFFFF);
+ break;
+ case 6:
+ overlong = (leftBits <= 0x03FFFFFF);
+ break;
+ }
+ if (overlong) {
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Overlong"), leftBits.ToString ());
+#endif
+ }
+ else if ((leftBits & 0xF800) == 0xD800) {
+ // UTF-8 doesn't use surrogate characters
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#endif
+ }
+ else {
if (posn >= length) {
throw new ArgumentException
(_("Arg_InsufficientSpace"), "chars");
}
- // is it an overlong ?
- bool overlong = false;
- switch (leftSize) {
- case 2:
- overlong = (leftBits <= 0x7F);
- break;
- case 3:
- overlong = (leftBits <= 0x07FF);
- break;
- case 4:
- overlong = (leftBits <= 0xFFFF);
- break;
- case 5:
- overlong = (leftBits <= 0x1FFFFF);
- break;
- case 6:
- overlong = (leftBits <= 0x03FFFFFF);
- break;
- }
- if (overlong) {
- if (throwOnInvalid)
- throw new ArgumentException (_("Overlong"), leftBits.ToString ());
- }
- else
- chars[posn++] = (char)leftBits;
+ chars[posn++] = (char)leftBits;
}
} else if (leftBits < (uint)0x110000) {
if ((posn + 2) > length) {
(uint)0xD800);
chars[posn++] =
(char)((leftBits & (uint)0x3FF) + (uint)0xDC00);
- } else if (throwOnInvalid) {
- throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+ } else {
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#endif
}
leftSize = 0;
}
} else {
// Invalid UTF-8 sequence: clear and restart.
- if (throwOnInvalid) {
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
- }
+#endif
leftSize = 0;
--byteIndex;
- ++byteCount;
}
}
}
- if (flush && leftSize != 0 && throwOnInvalid) {
+ if (flush && leftSize != 0) {
// We had left-over bytes that didn't make up
// a complete UTF-8 character sequence.
- throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#if NET_2_0
+ Fallback (provider, ref fallbackBuffer, bytes, byteIndex, chars, ref posn);
+#else
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
+#endif
}
leftOverBits = leftBits;
leftOverCount = (leftSoFar | (leftSize << 4));
{
uint leftOverBits = 0;
uint leftOverCount = 0;
+#if NET_2_0
+ DecoderFallbackBuffer buf = null;
+ return InternalGetChars (bytes, byteIndex, byteCount, chars,
+ charIndex, ref leftOverBits, ref leftOverCount, DecoderFallback, ref buf, true);
+#else
return InternalGetChars (bytes, byteIndex, byteCount, chars,
charIndex, ref leftOverBits, ref leftOverCount, throwOnInvalid, true);
+#endif
}
// Get the maximum number of bytes needed to encode a
// Get a UTF8-specific decoder that is attached to this instance.
public override Decoder GetDecoder ()
{
+#if NET_2_0
+ return new UTF8Decoder (DecoderFallback);
+#else
return new UTF8Decoder (throwOnInvalid);
+#endif
}
// Get a UTF8-specific encoder that is attached to this instance.
{
UTF8Encoding enc = (value as UTF8Encoding);
if (enc != null) {
+#if NET_2_0
+ return (codePage == enc.codePage &&
+ emitIdentifier == enc.emitIdentifier &&
+ DecoderFallback == enc.DecoderFallback &&
+ EncoderFallback == enc.EncoderFallback);
+#else
return (codePage == enc.codePage &&
emitIdentifier == enc.emitIdentifier &&
throwOnInvalid == enc.throwOnInvalid);
+#endif
} else {
return false;
}
[Serializable]
private class UTF8Decoder : Decoder
{
+#if !NET_2_0
private bool throwOnInvalid;
+#endif
private uint leftOverBits;
private uint leftOverCount;
// Constructor.
+#if NET_2_0
+ public UTF8Decoder (DecoderFallback fallback)
+#else
public UTF8Decoder (bool throwOnInvalid)
+#endif
{
+#if NET_2_0
+ Fallback = fallback;
+#else
this.throwOnInvalid = throwOnInvalid;
+#endif
leftOverBits = 0;
leftOverCount = 0;
}
// Override inherited methods.
public override int GetCharCount (byte[] bytes, int index, int count)
{
+#if NET_2_0
+ DecoderFallbackBuffer buf = null;
+ return InternalGetCharCount (bytes, index, count,
+ leftOverBits, leftOverCount, this, ref buf, false);
+#else
return InternalGetCharCount (bytes, index, count,
leftOverBits, leftOverCount, throwOnInvalid, false);
+#endif
}
public override int GetChars (byte[] bytes, int byteIndex,
int byteCount, char[] chars, int charIndex)
{
+#if NET_2_0
+ DecoderFallbackBuffer buf = null;
+ return InternalGetChars (bytes, byteIndex, byteCount,
+ chars, charIndex, ref leftOverBits, ref leftOverCount, this, ref buf, false);
+#else
return InternalGetChars (bytes, byteIndex, byteCount,
chars, charIndex, ref leftOverBits, ref leftOverCount, throwOnInvalid, false);
+#endif
}
} // class UTF8Decoder
private class UTF8Encoder : Encoder
{
private bool emitIdentifier;
- private uint leftOver;
+ private char leftOverForCount;
+ private char leftOverForConv;
// Constructor.
public UTF8Encoder (bool emitIdentifier)
{
this.emitIdentifier = emitIdentifier;
- leftOver = 0;
+ leftOverForCount = '\0';
+ leftOverForConv = '\0';
}
// Override inherited methods.
public override int GetByteCount (char[] chars, int index,
int count, bool flush)
{
- return InternalGetByteCount (chars, index, count, leftOver, flush);
+ return InternalGetByteCount (chars, index, count, ref leftOverForCount, flush);
}
public override int GetBytes (char[] chars, int charIndex,
- int charCount, byte[] bytes, int byteCount, bool flush)
+ int charCount, byte[] bytes, int byteIndex, bool flush)
+ {
+ int result;
+ result = InternalGetBytes (chars, charIndex, charCount, bytes, byteIndex, ref leftOverForConv, flush);
+ emitIdentifier = false;
+ return result;
+ }
+
+#if NET_2_0
+ public unsafe override int GetByteCount (char* chars, int count, bool flush)
+ {
+ return InternalGetByteCount (chars, count, ref leftOverForCount, flush);
+ }
+
+ public unsafe override int GetBytes (char* chars, int charCount,
+ byte* bytes, int byteCount, bool flush)
{
int result;
- result = InternalGetBytes (chars, charIndex, charCount, bytes, byteCount, ref leftOver, flush);
+ result = InternalGetBytes (chars, charCount, bytes, byteCount, ref leftOverForConv, flush);
emitIdentifier = false;
return result;
}
+#endif
} // class UTF8Encoder
projects / mono.git / blobdiff