summaryrefslogtreecommitdiff
path: root/py/objfloat.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2017-09-02 21:19:01 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2017-09-02 23:05:24 +0300
commit9950865c39044e9fef295d0676af7c5fd55289ea (patch)
tree38a31f618de5b880ca4024ec1ed4c0e965e41aa5 /py/objfloat.c
parentdd376a239dc4f47b0ee7866810fcda151f3cf6dd (diff)
py/objfloat: Fix binary ops with incompatible objects.
These are now returned as "operation not supported" instead of raising TypeError. In particular, this fixes equality for float vs incompatible types, which now properly results in False instead of exception. This also paves the road to support reverse operation (e.g. __radd__) with float objects. This is achieved by introducing mp_obj_get_float_maybe(), similar to existing mp_obj_get_int_maybe().
Diffstat (limited to 'py/objfloat.c')
-rw-r--r--py/objfloat.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/py/objfloat.c b/py/objfloat.c
index b1900b236..fadbbcb79 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -240,7 +240,11 @@ STATIC void mp_obj_float_divmod(mp_float_t *x, mp_float_t *y) {
}
mp_obj_t mp_obj_float_binary_op(mp_binary_op_t op, mp_float_t lhs_val, mp_obj_t rhs_in) {
- mp_float_t rhs_val = mp_obj_get_float(rhs_in); // can be any type, this function will convert to float (if possible)
+ mp_float_t rhs_val;
+ if (!mp_obj_get_float_maybe(rhs_in, &rhs_val)) {
+ return MP_OBJ_NULL; // op not supported
+ }
+
switch (op) {
case MP_BINARY_OP_ADD:
case MP_BINARY_OP_INPLACE_ADD: lhs_val += rhs_val; break;