{
using System;
+using System.Runtime.InteropServices;
[Serializable]
-[MonoTODO ("Fix serialization compatibility with MS.NET")]
+#if NET_2_0
+[ComVisible (true)]
+#endif
+[MonoTODO ("Serialization format not compatible with .NET")]
public class ASCIIEncoding : Encoding
{
// Magic number used by Windows for "ASCII".
}
#if NET_2_0
+ [ComVisible (false)]
public override bool IsSingleByte {
get { return true; }
}
}
// Convenience wrappers for "GetByteCount".
- public override int GetByteCount (String s)
+ public override int GetByteCount (String chars)
{
- if (s == null) {
- throw new ArgumentNullException ("s");
+ if (chars == null) {
+ throw new ArgumentNullException ("chars");
}
- return s.Length;
+ return chars.Length;
}
// Get the bytes that result from encoding a character buffer.
}
// Convenience wrappers for "GetBytes".
- public override int GetBytes (String s, int charIndex, int charCount, byte[] bytes, int byteIndex)
+ public override int GetBytes (String chars, int charIndex, int charCount, byte[] bytes, int byteIndex)
{
#if NET_2_0
// I know this #if is ugly, but I think it is the simplest switch.
EncoderFallbackBuffer buffer = null;
char [] fallback_chars = null;
- return GetBytes (s, charIndex, charCount, bytes, byteIndex,
+ return GetBytes (chars, charIndex, charCount, bytes, byteIndex,
ref buffer, ref fallback_chars);
}
- int GetBytes (String s, int charIndex, int charCount,
+ int GetBytes (String chars, int charIndex, int charCount,
byte[] bytes, int byteIndex,
ref EncoderFallbackBuffer buffer,
ref char [] fallback_chars)
{
#endif
- if (s == null) {
- throw new ArgumentNullException ("s");
+ if (chars == null) {
+ throw new ArgumentNullException ("chars");
}
if (bytes == null) {
throw new ArgumentNullException ("bytes");
}
- if (charIndex < 0 || charIndex > s.Length) {
+ if (charIndex < 0 || charIndex > chars.Length) {
throw new ArgumentOutOfRangeException ("charIndex", _("ArgRange_StringIndex"));
}
- if (charCount < 0 || charCount > (s.Length - charIndex)) {
+ if (charCount < 0 || charCount > (chars.Length - charIndex)) {
throw new ArgumentOutOfRangeException ("charCount", _("ArgRange_StringRange"));
}
if (byteIndex < 0 || byteIndex > bytes.Length) {
int count = charCount;
char ch;
while (count-- > 0) {
- ch = s [charIndex++];
+ ch = chars [charIndex++];
if (ch < (char)0x80) {
bytes [byteIndex++] = (byte)ch;
} else {
if (buffer == null)
buffer = EncoderFallback.CreateFallbackBuffer ();
if (Char.IsSurrogate (ch) && count > 1 &&
- Char.IsSurrogate (s [charIndex]))
- buffer.Fallback (ch, s [charIndex], charIndex++ - 1);
+ Char.IsSurrogate (chars [charIndex]))
+ buffer.Fallback (ch, chars [charIndex], charIndex++ - 1);
else
buffer.Fallback (ch, charIndex - 1);
if (fallback_chars == null || fallback_chars.Length < buffer.Remaining)
// Get the characters that result from decoding a byte buffer.
public override int GetChars (byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex)
{
+#if NET_2_0
+// well, yes, I know this #if is ugly, but I think it is the simplest switch.
+ DecoderFallbackBuffer buffer = null;
+ return GetChars (bytes, byteIndex, byteCount, chars,
+ charIndex, ref buffer);
+ }
+
+ int GetChars (byte[] bytes, int byteIndex, int byteCount,
+ char[] chars, int charIndex,
+ ref DecoderFallbackBuffer buffer)
+ {
+#endif
if (bytes == null)
throw new ArgumentNullException ("bytes");
if (chars == null)
int count = byteCount;
while (count-- > 0) {
- char c = (char)(bytes [byteIndex++]);
- if (c > 127)
- c = '?';
- chars [charIndex++] = c;
+ char c = (char) bytes [byteIndex++];
+ if (c < '\x80')
+ chars [charIndex++] = c;
+ else {
+#if NET_2_0
+ if (buffer == null)
+ buffer = DecoderFallback.CreateFallbackBuffer ();
+ buffer.Fallback (bytes, byteIndex);
+ while (buffer.Remaining > 0)
+ chars [charIndex++] = buffer.GetNextChar ();
+#else
+ chars [charIndex++] = '?';
+#endif
+ }
}
return byteCount;
}
}
// Decode a buffer of bytes into a string.
- public override String GetString (byte[] bytes, int index, int count)
+ public override String GetString (byte[] bytes, int byteIndex, int byteCount)
{
if (bytes == null) {
throw new ArgumentNullException ("bytes");
}
- if (index < 0 || index > bytes.Length) {
- throw new ArgumentOutOfRangeException ("index", _("ArgRange_Array"));
+ if (byteIndex < 0 || byteIndex > bytes.Length) {
+ throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
}
- if (count < 0 || count > (bytes.Length - index)) {
- throw new ArgumentOutOfRangeException ("count", _("ArgRange_Array"));
+ if (byteCount < 0 || byteCount > (bytes.Length - byteIndex)) {
+ throw new ArgumentOutOfRangeException ("byteCount", _("ArgRange_Array"));
}
- if (count == 0)
+ if (byteCount == 0)
return String.Empty;
unsafe {
- fixed (byte *ss = &bytes [0]) {
- return new String ((sbyte*)ss, index, count);
+ fixed (byte* bytePtr = bytes) {
+ string s = string.InternalAllocateStr (byteCount);
+
+ fixed (char* charPtr = s) {
+ byte* currByte = bytePtr + byteIndex;
+ byte* lastByte = currByte + byteCount;
+ char* currChar = charPtr;
+
+ while (currByte < lastByte) {
+#if NET_2_0
+ byte b = currByte++ [0];
+ currChar++ [0] = b <= 0x7F ? (char) b : (char) '?';
+#else
+ // GetString is incompatible with GetChars
+ currChar++ [0] = (char) (currByte++ [0] & 0x7F);
+#endif
+ }
+ }
+
+ return s;
}
}
}
#if NET_2_0
[CLSCompliantAttribute (false)]
+ [ComVisible (false)]
public unsafe override int GetBytes (char *chars, int charCount, byte *bytes, int byteCount)
{
if (chars == null)
}
[CLSCompliantAttribute(false)]
+ [ComVisible (false)]
public unsafe override int GetChars (byte *bytes, int byteCount, char *chars, int charCount)
{
if (bytes == null)
}
[CLSCompliantAttribute(false)]
+ [ComVisible (false)]
public unsafe override int GetCharCount (byte *bytes, int count)
{
return count;
}
[CLSCompliantAttribute(false)]
+ [ComVisible (false)]
public unsafe override int GetByteCount (char *chars, int count)
{
return count;
if (bytes == null) {
throw new ArgumentNullException ("bytes");
}
- int count = bytes.Length;
- if (count == 0)
- return String.Empty;
- unsafe {
- fixed (byte *ss = &bytes [0]) {
- return new String ((sbyte*)ss, 0, count);
- }
- }
+
+ return GetString (bytes, 0, bytes.Length);
+ }
+#endif
+
+#if NET_2_0
+ [MonoTODO ("we have simple override to match method signature.")]
+ [ComVisible (false)]
+ public override Decoder GetDecoder ()
+ {
+ return base.GetDecoder ();
+ }
+
+ [MonoTODO ("we have simple override to match method signature.")]
+ [ComVisible (false)]
+ public override Encoder GetEncoder ()
+ {
+ return base.GetEncoder ();
}
#endif
-
}; // class ASCIIEncoding
}; // namespace System.Text
projects / mono.git / blobdiff