From 3b6f7b95eb487fc927a3bc4644b1941cfbe2612b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 20 Jun 2014 01:48:35 +0300 Subject: 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 ;-). --- py/objfloat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'py/objfloat.c') diff --git a/py/objfloat.c b/py/objfloat.c index b608b1a3d..e3fefad8d 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); } } -- cgit v1.2.3