diff options
| author | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:26:13 +0100 |
|---|---|---|
| committer | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:26:13 +0100 |
| commit | 4cf7fd151e98a3d842eb5c9428545cb67ddd57ee (patch) | |
| tree | 947f265a2d498f4879bab3c7d19591133c56c1a0 /py/objfloat.c | |
| parent | 9397583f6c99533fc4c0a2753126120a8552ba4c (diff) | |
| parent | 21f08524baf11e62384814b7cb8fcd2b5a8998fb (diff) | |
Merge branch 'master' into nrf52
Diffstat (limited to 'py/objfloat.c')
| -rw-r--r-- | py/objfloat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/py/objfloat.c b/py/objfloat.c index 73d07feac..9292490a9 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -228,7 +228,12 @@ mp_obj_t mp_obj_float_binary_op(mp_uint_t op, mp_float_t lhs_val, mp_obj_t rhs_i } break; case MP_BINARY_OP_POWER: - case MP_BINARY_OP_INPLACE_POWER: lhs_val = MICROPY_FLOAT_C_FUN(pow)(lhs_val, rhs_val); break; + case MP_BINARY_OP_INPLACE_POWER: + if (lhs_val == 0 && rhs_val < 0) { + goto zero_division_error; + } + lhs_val = MICROPY_FLOAT_C_FUN(pow)(lhs_val, rhs_val); + break; case MP_BINARY_OP_DIVMOD: { if (rhs_val == 0) { goto zero_division_error; |