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

ICU-807 Modified all occurence of UCOL_* to UNORM_*.

Browse Source 
X-SVN-Rev: 3568
This commit is contained in:
Syn Wee Quek 2001-02-06 02:02:35 +00:00
parent 3bbcb9b96b
commit 39669d6f7a
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icu4c/source/common/unicode/normlzr.h
View File

@ -866,20 +866,20 @@ inline UNormalizationMode Normalizer::getUNormalizationMode(
switch (mode)
{
case Normalizer::NO_OP :
return UCOL_NO_NORMALIZATION;
return UNORM_NONE;
case Normalizer::COMPOSE :
return UCOL_DECOMP_CAN_COMP_COMPAT;
return UNORM_NFC;
case Normalizer::COMPOSE_COMPAT :
return UCOL_DECOMP_COMPAT_COMP_CAN;
return UNORM_NFKC;
case Normalizer::DECOMP :
return UCOL_DECOMP_CAN;
return UNORM_NFD;
case Normalizer::DECOMP_COMPAT :
return UCOL_DECOMP_COMPAT;
return UNORM_NFKD;
default :
status = U_ILLEGAL_ARGUMENT_ERROR;
}
}
return UCOL_DEFAULT_NORMALIZATION;
return UNORM_DEFAULT;
}
inline Normalizer::EMode Normalizer::getNormalizerEMode(
@ -889,15 +889,15 @@ inline Normalizer::EMode Normalizer::getNormalizerEMode(
{
switch (mode)
{
case UCOL_NO_NORMALIZATION :
case UNORM_NONE :
return Normalizer::NO_OP;
case UCOL_DECOMP_CAN :
case UNORM_NFD :
return Normalizer::DECOMP;
case UCOL_DECOMP_COMPAT :
case UNORM_NFKD :
return Normalizer::DECOMP_COMPAT;
case UCOL_DECOMP_CAN_COMP_COMPAT :
case UNORM_NFC :
return Normalizer::COMPOSE;
case UCOL_DECOMP_COMPAT_COMP_CAN :
case UNORM_NFKC :
return Normalizer::COMPOSE_COMPAT;
default :
status = U_ILLEGAL_ARGUMENT_ERROR;

15
icu4c/source/common/unicode/unorm.h
View File

@ -139,11 +139,10 @@ typedef UNormalizationMode UNormalizationOption;
* and options.
* @param source The string to normalize.
* @param sourceLength The length of source, or -1 if null-terminated.
* @param mode The normalization mode; one of UCOL_NO_NORMALIZATION,
* UCOL_CAN_DECOMP, UCOL_COMPAT_DECOMP, UCOL_CAN_DECOMP_COMPAT_COMP,
* UCOL_COMPAT_DECOMP_CAN_COMP, UCOL_DEFAULT_NORMALIZATION
* @param mode The normalization mode; one of UNORM_NONE,
* UNORM_NFD, UNORM_NFC, UNORM_NFKC, UNORM_NFKD, UNORM_DEFAULT
* @param options The normalization options, ORed together; possible values
* are UCOL_IGNORE_HANGUL
* are UNORM_IGNORE_HANGUL
* @param result A pointer to a buffer to receive the attribute.
* @param resultLength The maximum size of result.
* @param status A pointer to an UErrorCode to receive any errors
@ -188,9 +187,7 @@ typedef enum {
* results.
* @param source string for determining if it is in a normalized format
* @param sourcelength length of source to test
* @paran mode normalization format either UCOL_DECOMP_CAN,
* UCOL_DECOMP_COMPAT, UCOL_DECOMP_CAN_COMP_COMPAT or
* UCOL_DECOMP_COMPAT_COMP_CAN
* @paran mode normalization format from the enum UNormalizationMode
* @param status A pointer to an UErrorCode to receive any errors
* @return UQUICK_CHECK_YES, UQUICK_CHECK_NO or UQUICK_CHECK_MAYBE
*/
@ -212,9 +209,7 @@ u_quickCheck(const UChar* source,
* results.
* @param source string for determining if it is in a normalized format
* @param sourcelength length of source to test
* @paran mode normalization format either UCOL_DECOMP_CAN,
* UCOL_DECOMP_COMPAT, UCOL_DECOMP_CAN_COMP_COMPAT or
* UCOL_DECOMP_COMPAT_COMP_CAN
* @paran mode normalization format from the enum UNormalizationEnum
* @param options The normalization options, ORed together; possible values
* are UCOL_IGNORE_HANGUL
* @param status A pointer to an UErrorCode to receive any errors