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/objslice.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/objslice.c')
| -rw-r--r-- | py/objslice.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/py/objslice.c b/py/objslice.c index a624be9631..da69b92af2 100644 --- a/py/objslice.c +++ b/py/objslice.c @@ -30,7 +30,7 @@ const mp_obj_type_t ellipsis_type = { NULL, // binary_op NULL, // getiter NULL, // iternext - {{NULL, NULL},}, // method list + .methods = {{NULL, NULL},}, }; static const mp_obj_ellipsis_t ellipsis_obj = {{&ellipsis_type}}; @@ -57,14 +57,8 @@ void slice_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o const mp_obj_type_t slice_type = { { &mp_const_type }, "slice", - slice_print, - NULL, // call_n - NULL, // make_new - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - NULL, // iternext - { { NULL, NULL }, }, // method list + .print = slice_print, + .methods = { { NULL, NULL }, }, }; // TODO: Make sure to handle "empty" values, which are signified by None in CPython |