From 2a92fb2516251fb0ddfa2d1026930a2c7465e528 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Tue, 18 Aug 2020 22:12:28 +0900
Subject: Make division by zero cause `ZeroDivisionError`.

As described in ISO 15.2.30.
---
 src/numeric.c | 20 +++-----------------
 src/vm.c      | 13 +++++++------
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/numeric.c b/src/numeric.c
index 99d32f919..0cc7958e6 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -156,7 +156,7 @@ integral_div(mrb_state *mrb, mrb_value xv)
 
   mrb_get_args(mrb, "i", &y);
   if (y == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "devided by zero");
+    mrb_raise(mrb, E_ZERODIV_ERROR, "devided by zero");
   }
   return mrb_fixnum_value(mrb_fixnum(xv) / y);
 #else
@@ -932,14 +932,7 @@ int_mod(mrb_state *mrb, mrb_value x)
     mrb_int mod;
 
     if (b == 0) {
-#ifdef MRB_NO_FLOAT
-      /* ZeroDivisionError */
-      return mrb_fixnum_value(0);
-#else
-      if (a > 0) return mrb_float_value(mrb, INFINITY);
-      if (a < 0) return mrb_float_value(mrb, INFINITY);
-      return mrb_float_value(mrb, NAN);
-#endif
+      mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
     }
     fixdivmod(mrb, a, b, NULL, &mod);
     return mrb_fixnum_value(mod);
@@ -971,14 +964,7 @@ int_divmod(mrb_state *mrb, mrb_value x)
     mrb_int div, mod;
 
     if (mrb_fixnum(y) == 0) {
-#ifdef MRB_NO_FLOAT
-      return mrb_assoc_new(mrb, mrb_fixnum_value(0), mrb_fixnum_value(0));
-#else
-      return mrb_assoc_new(mrb, ((mrb_fixnum(x) == 0) ?
-                                 mrb_float_value(mrb, NAN):
-                                 mrb_float_value(mrb, INFINITY)),
-                           mrb_float_value(mrb, NAN));
-#endif
+      mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
     }
     fixdivmod(mrb, mrb_fixnum(x), mrb_fixnum(y), &div, &mod);
     return mrb_assoc_new(mrb, mrb_fixnum_value(div), mrb_fixnum_value(mod));
diff --git a/src/vm.c b/src/vm.c
index 979c67424..15a38c0e4 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2315,12 +2315,13 @@ RETRY_TRY_BLOCK:
         {
           mrb_int x = mrb_fixnum(regs[a]);
           mrb_int y = mrb_fixnum(regs[a+1]);
-          if (y == 0 || (x == MRB_INT_MIN && y == -1)) {
-#ifdef MRB_NO_FLOAT
-            SET_INT_VALUE(regs[a], y ? x / y : 0);
-#else
-            SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x / (mrb_float)y);
-#endif
+
+          
+          if (y == 0) {
+            mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
+          }
+          else if(x == MRB_INT_MIN && y == -1) {
+            mrb_raise(mrb, E_RANGE_ERROR, "integer overflow in division");
           }
           else {
             mrb_int div, mod;
-- 
cgit v1.2.3