Simplified implementation of _sre.ascii_iscased(). (GH-9097)

sir-sigurd · serhiy-storchaka · commit 7f0d59f3a83c · 2018-09-12T15:49:09.000+03:00
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -100,11 +100,6 @@ static unsigned int sre_lower_ascii(unsigned int ch)
     return ((ch) < 128 ? Py_TOLOWER(ch) : ch);
 }
 
-static unsigned int sre_upper_ascii(unsigned int ch)
-{
-    return ((ch) < 128 ? Py_TOUPPER(ch) : ch);
-}
-
 /* locale-specific character predicates */
 /* !(c & ~N) == (c < N+1) for any unsigned c, this avoids
  * warnings when c's type supports only numbers < N+1 */
@@ -293,7 +288,7 @@ _sre_ascii_iscased_impl(PyObject *module, int character)
 /*[clinic end generated code: output=4f454b630fbd19a2 input=9f0bd952812c7ed3]*/
 {
     unsigned int ch = (unsigned int)character;
-    return ch != sre_lower_ascii(ch) || ch != sre_upper_ascii(ch);
+    return ch < 128 && Py_ISALPHA(ch);
 }
 
 /*[clinic input]

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,6 @@ static unsigned int sre_lower_ascii(unsigned int ch)`
`100`	`100`	`return ((ch) < 128 ? Py_TOLOWER(ch) : ch);`
`101`	`101`	`}`
`102`	`102`
`103`		`-static unsigned int sre_upper_ascii(unsigned int ch)`
`104`		`-{`
`105`		`- return ((ch) < 128 ? Py_TOUPPER(ch) : ch);`
`106`		`-}`
`107`		`-`
`108`	`103`	`/* locale-specific character predicates */`
`109`	`104`	`/* !(c & ~N) == (c < N+1) for any unsigned c, this avoids`
`110`	`105`	`* warnings when c's type supports only numbers < N+1 */`
`@@ -293,7 +288,7 @@ _sre_ascii_iscased_impl(PyObject *module, int character)`
`293`	`288`	`/[clinic end generated code: output=4f454b630fbd19a2 input=9f0bd952812c7ed3]/`
`294`	`289`	`{`
`295`	`290`	`unsigned int ch = (unsigned int)character;`
`296`		`- return ch != sre_lower_ascii(ch) \|\| ch != sre_upper_ascii(ch);`
	`291`	`+ return ch < 128 && Py_ISALPHA(ch);`
`297`	`292`	`}`
`298`	`293`
`299`	`294`	`/*[clinic input]`