Remove mrb_flt2big() as there is no bignum in the core.

 Add new API mrb_flo_to_fixnum(). You can replace mrb_flt2big() to mrb_flo_to_fixnum() with few modifications.

4 files changed, 19 insertions, 17 deletions

diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h
index 4bcb43966..6d90fbad7 100644
--- a/include/mruby/numeric.h
+++ b/include/mruby/numeric.h
@@ -15,7 +15,7 @@ extern "C" {
 #define NEGFIXABLE(f) ((f) >= MRB_INT_MIN)
 #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
 
-mrb_value mrb_flt2big(mrb_state *mrb, mrb_float d);
+mrb_value mrb_flo_to_fixnum(mrb_state *mrb, mrb_value val);
 mrb_value mrb_fix2str(mrb_state *mrb, mrb_value x, int base);
 
 mrb_value mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y);
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index d2ea4c321..82a4d7ab4 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -806,7 +806,7 @@ retry:
               val = mrb_fixnum_value((mrb_int)mrb_float(val));
               goto bin_retry;
             }
-            val = mrb_flt2big(mrb, mrb_float(val));
+            val = mrb_flo_to_fixnum(mrb, val);
             if (mrb_fixnum_p(val)) goto bin_retry;
             break;
           case MRB_TT_STRING:
diff --git a/src/numeric.c b/src/numeric.c
index 084243291..02a18c130 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -1175,25 +1175,27 @@ fix_to_f(mrb_state *mrb, mrb_value num)
  *     FloatDomainError: Infinity
  */
 /* ------------------------------------------------------------------------*/
-static mrb_int
-flt2big(mrb_state *mrb, mrb_float d)
+mrb_value
+mrb_flo_to_fixnum(mrb_state *mrb, mrb_value x)
 {
   mrb_int z;
 
-  if (isinf(d)) {
-    mrb_raise(mrb, E_FLOATDOMAIN_ERROR, d < 0 ? "-Infinity" : "Infinity");
-  }
-  if (isnan(d)) {
-    mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN");
+  if (mrb_float_p(x)) {
+     mrb_raise(mrb, E_TYPE_ERROR, "non float value");
+     z = 0; /* not reached. just supress warnings. */
   }
-  z = (mrb_int)d;
-  return z;
-}
+  else {
+    mrb_float d = mrb_float(x);
 
-mrb_value
-mrb_flt2big(mrb_state *mrb, mrb_float d)
-{
-  return mrb_fixnum_value(flt2big(mrb, d));
+    if (isinf(d)) {
+      mrb_raise(mrb, E_FLOATDOMAIN_ERROR, d < 0 ? "-Infinity" : "Infinity");
+    }
+    if (isnan(d)) {
+      mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN");
+    }
+    z = (mrb_int)d;
+  }
+  return mrb_fixnum_value(z);
 }
 
 mrb_value
diff --git a/src/object.c b/src/object.c
index bd88459ae..bc59b615e 100644
--- a/src/object.c
+++ b/src/object.c
@@ -530,7 +530,7 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
       if (FIXABLE(mrb_float(val))) {
           break;
       }
-      return mrb_flt2big(mrb, mrb_float(val));
+      return mrb_flo_to_fixnum(mrb, val);
 
     case MRB_TT_FIXNUM:
       if (base != 0) goto arg_error;