Whitespaces [#METR-23332].

This commit is contained in:
Alexey Milovidov 2016-10-29 20:16:43 +03:00
parent 024799acee
commit 11477b942e

View File

@ -29,24 +29,24 @@ const char* UTF8Encoding::_names[] =
}; };
const TextEncoding::CharacterMap UTF8Encoding::_charMap = const TextEncoding::CharacterMap UTF8Encoding::_charMap =
{ {
/* 00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
/* 10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
/* 20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
/* 30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
/* 40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, /* 40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
/* 50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
/* 60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/* 70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
/* 80 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 80 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
/* 90 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 90 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
/* a0 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a0 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
/* b0 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* b0 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
/* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
/* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
/* e0 */ -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* e0 */ -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
/* f0 */ -4, -4, -4, -4, -4, -4, -4, -4, -5, -5, -5, -5, -6, -6, -1, -1, /* f0 */ -4, -4, -4, -4, -4, -4, -4, -4, -5, -5, -5, -5, -6, -6, -1, -1,
}; };
@ -87,15 +87,15 @@ int UTF8Encoding::convert(const unsigned char* bytes) const
{ {
int n = _charMap[*bytes]; int n = _charMap[*bytes];
int uc; int uc;
switch (n) switch (n)
{ {
case -6: case -6:
case -5: case -5:
case -1: case -1:
return -1; return -1;
case -4: case -4:
case -3: case -3:
case -2: case -2:
if (!isLegal(bytes, -n)) return -1; if (!isLegal(bytes, -n)) return -1;
uc = *bytes & ((0x07 << (n + 4)) | 0x03); uc = *bytes & ((0x07 << (n + 4)) | 0x03);
@ -104,8 +104,8 @@ int UTF8Encoding::convert(const unsigned char* bytes) const
return n; return n;
} }
while (n++ < -1) while (n++ < -1)
{ {
uc <<= 6; uc <<= 6;
uc |= (*++bytes & 0x3F); uc |= (*++bytes & 0x3F);
} }
@ -180,8 +180,8 @@ int UTF8Encoding::queryConvert(const unsigned char* bytes, int length) const
default: default:
return n; return n;
} }
while (n++ < -1) while (n++ < -1)
{ {
uc <<= 6; uc <<= 6;
uc |= (*++bytes & 0x3F); uc |= (*++bytes & 0x3F);
} }
@ -209,7 +209,7 @@ bool UTF8Encoding::isLegal(const unsigned char *bytes, int length)
// Note: The following is loosely based on the isLegalUTF8 function // Note: The following is loosely based on the isLegalUTF8 function
// from ftp://ftp.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c // from ftp://ftp.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c
// Excuse the ugliness... // Excuse the ugliness...
if (0 == bytes || 0 == length) return false; if (0 == bytes || 0 == length) return false;
unsigned char a; unsigned char a;
@ -221,7 +221,7 @@ bool UTF8Encoding::isLegal(const unsigned char *bytes, int length)
// Everything else falls through when true. // Everything else falls through when true.
case 4: case 4:
if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
case 3: case 3:
if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
case 2: case 2:
a = (*--srcptr); a = (*--srcptr);