mirror of https://github.com/python/cpython.git
Modified the ISALPHA and ISALNUM macros to use the new lookup APIs
from unicodectype.c
This commit is contained in:
parent
82249c8389
commit
f03e74126e
|
@ -137,6 +137,8 @@ typedef unsigned short Py_UNICODE;
|
||||||
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
||||||
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
||||||
|
|
||||||
|
#define Py_UNICODE_ISALPHA(ch) iswalpha(ch)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define Py_UNICODE_ISSPACE(ch) _PyUnicode_IsWhitespace(ch)
|
#define Py_UNICODE_ISSPACE(ch) _PyUnicode_IsWhitespace(ch)
|
||||||
|
@ -158,12 +160,9 @@ typedef unsigned short Py_UNICODE;
|
||||||
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
||||||
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
||||||
|
|
||||||
#endif
|
#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
|
||||||
|
|
||||||
#define Py_UNICODE_ISALPHA(ch) \
|
#endif
|
||||||
(Py_UNICODE_ISLOWER(ch) || \
|
|
||||||
Py_UNICODE_ISUPPER(ch) || \
|
|
||||||
Py_UNICODE_ISTITLE(ch))
|
|
||||||
|
|
||||||
#define Py_UNICODE_ISALNUM(ch) \
|
#define Py_UNICODE_ISALNUM(ch) \
|
||||||
(Py_UNICODE_ISALPHA(ch) || \
|
(Py_UNICODE_ISALPHA(ch) || \
|
||||||
|
@ -871,6 +870,10 @@ extern DL_IMPORT(int) _PyUnicode_IsNumeric(
|
||||||
register const Py_UNICODE ch /* Unicode character */
|
register const Py_UNICODE ch /* Unicode character */
|
||||||
);
|
);
|
||||||
|
|
||||||
|
extern DL_IMPORT(int) _PyUnicode_IsAlpha(
|
||||||
|
register const Py_UNICODE ch /* Unicode character */
|
||||||
|
);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue