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

Revert "numeric.c: simplifies int_mod definition."

Browse Source 
This reverts commit 3738d62a86.
The change changed the behavior with floating point numbers.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-08-03 16:11:02 +09:00
parent 2092bc7fe8
commit b70fd09f47
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+18 -6
View File
@@ -1113,15 +1113,27 @@ intdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
static mrb_value
int_mod(mrb_state *mrb, mrb_value x)
{
mrb_int a, b, mod;
mrb_value y = mrb_get_arg1(mrb);
mrb_int a, b;
mrb_get_args(mrb, "i", &b);
a = mrb_integer(x);
mod = a % b;
if ((a < 0) != (b < 0) && mod != 0) {
mod += b;
if (mrb_integer_p(y) && a != MRB_INT_MIN && (b=mrb_integer(y)) != MRB_INT_MIN) {
mrb_int mod = a % b;
if ((a < 0) != (b < 0) && mod != 0) {
mod += b;
}
return mrb_int_value(mrb, mod);
}
return mrb_int_value(mrb, mod);
#ifdef MRB_NO_FLOAT
mrb_raise(mrb, E_TYPE_ERROR, "non integer modulo");
#else
else {
mrb_float mod;
flodivmod(mrb, (mrb_float)a, mrb_as_float(mrb, y), NULL, &mod);
return mrb_float_value(mrb, mod);
}
#endif
}
/*