diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-17 15:31:10 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-29 11:05:41 +0900 |
commit | c29ec1ef1a88626319c39db02e7574c13f9b72d3 (patch) | |
tree | b504d1dfa6c59789a9cf4057dfec63d2295c10a2 /string.c | |
parent | 6df790f22ed48c9998c12dc5eaccf9d13e545185 (diff) | |
download | ruby-c29ec1ef1a88626319c39db02e7574c13f9b72d3.tar.gz |
rb_str_index_m: do not goto into a branch
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea. Better refactor.
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 23 |
1 files changed, 4 insertions, 19 deletions
@@ -3669,9 +3669,7 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str) } } - if (SPECIAL_CONST_P(sub)) goto generic; - switch (BUILTIN_TYPE(sub)) { - case T_REGEXP: + if (RB_TYPE_P(sub, T_REGEXP)) { if (pos > str_strlen(str, NULL)) return Qnil; pos = str_offset(RSTRING_PTR(str), RSTRING_END(str), pos, @@ -3679,24 +3677,11 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str) pos = rb_reg_search(sub, str, pos, 0); pos = rb_str_sublen(str, pos); - break; - - generic: - default: { - VALUE tmp; - - tmp = rb_check_string_type(sub); - if (NIL_P(tmp)) { - rb_raise(rb_eTypeError, "type mismatch: %s given", - rb_obj_classname(sub)); - } - sub = tmp; - } - /* fall through */ - case T_STRING: + } + else { + StringValue(sub); pos = rb_str_index(str, sub, pos); pos = rb_str_sublen(str, pos); - break; } if (pos == -1) return Qnil; |