mirror of
https://github.com/python/cpython.git
synced 2025-11-09 01:51:26 +00:00
57d5669f4b
as usual with slicing (both with str and unicode strings). This fixes issue 1259. For str only the stringobject.c file was modified. But for unicode, I needed to repeat in the four functions a lot of code, so created a new function that does part of the job for them (and placed it in find.h, following a suggestion of Barry). Also added tests for this behaviour.
160 lines
3.9 KiB
C
160 lines
3.9 KiB
C
/* stringlib: find/index implementation */
|
|
|
|
#ifndef STRINGLIB_FIND_H
|
|
#define STRINGLIB_FIND_H
|
|
|
|
#ifndef STRINGLIB_FASTSEARCH_H
|
|
#error must include "stringlib/fastsearch.h" before including this module
|
|
#endif
|
|
|
|
Py_LOCAL_INLINE(Py_ssize_t)
|
|
stringlib_find(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;
|
|
|
|
if (sub_len == 0) {
|
|
if (str_len < 0)
|
|
return -1;
|
|
return offset;
|
|
}
|
|
|
|
pos = fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);
|
|
|
|
if (pos >= 0)
|
|
pos += offset;
|
|
|
|
return pos;
|
|
}
|
|
|
|
Py_LOCAL_INLINE(Py_ssize_t)
|
|
stringlib_rfind(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
|
|
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
|
|
Py_ssize_t offset)
|
|
{
|
|
/* XXX - create reversefastsearch helper! */
|
|
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;
|
|
}
|
|
}
|
|
|
|
Py_LOCAL_INLINE(Py_ssize_t)
|
|
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(
|
|
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)
|
|
{
|
|
return stringlib_find(
|
|
STRINGLIB_STR(str), STRINGLIB_LEN(str),
|
|
STRINGLIB_STR(sub), STRINGLIB_LEN(sub), 0
|
|
) != -1;
|
|
}
|
|
|
|
#endif /* STRINGLIB_STR */
|
|
|
|
/*
|
|
This function is a helper for the "find" family (find, rfind, index,
|
|
rindex) of unicodeobject.c file, because they all have the same
|
|
behaviour for the arguments.
|
|
|
|
It does not touch the variables received until it knows everything
|
|
is ok.
|
|
|
|
Note that we receive a pointer to the pointer of the substring object,
|
|
so when we create that object in this function we don't DECREF it,
|
|
because it continues living in the caller functions (those functions,
|
|
after finishing using the substring, must DECREF it).
|
|
*/
|
|
|
|
int
|
|
_ParseTupleFinds (PyObject *args, PyObject **substring,
|
|
Py_ssize_t *start, Py_ssize_t *end) {
|
|
PyObject *tmp_substring;
|
|
Py_ssize_t tmp_start = 0;
|
|
Py_ssize_t tmp_end = PY_SSIZE_T_MAX;
|
|
PyObject *obj_start=Py_None, *obj_end=Py_None;
|
|
|
|
if (!PyArg_ParseTuple(args, "O|OO:find", &tmp_substring,
|
|
&obj_start, &obj_end))
|
|
return 0;
|
|
|
|
/* To support None in "start" and "end" arguments, meaning
|
|
the same as if they were not passed.
|
|
*/
|
|
if (obj_start != Py_None)
|
|
if (!_PyEval_SliceIndex(obj_start, &tmp_start))
|
|
return 0;
|
|
if (obj_end != Py_None)
|
|
if (!_PyEval_SliceIndex(obj_end, &tmp_end))
|
|
return 0;
|
|
|
|
tmp_substring = PyUnicode_FromObject(tmp_substring);
|
|
if (!tmp_substring)
|
|
return 0;
|
|
|
|
*start = tmp_start;
|
|
*end = tmp_end;
|
|
*substring = tmp_substring;
|
|
return 1;
|
|
}
|
|
|
|
|
|
#endif /* STRINGLIB_FIND_H */
|
|
|
|
/*
|
|
Local variables:
|
|
c-basic-offset: 4
|
|
indent-tabs-mode: nil
|
|
End:
|
|
*/
|