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/objdict.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/objdict.c')
| -rw-r--r-- | py/objdict.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/py/objdict.c b/py/objdict.c index 3737f5eab0..b3e21aedd2 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -63,14 +63,11 @@ static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { const mp_obj_type_t dict_type = { { &mp_const_type }, "dict", - dict_print, // print - dict_make_new, // make_new - NULL, // call_n - NULL, // unary_op - dict_binary_op, // binary_op - NULL, // getiter - NULL, // iternext - {{NULL, NULL},}, // method list + .print = dict_print, + .make_new = dict_make_new, + .binary_op = dict_binary_op, + .getiter = NULL, + .methods = {{NULL, NULL},}, }; mp_obj_t mp_obj_new_dict(int n_args) { |