summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-06-22 22:12:12 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-06-25 06:57:41 +0900
commit03c2b8656b91a3975e1dbc7dc09ee12245e91c0c (patch)
treeddfcf6c4770d78040bb358136ca7bc66e50ee11a /src
parentea6e1b003c7458a493ebad2ddb04bee1572f88be (diff)
downloadmruby-03c2b8656b91a3975e1dbc7dc09ee12245e91c0c.tar.gz
mruby-03c2b8656b91a3975e1dbc7dc09ee12245e91c0c.zip
Use `mrb_get_argc()` to improve performance.
Diffstat (limited to 'src')
-rw-r--r--src/string.c35
1 files changed, 21 insertions, 14 deletions
diff --git a/src/string.c b/src/string.c
index e65747318..f1ffbe43d 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2885,25 +2885,32 @@ mrb_str_setbyte(mrb_state *mrb, mrb_value str)
static mrb_value
mrb_str_byteslice(mrb_state *mrb, mrb_value str)
{
- mrb_value a1, a2;
+ mrb_value a1;
mrb_int str_len = RSTRING_LEN(str), beg, len;
mrb_bool empty = TRUE;
- if (mrb_get_args(mrb, "o|o", &a1, &a2) == 2) {
- beg = mrb_fixnum(mrb_to_int(mrb, a1));
- len = mrb_fixnum(mrb_to_int(mrb, a2));
- }
- else if (mrb_range_p(a1)) {
- if (mrb_range_beg_len(mrb, a1, &beg, &len, str_len, TRUE) != MRB_RANGE_OK) {
- return mrb_nil_value();
+ len = mrb_get_argc(mrb);
+ switch (len) {
+ case 2:
+ mrb_get_args(mrb, "ii", &beg, &len);
+ break;
+ case 1:
+ a1 = mrb_get_arg1(mrb);
+ 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_fixnum(mrb_to_int(mrb, a1));
+ len = 1;
+ empty = FALSE;
+ }
+ break;
+ default:
+ mrb_argnum_error(mrb, len, 1, 2);
+ break;
}
- else {
- beg = mrb_fixnum(mrb_to_int(mrb, a1));
- len = 1;
- empty = FALSE;
- }
-
if (mrb_str_beg_len(str_len, &beg, &len) && (empty || len != 0)) {
return mrb_str_byte_subseq(mrb, str, beg, len);
}