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

redefine POST/NEG FIXABLE using INT_MIN/MAX

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-05-17 09:32:23 +09:00
parent db20b4e063
commit 470da1eda0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/numeric.h
+2 -4
View File
@@ -10,10 +10,8 @@
#include <limits.h>
#define RSHIFT(x,y) ((x)>>(int)(y))
#define FIXNUM_MAX (LONG_MAX>>1)
#define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
#define POSFIXABLE(f) ((f) <= INT_MAX)
#define NEGFIXABLE(f) ((f) >= INT_MIN)
#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
mrb_value mrb_flt2big(mrb_state *mrb, mrb_float d);
src/object.c
+1 -2
View File
@@ -565,8 +565,7 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
switch (mrb_type(val)) {
case MRB_TT_FLOAT:
if (base != 0) goto arg_error;
if (mrb_float(val) <= (double)FIXNUM_MAX
&& mrb_float(val) >= (double)FIXNUM_MIN) {
if (FIXABLE(mrb_float(val))) {
break;
}
return mrb_flt2big(mrb, mrb_float(val));