ICU-673 Added HZ converter.

X-SVN-Rev: 2706
This commit is contained in:
Ram Viswanadha 2000-10-17 08:03:36 +00:00
parent cfa7836b11
commit af4e9945bb
6 changed files with 777 additions and 8 deletions

View File

@ -89,7 +89,7 @@ uchar.o uchriter.o ucmp8.o ucmp16.o ucmp32.o ucnv.o ucnv_bld.o ucnv_cb.o \
ucnv_cnv.o ucnv_err.o ucnv_io.o uhash.o uhash_us.o uloc.o unicode.o unistr.o \
uresbund.o uresdata.o ustring.o rbdata.o ubidi.o ubidiwrt.o ubidiln.o \
bidi.o ushape.o uvector.o udata.o unames.o utf_impl.o \
ucnv2022.o ucnvebdc.o ucnvlat1.o ucnv_utf.o ucnvsbcs.o ucnvmbcs.o ucnv_lmb.o
ucnv2022.o ucnvebdc.o ucnvlat1.o ucnv_utf.o ucnvhz.o ucnvsbcs.o ucnvmbcs.o ucnv_lmb.o
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))

View File

@ -64,7 +64,7 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\"
# PROP Output_Dir "..\..\lib\debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
@ -334,6 +334,10 @@ SOURCE=.\ucnvebdc.c
# End Source File
# Begin Source File
SOURCE=.\ucnvhz.c
# End Source File
# Begin Source File
SOURCE=.\ucnvlat1.c
# End Source File
# Begin Source File

View File

