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

needforspeed: stringlib refactoring, continued. added count and

Browse source 
find helpers; updated unicodeobject to use stringlib_count
This commit is contained in:
Fredrik Lundh 2006-05-26 19:24:53 +00:00
parent a26de2a80f
commit 58b5e84d52
5 changed files with 136 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Objects/stringlib/count.h Normal file
View file

@ -0,0 +1,34 @@
/* stringlib: count implementation */
#ifndef STRINGLIB_COUNT_H
#define STRINGLIB_COUNT_H
#ifndef STRINGLIB_FASTSEARCH_H
#error must include "stringlib/fastsearch.h" before including this module
#endif
Py_LOCAL(Py_ssize_t)
stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len)
{
Py_ssize_t count;
if (sub_len == 0)
return str_len + 1;
count = fastsearch(str, str_len, sub, sub_len, FAST_COUNT);
if (count < 0)
count = 0; /* no match */
return count;
}
#endif
/*
Local variables:
c-basic-offset: 4
indent-tabs-mode: nil
End:
*/

49
Objects/stringlib/find.h Normal file
View file

@ -0,0 +1,49 @@
/* 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(Py_ssize_t)
stringlib_find(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
const STRINGLIB_CHAR* sub, Py_ssize_t sub_len)
{
if (sub_len == 0)
return 0;
return fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);
}
Py_LOCAL(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 pos;
/* XXX - create reversefastsearch helper! */
if (sub_len == 0)
pos = str_len;
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;
break;
}
}
return pos;
}
#endif
/*
Local variables:
c-basic-offset: 4
indent-tabs-mode: nil
End:
*/

16
Objects/stringlib/partition.h
View file

@ -3,9 +3,15 @@
#ifndef STRINGLIB_PARTITION_H
#define STRINGLIB_PARTITION_H
#ifndef STRINGLIB_FASTSEARCH_H
#error must include "stringlib/fastsearch.h" before including this module
#endif
Py_LOCAL(PyObject*)
partition(PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len,
PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len)
stringlib_partition(
PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len,
PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len
)
{
PyObject* out;
Py_ssize_t pos;
@ -46,8 +52,10 @@ partition(PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len,
}
Py_LOCAL(PyObject*)
rpartition(PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len,
PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len)
stringlib_rpartition(
PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len,
PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len
)
{
PyObject* out;
Py_ssize_t pos;