summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/numeric.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/numeric.c b/src/numeric.c
index ded2880ff..5fbf9c586 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -1117,8 +1117,10 @@ int_mod(mrb_state *mrb, mrb_value x)
mrb_int a, b;
a = mrb_integer(x);
- if (mrb_integer_p(y) && a != MRB_INT_MIN && (b=mrb_integer(y)) != MRB_INT_MIN) {
+ if (mrb_integer_p(y)) {
+ b = mrb_integer(y);
if (b == 0) int_zerodiv(mrb);
+ if (a == MRB_INT_MIN && b == -1) return mrb_fixnum_value(0);
mrb_int mod = a % b;
if ((a < 0) != (b < 0) && mod != 0) {
mod += b;
@@ -1128,12 +1130,10 @@ int_mod(mrb_state *mrb, mrb_value x)
#ifdef MRB_NO_FLOAT
mrb_raise(mrb, E_TYPE_ERROR, "non integer modulo");
#else
- else {
- mrb_float mod;
+ mrb_float mod;
- flodivmod(mrb, (mrb_float)a, mrb_as_float(mrb, y), NULL, &mod);
- return mrb_float_value(mrb, mod);
- }
+ flodivmod(mrb, (mrb_float)a, mrb_as_float(mrb, y), NULL, &mod);
+ return mrb_float_value(mrb, mod);
#endif
}