Merge pull request #2625 from suzukaze/add-kernel.Integer

Add kernel#Integer

1 files changed, 6 insertions, 2 deletions

diff --git a/src/object.c b/src/object.c
index 143acfaa4..c5fb74575 100644
--- a/src/object.c
+++ b/src/object.c
@@ -516,7 +516,7 @@ mrb_to_int(mrb_state *mrb, mrb_value val)
   return mrb_to_integer(mrb, val, "to_int");
 }
 
-static mrb_value
+MRB_API mrb_value
 mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
 {
   mrb_value tmp;
@@ -537,13 +537,17 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
       if (base != 0) goto arg_error;
       return val;
 
+    case MRB_TT_STRING:
+    string_conv:
+      return mrb_str_to_inum(mrb, val, base, TRUE);
+
     default:
       break;
   }
   if (base != 0) {
     tmp = mrb_check_string_type(mrb, val);
     if (!mrb_nil_p(tmp)) {
-      return mrb_str_to_inum(mrb, val, base, TRUE);
+      goto string_conv;
     }
 arg_error:
     mrb_raise(mrb, E_ARGUMENT_ERROR, "base specified for non string value");