Skip to content

gh-111178: Fix function signatures of unicodeiter #130684

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 2 commits into from
Mar 4, 2025
Merged

gh-111178: Fix function signatures of unicodeiter #130684

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e03dc04
gh-111178: Fix function signatures of unicodeiter
vstinner Feb 28, 2025
fb627f4
Change more signatures
vstinner Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16026,23 +16026,26 @@ typedef struct {
} unicodeiterobject;

static void
unicodeiter_dealloc(unicodeiterobject *it)
unicodeiter_dealloc(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
_PyObject_GC_UNTRACK(it);
Py_XDECREF(it->it_seq);
PyObject_GC_Del(it);
}

static int
unicodeiter_traverse(unicodeiterobject *it, visitproc visit, void *arg)
unicodeiter_traverse(PyObject *op, visitproc visit, void *arg)
{
unicodeiterobject *it = (unicodeiterobject *)op;
Py_VISIT(it->it_seq);
return 0;
}

static PyObject *
unicodeiter_next(unicodeiterobject *it)
unicodeiter_next(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
PyObject *seq;

assert(it != NULL);
Expand All @@ -16065,8 +16068,9 @@ unicodeiter_next(unicodeiterobject *it)
}

static PyObject *
unicode_ascii_iter_next(unicodeiterobject *it)
unicode_ascii_iter_next(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
assert(it != NULL);
PyObject *seq = it->it_seq;
if (seq == NULL) {
Expand Down Expand Up @@ -16154,7 +16158,7 @@ PyTypeObject PyUnicodeIter_Type = {
sizeof(unicodeiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)unicodeiter_dealloc, /* tp_dealloc */
unicodeiter_dealloc,/* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand All @@ -16171,12 +16175,12 @@ PyTypeObject PyUnicodeIter_Type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
0, /* tp_doc */
(traverseproc)unicodeiter_traverse, /* tp_traverse */
unicodeiter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)unicodeiter_next, /* tp_iternext */
unicodeiter_next, /* tp_iternext */
unicodeiter_methods, /* tp_methods */
0,
};
Expand All @@ -16185,12 +16189,12 @@ PyTypeObject _PyUnicodeASCIIIter_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "str_ascii_iterator",
.tp_basicsize = sizeof(unicodeiterobject),
.tp_dealloc = (destructor)unicodeiter_dealloc,
.tp_dealloc = unicodeiter_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = (traverseproc)unicodeiter_traverse,
.tp_traverse = unicodeiter_traverse,
.tp_iter = PyObject_SelfIter,
.tp_iternext = (iternextfunc)unicode_ascii_iter_next,
.tp_iternext = unicode_ascii_iter_next,
.tp_methods = unicodeiter_methods,
};

Expand Down
Loading