mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r65910 | benjamin.peterson | 2008-08-20 09:07:59 -0500 (Wed, 20 Aug 2008) | 1 line fix up the multiprocessing docs a little ........ r65977 | christian.heimes | 2008-08-22 14:47:25 -0500 (Fri, 22 Aug 2008) | 3 lines Silenced compiler warning Objects/stringlib/find.h:97: warning: 'stringlib_contains_obj' defined but not used Reviewed by Benjamin Peterson ........ r65980 | christian.heimes | 2008-08-22 15:10:27 -0500 (Fri, 22 Aug 2008) | 3 lines Fixed two format strings in the _collections module. For example Modules/_collectionsmodule.c:674: warning: format '%i' expects type 'int', but argument 2 has type 'Py_ssize_t' Reviewed by Benjamin Peterson ........ r65984 | christian.heimes | 2008-08-22 16:23:47 -0500 (Fri, 22 Aug 2008) | 1 line d is the correct format string ........ r65986 | mark.hammond | 2008-08-22 19:59:14 -0500 (Fri, 22 Aug 2008) | 2 lines Fix bug 3625: test issues on 64bit windows. r=pitrou ........ r66000 | benjamin.peterson | 2008-08-23 15:27:43 -0500 (Sat, 23 Aug 2008) | 5 lines #3643 add a few more checks to _testcapi to prevent segfaults Author: Victor Stinner Reviewer: Benjamin Peterson ........ r66011 | neal.norwitz | 2008-08-24 12:27:43 -0500 (Sun, 24 Aug 2008) | 1 line Ignore a couple more tests that report leaks inconsistently. ........ r66012 | neal.norwitz | 2008-08-24 12:29:53 -0500 (Sun, 24 Aug 2008) | 1 line Use the actual blacklist of leaky tests ........ r66014 | georg.brandl | 2008-08-24 13:11:07 -0500 (Sun, 24 Aug 2008) | 2 lines #3654: fix duplicate test method name. Review by Benjamin P. ........ r66017 | benjamin.peterson | 2008-08-24 16:55:03 -0500 (Sun, 24 Aug 2008) | 1 line remove note about unimplemented feature ........ r66020 | brett.cannon | 2008-08-24 18:15:19 -0500 (Sun, 24 Aug 2008) | 1 line Clarify that some attributes/methods are listed somewhat separately because they are not part of the threading API. ........
163 lines
4 KiB
C
163 lines
4 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_WANT_CONTAINS_OBJ && !defined(FROM_BYTEARRAY)
|
|
|
|
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 */
|
|
|
|
#ifdef FROM_UNICODE
|
|
|
|
/*
|
|
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).
|
|
*/
|
|
|
|
Py_LOCAL_INLINE(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 /* FROM_UNICODE */
|
|
|
|
#endif /* STRINGLIB_FIND_H */
|
|
|
|
/*
|
|
Local variables:
|
|
c-basic-offset: 4
|
|
indent-tabs-mode: nil
|
|
End:
|
|
*/
|