Skip to content

bpo-20180: convert most of itertoolsmodule.c to use Argument Clinic #9164

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
rhettinger merged 11 commits into from
Sep 11, 2018
Merged

bpo-20180: convert most of itertoolsmodule.c to use Argument Clinic #9164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4942182
bpo-20180: AC convert itertools.tee and related
taleinat Sep 11, 2018
fd20ba0
bpo-20180: AC convert itertools.cycle
taleinat Sep 11, 2018
684ef41
bpo-20180: AC convert itertools.dropwhile and itertools.takewhile
taleinat Sep 11, 2018
818dcbf
bpo-20180: AC convert itertools.starmap
taleinat Sep 11, 2018
a7ce66f
bpo-20180: AC convert itertools.chain.from_iterable
taleinat Sep 11, 2018
77b616b
bpo-20180: AC convert itertools.combinations and itertools.combinatio…
taleinat Sep 11, 2018
c285dc8
bpo-20180: AC convert itertools.permutations and itertools.accumulate
taleinat Sep 11, 2018
9ffe07c
bpo-20180: AC convert itertools.compress and itertools.filterfalse
taleinat Sep 11, 2018
8459e0c
bpo-20180: AC convert itertools.count
taleinat Sep 11, 2018
77e052e
bpo-20180: AC convert itertools: two minor fixes
taleinat Sep 11, 2018
07eb3a9
Fix minor spacing issues.
rhettinger Sep 11, 2018
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
Prev Previous commit
Next Next commit
bpo-20180: AC convert itertools.count
  • Loading branch information
@taleinat
taleinat committed Sep 11, 2018
commit 8459e0c98c529afee5c9cbd17b95de68c8b6fa2d
38 changes: 37 additions & 1 deletion Modules/clinic/itertoolsmodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 24 additions & 22 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ class itertools.permutations "permutationsobject *" "&permutations_type"
class itertools.accumulate "accumulateobject *" "&accumulate_type"
class itertools.compress "compressobject *" "&compress_type"
class itertools.filterfalse "filterfalseobject *" "&filterfalse_type"
class itertools.count "countobject *" "&count_type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=1ebe103832d620a0]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=ea05c93c6d94726a]*/

static PyTypeObject groupby_type;
static PyTypeObject _grouper_type;
Expand All @@ -41,6 +42,8 @@ static PyTypeObject permutations_type;
static PyTypeObject accumulate_type;
static PyTypeObject compress_type;
static PyTypeObject filterfalse_type;
static PyTypeObject count_type;

#include "clinic/itertoolsmodule.c.h"


Expand Down Expand Up @@ -3998,20 +4001,30 @@ slow_mode: when cnt == PY_SSIZE_T_MAX, step is not int(1), or cnt is a float.

static PyTypeObject count_type;

/*[clinic input]
@classmethod
itertools.count.__new__
start as long_cnt: object(c_default="NULL") = 0
step as long_step: object(c_default="NULL") = 1
Return a count object whose .__next__() method returns consecutive values.

Equivalent to:
def count(firstval=0, step=1):
x = firstval
while 1:
yield x
x += step
[clinic start generated code]*/

static PyObject *
count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
itertools_count_impl(PyTypeObject *type, PyObject *long_cnt,
PyObject *long_step)
/*[clinic end generated code: output=09a9250aebd00b1c input=d7a85eec18bfcd94]*/
{
countobject *lz;
int fast_mode;
Py_ssize_t cnt = 0;
PyObject *long_cnt = NULL;
PyObject *long_step = NULL;
long step;
static char *kwlist[] = {"start", "step", 0};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO:count",
kwlist, &long_cnt, &long_step))
return NULL;

if ((long_cnt != NULL && !PyNumber_Check(long_cnt)) ||
(long_step != NULL && !PyNumber_Check(long_step))) {
Expand Down Expand Up @@ -4164,17 +4177,6 @@ static PyMethodDef count_methods[] = {
{NULL, NULL} /* sentinel */
};

PyDoc_STRVAR(count_doc,
"count(start=0, step=1) --> count object\n\
\n\
Return a count object whose .__next__() method returns consecutive values.\n\
Equivalent to:\n\n\
def count(firstval=0, step=1):\n\
x = firstval\n\
while 1:\n\
yield x\n\
x += step\n");

static PyTypeObject count_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"itertools.count", /* tp_name */
Expand All @@ -4198,7 +4200,7 @@ static PyTypeObject count_type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_BASETYPE, /* tp_flags */
count_doc, /* tp_doc */
itertools_count__doc__, /* tp_doc */
(traverseproc)count_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
Expand All @@ -4215,7 +4217,7 @@ static PyTypeObject count_type = {
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
count_new, /* tp_new */
itertools_count, /* tp_new */
PyObject_GC_Del, /* tp_free */
};

Expand Down