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

ICU-701 handle fallbacks more precisely

Browse Source 
X-SVN-Rev: 2939
This commit is contained in:
Markus Scherer 2000-11-17 19:35:00 +00:00
parent 0348e0f62c
commit 12f6684fcd
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icu4c/source/common/ucnv2022.c
View File

@ -1195,7 +1195,7 @@ getTrail:
/* There are no fallbacks in ISO_8859_1, ISO_8859_7,JISX201 so we can
* safely ignore the codepaths below
*/
/*if ((targetUniChar==0)&&(args->converter->useFallback == TRUE) &&
/*if ((targetUniChar==0) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar32) ucmp8_getu (myFromUnicodeSBCSFallback, mySourceChar);
} */
@ -1214,7 +1214,7 @@ getTrail:
* safely ignore the codepaths below
*/
/*
if ((targetUniChar==missingCharMarker)&&(args->converter->useFallback== TRUE) &&
if ((targetUniChar==missingCharMarker) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu (myFromUnicodeDBCSFallback, mySourceChar);
} */
@ -1505,7 +1505,7 @@ getTrail:
/* There are no fallbacks in ISO_8859_1, ISO_8859_7,JISX201 so we can
* safely ignore the codepaths below
*/
/*if ((targetUniChar==0)&&(args->converter->useFallback == TRUE) &&
/*if ((targetUniChar==0) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar32) ucmp8_getu (myFromUnicodeSBCSFallback, mySourceChar);
} */
@ -1524,7 +1524,7 @@ getTrail:
* safely ignore the codepaths below
*/
/*
if ((targetUniChar==missingCharMarker)&&(args->converter->useFallback== TRUE) &&
if ((targetUniChar==missingCharMarker) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu (myFromUnicodeDBCSFallback, mySourceChar);
}
@ -1965,7 +1965,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_JP(UConverterToUnicodeArgs *args,
myToUnicodeFallbackSBCS = myData->currentConverter->sharedData->table->sbcs.toUnicodeFallback;
targetUniChar = myToUnicodeSBCS[(unsigned char) mySourceChar];
if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = myToUnicodeFallbackSBCS[(unsigned char) mySource[mySourceIndex-1]];
@ -1994,7 +1994,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_JP(UConverterToUnicodeArgs *args,
targetUniChar = ucmp16_getu(myToUnicodeDBCS,mySourceChar);
if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu(myToUnicodeFallbackDBCS, mySourceChar);
@ -2191,7 +2191,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_JP_OFFSETS_LOGIC(UConverterToUnicodeA
myToUnicodeFallbackSBCS = myData->currentConverter->sharedData->table->sbcs.toUnicodeFallback;
targetUniChar = myToUnicodeSBCS[(unsigned char) mySourceChar];
if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = myToUnicodeFallbackSBCS[(unsigned char) mySource[mySourceIndex-1]];
@ -2220,7 +2220,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_JP_OFFSETS_LOGIC(UConverterToUnicodeA
targetUniChar = ucmp16_getu(myToUnicodeDBCS,mySourceChar);
if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu(myToUnicodeFallbackDBCS, mySourceChar);
@ -3371,7 +3371,7 @@ getTrail:
* safely ignore the codepaths below
*/
/*
if ((targetUniChar==missingCharMarker)&&(args->converter->useFallback == TRUE) &&
if ((targetUniChar==missingCharMarker) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu (myFromUnicodeDBCSFallback, mySourceChar);
} */
@ -3674,7 +3674,7 @@ getTrail:
/* There are no fallbacks in ISO-IR-165 or GB_2312_1 so we can
* safely ignore the codepaths below
*/
/*if ((targetUniChar==missingCharMarker)&&(args->converter->useFallback == TRUE) &&
/*if ((targetUniChar==missingCharMarker) && UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(myConverterData->fromUnicodeConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu (myFromUnicodeDBCSFallback, mySourceChar);
} */
@ -4233,7 +4233,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN(UConverterToUnicodeArgs *args,
* safely ignore the codepaths below
*/
/*if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu(myToUnicodeFallbackDBCS, mySourceChar);
@ -4478,7 +4478,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeA
*/
/*
if(targetUniChar> 0xfffe){
if((args->converter->useFallback == TRUE) &&
if(UCNV_TO_U_USE_FALLBACK(args->converter) &&
(myData->currentConverter->sharedData->staticData->hasFromUnicodeFallback == TRUE)){
targetUniChar = (UChar) ucmp16_getu(myToUnicodeFallbackDBCS, mySourceChar);

12
icu4c/source/common/ucnvsbcs.c
View File

@ -88,7 +88,7 @@ U_CFUNC void T_UConverter_toUnicode_SBCS (UConverterToUnicodeArgs * args,
}
else
{
if ((args->converter->useFallback == TRUE) &&
if (UCNV_TO_U_USE_FALLBACK(args->converter) &&
(args->converter->sharedData->staticData->hasToUnicodeFallback == TRUE))
{
/* Look up in the fallback table first */
@ -185,7 +185,7 @@ U_CFUNC void T_UConverter_fromUnicode_SBCS (UConverterFromUnicodeArgs * args,
/*writes the char to the output stream */
myTarget[myTargetIndex++] = targetChar;
}
else if ((args->converter->useFallback == TRUE) &&
else if (UCNV_FROM_U_USE_FALLBACK(args->converter, mySource[mySourceIndex-1]) &&
(args->converter->sharedData->staticData->hasFromUnicodeFallback == TRUE))
{
/* Look up in the fallback table first */
@ -301,7 +301,7 @@ U_CFUNC UChar32 T_UConverter_getNextUChar_SBCS(UConverterToUnicodeArgs* args,
UConverterCallbackReason reason;
/* Do the fallback stuff */
if ((args->converter->useFallback == TRUE)&&
if (UCNV_TO_U_USE_FALLBACK(args->converter) &&
(args->converter->sharedData->staticData->hasToUnicodeFallback == TRUE))
{
UChar fallbackUChar = args->converter->sharedData->table->sbcs.toUnicodeFallback[ (unsigned char)*(args->source-1)];
@ -450,7 +450,7 @@ U_CFUNC void T_UConverter_toUnicode_DBCS (UConverterToUnicodeArgs * args,
/*writes the UniChar to the output stream */
myTarget[myTargetIndex++] = targetUniChar;
}
else if ((args->converter->useFallback == TRUE) &&
else if (UCNV_TO_U_USE_FALLBACK(args->converter) &&
(args->converter->sharedData->staticData->hasToUnicodeFallback == TRUE))
{
UChar fallbackUniChar = (UChar) ucmp16_getu(myToUnicodeFallback, mySourceChar);
@ -570,7 +570,7 @@ U_CFUNC void T_UConverter_fromUnicode_DBCS (UConverterFromUnicodeArgs * args,
*err = U_BUFFER_OVERFLOW_ERROR;
}
}
else if ((args->converter->useFallback == TRUE) &&
else if (UCNV_FROM_U_USE_FALLBACK(args->converter, mySourceChar) &&
(args->converter->sharedData->staticData->hasFromUnicodeFallback == TRUE))
{
@ -708,7 +708,7 @@ U_CFUNC UChar32 T_UConverter_getNextUChar_DBCS(UConverterToUnicodeArgs* args,
UConverterCallbackReason reason;
/* Do the fallback stuff */
if ((args->converter->useFallback == TRUE) &&
if (UCNV_TO_U_USE_FALLBACK(args->converter) &&
(args->converter->sharedData->staticData->hasToUnicodeFallback == TRUE))
{
UChar fallbackUChar = ucmp16_getu((&args->converter->sharedData->table->dbcs.toUnicodeFallback),