AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5891 Updates per code review. Also added new data-driven test case.

Browse Source 
X-SVN-Rev: 22861
This commit is contained in:
David Bertoni 2007-10-26 20:57:56 +00:00
parent 2acc63bddc
commit 233ddab1bc
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/ucnv_err.c
View File

@ -245,11 +245,7 @@ UCNV_FROM_U_CALLBACK_ESCAPE (
case UCNV_PRV_ESCAPE_CSS2:
valueString[valueStringLength++] = (UChar) UNICODE_RS_CODEPOINT; /* adding \ */
if (length == 2) {
valueStringLength += uprv_itou (valueString + valueStringLength, VALUE_STRING_LENGTH - valueStringLength, codePoint, 16, 0);
} else {
valueStringLength += uprv_itou (valueString + valueStringLength, VALUE_STRING_LENGTH - valueStringLength, (uint16_t)codeUnits[0], 16, 0);
}
valueStringLength += uprv_itou (valueString + valueStringLength, VALUE_STRING_LENGTH - valueStringLength, codePoint, 16, 0);
/* Always add space character, becase the next character might be whitespace,
which would erroneously be considered the termination of the escape sequence. */
valueString[valueStringLength++] = (UChar) UNICODE_SPACE_CODEPOINT;

6
icu4c/source/common/unicode/ucnv_err.h
View File

@ -140,9 +140,9 @@ typedef struct UConverter UConverter;
#define UCNV_ESCAPE_UNICODE "U"
/**
* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to CSS2 conventions (\\X{XXXXX} followed by
* a space.
* @stable ICU 4.0
* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to CSS2 conventions (\\HH..H<space>, that is,
* a backslash, 1..6 hex digits, and a space)
* @draft ICU 4.0
*/
#define UCNV_ESCAPE_CSS2 "S"

8
icu4c/source/test/testdata/conversion.txt vendored
View File

@ -917,6 +917,14 @@ conversion:table(nofallback) {
:intvector{ -1,-1,-1,-1,0,1,2,2,2,3,3,5,5,5 },
:int{1}, :int{1}, "", "?\x00\x2f\x7e", ""
}
// ISO-2022-KR
{
"ibm-25546",
"AB\uc88b\U00050005\uacccC",
:bin{ 1b24294341420e41410f5c3530303035200e306a0f43 },
:intvector{ -1,-1,-1,-1,0,1,2,2,2,3,3,3,3,3,3,3,3,5,5,5,6,6 },
:int{1}, :int{1}, "", "&S", ""
}
// ISO-2022-JP-2 with G2 designator & SS2 shift
{