From: Benjamin Peterson Date: Fri, 8 Sep 2017 17:35:49 +0000 (-0700) Subject: replace custom table with pyctype (#3456) X-Git-Tag: v3.7.0a1~98 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b7953d974dbe5adc0937394c93f31c46cf01517;p=python replace custom table with pyctype (#3456) --- diff --git a/Objects/codeobject.c b/Objects/codeobject.c index adef625b29..f312f338a9 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -14,17 +14,6 @@ typedef struct { static int all_name_chars(PyObject *o) { - /* [a-zA-Z0-9_] */ - static const bool ok_name_char[128] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 - }; const unsigned char *s, *e; if (!PyUnicode_IS_ASCII(o)) @@ -33,7 +22,7 @@ all_name_chars(PyObject *o) s = PyUnicode_1BYTE_DATA(o); e = s + PyUnicode_GET_LENGTH(o); for (; s != e; s++) { - if (!ok_name_char[*s]) + if (!Py_ISALNUM(*s) && *s != '_') return 0; } return 1;