diff options
author | Damien George <damien.p.george@gmail.com> | 2014-08-30 00:35:11 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-08-30 00:35:11 +0100 |
commit | ecc88e949ca5e307d22da4605a40d39ea2df9e3b (patch) | |
tree | a2399541ebd9f2e8b2141805dc39473891be6456 /py/objcomplex.c | |
parent | 4d3fc4632681576eed8235f8b90b49a032c80218 (diff) | |
download | micropython-ecc88e949ca5e307d22da4605a40d39ea2df9e3b.tar.gz micropython-ecc88e949ca5e307d22da4605a40d39ea2df9e3b.zip |
Change some parts of the core API to use mp_uint_t instead of uint/int.
Addressing issue #50, still some way to go yet.
Diffstat (limited to 'py/objcomplex.c')
-rw-r--r-- | py/objcomplex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c index 0c58dee659..7876068c07 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -74,7 +74,7 @@ STATIC void complex_print(void (*print)(void *env, const char *fmt, ...), void * #endif } -STATIC mp_obj_t complex_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { +STATIC mp_obj_t complex_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 0, 2, false); switch (n_args) { @@ -117,7 +117,7 @@ STATIC mp_obj_t complex_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const } } -STATIC mp_obj_t complex_unary_op(int op, mp_obj_t o_in) { +STATIC mp_obj_t complex_unary_op(mp_uint_t op, mp_obj_t o_in) { mp_obj_complex_t *o = o_in; switch (op) { case MP_UNARY_OP_BOOL: return MP_BOOL(o->real != 0 || o->imag != 0); @@ -127,7 +127,7 @@ STATIC mp_obj_t complex_unary_op(int op, mp_obj_t o_in) { } } -STATIC mp_obj_t complex_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { +STATIC mp_obj_t complex_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { mp_obj_complex_t *lhs = lhs_in; return mp_obj_complex_binary_op(op, lhs->real, lhs->imag, rhs_in); } @@ -166,7 +166,7 @@ void mp_obj_complex_get(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag) { *imag = self->imag; } -mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in) { +mp_obj_t mp_obj_complex_binary_op(mp_uint_t op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in) { mp_float_t rhs_real, rhs_imag; mp_obj_get_complex(rhs_in, &rhs_real, &rhs_imag); // can be any type, this function will convert to float (if possible) switch (op) { |