Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-12 23:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

needforspeed: stringlib refactoring: changed find_obj to find_slice,

Browse source 
to enable use from stringobject
This commit is contained in:
Fredrik Lundh 2006-05-27 15:20:22 +00:00
parent c2d29c5a6d
commit 60d8b18831
2 changed files with 69 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Objects/stringlib/find.h
View file

@ -48,18 +48,49 @@ stringlib_rfind(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
return pos;
}
#ifdef STRINGLIB_STR
Py_LOCAL_INLINE(Py_ssize_t)
stringlib_find_obj(PyObject* str, PyObject* sub,
Py_ssize_t start, Py_ssize_t end)
stringlib_find_slice(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
Py_ssize_t start, Py_ssize_t end)
{
if (start < 0)
start += str_len;
if (start < 0)
start = 0;
if (end > str_len)
end = str_len;
if (end < 0)
end += str_len;
if (end < 0)
end = 0;
return stringlib_find(
STRINGLIB_STR(str) + start, end - start,
STRINGLIB_STR(sub), STRINGLIB_LEN(sub), start
str + start, end - start,
sub, sub_len, start
);
}
Py_LOCAL_INLINE(Py_ssize_t)
stringlib_rfind_slice(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
Py_ssize_t start, Py_ssize_t end)
{
if (start < 0)
start += str_len;
if (start < 0)
start = 0;
if (end > str_len)
end = str_len;
if (end < 0)
end += str_len;
if (end < 0)
end = 0;
return stringlib_rfind(str + start, end - start, sub, sub_len, start);
}
#ifdef STRINGLIB_STR
Py_LOCAL_INLINE(int)
stringlib_contains_obj(PyObject* str, PyObject* sub)
{
@ -69,19 +100,9 @@ stringlib_contains_obj(PyObject* str, PyObject* sub)
) != -1;
}
Py_LOCAL_INLINE(Py_ssize_t)
stringlib_rfind_obj(PyObject* str, PyObject* sub,
Py_ssize_t start, Py_ssize_t end)
{
return stringlib_rfind(
STRINGLIB_STR(str) + start, end - start,
STRINGLIB_STR(sub), STRINGLIB_LEN(sub), start
);
}
#endif /* STRINGLIB_STR */
#endif
#endif
#endif /* STRINGLIB_FIND_H */
/*
Local variables: