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/objcomplex.c | |
| parent | 27d4ca7693c276d09a911c00c3442729c516dc23 (diff) | |
| download | micropython-9c83ec0edac2394431a5d1aecba1d666ffdea0a3.tar.gz micropython-9c83ec0edac2394431a5d1aecba1d666ffdea0a3.zip | |
Merge remote-tracking branch 'upstream/master' into dict_feats
Diffstat (limited to 'py/objcomplex.c')
| -rw-r--r-- | py/objcomplex.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c index 46f43b54b5..1036bae420 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -87,14 +87,10 @@ static mp_obj_t complex_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { const mp_obj_type_t complex_type = { { &mp_const_type }, "complex", - complex_print, // print - complex_make_new, // make_new - NULL, // call_n - complex_unary_op, // unary_op - complex_binary_op, // binary_op - NULL, // getiter - NULL, // iternext - .methods = { { NULL, NULL }, }, + .print = complex_print, + .make_new = complex_make_new, + .unary_op = complex_unary_op, + .binary_op = complex_binary_op, }; mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) { |