diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-07 23:06:46 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-07 23:06:46 +0000 |
| commit | 9c83ec0edac2394431a5d1aecba1d666ffdea0a3 (patch) | |
| tree | ccf18860da373cf13194788b793a962335d69fef /py/objgenerator.c | |
| parent | 27d4ca7693c276d09a911c00c3442729c516dc23 (diff) | |
Merge remote-tracking branch 'upstream/master' into dict_feats
Diffstat (limited to 'py/objgenerator.c')
| -rw-r--r-- | py/objgenerator.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c index a91b0d6fc..7eeb4ef80 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -39,14 +39,7 @@ mp_obj_t gen_wrap_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) { const mp_obj_type_t gen_wrap_type = { { &mp_const_type }, "generator", - NULL, // print - NULL, // make_new - gen_wrap_call_n, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - NULL, // iternext - .methods = {{NULL, NULL},}, + .call_n = gen_wrap_call_n, }; mp_obj_t mp_obj_new_gen_wrap(uint n_locals, uint n_stack, mp_obj_t fun) { @@ -94,14 +87,9 @@ mp_obj_t gen_instance_iternext(mp_obj_t self_in) { const mp_obj_type_t gen_instance_type = { { &mp_const_type }, "generator", - gen_instance_print, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - gen_instance_getiter, // getiter - gen_instance_iternext, // iternext - .methods = {{NULL, NULL},}, + .print = gen_instance_print, + .getiter = gen_instance_getiter, + .iternext = gen_instance_iternext, }; // args are in reverse order in the array |