8000 gh-101277: Isolate itertools, part 3/4 by erlend-aasland · Pull Request #101304 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-101277: Isolate itertools, part 3/4 #101304

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
Feb 8, 2023
Merged

gh-101277: Isolate itertools, part 3/4 #101304

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d5d4d2
gh-101277: Add accumulate type to module state
erlend-aasland Jan 24, 2023
e42e834
gh-101277: Add compress type to module state
erlend-aasland Jan 24, 2023
daea7f8
101277: Add filterfalse type to module state
erlend-aasland Jan 24, 2023
ecb447f
gh-101277: Add count type to module state
erlend-aasland Jan 24, 2023
fb0e18d
gh-101277: Add pairwise type to module state
erlend-aasland Jan 24, 2023
5a27550
gh-101277: Add ziplongest type to module state
erlend-aasland Jan 24, 2023
8baf0e1
gh-101277: Add product type to module state
erlend-aasland Jan 24, 2023
a02e90a
Move clinic_state down to where it belongs; left-overs from first PR
erlend-aasland Feb 3, 2023
4b6cc35
Merge branch 'main' into isolate-itertools/batch-3
kumaraditya303 Feb 7, 2023
1784785
Merge branch 'main' into isolate-itertools/batch-3
kumaraditya303 Feb 8, 2023
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
Next Next commit
gh-101277: Add accumulate type to module state
  • Loading branch information
@erlend-aasland
erlend-aasland committed Feb 3, 2023
commit 6d5d4d2e83205fedbbaca947cd0056a1c23f73b1
76 changes: 29 additions & 47 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/

typedef struct {
PyTypeObject *accumulate_type;
PyTypeObject *combinations_type;
PyTypeObject *cwr_type;
PyTypeObject *cycle_type;
Expand Down Expand Up @@ -65,18 +66,17 @@ class itertools.chain "chainobject *" "&chain_type"
class itertools.combinations "combinationsobject *" "clinic_state()->combinations_type"
class itertools.combinations_with_replacement "cwr_object *" "clinic_state()->cwr_type"
class itertools.permutations "permutationsobject *" "clinic_state()->permutations_type"
class itertools.accumulate "accumulateobject *" "&accumulate_type"
class itertools.accumulate "accumulateobject *" "clinic_state()->accumulate_type"
class itertools.compress "compressobject *" "&compress_type"
class itertools.filterfalse "filterfalseobject *" "&filterfalse_type"
class itertools.count "countobject *" "&count_type"
class itertools.pairwise "pairwiseobject *" "&pairwise_type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=1790ac655869a651]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=e0155dd6d01d40dd]*/

static PyTypeObject teedataobject_type;
static PyTypeObject tee_type;
static PyTypeObject batched_type;
static PyTypeObject accumulate_type;
static PyTypeObject compress_type;
static PyTypeObject filterfalse_type;
static PyTypeObject count_type;
Expand Down Expand Up< 8000 /tool-tip> @@ -3658,17 +3658,20 @@ itertools_accumulate_impl(PyTypeObject *type, PyObject *iterable,
static void
accumulate_dealloc(accumulateobject *lz)
{
PyTypeObject *tp = Py_TYPE(lz);
PyObject_GC_UnTrack(lz);
Py_XDECREF(lz->binop);
Py_XDECREF(lz->total);
Py_XDECREF(lz->it);
Py_XDECREF(lz->initial);
Py_TYPE(lz)->tp_free(lz);
tp->tp_free(lz);
Py_DECREF(tp);
}

static int
accumulate_traverse(accumulateobject *lz, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(lz));
Py_VISIT(lz->binop);
Py_VISIT(lz->it);
Py_VISIT(lz->total);
Expand Down Expand Up @@ -3762,48 +3765,25 @@ static PyMethodDef accumulate_methods[] = {
{NULL, NULL} /* sentinel */
};

static PyTypeObject accumulate_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"itertools.accumulate", /* tp_name */
sizeof(accumulateobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)accumulate_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_BASETYPE, /* tp_flags */
itertools_accumulate__doc__, /* tp_doc */
(traverseproc)accumulate_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)accumulate_next, /* tp_iternext */
accumulate_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
itertools_accumulate, /* tp_new */
PyObject_GC_Del, /* tp_free */
static PyType_Slot accumulate_slots[] = {
{Py_tp_dealloc, accumulate_dealloc},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_doc, (void *)itertools_accumulate__doc__},
{Py_tp_traverse, accumulate_traverse},
{Py_tp_iter, PyObject_SelfIter},
{Py_tp_iternext, accumulate_next},
{Py_tp_methods, accumulate_methods},
{Py_tp_new, itertools_accumulate},
{Py_tp_free, PyObject_GC_Del},
{0, NULL},
};

static PyType_Spec accumulate_spec = {
.name = "itertools.accumulate",
.basicsize = sizeof(accumulateobject),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = accumulate_slots,
};


Expand Down Expand Up @@ -4835,6 +4815,7 @@ static int
itertoolsmodule_traverse(PyObject *mod, visitproc visit, void *arg)
{
itertools_state *state = get_module_state(mod);
Py_VISIT(state->accumulate_type);
Py_VISIT(state->combinations_type);
Py_VISIT(state->cwr_type);
Py_VISIT(state->cycle_type);
Expand All @@ -4851,6 +4832,7 @@ static int
itertoolsmodule_clear(PyObject *mod)
{
itertools_state *state = get_module_state(mod);
Py_CLEAR(state->accumulate_type);
Py_CLEAR(state->combinations_type);
Py_CLEAR(state->cwr_type);
Py_CLEAR(state->cycle_type);
Expand Down Expand Up @@ -4884,6 +4866,7 @@ static int
itertoolsmodule_exec(PyObject *mod)
{
itertools_state *state = get_module_state(mod);
ADD_TYPE(mod, state->accumulate_type, &accumulate_spec);
ADD_TYPE(mod, state->combinations_type, &combinations_spec);
ADD_TYPE(mod, state->cwr_type, &cwr_spec);
ADD_TYPE(mod, state->cycle_type, &cycle_spec);
Expand All @@ -4895,7 +4878,6 @@ itertoolsmodule_exec(PyObject *mod)
ADD_TYPE(mod, state->takewhile_type, &takewhile_spec);

PyTypeObject *typelist[] = {
&accumulate_type,
&batched_type,
&islice_type,
&chain_type,
Expand Down
0