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

string.c: reorganize str_convert_range using mrb_ensure_int_type

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-12-29 16:44:35 +09:00
parent b6d31810fe
commit 66a099b1b3
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+3 -12
View File
@@ -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;