diff options
| author | Marc-André Lemburg <mal@egenix.com> | 2000-07-05 09:45:59 +0000 |
|---|---|---|
| committer | Marc-André Lemburg <mal@egenix.com> | 2000-07-05 09:45:59 +0000 |
| commit | 52fbb444d77f3fbdb8bc1c32247b5ea35122497f (patch) | |
| tree | cf5434a4824db940e36f16b1f51d37f5686d09c8 /Include/unicodeobject.h | |
| parent | dbd0bffe4b052aadf927abd5aa04294f47a1a630 (diff) | |
| download | cpython-52fbb444d77f3fbdb8bc1c32247b5ea35122497f.tar.gz | |
Modified the ISALPHA and ISALNUM macros to use the new lookup APIs
from unicodectype.c
Diffstat (limited to 'Include/unicodeobject.h')
| -rw-r--r-- | Include/unicodeobject.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index f076fae53b..74cb0334db 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -137,6 +137,8 @@ typedef unsigned short Py_UNICODE; #define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) #define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) +#define Py_UNICODE_ISALPHA(ch) iswalpha(ch) + #else #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_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) -#endif +#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch) -#define Py_UNICODE_ISALPHA(ch) \ - (Py_UNICODE_ISLOWER(ch) || \ - Py_UNICODE_ISUPPER(ch) || \ - Py_UNICODE_ISTITLE(ch)) +#endif #define Py_UNICODE_ISALNUM(ch) \ (Py_UNICODE_ISALPHA(ch) || \ @@ -871,6 +870,10 @@ extern DL_IMPORT(int) _PyUnicode_IsNumeric( register const Py_UNICODE ch /* Unicode character */ ); +extern DL_IMPORT(int) _PyUnicode_IsAlpha( + register const Py_UNICODE ch /* Unicode character */ + ); + #ifdef __cplusplus } #endif |