organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-1439 implement ucnv_getUnicodeSet() for roundtrippable code points.

Browse source 
X-SVN-Rev: 11475
This commit is contained in:
George Rhoten 2003-04-09 00:00:51 +00:00
parent b2599603cc
commit 48eda8bd06
3 changed files with 71 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
icu4c/source/common/ucnv2022.c
View file

@ -31,6 +31,7 @@
#if !UCONFIG_NO_LEGACY_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/uset.h"
#include "unicode/ucnv_err.h"
#include "unicode/ucnv_cb.h"
#include "ucnv_bld.h"
@ -116,6 +117,12 @@ _MBCSToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
/* Protos */
/***************** ISO-2022 ********************************/
static void
_ISO_2022_GetUnicodeSet(const UConverter *cnv,
USet *set,
UConverterUnicodeSet which,
UErrorCode *pErrorCode);
static void
T_UConverter_toUnicode_ISO_2022(UConverterToUnicodeArgs * args,
UErrorCode * err);
@ -369,7 +376,8 @@ static const UConverterImpl _ISO2022Impl={
NULL,
_ISO2022getName,
_ISO_2022_WriteSub,
_ISO_2022_SafeClone
_ISO_2022_SafeClone,
_ISO_2022_GetUnicodeSet
};
static const UConverterStaticData _ISO2022StaticData={
sizeof(UConverterStaticData),
@ -418,7 +426,8 @@ static const UConverterImpl _ISO2022JPImpl={
NULL,
_ISO2022getName,
_ISO_2022_WriteSub,
_ISO_2022_SafeClone
_ISO_2022_SafeClone,
_ISO_2022_GetUnicodeSet
};
static const UConverterStaticData _ISO2022JPStaticData={
sizeof(UConverterStaticData),
@ -467,7 +476,8 @@ static const UConverterImpl _ISO2022KRImpl={
NULL,
_ISO2022getName,
_ISO_2022_WriteSub,
_ISO_2022_SafeClone
_ISO_2022_SafeClone,
_ISO_2022_GetUnicodeSet
};
static const UConverterStaticData _ISO2022KRStaticData={
sizeof(UConverterStaticData),
@ -517,7 +527,8 @@ static const UConverterImpl _ISO2022CNImpl={
NULL,
_ISO2022getName,
_ISO_2022_WriteSub,
_ISO_2022_SafeClone
_ISO_2022_SafeClone,
_ISO_2022_GetUnicodeSet
};
static const UConverterStaticData _ISO2022CNStaticData={
sizeof(UConverterStaticData),
@ -565,7 +576,7 @@ _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t opti
myConverterData->isFirstBuffer = TRUE;
cnv->fromUnicodeStatus =FALSE;
if(locale){
uprv_strcpy(myLocale,locale);
uprv_strncpy(myLocale, locale, sizeof(myLocale));
myConverterData->isLocaleSpecified = TRUE;
}
myConverterData->version= 0;
@ -642,8 +653,8 @@ _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t opti
uprv_strcpy(myConverterData->locale,"cn");
if ((options & UCNV_OPTIONS_VERSION_MASK)==1){
myConverterData->version = 1;
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn,version=1");
myConverterData->version = 1;
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn,version=1");
}else{
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn,version=0");
myConverterData->version = 0;
@ -3406,4 +3417,43 @@ _ISO_2022_SafeClone(
return &localClone->cnv;
}
static void
_ISO_2022_GetUnicodeSet(const UConverter *cnv,
USet *set,
UConverterUnicodeSet which,
UErrorCode *pErrorCode)
{
int32_t i;
USet *cnvSet;
UConverterDataISO2022* cnvData;
if (U_FAILURE(*pErrorCode)) {
return;
}
if (cnv->sharedData == &_ISO2022Data) {
/* We use UTF-8 in this case */
uset_addRange(set, 0, 0xd7FF);
uset_addRange(set, 0xE000, 0x10FFFF);
return;
}
cnvData = (UConverterDataISO2022*)cnv->extraInfo;
if (cnv->sharedData == &_ISO2022KRData && cnvData->currentConverter != NULL) {
ucnv_getUnicodeSet(cnvData->currentConverter, set, which, pErrorCode);
return;
}
cnvSet = uset_open(0, 0);
if (!cnvSet) {
*pErrorCode =U_MEMORY_ALLOCATION_ERROR;
return;
}
for (i=0; (i<UCNV_2022_MAX_CONVERTERS) && cnvData->myConverterArray[i]; i++) {
ucnv_getUnicodeSet(cnvData->myConverterArray[i], cnvSet, which, pErrorCode);
uset_addAll(set, cnvSet /* pErrorCode */);
}
uset_close(cnvSet);
}
#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */

9
icu4c/source/common/unicode/uset.h
View file

@ -183,6 +183,15 @@ uset_toPattern(const USet* set,
U_CAPI void U_EXPORT2
uset_add(USet* set, UChar32 c);
/**
* Adds each of the characters in this string to the set. Thus "ch" => {"c", "h"}
* If this set already any particular character, it has no effect on that character.
* @param s the source string
* @draft ICU 2.4
*/
U_CAPI void U_EXPORT2
uset_addAll(USet* set, const USet *additionalSet);
/**
* Adds the given range of characters to the given USet. After this call,
* uset_contains(set, start, end) will return TRUE.

5
icu4c/source/common/uset.cpp
View file

@ -88,6 +88,11 @@ uset_toPattern(const USet* set,
return pat.extract(result, resultCapacity, *ec);
}
U_CAPI void U_EXPORT2
uset_addAll(USet* set, const USet *additionalSet) {
((UnicodeSet*) set)->addAll(*((const UnicodeSet*)additionalSet));
}
U_CAPI void U_EXPORT2
uset_add(USet* set, UChar32 c) {
((UnicodeSet*) set)->add(c);