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

Merge pull request #2248 from carsonmcdonald/mulfix

Browse Source 
Another change to fix issue #2244
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-05-14 01:19:27 +09:00
parent 1a462131c0 f0fed9dbec
commit e1b84143c6
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+2 -1
View File
@@ -702,7 +702,8 @@ mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y)
a = mrb_fixnum(x);
if (mrb_fixnum_p(y)) {
mrb_int b, c;
mrb_float c;
mrb_int b;
if (a == 0) return x;
b = mrb_fixnum(y);
src/vm.c
+17 -12
View File
@@ -1729,19 +1729,24 @@ RETRY_TRY_BLOCK:
switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
{
mrb_int x, y, z;
mrb_value z;
x = mrb_fixnum(regs[a]);
y = mrb_fixnum(regs[a+1]);
z = x * y;
#ifdef MRB_WORD_BOXING
z = (z << MRB_FIXNUM_SHIFT) / (1 << MRB_FIXNUM_SHIFT);
#endif
if (x != 0 && z/x != y) {
SET_FLT_VALUE(mrb, regs[a], (mrb_float)x * (mrb_float)y);
}
else {
SET_INT_VALUE(regs[a], z);
z = mrb_fixnum_mul(mrb, regs[a], regs[a+1]);
switch (mrb_type(z)) {
case MRB_TT_FIXNUM:
{
SET_INT_VALUE(regs[a], mrb_fixnum(z));
}
break;
case MRB_TT_FLOAT:
{
SET_FLT_VALUE(mrb, regs[a], mrb_float(z));
}
break;
default:
/* cannot happen */
break;
}
}
break;