commit 6ded55a61f6bbf007d518fc4531287de08fe51c4
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Mon Mar 31 02:20:00 2014 +0300
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Mon Mar 31 02:23:57 2014 +0300
tree f78ee04bd9636bea80d6b63d86f8044c76fdb17a
parent 96ed213320cb627c1df7ea8550b86b0bba5cb559

py: Properly implement divide-by-zero handling.

"1/0" is sacred idiom, the shortest way to break program execution
(sys.exit() is too long).

py/runtime.c

diff --git a/py/runtime.c b/py/runtime.c
index 4898864..1eca454 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -348,13 +348,20 @@
                 }
                 case MP_BINARY_OP_FLOOR_DIVIDE:
                 case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
-                {
+                    if (rhs_val == 0) {
+                        goto zero_division;
+                    }
                     lhs_val = python_floor_divide(lhs_val, rhs_val);
                     break;
-                }
+
                 #if MICROPY_ENABLE_FLOAT
                 case MP_BINARY_OP_TRUE_DIVIDE:
-                case MP_BINARY_OP_INPLACE_TRUE_DIVIDE: return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
+                case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
+                    if (rhs_val == 0) {
+zero_division:
+                        nlr_jump(mp_obj_new_exception_msg(&mp_type_ZeroDivisionError, "division by zero"));
+                    }
+                    return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
                 #endif
 
                 case MP_BINARY_OP_MODULO: