mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

changed find/rfind to return -1 for matches outside the source string

Browse source
This commit is contained in:
Fredrik Lundh 2006-05-30 17:11:48 +00:00
parent 9faa3eda6b
commit 93eff6fecd
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/string_tests.py
View file

@ -154,6 +154,10 @@ class CommonTest(unittest.TestCase):
self.checkequal(9, 'abcdefghiabc', 'find', 'abc', 1)
self.checkequal(-1, 'abcdefghiabc', 'find', 'def', 4)
self.checkequal(0, 'abc', 'find', '', 0)
self.checkequal(3, 'abc', 'find', '', 3)
self.checkequal(-1, 'abc', 'find', '', 4)
self.checkraises(TypeError, 'hello', 'find')
self.checkraises(TypeError, 'hello', 'find', 42)
@ -188,6 +192,10 @@ class CommonTest(unittest.TestCase):
self.checkequal(0, 'abcdefghiabc', 'rfind', 'abcd')
self.checkequal(-1, 'abcdefghiabc', 'rfind', 'abcz')
self.checkequal(3, 'abc', 'rfind', '', 0)
self.checkequal(3, 'abc', 'rfind', '', 3)
self.checkequal(-1, 'abc', 'rfind', '', 4)
self.checkraises(TypeError, 'hello', 'rfind')
self.checkraises(TypeError, 'hello', 'rfind', 42)

21
Objects/stringlib/find.h
View file

@ -14,8 +14,11 @@ stringlib_find(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
{
Py_ssize_t pos;
if (sub_len == 0)
if (sub_len == 0) {
if (str_len < 0)
return -1;
return offset;
}
pos = fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);
@ -30,22 +33,20 @@ stringlib_rfind(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
Py_ssize_t offset)
{
Py_ssize_t pos;
/* XXX - create reversefastsearch helper! */
if (sub_len == 0)
pos = str_len + offset;
else {
Py_ssize_t j;
pos = -1;
if (sub_len == 0) {
if (str_len < 0)
return -1;
return str_len + offset;
} else {
Py_ssize_t j, pos = -1;
for (j = str_len - sub_len; j >= 0; --j)
if (STRINGLIB_CMP(str+j, sub, sub_len) == 0) {
pos = j + offset;
break;
}
return pos;
}
return pos;
}
Py_LOCAL_INLINE(Py_ssize_t)