mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mcs/class/I18N/CJK/CP51932.cs
View File

@@ -521,19 +521,13 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
--count;
if (last == 0) {
if (byteval == 0x8F) {
if (byteval != 0) {
// Invalid second byte of a 3-byte character.
last = 0;
length++;
}
// First byte in a triple-byte sequence
else
last = byteval;
// SS3: One-time triple-byte sequence should follow.
last = byteval;
} else if (byteval <= 0x7F) {
// Ordinary ASCII/Latin1/Control character.
length++;
} else if (byteval == 0x8E) {
// First byte of half-width Katakana
// SS2: One-time double-byte sequence should follow.
last = byteval;
} else if (byteval >= 0xA1 && byteval <= 0xFE) {
// First byte in a double-byte sequence.
@@ -544,9 +538,8 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
}
}
else if (last == 0x8E) {
// SS2 (One-time double-byte sequence)
if (byteval >= 0xA1 && byteval <= 0xDF) {
value = ((byteval - 0x40) |
(last + 0x71) << 8);
length++;
} else {
// Invalid second byte.
@@ -555,8 +548,8 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
last =0;
}
else if (last == 0x8F) {
// 3-byte character
// FIXME: currently not supported yet
// SS3: 3-byte character
// FIXME: not supported (I don't think iso-2022-jp has)
last = byteval;
}
else
@@ -627,23 +620,15 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
--byteCount;
if (last == 0) {
if (byteval == 0x8F) {
if (byteval != 0) {
// Invalid second byte of a 3-byte character.
last = 0;
if (posn >= charLength)
throw Insufficient ();
chars [posn++] = '\u30FB';
}
// First byte in a triple-byte sequence
else
last = byteval;
// SS3 (One-time triple-byte sequence) should follow.
last = byteval;
} else if (byteval <= 0x7F) {
// Ordinary ASCII/Latin1/Control character.
if (posn >= charLength)
throw Insufficient ();
chars [posn++] = (char) byteval;
} else if (byteval == 0x8E) {
// First byte of half-width Katakana
// SS2 (One-time double-byte sequence) should follow.
last = byteval;
} else if (byteval >= 0xA1 && byteval <= 0xFE) {
// First byte in a double-byte sequence.
@@ -656,6 +641,7 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
}
}
else if (last == 0x8E) {
// SS2 (One-time double-byte sequence)
if (byteval >= 0xA1 && byteval <= 0xDF) {
value = ((byteval - 0x40) |
(last + 0x71) << 8);
@@ -671,8 +657,8 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
last =0;
}
else if (last == 0x8F) {
// 3-byte character
// FIXME: currently not supported yet
// SS3: 3-byte character
// FIXME: not supported (I don't think iso-2022-jp has)
last = byteval;
}
else

2
mcs/class/I18N/tools/ucm2cp.c
View File

@@ -691,9 +691,7 @@ static void printCharToByte(void)
printf("\t\tint ch;\n");
printf("\t\tint charIndex = 0;\n");
printf("\t\tint byteIndex = 0;\n");
printf("#if NET_2_0\n");
printf("\t\tEncoderFallbackBuffer buffer = null;\n");
printf("#endif\n");
printf("\t\twhile (charCount > 0)\n");
printf("\t\t{\n");
printf("\t\t\tch = (int)(chars[charIndex]);\n");