@ -50,7 +50,8 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={
&_UTF8Data, &_UTF16BEData, &_UTF16LEData, &_EBCDICStatefulData,
&_ISO2022Data,
&_LMBCSData1,&_LMBCSData2, &_LMBCSData3, &_LMBCSData4, &_LMBCSData5, &_LMBCSData6,
&_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19
&_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19,
&_HZData,
};
static struct {
@ -80,7 +81,8 @@ static struct {
{ "LMBCS-16",UCNV_LMBCS_16 },
{ "LMBCS-17",UCNV_LMBCS_17 },
{ "LMBCS-18",UCNV_LMBCS_18 },
{ "LMBCS-19",UCNV_LMBCS_19 }
{ "LMBCS-19",UCNV_LMBCS_19 },
{ "HZ",UCNV_HZ }
};

View File

@ -206,9 +206,9 @@ struct UConverterImpl {
extern const UConverterSharedData
_SBCSData, _DBCSData, _MBCSData, _Latin1Data,
_UTF8Data, _UTF16BEData, _UTF16LEData, _EBCDICStatefulData,
_ISO2022Data,
_ISO2022Data,
_LMBCSData1,_LMBCSData2, _LMBCSData3, _LMBCSData4, _LMBCSData5, _LMBCSData6,
_LMBCSData8,_LMBCSData11,_LMBCSData16,_LMBCSData17,_LMBCSData18,_LMBCSData19;
_LMBCSData8,_LMBCSData11,_LMBCSData16,_LMBCSData17,_LMBCSData18,_LMBCSData19,_HZData;
U_CDECL_END

View File

@ -0,0 +1,762 @@
/*
**********************************************************************
* Copyright (C) 2000, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ucnvhz.c
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* created on: 2000oct16
* created by: Ram Viswanadha
*
*
*/
#include "unicode/utypes.h"
#include "cmemory.h"
#include "ucmp16.h"
#include "ucmp8.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "unicode/ucnv.h"
#include "ucnv_cnv.h"
#include "unicode/ustring.h"
#include "cstring.h"
#define UCNV_TILDE 0x7E /* ~ */
#define UCNV_OPEN_BRACE 0x7B /* { */
#define UCNV_CLOSE_BRACE 0x7D /* } */
#define SB_ESCAPE "\x7E\x7D"
#define DB_ESCAPE "\x7E\x7B"
#define TEST_ERROR_CONDITION(args,myTargetIndex, mySourceIndex, isTargetUCharDBCS, myConverterData, err){ \
if(*err ==U_BUFFER_OVERFLOW_ERROR){ \
/*save the state and return */ \
args->target += myTargetIndex; \
args->source += mySourceIndex; \
myConverterData->sourceIndex = 0; \
myConverterData->targetIndex = 0; \
args->converter->fromUnicodeStatus = isTargetUCharDBCS; \
return; \
} \
}
/*********** HZ Converter Protos ***********/
static void _HZOpen(UConverter *cnv, const char *name, const char *locale, UErrorCode *errorCode);
static void _HZClose(UConverter *converter);
static void _HZReset(UConverter *converter);
U_CFUNC void UConverter_toUnicode_HZ(UConverterToUnicodeArgs *args,
UErrorCode *err);
U_CFUNC void UConverter_toUnicode_HZ_OFFSETS_LOGIC (UConverterToUnicodeArgs *args,
UErrorCode *err);
U_CFUNC void UConverter_fromUnicode_HZ(UConverterFromUnicodeArgs *args,
UErrorCode *err);
U_CFUNC void UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs *args,
UErrorCode *err);
U_CFUNC UChar32 UConverter_getNextUChar_HZ (UConverterToUnicodeArgs *pArgs,
UErrorCode *pErrorCode);
static UConverterImpl _HZImpl={
UCNV_HZ,
NULL,
NULL,
_HZOpen,
_HZClose,
_HZReset,
UConverter_toUnicode_HZ,
UConverter_toUnicode_HZ_OFFSETS_LOGIC,
UConverter_fromUnicode_HZ,
UConverter_fromUnicode_HZ_OFFSETS_LOGIC,
UConverter_getNextUChar_HZ,
NULL
};
const UConverterStaticData _HZStaticData={
sizeof(UConverterStaticData),
"HZ",
2023, UCNV_IBM, UCNV_HZ, 1, 4,
{ 0x1a, 0, 0, 0 },1, FALSE, FALSE,
{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} /* reserved */
};
const UConverterSharedData _HZData={
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_HZStaticData, FALSE, &_HZImpl,
0
};
typedef struct{
int32_t targetIndex;
int32_t sourceIndex;
UBool isEscapeAppended;
UConverter* gbConverter;
UBool isStateDBCS;
UBool isTargetUCharDBCS;
}UConverterDataHZ;
static void _HZOpen(UConverter *cnv, const char *name,const char* locale, UErrorCode *errorCode){
cnv->toUnicodeStatus = 0;
cnv->fromUnicodeStatus= 0;
cnv->mode=0;
cnv->fromUSurrogateLead;
cnv->extraInfo = uprv_malloc (sizeof (UConverterDataHZ));
if(cnv->extraInfo != NULL){
((UConverterDataHZ*)cnv->extraInfo)->gbConverter = ucnv_open("ibm-1386",errorCode);
((UConverterDataHZ*)cnv->extraInfo)->isStateDBCS = FALSE;
((UConverterDataHZ*)cnv->extraInfo)->isEscapeAppended = FALSE;
((UConverterDataHZ*)cnv->extraInfo)->targetIndex = 0;
((UConverterDataHZ*)cnv->extraInfo)->sourceIndex = 0;
}
}
static void _HZClose(UConverter *cnv){
ucnv_close (((UConverterDataHZ *) (cnv->extraInfo))->gbConverter);
uprv_free(cnv->extraInfo);
}
static void _HZReset(UConverter *cnv){
cnv->toUnicodeStatus = 0;
cnv->fromUnicodeStatus= 0;
cnv->mode=0;
cnv->fromUSurrogateLead;
if(cnv->extraInfo != NULL){
((UConverterDataHZ*)cnv->extraInfo)->isStateDBCS = FALSE;
((UConverterDataHZ*)cnv->extraInfo)->isEscapeAppended = FALSE;
((UConverterDataHZ*)cnv->extraInfo)->targetIndex = 0;
((UConverterDataHZ*)cnv->extraInfo)->sourceIndex = 0;
}
}
/**************************************HZ Encoding*************************************************
* Rules for HZ encoding
*
* In ASCII mode, a byte is interpreted as an ASCII character, unless a
* '~' is encountered. The character '~' is an escape character. By
* convention, it must be immediately followed ONLY by '~', '{' or '\n'
* (<LF>), with the following special meaning.
* 1. The escape sequence '~~' is interpreted as a '~'.
* 2. The escape-to-GB sequence '~{' switches the mode from ASCII to GB.
* 3. The escape sequence '~\n' is a line-continuation marker to be
* consumed with no output produced.
* In GB mode, characters are interpreted two bytes at a time as (pure)
* GB codes until the escape-from-GB code '~}' is read. This code
* switches the mode from GB back to ASCII. (Note that the escape-
* from-GB code '~}' ($7E7D) is outside the defined GB range.)
*
* Source: RFC 1842
*/
U_CFUNC void UConverter_toUnicode_HZ(UConverterToUnicodeArgs *args,
UErrorCode* err){
char tempBuf[3];
char* pBuf;
const char *mySource = ( char *) args->source;
UChar *myTarget = args->target;
char *tempLimit = &tempBuf[2]+1;
int32_t mySourceIndex = 0;
int32_t myTargetIndex = 0;
const char *mySourceLimit = args->sourceLimit;
UChar32 targetUniChar = 0x0000;
UChar mySourceChar = 0x0000;
UConverterDataHZ* myData=(UConverterDataHZ*)(args->converter->extraInfo);
/*Arguments Check*/
if (U_FAILURE(*err))
return;
if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)){
*err = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
while(mySource< args->sourceLimit){
if(myTarget < args->targetLimit){
mySourceChar= (unsigned char) *mySource++;
if( mySourceChar <= 0x20){
myData->isStateDBCS = FALSE;
}
switch(mySourceChar){
case 0x0A:
if(args->converter->mode ==UCNV_TILDE){
args->converter->mode=0;
}
*(myTarget++)=(UChar)mySourceChar;
continue;
case UCNV_TILDE:
if(args->converter->mode ==UCNV_TILDE){
*(myTarget++)=(UChar)mySourceChar;
args->converter->mode=0;
continue;
}
else if(args->converter->toUnicodeStatus !=0){
args->converter->mode=0;
break;
}
else{
args->converter->mode = UCNV_TILDE;
continue;
}
case UCNV_OPEN_BRACE:
if(args->converter->mode == UCNV_TILDE){
args->converter->mode=0;
myData->isStateDBCS = TRUE;
continue;
}
else{
break;
}
case UCNV_CLOSE_BRACE:
if(args->converter->mode == UCNV_TILDE){
args->converter->mode=0;
myData->isStateDBCS = FALSE;
continue;
}
else{
break;
}
default: /*not expected*/
break;
}
if(myData->isStateDBCS){
if(args->converter->toUnicodeStatus == 0x00){
args->converter->toUnicodeStatus = (UChar) mySourceChar;
continue;
}
else{
tempBuf[0] = (char) (args->converter->toUnicodeStatus +0x80);
tempBuf[1] = (char) (mySourceChar+0x80);
mySourceChar= (UChar)(((args->converter->toUnicodeStatus+0x80) << 8) | ((mySourceChar & 0x00ff)+0x80));
args->converter->toUnicodeStatus =0x00;
pBuf = &tempBuf[0];
tempLimit = &tempBuf[2]+1;
targetUniChar = _MBCSSimpleGetNextUChar(myData->gbConverter->sharedData,
&pBuf,tempLimit,args->converter->useFallback);
}
}
else{
if(args->converter->fromUnicodeStatus == 0x00){
tempBuf[0] = (char) mySourceChar;
pBuf = &tempBuf[0];
tempLimit = &tempBuf[1];
targetUniChar = _MBCSSimpleGetNextUChar(myData->gbConverter->sharedData,
&pBuf,tempLimit,args->converter->useFallback);
}
else{
goto SAVE_STATE;
}
}
if(targetUniChar < 0xfffe){
*(myTarget++)=(UChar)targetUniChar;
}
else if(targetUniChar>=0xfffe){
SAVE_STATE:
{
const char *saveSource = args->source;
UChar *saveTarget = args->target;
int32_t *saveOffsets = args->offsets;
UConverterCallbackReason reason;
if(targetUniChar == 0xfffe){
reason = UCNV_UNASSIGNED;
*err = U_INVALID_CHAR_FOUND;
}
else{
reason = UCNV_ILLEGAL;
*err = U_ILLEGAL_CHAR_FOUND;
}
args->converter->invalidCharBuffer[args->converter->invalidCharLength++] = tempBuf[0];
args->converter->invalidCharBuffer[args->converter->invalidCharLength++] = tempBuf[1];
args->target = myTarget;
args->source = mySource;
ToU_CALLBACK_MACRO( args->converter->toUContext,
args,
args->converter->invalidCharBuffer,
args->converter->invalidCharLength,
reason,
err);
args->source = saveSource;
args->target = saveTarget;
args->offsets = saveOffsets;
if(U_FAILURE(*err))
break;
args->converter->invalidCharLength=0;
}
}
}
else{
*err =U_BUFFER_OVERFLOW_ERROR;
break;
}
}
if((args->flush==TRUE)
&& (mySource == mySourceLimit)
&& ( args->converter->toUnicodeStatus !=0x00)){
if(U_SUCCESS(*err)){
*err = U_TRUNCATED_CHAR_FOUND;
args->converter->toUnicodeStatus = 0x00;
}
}
args->target = myTarget;
args->source = mySource;
}
U_CFUNC void UConverter_toUnicode_HZ_OFFSETS_LOGIC(UConverterToUnicodeArgs *args,
UErrorCode* err){
char tempBuf[3];
char* pBuf;
const char *mySource = ( char *) args->source;
UChar *myTarget = args->target;
char *tempLimit = &tempBuf[3];
int32_t mySourceIndex = 0;
int32_t myTargetIndex = 0;
const char *mySourceLimit = args->sourceLimit;
UChar32 targetUniChar = 0x0000;
UChar mySourceChar = 0x0000;
UConverterDataHZ* myData=(UConverterDataHZ*)(args->converter->extraInfo);
/*Arguments Check*/
if (U_FAILURE(*err))
return;
if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)){
*err = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
while(mySource< args->sourceLimit){
if(myTarget < args->targetLimit){
mySourceChar= (unsigned char) *mySource++;
if( mySourceChar <= 0x20){
myData->isStateDBCS = FALSE;
}
switch(mySourceChar){
case 0x0A:
if(args->converter->mode ==UCNV_TILDE){
args->converter->mode=0;
}
*(myTarget++)=(UChar)mySourceChar;
continue;
case UCNV_TILDE:
if(args->converter->mode ==UCNV_TILDE){
*(myTarget++)=(UChar)mySourceChar;
args->converter->mode=0;
continue;
}
else if(args->converter->toUnicodeStatus !=0){
args->converter->mode=0;
break;
}
else{
args->converter->mode = UCNV_TILDE;
continue;
}
case UCNV_OPEN_BRACE:
if(args->converter->mode == UCNV_TILDE){
args->converter->mode=0;
myData->isStateDBCS = TRUE;
continue;
}
else{
break;
}
case UCNV_CLOSE_BRACE:
if(args->converter->mode == UCNV_TILDE){
args->converter->mode=0;
myData->isStateDBCS = FALSE;
continue;
}
else{
break;
}
default: /*not expected*/
break;
}
if(myData->isStateDBCS){
if(args->converter->toUnicodeStatus == 0x00){
args->converter->toUnicodeStatus = (UChar) mySourceChar;
continue;
}
else{
tempBuf[0] = (char) (args->converter->toUnicodeStatus+0x80) ;
tempBuf[1] = (char) (mySourceChar+0x80);
mySourceChar= (UChar)(((args->converter->toUnicodeStatus << 8)+0x80) | ((mySourceChar & 0x00ff)+0x80));
args->converter->toUnicodeStatus =0x00;
pBuf = &tempBuf[0];
tempLimit = &tempBuf[2]+1;
targetUniChar = _MBCSSimpleGetNextUChar(myData->gbConverter->sharedData,
&pBuf,tempLimit,args->converter->useFallback);
}
}
else{
if(args->converter->fromUnicodeStatus == 0x00){
tempBuf[0] = (char) mySourceChar;
pBuf = &tempBuf[0];
tempLimit = &tempBuf[1];
targetUniChar = _MBCSSimpleGetNextUChar(myData->gbConverter->sharedData,
&pBuf,tempLimit,args->converter->useFallback);
}
else{
goto SAVE_STATE;
}
}
if(targetUniChar < 0xfffe){
if(myData->isStateDBCS){
args->offsets[myTarget - args->target]= mySource - args->source - 2;
}
else{
args->offsets[myTarget - args->target]= mySource - args->source - 1;
}
*(myTarget++)=(UChar)targetUniChar;
}
else if(targetUniChar>=0xfffe){
SAVE_STATE:
{
const char *saveSource = args->source;
UChar *saveTarget = args->target;
int32_t *saveOffsets = args->offsets;
UConverterCallbackReason reason;
if(targetUniChar == 0xfffe){
reason = UCNV_UNASSIGNED;
*err = U_INVALID_CHAR_FOUND;
}
else{
reason = UCNV_ILLEGAL;
*err = U_ILLEGAL_CHAR_FOUND;
}
args->converter->invalidCharBuffer[args->converter->invalidCharLength++] = tempBuf[0];
args->converter->invalidCharBuffer[args->converter->invalidCharLength++] = tempBuf[1];
args->target = myTarget;
args->source = mySource;
ToU_CALLBACK_MACRO( args->converter->toUContext,
args,
args->converter->invalidCharBuffer,
args->converter->invalidCharLength,
reason,
err);
args->source = saveSource;
args->target = saveTarget;
args->offsets = saveOffsets;
if(U_FAILURE(*err))
break;
args->converter->invalidCharLength=0;
}
}
}
else{
*err =U_BUFFER_OVERFLOW_ERROR;
break;
}
}
if((args->flush==TRUE)
&& (mySource == mySourceLimit)
&& ( args->converter->toUnicodeStatus !=0x00)){
if(U_SUCCESS(*err)){
*err = U_TRUNCATED_CHAR_FOUND;
args->converter->toUnicodeStatus = 0x00;
}
}
args->target = myTarget;
args->source = mySource;
}
static void concatEscape(UConverterFromUnicodeArgs* args, int32_t *targetIndex, int32_t *targetLength,
const char* strToAppend,UErrorCode* err,int len){
while(len-->0){
if(*targetIndex < *targetLength){
args->target[(*targetIndex)++] = (unsigned char) *strToAppend;
}
else{
args->converter->charErrorBuffer[(int)args->converter->charErrorBufferLength++] = (unsigned char) *strToAppend;
*err =U_BUFFER_OVERFLOW_ERROR;
}
strToAppend++;
}
}
static void concatString(UConverterFromUnicodeArgs* args, int32_t *targetIndex, int32_t *targetLength,
const UChar32* strToAppend,UErrorCode* err, int32_t *sourceIndex){
if(*strToAppend < 0x00FF){
if( (*targetIndex)+1 >= *targetLength){
args->converter->charErrorBuffer[args->converter->charErrorBufferLength++] = (unsigned char) *strToAppend;
*err = U_BUFFER_OVERFLOW_ERROR;
}else{
args->target[*targetIndex] = (unsigned char) *strToAppend;
if(args->offsets!=NULL){
args->offsets[*targetIndex] = *sourceIndex-1;
}
(*targetIndex)++;
}
}
else{
if(*targetIndex < *targetLength){
args->target[*targetIndex] =(unsigned char) ((*strToAppend>>8)-0x80 );
if(args->offsets!=NULL){
args->offsets[*targetIndex] = *sourceIndex-1;
}
(*targetIndex)++;
if(*targetIndex < *targetLength){
args->target[(*targetIndex)] =(unsigned char) ((*strToAppend & 0x00FF)-0x80);
if(args->offsets!=NULL){
args->offsets[*targetIndex] = *sourceIndex-1;
}
(*targetIndex)++;
}
else{
args->converter->charErrorBuffer[args->converter->charErrorBufferLength++] = (unsigned char) ((*strToAppend & 0x00FF)-0x80);
*err = U_BUFFER_OVERFLOW_ERROR;
}
}
else{
args->converter->charErrorBuffer[args->converter->charErrorBufferLength++] = (unsigned char) ((*strToAppend>>8)-0x80);
args->converter->charErrorBuffer[args->converter->charErrorBufferLength++] = (unsigned char) ((*strToAppend & 0x00FF)-0x80);
*err = U_BUFFER_OVERFLOW_ERROR;
if(args->offsets!=NULL){
args->offsets[*targetIndex] = *sourceIndex-1;
}
}
}
}
U_CFUNC void UConverter_fromUnicode_HZ(UConverterFromUnicodeArgs *args, UErrorCode *err){
const UChar *mySource = args->source;
unsigned char *myTarget = (unsigned char *) args->target;
int32_t mySourceIndex = 0;
int32_t myTargetIndex = 0;
uint32_t targetValue=0;
int32_t targetLength = args->targetLimit - args->target;
int32_t sourceLength = args->sourceLimit - args->source;
int32_t length=0;
UChar32 targetUniChar = 0x0000;
UChar32 mySourceChar = 0x0000,c=0x0000;
UConverterDataHZ *myConverterData=(UConverterDataHZ*)args->converter->extraInfo;
UBool isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS;
UBool oldIsTargetUCharDBCS = isTargetUCharDBCS;
UConverterCallbackReason reason;
UBool isEscapeAppended =FALSE;
isTargetUCharDBCS = (UBool) args->converter->fromUnicodeStatus;
/*Arguments Check*/
if (U_FAILURE(*err))
return;
if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)){
*err = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
/*writing the char to the output stream */
while (mySourceIndex < sourceLength){
if (myTargetIndex < targetLength){
c=mySourceChar = (UChar) args->source[mySourceIndex++];
/*Handle surrogates */
if(args->converter->fromUSurrogateLead!=0 || UTF_IS_SURROGATE(mySourceChar)){
if(UTF_IS_SURROGATE_FIRST(mySourceChar)){
/* no more input */
args->converter->fromUSurrogateLead = (UChar) mySourceChar;
continue;
}
else if(UTF_IS_SECOND_SURROGATE(mySourceChar)){
if(args->converter->fromUSurrogateLead !=0){
mySourceChar =(UChar32) UTF16_GET_PAIR_VALUE(args->converter->fromUSurrogateLead,mySourceChar);
break;
}
else{
reason=UCNV_ILLEGAL;
*err=U_ILLEGAL_CHAR_FOUND;
goto CALLBACK;
}
}
else {
reason=UCNV_ILLEGAL;
*err=U_ILLEGAL_CHAR_FOUND;
goto CALLBACK;
}
}
oldIsTargetUCharDBCS = isTargetUCharDBCS;
if(mySourceChar == 0x7E){
concatEscape(args, &myTargetIndex, &targetLength,"\x7E\x7E",err,2);
TEST_ERROR_CONDITION(args,myTargetIndex, mySourceIndex, isTargetUCharDBCS,myConverterData, err);
continue;
}
else{
length= _MBCSFromUChar32(myConverterData->gbConverter->sharedData,
mySourceChar,&targetValue,args->converter->useFallback);
targetUniChar = (UChar32) targetValue;
}
/* only DBCS or SBCS characters are expected*/
if(length > 2 || length==0){
reason =UCNV_ILLEGAL;
*err =U_INVALID_CHAR_FOUND;
goto CALLBACK;
}
isTargetUCharDBCS = (UBool)(targetUniChar>0x00FF);
if (targetUniChar != missingCharMarker){
if(oldIsTargetUCharDBCS != isTargetUCharDBCS ){
/*Shifting from a double byte to single byte mode*/
if(!isTargetUCharDBCS){
concatEscape(args, &myTargetIndex, &targetLength, SB_ESCAPE,err, 2);
myConverterData->isEscapeAppended =isEscapeAppended =TRUE;
TEST_ERROR_CONDITION(args,myTargetIndex, mySourceIndex, isTargetUCharDBCS,myConverterData, err);
}
else{ /* Shifting from a single byte to double byte mode*/
concatEscape(args, &myTargetIndex, &targetLength, DB_ESCAPE,err, 2);
myConverterData->isEscapeAppended =isEscapeAppended =TRUE;
TEST_ERROR_CONDITION(args,myTargetIndex, mySourceIndex, isTargetUCharDBCS,myConverterData, err);
}
}
concatString(args, &myTargetIndex, &targetLength,&targetUniChar,err, &mySourceIndex);
TEST_ERROR_CONDITION(args,myTargetIndex, mySourceIndex, isTargetUCharDBCS,myConverterData, err);
}
else{
CALLBACK:
{
const UChar* saveSource = args->source;
char* saveTarget = args->target;
int32_t *saveOffsets = args->offsets;
isTargetUCharDBCS = oldIsTargetUCharDBCS;
*err = U_INVALID_CHAR_FOUND;
args->converter->invalidUCharBuffer[0] = (UChar) mySourceChar;
args->converter->invalidUCharLength = 1;
myConverterData->isTargetUCharDBCS = isTargetUCharDBCS;
args->target += myTargetIndex;
args->source += mySourceIndex;
FromU_CALLBACK_MACRO(args->converter->fromUContext,
args,
args->converter->invalidUCharBuffer,
1,
(UChar32) mySourceChar,
UCNV_UNASSIGNED,
err);
args->source = saveSource;
args->target = saveTarget;
args->offsets = saveOffsets;
isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS;
if (U_FAILURE (*err))
break;
args->converter->invalidUCharLength = 0;
}
}
}
else{
*err = U_BUFFER_OVERFLOW_ERROR;
break;
}
}
args->target += myTargetIndex;
args->source += mySourceIndex;
myConverterData->isTargetUCharDBCS = isTargetUCharDBCS;
return;
}
U_CFUNC void UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args,
UErrorCode * err){
UConverter_fromUnicode_HZ(args,err);
}
U_CFUNC UChar32 UConverter_getNextUChar_HZ (UConverterToUnicodeArgs * pArgs,
UErrorCode *pErrorCode){
UChar buffer[UTF_MAX_CHAR_LENGTH];
const char *realLimit=pArgs->sourceLimit;
pArgs->target=buffer;
pArgs->targetLimit=buffer+UTF_MAX_CHAR_LENGTH;
while(pArgs->source<realLimit) {
/* feed in one byte at a time to make sure to get only one character out */
pArgs->sourceLimit=pArgs->source+1;
pArgs->flush= (UBool)(pArgs->sourceLimit==realLimit);
UConverter_toUnicode_HZ(pArgs, pErrorCode);
if(U_FAILURE(*pErrorCode) && *pErrorCode!=U_BUFFER_OVERFLOW_ERROR) {
return 0xffff;
} else if(pArgs->target!=buffer) {
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
*pErrorCode=U_ZERO_ERROR;
}
return ucnv_getUChar32KeepOverflow(pArgs->converter, buffer, pArgs->target-buffer);
}
}
/* no output because of empty input or only state changes and skipping callbacks */
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
return 0xffff;
}

View File

@ -52,7 +52,7 @@ typedef enum {
UCNV_UTF16_LittleEndian = 6,
UCNV_EBCDIC_STATEFUL = 7,
UCNV_ISO_2022 = 8,
UCNV_LMBCS_1 = 9,
UCNV_LMBCS_2,
UCNV_LMBCS_3,
@ -65,7 +65,8 @@ typedef enum {
UCNV_LMBCS_17,
UCNV_LMBCS_18,
UCNV_LMBCS_19,
UCNV_LMBCS_LAST = UCNV_LMBCS_19,
UCNV_HZ,
UCNV_LMBCS_LAST = UCNV_HZ,
/* Number of converter types for which we have conversion routines. */
UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES = UCNV_LMBCS_LAST+1