diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-20 01:48:35 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-20 18:00:23 +0300 |
| commit | 3b6f7b95eb487fc927a3bc4644b1941cfbe2612b (patch) | |
| tree | e06661e63e4c8bd6f94494281237bc31f4d488eb /py/objfloat.c | |
| parent | 7efbd325bb5ac540b746a594a76185c211963c46 (diff) | |
| download | micropython-3b6f7b95eb487fc927a3bc4644b1941cfbe2612b.tar.gz micropython-3b6f7b95eb487fc927a3bc4644b1941cfbe2612b.zip | |
py: Separate MICROPY_PY_BUILTINS_COMPLEX from MICROPY_PY_BUILTINS_FLOAT.
One thing is wanting to do 1 / 2 and get something else but 0, and quite
another - doing rocket science ;-).
Diffstat (limited to 'py/objfloat.c')
| -rw-r--r-- | py/objfloat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/py/objfloat.c b/py/objfloat.c index b608b1a3d7..e3fefad8db 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -102,9 +102,12 @@ STATIC mp_obj_t float_unary_op(int op, mp_obj_t o_in) { STATIC mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { mp_obj_float_t *lhs = lhs_in; +#if MICROPY_PY_BUILTINS_COMPLEX if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_complex)) { return mp_obj_complex_binary_op(op, lhs->value, 0, rhs_in); - } else { + } else +#endif + { return mp_obj_float_binary_op(op, lhs->value, rhs_in); } } |