organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-22520 Refactor function macros into inline functions.

Browse source 
This is to facilitate further refactoring of the locale code.
This commit is contained in:
Fredrik Roubert 2024-02-07 22:37:31 +01:00 • committed by Fredrik Roubert
parent ba1208e49b
commit 63ae786bf7
6 changed files with 71 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/localebuilder.cpp
View file

@ -12,8 +12,10 @@
U_NAMESPACE_BEGIN
#define UPRV_ISDIGIT(c) (((c) >= '0') && ((c) <= '9'))
#define UPRV_ISALPHANUM(c) (uprv_isASCIILetter(c) || UPRV_ISDIGIT(c) )
namespace {
inline bool UPRV_ISDIGIT(char c) { return c >= '0' && c <= '9'; }
inline bool UPRV_ISALPHANUM(char c) { return uprv_isASCIILetter(c) || UPRV_ISDIGIT(c); }
} // namespace
constexpr const char* kAttributeKey = "attribute";

44
icu4c/source/common/loclikely.cpp
View file

@ -199,24 +199,27 @@ error:
goto exit;
}
#define CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength) UPRV_BLOCK_MACRO_BEGIN { \
int32_t count = 0; \
int32_t i; \
for (i = 0; i < trailingLength; i++) { \
if (trailing[i] == '-' || trailing[i] == '_') { \
count = 0; \
if (count > 8) { \
goto error; \
} \
} else if (trailing[i] == '@') { \
break; \
} else if (count > 8) { \
goto error; \
} else { \
count++; \
} \
} \
} UPRV_BLOCK_MACRO_END
namespace {
inline bool CHECK_TRAILING_VARIANT_SIZE(const char* trailing, int32_t trailingLength) {
int32_t count = 0;
int32_t i;
for (i = 0; i < trailingLength; i++) {
if (trailing[i] == '-' || trailing[i] == '_') {
count = 0;
if (count > 8) {
return false;
}
} else if (trailing[i] == '@') {
break;
} else if (count > 8) {
return false;
} else {
count++;
}
}
return true;
}
} // namespace
static UBool
_uloc_addLikelySubtags(const char* localeID,
@ -266,7 +269,8 @@ _uloc_addLikelySubtags(const char* localeID,
trailing = &localeID[trailingIndex];
trailingLength = (int32_t)uprv_strlen(trailing);
CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength);
if (!CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength)) goto error;
{
const icu::LikelySubtags* likelySubtags = icu::LikelySubtags::getSingleton(*err);
if(U_FAILURE(*err)) {
@ -362,7 +366,7 @@ _uloc_minimizeSubtags(const char* localeID,
trailing = &localeID[trailingIndex];
trailingLength = (int32_t)uprv_strlen(trailing);
CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength);
if (!CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength)) goto error;
{
const icu::LikelySubtags* likelySubtags = icu::LikelySubtags::getSingleton(*err);

22
icu4c/source/common/locmap.cpp
View file

@ -1030,22 +1030,24 @@ getPosixID(const ILcidPosixMap *this_0, uint32_t hostID)
/////////////////////////////////////
*/
#if U_PLATFORM_HAS_WIN32_API && UCONFIG_USE_WINDOWS_LCID_MAPPING_API
namespace {
/*
* Various language tags needs to be changed:
* quz -> qu
* prs -> fa
*/
#define FIX_LANGUAGE_ID_TAG(buffer, len) \
if (len >= 3) { \
if (buffer[0] == 'q' && buffer[1] == 'u' && buffer[2] == 'z') {\
buffer[2] = 0; \
uprv_strcat(buffer, buffer+3); \
} else if (buffer[0] == 'p' && buffer[1] == 'r' && buffer[2] == 's') {\
buffer[0] = 'f'; buffer[1] = 'a'; buffer[2] = 0; \
uprv_strcat(buffer, buffer+3); \
} \
inline void FIX_LANGUAGE_ID_TAG(char* buffer, int32_t len) {
if (len >= 3) {
if (buffer[0] == 'q' && buffer[1] == 'u' && buffer[2] == 'z') {
buffer[2] = 0;
uprv_strcat(buffer, buffer+3);
} else if (buffer[0] == 'p' && buffer[1] == 'r' && buffer[2] == 's') {
buffer[0] = 'f'; buffer[1] = 'a'; buffer[2] = 0;
uprv_strcat(buffer, buffer+3);
}
}
}
} // namespace
#endif
U_CAPI int32_t

38
icu4c/source/common/uloc.cpp
View file

@ -476,11 +476,11 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = {
{ "zh_YUE", "yue" }, /* registered name */
};
namespace {
/* ### BCP47 Conversion *******************************************/
/* Test if the locale id has BCP47 u extension and does not have '@' */
#define _hasBCP47Extension(id) (id && uprv_strstr(id, "@") == nullptr && getShortestSubtagLength(id) == 1)
/* Gets the size of the shortest subtag in the given localeID. */
static int32_t getShortestSubtagLength(const char *localeID) {
int32_t getShortestSubtagLength(const char *localeID) {
int32_t localeIDLength = static_cast<int32_t>(uprv_strlen(localeID));
int32_t length = localeIDLength;
int32_t tmpLength = 0;
@ -504,12 +504,18 @@ static int32_t getShortestSubtagLength(const char *localeID) {
return length;
}
/* Test if the locale id has BCP47 u extension and does not have '@' */
inline bool _hasBCP47Extension(const char *id) {
return id != nullptr && uprv_strstr(id, "@") == nullptr && getShortestSubtagLength(id) == 1;
}
/* ### Keywords **************************************************/
#define UPRV_ISDIGIT(c) (((c) >= '0') && ((c) <= '9'))
#define UPRV_ISALPHANUM(c) (uprv_isASCIILetter(c) || UPRV_ISDIGIT(c) )
inline bool UPRV_ISDIGIT(char c) { return c >= '0' && c <= '9'; }
inline bool UPRV_ISALPHANUM(char c) { return uprv_isASCIILetter(c) || UPRV_ISDIGIT(c); }
/* Punctuation/symbols allowed in legacy key values */
#define UPRV_OK_VALUE_PUNCTUATION(c) ((c) == '_' || (c) == '-' || (c) == '+' || (c) == '/')
inline bool UPRV_OK_VALUE_PUNCTUATION(char c) { return c == '_' || c == '-' || c == '+' || c == '/'; }
} // namespace
#define ULOC_KEYWORD_BUFFER_LEN 25
#define ULOC_MAX_NO_KEYWORDS 25
@ -1094,18 +1100,18 @@ ulocimp_setKeywordValue(const char* keywords,
/* ### ID parsing implementation **************************************************/
#define _isPrefixLetter(a) ((a=='x')||(a=='X')||(a=='i')||(a=='I'))
namespace {
inline bool _isPrefixLetter(char a) { return a == 'x' || a == 'X' || a == 'i' || a == 'I'; }
/*returns true if one of the special prefixes is here (s=string)
'x-' or 'i-' */
#define _isIDPrefix(s) (_isPrefixLetter(s[0])&&_isIDSeparator(s[1]))
inline bool _isIDPrefix(const char *s) { return _isPrefixLetter(s[0]) && _isIDSeparator(s[1]); }
/* Dot terminates it because of POSIX form where dot precedes the codepage
* except for variant
*/
#define _isTerminator(a) ((a==0)||(a=='.')||(a=='@'))
namespace {
inline bool _isTerminator(char a) { return a == 0 || a == '.' || a == '@'; }
inline bool _isBCP47Extension(const char* p) {
return p[0] == '-' &&
@ -1680,10 +1686,14 @@ uloc_openKeywords(const char* localeID,
#define _ULOC_STRIP_KEYWORDS 0x2
#define _ULOC_CANONICALIZE 0x1
#define OPTION_SET(options, mask) ((options & mask) != 0)
namespace {
static const char i_default[] = {'i', '-', 'd', 'e', 'f', 'a', 'u', 'l', 't'};
#define I_DEFAULT_LENGTH UPRV_LENGTHOF(i_default)
inline bool OPTION_SET(uint32_t options, uint32_t mask) { return (options & mask) != 0; }
constexpr char i_default[] = {'i', '-', 'd', 'e', 'f', 'a', 'u', 'l', 't'};
constexpr int32_t I_DEFAULT_LENGTH = UPRV_LENGTHOF(i_default);
} // namespace
/**
* Canonicalize the given localeID, to level 1 or to level 2,

6
icu4c/source/common/uloc_tag.cpp
View file

@ -69,8 +69,10 @@ typedef struct ULanguageTag {
#define LOCALE_KEYWORD_SEP ';'
#define LOCALE_KEY_TYPE_SEP '='
#define ISALPHA(c) uprv_isASCIILetter(c)
#define ISNUMERIC(c) ((c)>='0' && (c)<='9')
namespace {
constexpr auto ISALPHA = uprv_isASCIILetter;
inline bool ISNUMERIC(char c) { return c >= '0' && c <= '9'; }
} // namespace
static const char EMPTY[] = "";
static const char LANG_UND[] = "und";

4
icu4c/source/common/ulocimp.h
View file

@ -42,8 +42,10 @@ uloc_getTableStringWithFallback(
int32_t *pLength,
UErrorCode *pErrorCode);
namespace {
/*returns true if a is an ID separator false otherwise*/
#define _isIDSeparator(a) (a == '_' || a == '-')
inline bool _isIDSeparator(char a) { return a == '_' || a == '-'; }
} // namespace
U_CFUNC const char*
uloc_getCurrentCountryID(const char* oldID);