admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make division by zero cause ZeroDivisionError.

Browse Source 
As described in ISO 15.2.30.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-08-18 22:12:28 +09:00
parent 18e3d39ee2
commit 2a92fb2516
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+3 -17
View File
@@ -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));
src/vm.c
+7 -6
View File
@@ -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;