diff options
author | Fredrik Lundh <fredrik@pythonware.com> | 2000-07-01 17:50:59 (GMT) |
---|---|---|
committer | Fredrik Lundh <fredrik@pythonware.com> | 2000-07-01 17:50:59 (GMT) |
commit | 22d254652099e3a1f157543c7b1b37e3263e65c7 (patch) | |
tree | e761c89098e3efcc101ed90f2647d8e231bdd150 /Modules/_sre.c | |
parent | c3a65982a3bab83307bc4b2db2bdac659950e559 (diff) | |
download | cpython-22d254652099e3a1f157543c7b1b37e3263e65c7.zip cpython-22d254652099e3a1f157543c7b1b37e3263e65c7.tar.gz cpython-22d254652099e3a1f157543c7b1b37e3263e65c7.tar.bz2 |
today's SRE update:
-- changed 1.6 to 2.0 in the file headers
-- fixed ISALNUM macro for the unicode locale. this
solution isn't perfect, but the best I can do with
Python's current unicode database.
Diffstat (limited to 'Modules/_sre.c')
-rw-r--r-- | Modules/_sre.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Modules/_sre.c b/Modules/_sre.c index 46fe4ed..3d6305a 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -25,7 +25,7 @@ * Copyright (c) 1997-2000 by Secret Labs AB. All rights reserved. * * Portions of this engine have been developed in cooperation with - * CNRI. Hewlett-Packard provided funding for 1.6 integration and + * CNRI. Hewlett-Packard provided funding for 2.0 integration and * other compatibility work. */ @@ -52,7 +52,7 @@ char copyright[] = " SRE 0.9.4 Copyright (c) 1997-2000 by Secret Labs AB "; #undef DEBUG #if PY_VERSION_HEX >= 0x01060000 -/* defining this enables unicode support (default under 1.6) */ +/* defining this enables unicode support (default under 1.6a1 and later) */ #define HAVE_UNICODE #endif @@ -143,11 +143,18 @@ static unsigned int sre_lower_unicode(unsigned int ch) { return (unsigned int) Py_UNICODE_TOLOWER((Py_UNICODE)(ch)); } -#define SRE_UNI_TO_LOWER(ch) Py_UNICODE_TOLOWER((Py_UNICODE)(ch)) + +#if !defined(Py_UNICODE_ISALNUM) +/* FIXME: workaround. should be fixed in unicodectype.c */ +#define Py_UNICODE_ISALNUM(ch)\ + (Py_UNICODE_ISLOWER(ch) || Py_UNICODE_ISUPPER(ch) ||\ + Py_UNICODE_ISTITLE(ch) || Py_UNICODE_ISDIGIT(ch)) +#endif + #define SRE_UNI_IS_DIGIT(ch) Py_UNICODE_ISDIGIT((Py_UNICODE)(ch)) #define SRE_UNI_IS_SPACE(ch) Py_UNICODE_ISSPACE((Py_UNICODE)(ch)) #define SRE_UNI_IS_LINEBREAK(ch) Py_UNICODE_ISLINEBREAK((Py_UNICODE)(ch)) -#define SRE_UNI_IS_ALNUM(ch) ((ch) < 256 ? isalnum((ch)) : 0) +#define SRE_UNI_IS_ALNUM(ch) Py_UNICODE_ISALNUM((Py_UNICODE)(ch)) #define SRE_UNI_IS_WORD(ch) (SRE_IS_ALNUM((ch)) || (ch) == '_') #endif |