8000 gh-97982: Reuse `PyUnicode_Count` in `unicode_count` by sobolevn · Pull Request #98025 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-97982: Reuse PyUnicode_Count in unicode_count #98025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 12, 2022
Merged

gh-97982: Reuse PyUnicode_Count in unicode_count #98025

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b239ae5
gh-97982: Reuse `PyUnicode_Count` in `unicode_count`
sobolevn Oct 7, 2022
e9d6358
Address review
sobolevn Oct 7, 2022
886d6e3
Update 2022-10-07-13-09-57.gh-issue-97982.6qR7Qm.rst
sobolevn Oct 7, 2022
482010a
Update 2022-10-07-13-09-57.gh-issue-97982.6qR7Qm.rst
sobolevn Oct 7, 2022
4b2447e
Use `assert()` for unicode objects
sobolevn Oct 7, 2022
35ecc77
Address review
sobolevn Oct 8, 2022
8270d4b
Merge branch 'main' into issue-97982
sobolevn Oct 12, 2022
2dabc73
Use `anylib_count` in `unicode_count_impl`
sobolevn Oct 12, 2022
74f8c1c
Revert "Use `anylib_count` in `unicode_count_impl`"
sobolevn Oct 12, 2022
69a94e2
Add a comment about `anylib_count`
sobolevn Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed 8000 to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review
  • Loading branch information
@sobolevn
sobolevn committed Oct 7, 2022
commit e9d63589165daee34efaf76b33d31b297fdaa484
35 changes: 25 additions & 10 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8964,21 +8964,19 @@ _PyUnicode_InsertThousandsGrouping(
return count;
}


Py_ssize_t
PyUnicode_Count(PyObject *str,
PyObject *substr,
Py_ssize_t start,
Py_ssize_t end)
static Py_ssize_t
any_unicode_count(PyObject *str,
PyObject *substr,
Py_ssize_t start,
Py_ssize_t end)
{
// You must ensure that `str` and `substr` are both unicode objects
// before calling this function.
Py_ssize_t result;
int kind1, kind2;
const void *buf1 = NULL, *buf2 = NULL;
Py_ssize_t len1, len2;

if (ensure_unicode(str) < 0 || ensure_unicode(substr) < 0)
return -1;

kind1 = PyUnicode_KIND(str);
kind2 = PyUnicode_KIND(substr);
if (kind1 < kind2)
Expand Down Expand Up @@ -9039,6 +9037,18 @@ PyUnicode_Count(PyObject *str,
return -1;
}

Py_ssize_t
PyUnicode_Count(PyObject *str,
PyObject *substr,
Py_ssize_t start,
Py_ssize_t end)
{
if (ensure_unicode(str) < 0 || ensure_unicode(substr) < 0)
return -1;

return any_unicode_count(str, substr, start, end);
}

Py_ssize_t
PyUnicode_Find(PyObject *str,
PyObject *substr,
Expand Down Expand Up @@ -10858,11 +10868,16 @@ unicode_count(PyObject *self, PyObject *args)
Py_ssize_t start = 0;
Py_ssize_t end = PY_SSIZE_T_MAX;
PyObject *result;
Py_ssize_t iresult;

if (!parse_args_finds_unicode("count", args, &substring, &start, &end))
return NULL;

result = PyLong_FromSsize_t(PyUnicode_Count(self, substring, start, end));
iresult = any_unicode_count(self, substring, start, end);
if (iresult == -1)
return NULL;

result = PyLong_FromSsize_t(iresult);
return result;
}

Expand Down
0