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

ICU-2087 change @deprecated to @obsolete

Browse Source 
X-SVN-Rev: 10518
This commit is contained in:
Markus Scherer 2002-12-06 00:19:24 +00:00
parent df436948e3
commit 982f05ae4a
15 changed files with 210 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/unicode/bidi.h
View File

@ -28,7 +28,7 @@
U_NAMESPACE_BEGIN
/**
* This class is deprecated and will be removed.
* This class is obsolete and will be removed.
* Use the C API with the UBiDi type and ubidi_... functions.
* The BiDi class was just a pure 1:1 wrapper for the ubidi_ API.
*

2
icu4c/source/common/unicode/convert.h
View File

@ -21,7 +21,7 @@
U_NAMESPACE_BEGIN
/**
* This class is deprecated and will be removed.
* This class is obsolete and will be removed.
* Use the more powerful C conversion API with the UConverter type and ucnv_... functions.
*
* There are also two new functions in ICU 2.0 that convert a UnicodeString

44
icu4c/source/common/unicode/locid.h
View File

@ -183,7 +183,7 @@ public:
* A proxy for the Locale.
* This is defined to stay source code compatible and to remove static initialization.
* Treat it just like a Locale.
* @deprecated Remove after 2002-aug-31. Use one of the other Locale get functions.
* @obsolete ICU 2.4. Use one of the other Locale get functions instead since this API will be removed in that release.
*/
typedef struct U_COMMON_API LocaleProxy {
@ -235,51 +235,51 @@ public:
/**
* Useful constants for language.
*/
/* @deprecated Remove after 2002-aug-31. Use getEnglish() instead.*/
/** @obsolete ICU 2.4. Use getEnglish() instead since this API will be removed in that release. */
static const LocaleProxy ENGLISH;
/* @deprecated Remove after 2002-aug-31. Use getFrench() instead.*/
/** @obsolete ICU 2.4. Use getFrench() instead since this API will be removed in that release. */
static const LocaleProxy FRENCH;
/* @deprecated Remove after 2002-aug-31. Use getGerman() instead.*/
/** @obsolete ICU 2.4. Use getGerman() instead since this API will be removed in that release. */
static const LocaleProxy GERMAN;
/* @deprecated Remove after 2002-aug-31. Use getItalian() instead.*/
/** @obsolete ICU 2.4. Use getItalian() instead since this API will be removed in that release. */
static const LocaleProxy ITALIAN;
/* @deprecated Remove after 2002-aug-31. Use getJapanese() instead.*/
/** @obsolete ICU 2.4. Use getJapanese() instead since this API will be removed in that release. */
static const LocaleProxy JAPANESE;
/* @deprecated Remove after 2002-aug-31. Use getKorean() instead.*/
/** @obsolete ICU 2.4. Use getKorean() instead since this API will be removed in that release. */
static const LocaleProxy KOREAN;
/* @deprecated Remove after 2002-aug-31. Use getChinese() instead.*/
/** @obsolete ICU 2.4. Use getChinese() instead since this API will be removed in that release. */
static const LocaleProxy CHINESE;
/* @deprecated Remove after 2002-aug-31. Use getSimplifiedChinese() instead.*/
/** @obsolete ICU 2.4. Use getSimplifiedChinese() instead since this API will be removed in that release. */
static const LocaleProxy SIMPLIFIED_CHINESE;
/* @deprecated Remove after 2002-aug-31. Use getTraditionalChinese() instead.*/
/** @obsolete ICU 2.4. Use getTraditionalChinese() instead since this API will be removed in that release. */
static const LocaleProxy TRADITIONAL_CHINESE;
/**
* Useful constants for country.
*/
/* @deprecated Remove after 2002-aug-31. Use getFrance() instead.*/
/** @obsolete ICU 2.4. Use getFrance() instead since this API will be removed in that release. */
static const LocaleProxy FRANCE;
/* @deprecated Remove after 2002-aug-31. Use getGermany() instead.*/
/** @obsolete ICU 2.4. Use getGermany() instead since this API will be removed in that release. */
static const LocaleProxy GERMANY;
/* @deprecated Remove after 2002-aug-31. Use getItaly() instead.*/
/** @obsolete ICU 2.4. Use getItaly() instead since this API will be removed in that release. */
static const LocaleProxy ITALY;
/* @deprecated Remove after 2002-aug-31. Use getJapan() instead.*/
/** @obsolete ICU 2.4. Use getJapan() instead since this API will be removed in that release. */
static const LocaleProxy JAPAN;
/* @deprecated Remove after 2002-aug-31. Use getKorea() instead.*/
/** @obsolete ICU 2.4. Use getKorea() instead since this API will be removed in that release. */
static const LocaleProxy KOREA;
/* @deprecated Remove after 2002-aug-31. Use getChina() instead.*/
/** @obsolete ICU 2.4. Use getChina() instead since this API will be removed in that release. */
static const LocaleProxy CHINA; /* Alias for PRC */
/* @deprecated Remove after 2002-aug-31. Use getPRC() instead.*/
/** @obsolete ICU 2.4. Use getPRC() instead since this API will be removed in that release. */
static const LocaleProxy PRC; /* Peoples Republic of China */
/* @deprecated Remove after 2002-aug-31. Use getTaiwan() instead.*/
/** @obsolete ICU 2.4. Use getTaiwan() instead since this API will be removed in that release. */
static const LocaleProxy TAIWAN;
/* @deprecated Remove after 2002-aug-31. Use getUK() instead.*/
/** @obsolete ICU 2.4. Use getUK() instead since this API will be removed in that release. */
static const LocaleProxy UK;
/* @deprecated Remove after 2002-aug-31. Use getUS() instead.*/
/** @obsolete ICU 2.4. Use getUS() instead since this API will be removed in that release. */
static const LocaleProxy US;
/* @deprecated Remove after 2002-aug-31. Use getCanada() instead.*/
/** @obsolete ICU 2.4. Use getCanada() instead since this API will be removed in that release. */
static const LocaleProxy CANADA;
/* @deprecated Remove after 2002-aug-31. Use getCanadaFrench() instead.*/
/** @obsolete ICU 2.4. Use getCanadaFrench() instead since this API will be removed in that release. */
static const LocaleProxy CANADA_FRENCH;
#endif /* ICU_LOCID_USE_DEPRECATES */

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

@ -183,7 +183,7 @@ public:
* <p>
* The <code>options</code> parameter specifies which optional
* <code>Normalizer</code> features are to be enabled for this operation.
* Currently the only available option is deprecated.
* Currently the only available option is obsolete.
* If you want the default behavior corresponding to one of the standard
* Unicode Normalization Forms, use 0 for this argument.
* <p>
@ -206,7 +206,7 @@ public:
* <p>
* The <code>options</code> parameter specifies which optional
* <code>Normalizer</code> features are to be enabled for this operation.
* Currently the only available option is deprecated.
* Currently the only available option is obsolete.
* If you want the default behavior corresponding
* to Unicode Normalization Form <b>C</b> or <b>KC</b>,
* use 0 for this argument.
@ -232,7 +232,7 @@ public:
* <p>
* The <code>options</code> parameter specifies which optional
* <code>Normalizer</code> features are to be enabled for this operation.
* Currently the only available option is deprecated.
* Currently the only available option is obsolete.
* The desired options should be OR'ed together to determine the value
* of this argument. If you want the default behavior corresponding
* to Unicode Normalization Form <b>D</b> or <b>KD</b>,
@ -467,7 +467,7 @@ public:
* If the next call is to previous() then this piece of text probably
* did not need to be normalized.
*
* This function is deprecated.
* This function is obsolete.
* It is recommended to use setIndexOnly() instead of setIndex().
*
* @param index the desired index in the input text.

2
icu4c/source/common/unicode/putil.h
View File

@ -228,7 +228,7 @@ U_CAPI const char* U_EXPORT2 uprv_getDefaultLocaleID(void);
* It is not a general purpose function and not defined for NaN or Infinity
* @return the least double greater than d (if positive == true),
* or the greatest double less than d (if positive == false).
* @deprecated This will be removed after 2002-Jun-30. Use the ChoiceFormat closures API instead.
* @obsolete ICU 2.2. Use the ChoiceFormat closures API instead since this API will be removed in that release.
*/
U_CAPI double U_EXPORT2 uprv_nextDouble(double d, UBool positive);
#endif /* ICU_NEXTDOUBLE_USE_DEPRECATES */

4
icu4c/source/common/unicode/resbund.h
View File

@ -126,7 +126,7 @@ public:
/**
* Constructs a ResourceBundle
*
* @deprecated Remove after Aug 2002
* @obsolete ICU 2.4. Use const char * pathnames instead since this API will be removed in that release.
*/
ResourceBundle(const wchar_t* path,
const Locale& locale,
@ -447,7 +447,7 @@ private:
void constructForLocale(const UnicodeString& path, const Locale& locale, UErrorCode& error);
#ifdef ICU_RESOURCEBUNDLE_USE_DEPRECATES
/**
*@deprecated Remove after Aug 2002
* @obsolete ICU 2.4. Use const char * pathnames instead since this API will be removed in that release.
*/
void constructForLocale(const wchar_t* path, const Locale& locale, UErrorCode& error);
#endif /* ICU_RESOURCEBUNDLE_USE_DEPRECATES */

4
icu4c/source/common/unicode/uchar.h
View File

@ -1750,7 +1750,7 @@ U_CAPI UChar32 U_EXPORT2
u_charMirror(UChar32 c);
/**
* Deprecated because the "cell width" functions and implementation are
* Obsolete because the "cell width" functions and implementation are
* out of date compared with Unicode Standard Annex #11.
* Use u_getIntPropertyValue with UCHAR_EAST_ASIAN_WIDTH.
* See http://www.unicode.org/reports/tr11/
@ -1805,7 +1805,7 @@ u_charMirror(UChar32 c);
* conventions.
* @param c The character to be tested
* @return a value indicating the display-cell width of the character when used in Asian text
* @deprecated To be removed after 2003-jun-30; use UCHAR_EAST_ASIAN_WIDTH.
* @obsolete ICU 2.6. Use UCHAR_EAST_ASIAN_WIDTH instead since this API will be removed in that release.
*/
U_CAPI uint16_t U_EXPORT2
u_charCellWidth(UChar32 c);

2
icu4c/source/common/unicode/unicode.h
View File

@ -33,7 +33,7 @@
#ifdef ICU_UNICODE_CLASS_USE_DEPRECATES
U_NAMESPACE_BEGIN
/**
* This class is deprecated and will be removed.
* This class is obsolete and will be removed.
* Use the C API, see uchar.h and utf.h.
* The Unicode class is a pure 1:1 wrapper for the functions and macros there.
*

4
icu4c/source/common/unicode/uniset.h
View File

@ -322,10 +322,10 @@ public:
UErrorCode& status);
/**
* DEPRECATED Constructs a set from the given Unicode character category.
* Obsolete: Constructs a set from the given Unicode character category.
* @param category an integer indicating the character category as
* defined in uchar.h.
* @deprecated To be removed after 2002-DEC-31
* @obsolete ICU 2.6. Use a pattern with the category instead since this API will be removed in that release.
*/
UnicodeSet(int8_t category, UErrorCode& status);

13
icu4c/source/common/unicode/unistr.h
View File

@ -1241,7 +1241,7 @@ public:
* to the first surrogate.
* @param offset a valid offset into one code point of the text
* @return offset of the first code unit of the same code point
* @deprecated To be removed after 2002-sep-30. Use getChar32Start().
* @obsolete ICU 2.4. Use getChar32Start() instead since this API will be removed in that release.
*/
inline int32_t getCharStart(int32_t offset) const;
@ -1265,7 +1265,7 @@ public:
* behind the second surrogate (i.e., to the first surrogate).
* @param offset a valid offset after any code unit of a code point of the text
* @return offset of the first code unit after the same code point
* @deprecated To be removed after 2002-sep-30. Use getChar32Limit().
* @obsolete ICU 2.4. Use getChar32Limit() instead since this API will be removed in that release.
*/
inline int32_t getCharLimit(int32_t offset) const;
@ -1276,7 +1276,7 @@ public:
* If you want to remove a string's contents, then call truncate(0).
*
* @return TRUE if this string contains 0 characters, FALSE otherwise.
* @deprecated To be removed after 2002-sep-30. Use isEmtpy() or truncate(0).
* @obsolete ICU 2.4. Use isEmtpy() or truncate(0) instead since this API will be removed in that release.
*/
inline UBool empty(void) const;
#endif
@ -2790,7 +2790,7 @@ public:
* of how many Latin display cells the text will take up in a monospaced
* font.
* @return the number of display cells occupied by the specified substring.
* @deprecated To be removed after 2003-jun-30; use UCHAR_EAST_ASIAN_WIDTH.
* @obsolete ICU 2.6. Use UCHAR_EAST_ASIAN_WIDTH instead since this API will be removed in that release.
*/
int32_t numDisplayCells(int32_t start = 0,
int32_t length = INT32_MAX,
@ -2807,7 +2807,7 @@ public:
*
* @param pos The index of the code unit to refer to.
* @return A modifiable UCharReference to that code unit.
* @deprecated since ICU 2.4. Use charAt(), setCharAt(), and operator[] const instead.
* @obsolete ICU 2.4. Use charAt(), setCharAt(), and operator[] const instead since this API will be removed in that release.
*/
UCharReference operator[] (int32_t pos);
#endif
@ -4099,8 +4099,7 @@ UnicodeString::getArrayStart() const
/**
* A proxy class to allow the UnicodeString::operator[] function to
* work as a readable and a writable operator.
* @deprecated since ICU 2.4. Use charAt(), setCharAt(), and operator[] const
* instead of non-const UnicodeString::operator[].
* @obsolete ICU 2.4. Use charAt(), setCharAt(), and operator[] const instead since this API will be removed in that release.
*/
class U_COMMON_API UCharReference : public UObject {
public:

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

@ -140,49 +140,49 @@ typedef enum {
/** One more than the highest normalization mode constant. @stable ICU 2.0 */
UNORM_MODE_COUNT
/* *** The rest of this enum is entirely deprecated. *** */
/* *** The rest of this enum is obsolete. *** */
#ifdef ICU_UNORM_USE_DEPRECATES
/**
* No decomposition/composition
* @deprecated To be removed after 2002-sep-30, use UNORM_NONE.
* @obsolete ICU 2.4. Use UNORM_NONE instead since this API will be removed in that release.
*/
,UCOL_NO_NORMALIZATION = 1,
/**
* Canonical decomposition
* @deprecated To be removed after 2002-sep-30, use UNORM_NFD.
* @obsolete ICU 2.4. Use UNORM_NFD instead since this API will be removed in that release.
*/
UCOL_DECOMP_CAN = 2,
/**
* Compatibility decomposition
* @deprecated To be removed after 2002-sep-30, use UNORM_NFKD.
* @obsolete ICU 2.4. Use UNORM_NFKD instead since this API will be removed in that release.
*/
UCOL_DECOMP_COMPAT = 3,
/**
* Default normalization
* @deprecated To be removed after 2002-sep-30, use UNORM_NFKD or UNORM_DEFAULT.
* @obsolete ICU 2.4. Use UNORM_NFKD or UNORM_DEFAULT instead since this API will be removed in that release.
*/
UCOL_DEFAULT_NORMALIZATION = UCOL_DECOMP_COMPAT,
/**
* Canonical decomposition followed by canonical composition
* @deprecated To be removed after 2002-sep-30, use UNORM_NFC.
* @obsolete ICU 2.4. Use UNORM_NFC instead since this API will be removed in that release.
*/
UCOL_DECOMP_CAN_COMP_COMPAT = 4,
/**
* Compatibility decomposition followed by canonical composition
* @deprecated To be removed after 2002-sep-30, use UNORM_NFKC.
* @obsolete ICU 2.4. Use UNORM_NFKC instead since this API will be removed in that release.
*/
UCOL_DECOMP_COMPAT_COMP_CAN =5,
/**
* Do not normalize Hangul.
* @deprecated To be removed without replacement after 2002-mar-31.
* @obsolete ICU 2.2. Obsolete option, to be removed (or moved to private for documentation) in that release.
*/
UCOL_IGNORE_HANGUL = 16,
/**
* Do not normalize Hangul.
* @deprecated To be removed without replacement after 2002-mar-31.
* @obsolete ICU 2.2. Obsolete option, to be removed (or moved to private for documentation) in that release.
*/
UNORM_IGNORE_HANGUL = 16
#endif /* ICU_UNORM_USE_DEPRECATES */
@ -216,8 +216,8 @@ unorm_normalize(const UChar *source, int32_t sourceLength,
#ifdef ICU_UNORM_USE_DEPRECATES
/**
* The function u_normalize() has been renamed to unorm_normalize()
* for consistency. The old name is deprecated.
* @deprecated To be removed after 2002-mar-31.
* for consistency. The old name is obsolete.
* @obsolete ICU 2.2. Use unorm_normalize instead since this API will be removed in that release.
*/
#define u_normalize unorm_normalize
#endif /* ICU_UNORM_USE_DEPRECATES */

4
icu4c/source/common/unicode/ures.h
View File

@ -225,7 +225,7 @@ ures_openDirect(const char* path,
*@param status: fills in the outgoing error code.
*@see ures_close
*@return : a newly allocated resource bundle.
*@deprecated remove after Aug 2002
* @obsolete ICU 2.4. Use const char * pathnames instead since this API will be removed in that release.
*/
U_CAPI UResourceBundle* U_EXPORT2
ures_openW(const wchar_t* path,
@ -254,7 +254,7 @@ ures_openU(const UChar* path,
/**
* Returns the number of strings/arrays in resource bundles.
* Better to use user_getSize, as this function will be deprecated.
* Better to use ures_getSize, as this function will be deprecated.
*
*@param resourceBundle: resource bundle containing the desired strings
*@param resourceKey: key tagging the resource

2
icu4c/source/common/unicode/utf32.h
View File

@ -17,7 +17,7 @@
* \file
* \brief C API: UTF-32 macros
*
* This file is deprecated and its contents moved to utf_old.h.
* This file is obsolete and its contents moved to utf_old.h.
* See utf_old.h and Jitterbug 2150 and its discussion on the ICU mailing list
* in September 2002.
*/

288
icu4c/source/common/unicode/utf_old.h
View File

@ -134,7 +134,7 @@
*
* <hr>
*
* @deprecated since ICU 2.4. Use the macros in utf.h, utf16.h, utf8.h instead.
* @deprecated ICU 2.4. Use the macros in utf.h, utf16.h, utf8.h instead.
*/
/* utf.h must be included first. */
@ -152,23 +152,23 @@
* ICU always counts Unicode code units (UChars) for
* string offsets, indexes, and lengths, not Unicode code points.
*
* @deprecated Use int32_t directly. UTextOffset to be removed after 2003-mar.
* @obsolete ICU 2.6. Use int32_t directly instead since this API will be removed in that release.
*/
typedef int32_t UTextOffset;
/** Number of bits in a Unicode string code unit - ICU uses 16-bit Unicode. @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** Number of bits in a Unicode string code unit - ICU uses 16-bit Unicode. @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF_SIZE 16
/**
* The default choice for general Unicode string macros is to use the ..._SAFE macro implementations
* with strict=FALSE.
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF_SAFE
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#undef UTF_UNSAFE
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#undef UTF_STRICT
/**
@ -181,14 +181,14 @@ typedef int32_t UTextOffset;
* that needs the same number of code units (bytes) as were seen by
* a macro. They should be tested with UTF_IS_ERROR() or UTF_IS_VALID().</p>
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF8_ERROR_VALUE_1 0x15
/**
* See documentation on UTF8_ERROR_VALUE_1 for details.
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF8_ERROR_VALUE_2 0x9f
@ -196,7 +196,7 @@ typedef int32_t UTextOffset;
* Error value for all UTFs. This code point value will be set by macros with error
* checking if an error is detected.
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF_ERROR_VALUE 0xffff
@ -204,7 +204,7 @@ typedef int32_t UTextOffset;
* Is a given 32-bit code an error value
* as returned by one of the macros for any UTF?
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF_IS_ERROR(c) \
(((c)&0xfffe)==0xfffe || (c)==UTF8_ERROR_VALUE_1 || (c)==UTF8_ERROR_VALUE_2)
@ -212,7 +212,7 @@ typedef int32_t UTextOffset;
/**
* This is a combined macro: Is c a valid Unicode value _and_ not an error code?
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF_IS_VALID(c) \
(UTF_IS_UNICODE_CHAR(c) && \
@ -220,14 +220,14 @@ typedef int32_t UTextOffset;
/**
* Is this code unit or code point a surrogate (U+d800..U+dfff)?
* @deprecated since ICU 2.4. Renamed to U_IS_SURROGATE and U16_IS_SURROGATE, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_SURROGATE and U16_IS_SURROGATE, see utf_old.h.
*/
#define UTF_IS_SURROGATE(uchar) (((uchar)&0xfffff800)==0xd800)
/**
* Is a given 32-bit code point a Unicode noncharacter?
*
* @deprecated since ICU 2.4. Renamed to U_IS_UNICODE_NONCHAR, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_UNICODE_NONCHAR, see utf_old.h.
*/
#define UTF_IS_UNICODE_NONCHAR(c) \
((c)>=0xfdd0 && \
@ -247,7 +247,7 @@ typedef int32_t UTextOffset;
* This means that all code points below U+d800 are character code points,
* and that boundary is tested first for performance.
*
* @deprecated since ICU 2.4. Renamed to U_IS_UNICODE_CHAR, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_UNICODE_CHAR, see utf_old.h.
*/
#define UTF_IS_UNICODE_CHAR(c) \
((uint32_t)(c)<0xd800 || \
@ -259,24 +259,24 @@ typedef int32_t UTextOffset;
/**
* Count the trail bytes for a UTF-8 lead byte.
* @deprecated since ICU 2.4. Renamed to U8_COUNT_TRAIL_BYTES, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U8_COUNT_TRAIL_BYTES, see utf_old.h.
*/
#define UTF8_COUNT_TRAIL_BYTES(leadByte) (utf8_countTrailBytes[(uint8_t)leadByte])
/**
* Mask a UTF-8 lead byte, leave only the lower bits that form part of the code point value.
* @deprecated since ICU 2.4. Renamed to U8_MASK_LEAD_BYTE, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U8_MASK_LEAD_BYTE, see utf_old.h.
*/
#define UTF8_MASK_LEAD_BYTE(leadByte, countTrailBytes) ((leadByte)&=(1<<(6-(countTrailBytes)))-1)
/** Is this this code point a single code unit (byte)? @deprecated since ICU 2.4. Renamed to U8_IS_SINGLE, see utf_old.h. */
/** Is this this code point a single code unit (byte)? @deprecated ICU 2.4. Renamed to U8_IS_SINGLE, see utf_old.h. */
#define UTF8_IS_SINGLE(uchar) (((uchar)&0x80)==0)
/** Is this this code unit the lead code unit (byte) of a code point? @deprecated since ICU 2.4. Renamed to U8_IS_LEAD, see utf_old.h. */
/** Is this this code unit the lead code unit (byte) of a code point? @deprecated ICU 2.4. Renamed to U8_IS_LEAD, see utf_old.h. */
#define UTF8_IS_LEAD(uchar) ((uint8_t)((uchar)-0xc0)<0x3e)
/** Is this this code unit a trailing code unit (byte) of a code point? @deprecated since ICU 2.4. Renamed to U8_IS_TRAIL, see utf_old.h. */
/** Is this this code unit a trailing code unit (byte) of a code point? @deprecated ICU 2.4. Renamed to U8_IS_TRAIL, see utf_old.h. */
#define UTF8_IS_TRAIL(uchar) (((uchar)&0xc0)==0x80)
/** Does this scalar Unicode value need multiple code units for storage? @deprecated since ICU 2.4. Use U8_LENGTH or test ((uint32_t)(c)>0x7f) instead, see utf_old.h. */
/** Does this scalar Unicode value need multiple code units for storage? @deprecated ICU 2.4. Use U8_LENGTH or test ((uint32_t)(c)>0x7f) instead, see utf_old.h. */
#define UTF8_NEED_MULTIPLE_UCHAR(c) ((uint32_t)(c)>0x7f)
/**
@ -290,7 +290,7 @@ typedef int32_t UTextOffset;
* Code point comparisons need to be in uint32_t because UChar32
* may be a signed type, and negative values must be recognized.
*
* @deprecated since ICU 2.4. Use U8_LENGTH instead, see utf_old.h.
* @deprecated ICU 2.4. Use U8_LENGTH instead, see utf_old.h.
*/
#if 1
# define UTF8_CHAR_LENGTH(c) \
@ -314,27 +314,27 @@ typedef int32_t UTextOffset;
)
#endif
/** The maximum number of bytes per code point. @deprecated since ICU 2.4. Renamed to U8_MAX_LENGTH, see utf_old.h. */
/** The maximum number of bytes per code point. @deprecated ICU 2.4. Renamed to U8_MAX_LENGTH, see utf_old.h. */
#define UTF8_MAX_CHAR_LENGTH 4
/** Average number of code units compared to UTF-16. @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** Average number of code units compared to UTF-16. @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF8_ARRAY_SIZE(size) ((5*(size))/2)
/** @deprecated since ICU 2.4. Renamed to U8_GET_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_GET_UNSAFE, see utf_old.h. */
#define UTF8_GET_CHAR_UNSAFE(s, i, c) { \
int32_t __I=(int32_t)(i); \
UTF8_SET_CHAR_START_UNSAFE(s, __I); \
UTF8_NEXT_CHAR_UNSAFE(s, __I, c); \
}
/** @deprecated since ICU 2.4. Use U8_GET instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U8_GET instead, see utf_old.h. */
#define UTF8_GET_CHAR_SAFE(s, start, i, length, c, strict) { \
int32_t __I=(int32_t)(i); \
UTF8_SET_CHAR_START_SAFE(s, start, __I); \
UTF8_NEXT_CHAR_SAFE(s, __I, length, c, strict); \
}
/** @deprecated since ICU 2.4. Renamed to U8_NEXT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_NEXT_UNSAFE, see utf_old.h. */
#define UTF8_NEXT_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[(i)++]; \
if((uint8_t)((c)-0xc0)<0x35) { \
@ -354,7 +354,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_APPEND_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_APPEND_UNSAFE, see utf_old.h. */
#define UTF8_APPEND_CHAR_UNSAFE(s, i, c) { \
if((uint32_t)(c)<=0x7f) { \
(s)[(i)++]=(uint8_t)(c); \
@ -374,12 +374,12 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_FWD_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_FWD_1_UNSAFE, see utf_old.h. */
#define UTF8_FWD_1_UNSAFE(s, i) { \
(i)+=1+UTF8_COUNT_TRAIL_BYTES((s)[i]); \
}
/** @deprecated since ICU 2.4. Renamed to U8_FWD_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_FWD_N_UNSAFE, see utf_old.h. */
#define UTF8_FWD_N_UNSAFE(s, i, n) { \
int32_t __N=(n); \
while(__N>0) { \
@ -388,12 +388,12 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_SET_CP_START_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_SET_CP_START_UNSAFE, see utf_old.h. */
#define UTF8_SET_CHAR_START_UNSAFE(s, i) { \
while(UTF8_IS_TRAIL((s)[i])) { --(i); } \
}
/** @deprecated since ICU 2.4. Use U8_NEXT instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U8_NEXT instead, see utf_old.h. */
#define UTF8_NEXT_CHAR_SAFE(s, i, length, c, strict) { \
(c)=(s)[(i)++]; \
if((c)>=0x80) { \
@ -405,7 +405,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Use U8_APPEND instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U8_APPEND instead, see utf_old.h. */
#define UTF8_APPEND_CHAR_SAFE(s, i, length, c) { \
if((uint32_t)(c)<=0x7f) { \
(s)[(i)++]=(uint8_t)(c); \
@ -414,16 +414,16 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_FWD_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_FWD_1, see utf_old.h. */
#define UTF8_FWD_1_SAFE(s, i, length) U8_FWD_1(s, i, length)
/** @deprecated since ICU 2.4. Renamed to U8_FWD_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_FWD_N, see utf_old.h. */
#define UTF8_FWD_N_SAFE(s, i, length, n) U8_FWD_N(s, i, length, n)
/** @deprecated since ICU 2.4. Renamed to U8_SET_CP_START, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_SET_CP_START, see utf_old.h. */
#define UTF8_SET_CHAR_START_SAFE(s, start, i) U8_SET_CP_START(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U8_PREV_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_PREV_UNSAFE, see utf_old.h. */
#define UTF8_PREV_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[--(i)]; \
if(UTF8_IS_TRAIL(c)) { \
@ -446,12 +446,12 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_BACK_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_BACK_1_UNSAFE, see utf_old.h. */
#define UTF8_BACK_1_UNSAFE(s, i) { \
while(UTF8_IS_TRAIL((s)[--(i)])) {} \
}
/** @deprecated since ICU 2.4. Renamed to U8_BACK_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_BACK_N_UNSAFE, see utf_old.h. */
#define UTF8_BACK_N_UNSAFE(s, i, n) { \
int32_t __N=(n); \
while(__N>0) { \
@ -460,13 +460,13 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
#define UTF8_SET_CHAR_LIMIT_UNSAFE(s, i) { \
UTF8_BACK_1_UNSAFE(s, i); \
UTF8_FWD_1_UNSAFE(s, i); \
}
/** @deprecated since ICU 2.4. Use U8_PREV instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U8_PREV instead, see utf_old.h. */
#define UTF8_PREV_CHAR_SAFE(s, start, i, c, strict) { \
(c)=(s)[--(i)]; \
if((c)>=0x80) { \
@ -478,64 +478,64 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U8_BACK_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_BACK_1, see utf_old.h. */
#define UTF8_BACK_1_SAFE(s, start, i) U8_BACK_1(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U8_BACK_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_BACK_N, see utf_old.h. */
#define UTF8_BACK_N_SAFE(s, start, i, n) U8_BACK_N(s, start, i, n)
/** @deprecated since ICU 2.4. Renamed to U8_SET_CP_LIMIT, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U8_SET_CP_LIMIT, see utf_old.h. */
#define UTF8_SET_CHAR_LIMIT_SAFE(s, start, i, length) U8_SET_CP_LIMIT(s, start, i, length)
/* Formerly utf16.h --------------------------------------------------------- */
/** Is uchar a first/lead surrogate? @deprecated since ICU 2.4. Renamed to U_IS_LEAD and U16_IS_LEAD, see utf_old.h. */
/** Is uchar a first/lead surrogate? @deprecated ICU 2.4. Renamed to U_IS_LEAD and U16_IS_LEAD, see utf_old.h. */
#define UTF_IS_FIRST_SURROGATE(uchar) (((uchar)&0xfffffc00)==0xd800)
/** Is uchar a second/trail surrogate? @deprecated since ICU 2.4. Renamed to U_IS_TRAIL and U16_IS_TRAIL, see utf_old.h. */
/** Is uchar a second/trail surrogate? @deprecated ICU 2.4. Renamed to U_IS_TRAIL and U16_IS_TRAIL, see utf_old.h. */
#define UTF_IS_SECOND_SURROGATE(uchar) (((uchar)&0xfffffc00)==0xdc00)
/** Assuming c is a surrogate, is it a first/lead surrogate? @deprecated since ICU 2.4. Renamed to U_IS_SURROGATE_LEAD and U16_IS_SURROGATE_LEAD, see utf_old.h. */
/** Assuming c is a surrogate, is it a first/lead surrogate? @deprecated ICU 2.4. Renamed to U_IS_SURROGATE_LEAD and U16_IS_SURROGATE_LEAD, see utf_old.h. */
#define UTF_IS_SURROGATE_FIRST(c) (((c)&0x400)==0)
/** Helper constant for UTF16_GET_PAIR_VALUE. @deprecated since ICU 2.4. Renamed to U16_SURROGATE_OFFSET, see utf_old.h. */
/** Helper constant for UTF16_GET_PAIR_VALUE. @deprecated ICU 2.4. Renamed to U16_SURROGATE_OFFSET, see utf_old.h. */
#define UTF_SURROGATE_OFFSET ((0xd800<<10UL)+0xdc00-0x10000)
/** Get the UTF-32 value from the surrogate code units. @deprecated since ICU 2.4. Renamed to U16_GET_SUPPLEMENTARY, see utf_old.h. */
/** Get the UTF-32 value from the surrogate code units. @deprecated ICU 2.4. Renamed to U16_GET_SUPPLEMENTARY, see utf_old.h. */
#define UTF16_GET_PAIR_VALUE(first, second) \
(((first)<<10UL)+(second)-UTF_SURROGATE_OFFSET)
/** @deprecated since ICU 2.4. Renamed to U16_LEAD, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_LEAD, see utf_old.h. */
#define UTF_FIRST_SURROGATE(supplementary) (UChar)(((supplementary)>>10)+0xd7c0)
/** @deprecated since ICU 2.4. Renamed to U16_TRAIL, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_TRAIL, see utf_old.h. */
#define UTF_SECOND_SURROGATE(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00)
/** @deprecated since ICU 2.4. Renamed to U16_LEAD, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_LEAD, see utf_old.h. */
#define UTF16_LEAD(supplementary) UTF_FIRST_SURROGATE(supplementary)
/** @deprecated since ICU 2.4. Renamed to U16_TRAIL, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_TRAIL, see utf_old.h. */
#define UTF16_TRAIL(supplementary) UTF_SECOND_SURROGATE(supplementary)
/** @deprecated since ICU 2.4. Renamed to U16_IS_SINGLE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_IS_SINGLE, see utf_old.h. */
#define UTF16_IS_SINGLE(uchar) !UTF_IS_SURROGATE(uchar)
/** @deprecated since ICU 2.4. Renamed to U16_IS_LEAD, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_IS_LEAD, see utf_old.h. */
#define UTF16_IS_LEAD(uchar) UTF_IS_FIRST_SURROGATE(uchar)
/** @deprecated since ICU 2.4. Renamed to U16_IS_TRAIL, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_IS_TRAIL, see utf_old.h. */
#define UTF16_IS_TRAIL(uchar) UTF_IS_SECOND_SURROGATE(uchar)
/** Does this scalar Unicode value need multiple code units for storage? @deprecated since ICU 2.4. Use U16_LENGTH or test ((uint32_t)(c)>0xffff) instead, see utf_old.h. */
/** Does this scalar Unicode value need multiple code units for storage? @deprecated ICU 2.4. Use U16_LENGTH or test ((uint32_t)(c)>0xffff) instead, see utf_old.h. */
#define UTF16_NEED_MULTIPLE_UCHAR(c) ((uint32_t)(c)>0xffff)
/** @deprecated since ICU 2.4. Renamed to U16_LENGTH, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_LENGTH, see utf_old.h. */
#define UTF16_CHAR_LENGTH(c) ((uint32_t)(c)<=0xffff ? 1 : 2)
/** @deprecated since ICU 2.4. Renamed to U16_MAX_LENGTH, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_MAX_LENGTH, see utf_old.h. */
#define UTF16_MAX_CHAR_LENGTH 2
/** Average number of code units compared to UTF-16. @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** Average number of code units compared to UTF-16. @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF16_ARRAY_SIZE(size) (size)
/**
@ -547,7 +547,7 @@ typedef int32_t UTextOffset;
* UTF16_CHAR_LENGTH() and UTF_IS_ERROR(),
* but the use of UTF16_NEXT_CHAR[_UNSAFE]() and
* UTF16_PREV_CHAR[_UNSAFE]() is more efficient for that.
* @deprecated since ICU 2.4. Renamed to U16_GET_UNSAFE, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_GET_UNSAFE, see utf_old.h.
*/
#define UTF16_GET_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[i]; \
@ -560,7 +560,7 @@ typedef int32_t UTextOffset;
} \
}
/* @deprecated since ICU 2.4. Use U16_GET instead, see utf_old.h. */
/* @deprecated ICU 2.4. Use U16_GET instead, see utf_old.h. */
#define UTF16_GET_CHAR_SAFE(s, start, i, length, c, strict) { \
(c)=(s)[i]; \
if(UTF_IS_SURROGATE(c)) { \
@ -587,7 +587,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_NEXT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_NEXT_UNSAFE, see utf_old.h. */
#define UTF16_NEXT_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[(i)++]; \
if(UTF_IS_FIRST_SURROGATE(c)) { \
@ -595,7 +595,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_APPEND_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_APPEND_UNSAFE, see utf_old.h. */
#define UTF16_APPEND_CHAR_UNSAFE(s, i, c) { \
if((uint32_t)(c)<=0xffff) { \
(s)[(i)++]=(uint16_t)(c); \
@ -605,14 +605,14 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_FWD_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_1_UNSAFE, see utf_old.h. */
#define UTF16_FWD_1_UNSAFE(s, i) { \
if(UTF_IS_FIRST_SURROGATE((s)[(i)++])) { \
++(i); \
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_FWD_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_N_UNSAFE, see utf_old.h. */
#define UTF16_FWD_N_UNSAFE(s, i, n) { \
int32_t __N=(n); \
while(__N>0) { \
@ -621,14 +621,14 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_START_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_START_UNSAFE, see utf_old.h. */
#define UTF16_SET_CHAR_START_UNSAFE(s, i) { \
if(UTF_IS_SECOND_SURROGATE((s)[i])) { \
--(i); \
} \
}
/** @deprecated since ICU 2.4. Use U16_NEXT instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_NEXT instead, see utf_old.h. */
#define UTF16_NEXT_CHAR_SAFE(s, i, length, c, strict) { \
(c)=(s)[(i)++]; \
if(UTF_IS_FIRST_SURROGATE(c)) { \
@ -647,7 +647,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Use U16_APPEND instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_APPEND instead, see utf_old.h. */
#define UTF16_APPEND_CHAR_SAFE(s, i, length, c) { \
if((uint32_t)(c)<=0xffff) { \
(s)[(i)++]=(uint16_t)(c); \
@ -663,16 +663,16 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_FWD_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_1, see utf_old.h. */
#define UTF16_FWD_1_SAFE(s, i, length) U16_FWD_1(s, i, length)
/** @deprecated since ICU 2.4. Renamed to U16_FWD_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_N, see utf_old.h. */
#define UTF16_FWD_N_SAFE(s, i, length, n) U16_FWD_N(s, i, length, n)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h. */
#define UTF16_SET_CHAR_START_SAFE(s, start, i) U16_SET_CP_START(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U16_PREV_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_PREV_UNSAFE, see utf_old.h. */
#define UTF16_PREV_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[--(i)]; \
if(UTF_IS_SECOND_SURROGATE(c)) { \
@ -680,14 +680,14 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_BACK_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_1_UNSAFE, see utf_old.h. */
#define UTF16_BACK_1_UNSAFE(s, i) { \
if(UTF_IS_SECOND_SURROGATE((s)[--(i)])) { \
--(i); \
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_BACK_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_N_UNSAFE, see utf_old.h. */
#define UTF16_BACK_N_UNSAFE(s, i, n) { \
int32_t __N=(n); \
while(__N>0) { \
@ -696,14 +696,14 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
#define UTF16_SET_CHAR_LIMIT_UNSAFE(s, i) { \
if(UTF_IS_FIRST_SURROGATE((s)[(i)-1])) { \
++(i); \
} \
}
/** @deprecated since ICU 2.4. Use U16_PREV instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_PREV instead, see utf_old.h. */
#define UTF16_PREV_CHAR_SAFE(s, start, i, c, strict) { \
(c)=(s)[--(i)]; \
if(UTF_IS_SECOND_SURROGATE(c)) { \
@ -722,13 +722,13 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Renamed to U16_BACK_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_1, see utf_old.h. */
#define UTF16_BACK_1_SAFE(s, start, i) U16_BACK_1(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U16_BACK_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_N, see utf_old.h. */
#define UTF16_BACK_N_SAFE(s, start, i, n) U16_BACK_N(s, start, i, n)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h. */
#define UTF16_SET_CHAR_LIMIT_SAFE(s, start, i, length) U16_SET_CP_LIMIT(s, start, i, length)
/* Formerly utf32.h --------------------------------------------------------- */
@ -748,7 +748,7 @@ typedef int32_t UTextOffset;
/* internal definitions ----------------------------------------------------- */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_IS_SAFE(c, strict) \
(!(strict) ? \
(uint32_t)(c)<=0x10ffff : \
@ -764,33 +764,33 @@ typedef int32_t UTextOffset;
/* classes of code unit values */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_IS_SINGLE(uchar) 1
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_IS_LEAD(uchar) 0
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_IS_TRAIL(uchar) 0
/* number of code units per code point */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_NEED_MULTIPLE_UCHAR(c) 0
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_CHAR_LENGTH(c) 1
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_MAX_CHAR_LENGTH 1
/* average number of code units compared to UTF-16 */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_ARRAY_SIZE(size) (size)
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_GET_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[i]; \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_GET_CHAR_SAFE(s, start, i, length, c, strict) { \
(c)=(s)[i]; \
if(!UTF32_IS_SAFE(c, strict)) { \
@ -800,31 +800,31 @@ typedef int32_t UTextOffset;
/* definitions with forward iteration --------------------------------------- */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_NEXT_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[(i)++]; \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_APPEND_CHAR_UNSAFE(s, i, c) { \
(s)[(i)++]=(c); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_FWD_1_UNSAFE(s, i) { \
++(i); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_FWD_N_UNSAFE(s, i, n) { \
(i)+=(n); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_SET_CHAR_START_UNSAFE(s, i) { \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_NEXT_CHAR_SAFE(s, i, length, c, strict) { \
(c)=(s)[(i)++]; \
if(!UTF32_IS_SAFE(c, strict)) { \
@ -832,7 +832,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_APPEND_CHAR_SAFE(s, i, length, c) { \
if((uint32_t)(c)<=0x10ffff) { \
(s)[(i)++]=(c); \
@ -841,44 +841,44 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_FWD_1_SAFE(s, i, length) { \
++(i); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_FWD_N_SAFE(s, i, length, n) { \
if(((i)+=(n))>(length)) { \
(i)=(length); \
} \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_SET_CHAR_START_SAFE(s, start, i) { \
}
/* definitions with backward iteration -------------------------------------- */
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_PREV_CHAR_UNSAFE(s, i, c) { \
(c)=(s)[--(i)]; \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_BACK_1_UNSAFE(s, i) { \
--(i); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_BACK_N_UNSAFE(s, i, n) { \
(i)-=(n); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_SET_CHAR_LIMIT_UNSAFE(s, i) { \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_PREV_CHAR_SAFE(s, start, i, c, strict) { \
(c)=(s)[--(i)]; \
if(!UTF32_IS_SAFE(c, strict)) { \
@ -886,12 +886,12 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_BACK_1_SAFE(s, start, i) { \
--(i); \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_BACK_N_SAFE(s, start, i, n) { \
(i)-=(n); \
if((i)<(start)) { \
@ -899,7 +899,7 @@ typedef int32_t UTextOffset;
} \
}
/** @deprecated since ICU 2.4. Obsolete, see utf_old.h. */
/** @deprecated ICU 2.4. Obsolete, see utf_old.h. */
#define UTF32_SET_CHAR_LIMIT_SAFE(s, i, length) { \
}
@ -908,77 +908,77 @@ typedef int32_t UTextOffset;
/**
* Estimate the number of code units for a string based on the number of UTF-16 code units.
*
* @deprecated since ICU 2.4. Obsolete, see utf_old.h.
* @deprecated ICU 2.4. Obsolete, see utf_old.h.
*/
#define UTF_ARRAY_SIZE(size) UTF16_ARRAY_SIZE(size)
/** @deprecated since ICU 2.4. Renamed to U16_GET_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_GET_UNSAFE, see utf_old.h. */
#define UTF_GET_CHAR_UNSAFE(s, i, c) UTF16_GET_CHAR_UNSAFE(s, i, c)
/** @deprecated since ICU 2.4. Use U16_GET instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_GET instead, see utf_old.h. */
#define UTF_GET_CHAR_SAFE(s, start, i, length, c, strict) UTF16_GET_CHAR_SAFE(s, start, i, length, c, strict)
/** @deprecated since ICU 2.4. Renamed to U16_NEXT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_NEXT_UNSAFE, see utf_old.h. */
#define UTF_NEXT_CHAR_UNSAFE(s, i, c) UTF16_NEXT_CHAR_UNSAFE(s, i, c)
/** @deprecated since ICU 2.4. Use U16_NEXT instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_NEXT instead, see utf_old.h. */
#define UTF_NEXT_CHAR_SAFE(s, i, length, c, strict) UTF16_NEXT_CHAR_SAFE(s, i, length, c, strict)
/** @deprecated since ICU 2.4. Renamed to U16_APPEND_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_APPEND_UNSAFE, see utf_old.h. */
#define UTF_APPEND_CHAR_UNSAFE(s, i, c) UTF16_APPEND_CHAR_UNSAFE(s, i, c)
/** @deprecated since ICU 2.4. Use U16_APPEND instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_APPEND instead, see utf_old.h. */
#define UTF_APPEND_CHAR_SAFE(s, i, length, c) UTF16_APPEND_CHAR_SAFE(s, i, length, c)
/** @deprecated since ICU 2.4. Renamed to U16_FWD_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_1_UNSAFE, see utf_old.h. */
#define UTF_FWD_1_UNSAFE(s, i) UTF16_FWD_1_UNSAFE(s, i)
/** @deprecated since ICU 2.4. Renamed to U16_FWD_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_1, see utf_old.h. */
#define UTF_FWD_1_SAFE(s, i, length) UTF16_FWD_1_SAFE(s, i, length)
/** @deprecated since ICU 2.4. Renamed to U16_FWD_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_N_UNSAFE, see utf_old.h. */
#define UTF_FWD_N_UNSAFE(s, i, n) UTF16_FWD_N_UNSAFE(s, i, n)
/** @deprecated since ICU 2.4. Renamed to U16_FWD_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_FWD_N, see utf_old.h. */
#define UTF_FWD_N_SAFE(s, i, length, n) UTF16_FWD_N_SAFE(s, i, length, n)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_START_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_START_UNSAFE, see utf_old.h. */
#define UTF_SET_CHAR_START_UNSAFE(s, i) UTF16_SET_CHAR_START_UNSAFE(s, i)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h. */
#define UTF_SET_CHAR_START_SAFE(s, start, i) UTF16_SET_CHAR_START_SAFE(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U16_PREV_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_PREV_UNSAFE, see utf_old.h. */
#define UTF_PREV_CHAR_UNSAFE(s, i, c) UTF16_PREV_CHAR_UNSAFE(s, i, c)
/** @deprecated since ICU 2.4. Use U16_PREV instead, see utf_old.h. */
/** @deprecated ICU 2.4. Use U16_PREV instead, see utf_old.h. */
#define UTF_PREV_CHAR_SAFE(s, start, i, c, strict) UTF16_PREV_CHAR_SAFE(s, start, i, c, strict)
/** @deprecated since ICU 2.4. Renamed to U16_BACK_1_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_1_UNSAFE, see utf_old.h. */
#define UTF_BACK_1_UNSAFE(s, i) UTF16_BACK_1_UNSAFE(s, i)
/** @deprecated since ICU 2.4. Renamed to U16_BACK_1, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_1, see utf_old.h. */
#define UTF_BACK_1_SAFE(s, start, i) UTF16_BACK_1_SAFE(s, start, i)
/** @deprecated since ICU 2.4. Renamed to U16_BACK_N_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_N_UNSAFE, see utf_old.h. */
#define UTF_BACK_N_UNSAFE(s, i, n) UTF16_BACK_N_UNSAFE(s, i, n)
/** @deprecated since ICU 2.4. Renamed to U16_BACK_N, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_BACK_N, see utf_old.h. */
#define UTF_BACK_N_SAFE(s, start, i, n) UTF16_BACK_N_SAFE(s, start, i, n)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT_UNSAFE, see utf_old.h. */
#define UTF_SET_CHAR_LIMIT_UNSAFE(s, i) UTF16_SET_CHAR_LIMIT_UNSAFE(s, i)
/** @deprecated since ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h. */
/** @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h. */
#define UTF_SET_CHAR_LIMIT_SAFE(s, start, i, length) UTF16_SET_CHAR_LIMIT_SAFE(s, start, i, length)
/* Define default macros (UTF-16 "safe") ------------------------------------ */
@ -986,42 +986,42 @@ typedef int32_t UTextOffset;
/**
* Does this code unit alone encode a code point (BMP, not a surrogate)?
* Same as UTF16_IS_SINGLE.
* @deprecated since ICU 2.4. Renamed to U_IS_SINGLE and U16_IS_SINGLE, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_SINGLE and U16_IS_SINGLE, see utf_old.h.
*/
#define UTF_IS_SINGLE(uchar) U16_IS_SINGLE(uchar)
/**
* Is this code unit the first one of several (a lead surrogate)?
* Same as UTF16_IS_LEAD.
* @deprecated since ICU 2.4. Renamed to U_IS_LEAD and U16_IS_LEAD, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_LEAD and U16_IS_LEAD, see utf_old.h.
*/
#define UTF_IS_LEAD(uchar) U16_IS_LEAD(uchar)
/**
* Is this code unit one of several but not the first one (a trail surrogate)?
* Same as UTF16_IS_TRAIL.
* @deprecated since ICU 2.4. Renamed to U_IS_TRAIL and U16_IS_TRAIL, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U_IS_TRAIL and U16_IS_TRAIL, see utf_old.h.
*/
#define UTF_IS_TRAIL(uchar) U16_IS_TRAIL(uchar)
/**
* Does this code point require multiple code units (is it a supplementary code point)?
* Same as UTF16_NEED_MULTIPLE_UCHAR.
* @deprecated since ICU 2.4. Use U16_LENGTH or test ((uint32_t)(c)>0xffff) instead.
* @deprecated ICU 2.4. Use U16_LENGTH or test ((uint32_t)(c)>0xffff) instead.
*/
#define UTF_NEED_MULTIPLE_UCHAR(c) UTF16_NEED_MULTIPLE_UCHAR(c)
/**
* How many code units are used to encode this code point (1 or 2)?
* Same as UTF16_CHAR_LENGTH.
* @deprecated since ICU 2.4. Renamed to U16_LENGTH, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_LENGTH, see utf_old.h.
*/
#define UTF_CHAR_LENGTH(c) U16_LENGTH(c)
/**
* How many code units are used at most for any Unicode code point (2)?
* Same as UTF16_MAX_CHAR_LENGTH.
* @deprecated since ICU 2.4. Renamed to U16_MAX_LENGTH, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_MAX_LENGTH, see utf_old.h.
*/
#define UTF_MAX_CHAR_LENGTH U16_MAX_LENGTH
@ -1032,7 +1032,7 @@ typedef int32_t UTextOffset;
* Same as UTF16_GET_CHAR.
* \pre 0<=i<length
*
* @deprecated since ICU 2.4. Renamed to U16_GET, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_GET, see utf_old.h.
*/
#define UTF_GET_CHAR(s, start, i, length, c) U16_GET(s, start, i, length, c)
@ -1045,7 +1045,7 @@ typedef int32_t UTextOffset;
* \pre 0<=i<length
* \post 0<i<=length
*
* @deprecated since ICU 2.4. Renamed to U16_NEXT, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_NEXT, see utf_old.h.
*/
#define UTF_NEXT_CHAR(s, i, length, c) U16_NEXT(s, i, length, c)
@ -1058,7 +1058,7 @@ typedef int32_t UTextOffset;
* \pre 0<=i<length
* \post 0<i<=length
*
* @deprecated since ICU 2.4. Use U16_APPEND instead, see utf_old.h.
* @deprecated ICU 2.4. Use U16_APPEND instead, see utf_old.h.
*/
#define UTF_APPEND_CHAR(s, i, length, c) UTF16_APPEND_CHAR_SAFE(s, i, length, c)
@ -1069,7 +1069,7 @@ typedef int32_t UTextOffset;
* \pre 0<=i<length
* \post 0<i<=length
*
* @deprecated since ICU 2.4. Renamed to U16_FWD_1, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_FWD_1, see utf_old.h.
*/
#define UTF_FWD_1(s, i, length) U16_FWD_1(s, i, length)
@ -1080,7 +1080,7 @@ typedef int32_t UTextOffset;
* \pre 0<=i<length
* \post 0<i<=length
*
* @deprecated since ICU 2.4. Renamed to U16_FWD_N, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_FWD_N, see utf_old.h.
*/
#define UTF_FWD_N(s, i, length, n) U16_FWD_N(s, i, length, n)
@ -1096,7 +1096,7 @@ typedef int32_t UTextOffset;
* \pre start<=i<length
* \post start<=i<length
*
* @deprecated since ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_SET_CP_START, see utf_old.h.
*/
#define UTF_SET_CHAR_START(s, start, i) U16_SET_CP_START(s, start, i)
@ -1109,7 +1109,7 @@ typedef int32_t UTextOffset;
* \pre start<i<=length
* \post start<=i<length
*
* @deprecated since ICU 2.4. Renamed to U16_PREV, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_PREV, see utf_old.h.
*/
#define UTF_PREV_CHAR(s, start, i, c) U16_PREV(s, start, i, c)
@ -1122,7 +1122,7 @@ typedef int32_t UTextOffset;
* \pre start<i<=length
* \post start<=i<length
*
* @deprecated since ICU 2.4. Renamed to U16_BACK_1, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_BACK_1, see utf_old.h.
*/
#define UTF_BACK_1(s, start, i) U16_BACK_1(s, start, i)
@ -1135,7 +1135,7 @@ typedef int32_t UTextOffset;
* \pre start<i<=length
* \post start<=i<length
*
* @deprecated since ICU 2.4. Renamed to U16_BACK_N, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_BACK_N, see utf_old.h.
*/
#define UTF_BACK_N(s, start, i, n) U16_BACK_N(s, start, i, n)
@ -1151,7 +1151,7 @@ typedef int32_t UTextOffset;
* \pre start<i<=length
* \post start<i<=length
*
* @deprecated since ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h.
* @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT, see utf_old.h.
*/
#define UTF_SET_CHAR_LIMIT(s, start, i, length) U16_SET_CP_LIMIT(s, start, i, length)

20
icu4c/source/common/unicode/utypes.h
View File

@ -378,16 +378,16 @@ typedef enum UErrorCode {
U_ERROR_WARNING_LIMIT, /**< This must always be the last warning value to indicate the limit for UErrorCode warnings (last warning code +1) */
#ifdef ICU_UERRORCODE_USE_DEPRECATES
/** @deprecated remove after 09/01/2002. use the enum that ends in _WARNING */
U_USING_FALLBACK_ERROR = -128, /**< A resource bundle lookup returned a fallback result (not an error) */
/** @deprecated remove after 09/01/2002. use the enum that ends in _WARNING */
U_ERROR_INFO_START = U_ERROR_WARNING_START, /**< Start of information results (semantically successful) */
/** @deprecated remove after 09/01/2002. use the enum that ends in _WARNING */
U_USING_DEFAULT_ERROR = -127, /**< A resource bundle lookup returned a result from the root locale (not an error) */
/** @deprecated remove after 09/01/2002. use the enum that ends in _WARNING */
U_SAFECLONE_ALLOCATED_ERROR = -126, /**< A SafeClone operation required allocating memory (informational only) */
/** @deprecated remove after 09/01/2002. use the enum that ends in _WARNING */
U_ERROR_INFO_LIMIT = U_ERROR_WARNING_LIMIT, /**< This must always be the last warning value to indicate the limit for UErrorCode warnings (last warning code +1) */
/** @obsolete ICU 2.4. Use the enum that ends in _WARNING instead since this API will be removed in that release. */
U_USING_FALLBACK_ERROR = -128,
/** @obsolete ICU 2.4. Use the enum that ends in _WARNING instead since this API will be removed in that release. */
U_ERROR_INFO_START = U_ERROR_WARNING_START,
/** @obsolete ICU 2.4. Use the enum that ends in _WARNING instead since this API will be removed in that release. */
U_USING_DEFAULT_ERROR = -127,
/** @obsolete ICU 2.4. Use the enum that ends in _WARNING instead since this API will be removed in that release. */
U_SAFECLONE_ALLOCATED_ERROR = -126,
/** @obsolete ICU 2.4. Use the enum that ends in _WARNING instead since this API will be removed in that release. */
U_ERROR_INFO_LIMIT = U_ERROR_WARNING_LIMIT,
#endif /* ICU_UERRORCODE_USE_DEPRECATES */