1 files changed, 11 insertions, 16 deletions

diff --git a/src/string.c b/src/string.c
index 6c9dd2996..332c4e777 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1108,6 +1108,9 @@ str_convert_range(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen,
   }
   else {
     switch (mrb_type(indx)) {
+      default:
+        indx = mrb_ensure_int_type(mrb, indx);
+        /* fall through */
       case MRB_TT_INTEGER:
         *beg = mrb_integer(indx);
         *len = 1;
@@ -1120,16 +1123,6 @@ str_convert_range(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen,
         return STR_BYTE_RANGE_CORRECTED;
 
       case MRB_TT_RANGE:
-        goto range_arg;
-
-      default:
-        indx = mrb_to_integer(mrb, indx);
-        if (mrb_integer_p(indx)) {
-          *beg = mrb_integer(indx);
-          *len = 1;
-          return STR_CHAR_RANGE;
-        }
-range_arg:
         *len = RSTRING_CHAR_LEN(str);
         switch (mrb_range_beg_len(mrb, indx, beg, len, *len, TRUE)) {
           case MRB_RANGE_OK:
@@ -1139,8 +1132,6 @@ range_arg:
           default:
             break;
         }
-
-        mrb_raise(mrb, E_TYPE_ERROR, "can't convert to Integer");
     }
   }
   return STR_OUT_OF_RANGE;
@@ -2047,9 +2038,11 @@ static mrb_value
 mrb_str_rindex(mrb_state *mrb, mrb_value str)
 {
   mrb_value sub;
-  mrb_int pos, len = RSTRING_CHAR_LEN(str);
+  mrb_int pos;
+  int argc = mrb_get_args(mrb, "S|i", &sub, &pos);
+  mrb_int len = RSTRING_CHAR_LEN(str);
 
-  if (mrb_get_args(mrb, "S|i", &sub, &pos) == 1) {
+  if (argc == 1) {
     pos = len;
   }
   else {
@@ -2828,23 +2821,25 @@ static mrb_value
 mrb_str_byteslice(mrb_state *mrb, mrb_value str)
 {
   mrb_value a1;
-  mrb_int str_len = RSTRING_LEN(str), beg, len;
+  mrb_int str_len, beg, len;
   mrb_bool empty = TRUE;
 
   len = mrb_get_argc(mrb);
   switch (len) {
   case 2:
     mrb_get_args(mrb, "ii", &beg, &len);
+    str_len = RSTRING_LEN(str);
     break;
   case 1:
     a1 = mrb_get_arg1(mrb);
+    str_len = RSTRING_LEN(str);
     if (mrb_range_p(a1)) {
       if (mrb_range_beg_len(mrb, a1, &beg, &len, str_len, TRUE) != MRB_RANGE_OK) {
         return mrb_nil_value();
       }
     }
     else {
-      beg = mrb_integer(mrb_to_integer(mrb, a1));
+      beg = mrb_as_int(mrb, a1);
       len = 1;
       empty = FALSE;
     }