diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-06 00:08:21 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-06 00:08:21 +0000 |
| commit | a10dba75090b38919790d1c3ad8bb9d2c126b7f4 (patch) | |
| tree | 6750678d47844bb3918b4012a8af41cd989eeda5 /py/objtuple.c | |
| parent | ba3f87c94776538fece5e87ff1d7de547930397a (diff) | |
| parent | 8137b004b004d8e3a594eab90afccb72b779273a (diff) | |
| download | micropython-a10dba75090b38919790d1c3ad8bb9d2c126b7f4.tar.gz micropython-a10dba75090b38919790d1c3ad8bb9d2c126b7f4.zip | |
Merge remote-tracking branch 'upstream/master' into list_reverse
Diffstat (limited to 'py/objtuple.c')
| -rw-r--r-- | py/objtuple.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/py/objtuple.c b/py/objtuple.c index d55259d1a6..ceca4200e4 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -99,14 +99,11 @@ static mp_obj_t tuple_getiter(mp_obj_t o_in) { const mp_obj_type_t tuple_type = { { &mp_const_type }, "tuple", - tuple_print, // print - tuple_make_new, // make_new - NULL, // call_n - NULL, // unary_op - tuple_binary_op, // binary_op - tuple_getiter, // getiter - NULL, // iternext - {{NULL, NULL},}, // method list + .print = tuple_print, + .make_new = tuple_make_new, + .binary_op = tuple_binary_op, + .getiter = tuple_getiter, + .methods = {{NULL, NULL},}, }; // the zero-length tuple @@ -168,14 +165,8 @@ static mp_obj_t tuple_it_iternext(mp_obj_t self_in) { static const mp_obj_type_t tuple_it_type = { { &mp_const_type }, "tuple_iterator", - NULL, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - tuple_it_iternext, - {{NULL, NULL},}, // method list + .iternext = tuple_it_iternext, + .methods = {{NULL, NULL},}, }; static mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur) { |