mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix fastsearch for UCS2 and UCS4

Browse source 
* If needle is 0, try (p[0] >> 16) & 0xff for UCS4
 * Disable fastsearch_memchr_1char() if needle is zero for UCS2 and UCS4
This commit is contained in:
Victor Stinner 2011-10-11 23:22:22 +02:00
parent c5af7730e3
commit 8cc70dcf70
8 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Objects/stringlib/asciilib.h
View file

@ -6,6 +6,7 @@
#define FASTSEARCH asciilib_fastsearch #define FASTSEARCH asciilib_fastsearch
#define STRINGLIB(F) asciilib_##F #define STRINGLIB(F) asciilib_##F
#define STRINGLIB_OBJECT PyUnicodeObject #define STRINGLIB_OBJECT PyUnicodeObject
#define STRINGLIB_SIZEOF_CHAR 1
#define STRINGLIB_CHAR Py_UCS1 #define STRINGLIB_CHAR Py_UCS1
#define STRINGLIB_TYPE_NAME "unicode" #define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U" #define STRINGLIB_PARSE_CODE "U"

10
Objects/stringlib/fastsearch.h
View file

@ -115,11 +115,17 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n,
unsigned char needle; unsigned char needle;
int use_needle = 1; int use_needle = 1;
needle = p[0] & 0xff; needle = p[0] & 0xff;
if (needle == 0 && sizeof(STRINGLIB_CHAR) > 1) { #if STRINGLIB_SIZEOF_CHAR > 1
if (needle == 0) {
needle = (p[0] >> 8) & 0xff; needle = (p[0] >> 8) & 0xff;
if (needle >= 32) #if STRINGLIB_SIZEOF_CHAR > 2
if (needle == 0)
needle = (p[0] >> 16) & 0xff;
#endif
if (needle >= 32 || needle == 0)
use_needle = 0; use_needle = 0;
} }
#endif
if (use_needle) if (use_needle)
return STRINGLIB(fastsearch_memchr_1char) return STRINGLIB(fastsearch_memchr_1char)
(s, n, p[0], needle, maxcount, mode); (s, n, p[0], needle, maxcount, mode);

1
Objects/stringlib/stringdefs.h
View file

@ -9,6 +9,7 @@
#define FASTSEARCH fastsearch #define FASTSEARCH fastsearch
#define STRINGLIB(F) stringlib_##F #define STRINGLIB(F) stringlib_##F
#define STRINGLIB_OBJECT PyBytesObject #define STRINGLIB_OBJECT PyBytesObject
#define STRINGLIB_SIZEOF_CHAR 1
#define STRINGLIB_CHAR char #define STRINGLIB_CHAR char
#define STRINGLIB_TYPE_NAME "string" #define STRINGLIB_TYPE_NAME "string"
#define STRINGLIB_PARSE_CODE "S" #define STRINGLIB_PARSE_CODE "S"

1
Objects/stringlib/ucs1lib.h
View file

@ -6,6 +6,7 @@
#define FASTSEARCH ucs1lib_fastsearch #define FASTSEARCH ucs1lib_fastsearch
#define STRINGLIB(F) ucs1lib_##F #define STRINGLIB(F) ucs1lib_##F
#define STRINGLIB_OBJECT PyUnicodeObject #define STRINGLIB_OBJECT PyUnicodeObject
#define STRINGLIB_SIZEOF_CHAR 1
#define STRINGLIB_CHAR Py_UCS1 #define STRINGLIB_CHAR Py_UCS1
#define STRINGLIB_TYPE_NAME "unicode" #define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U" #define STRINGLIB_PARSE_CODE "U"

1
Objects/stringlib/ucs2lib.h
View file

@ -6,6 +6,7 @@
#define FASTSEARCH ucs2lib_fastsearch #define FASTSEARCH ucs2lib_fastsearch
#define STRINGLIB(F) ucs2lib_##F #define STRINGLIB(F) ucs2lib_##F
#define STRINGLIB_OBJECT PyUnicodeObject #define STRINGLIB_OBJECT PyUnicodeObject
#define STRINGLIB_SIZEOF_CHAR 2
#define STRINGLIB_CHAR Py_UCS2 #define STRINGLIB_CHAR Py_UCS2
#define STRINGLIB_TYPE_NAME "unicode" #define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U" #define STRINGLIB_PARSE_CODE "U"

1
Objects/stringlib/ucs4lib.h
View file

@ -6,6 +6,7 @@
#define FASTSEARCH ucs4lib_fastsearch #define FASTSEARCH ucs4lib_fastsearch
#define STRINGLIB(F) ucs4lib_##F #define STRINGLIB(F) ucs4lib_##F
#define STRINGLIB_OBJECT PyUnicodeObject #define STRINGLIB_OBJECT PyUnicodeObject
#define STRINGLIB_SIZEOF_CHAR 4
#define STRINGLIB_CHAR Py_UCS4 #define STRINGLIB_CHAR Py_UCS4
#define STRINGLIB_TYPE_NAME "unicode" #define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U" #define STRINGLIB_PARSE_CODE "U"

1
Objects/stringlib/undef.h
View file

@ -1,5 +1,6 @@
#undef FASTSEARCH #undef FASTSEARCH
#undef STRINGLIB #undef STRINGLIB
#undef STRINGLIB_SIZEOF_CHAR
#undef STRINGLIB_CHAR #undef STRINGLIB_CHAR
#undef STRINGLIB_STR #undef STRINGLIB_STR
#undef STRINGLIB_LEN #undef STRINGLIB_LEN

1
Objects/stringlib/unicodedefs.h
View file

@ -9,6 +9,7 @@
#define FASTSEARCH fastsearch #define FASTSEARCH fastsearch
#define STRINGLIB(F) stringlib_##F #define STRINGLIB(F) stringlib_##F
#define STRINGLIB_OBJECT PyUnicodeObject #define STRINGLIB_OBJECT PyUnicodeObject
#define STRINGLIB_SIZEOF_CHAR Py_UNICODE_SIZE
#define STRINGLIB_CHAR Py_UNICODE #define STRINGLIB_CHAR Py_UNICODE
#define STRINGLIB_TYPE_NAME "unicode" #define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U" #define STRINGLIB_PARSE_CODE "U"