Merged revisions 79725 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79725 | benjamin.peterson | 2010-04-03 18:03:35 -0500 (Sat, 03 Apr 2010) | 4 lines
use our own locale independent ctype macros
requires building pyctype.o into pgen
........
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 898c4f0..c704b14 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -239,6 +239,7 @@
PGOBJS= \
Objects/obmalloc.o \
Python/mysnprintf.o \
+ Python/pyctype.o \
Parser/tokenizer_pgen.o \
Parser/printgrammar.o \
Parser/pgenmain.o
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index be2940c..77fec74 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -179,16 +179,6 @@
#else /* PGEN */
-/* Ensure that the locale does not interfere with tokenization. */
-
-static int
-ascii_isalnum(int c)
-{
- return (('a' <= c && c <= 'z') ||
- ('A' <= c && c <= 'Z') ||
- ('0' <= c && c <= '9'));
-}
-
static char *
error_ret(struct tok_state *tok) /* XXX */
{
@@ -255,7 +245,7 @@
} while (t[0] == '\x20' || t[0] == '\t');
begin = t;
- while (ascii_isalnum(Py_CHARMASK(t[0])) ||
+ while (Py_ISALNUM(t[0]) ||
t[0] == '-' || t[0] == '_' || t[0] == '.')
t++;