1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rb_str_partition: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-18 16:55:52 +09:00
parent e3d821a36c
commit 5f926b2b00
Notes: git 2020-06-29 11:06:44 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -9939,8 +9939,7 @@ rb_str_partition(VALUE str, VALUE sep)
if (RB_TYPE_P(sep, T_REGEXP)) { if (RB_TYPE_P(sep, T_REGEXP)) {
pos = rb_reg_search(sep, str, 0, 0); pos = rb_reg_search(sep, str, 0, 0);
if (pos < 0) { if (pos < 0) {
failed: goto failed;
return rb_ary_new3(3, rb_str_dup(str), str_new_empty(str), str_new_empty(str));
} }
sep = rb_str_subpat(str, sep, INT2FIX(0)); sep = rb_str_subpat(str, sep, INT2FIX(0));
} }
@ -9952,6 +9951,9 @@ rb_str_partition(VALUE str, VALUE sep)
sep, sep,
rb_str_subseq(str, pos+RSTRING_LEN(sep), rb_str_subseq(str, pos+RSTRING_LEN(sep),
RSTRING_LEN(str)-pos-RSTRING_LEN(sep))); RSTRING_LEN(str)-pos-RSTRING_LEN(sep)));
failed:
return rb_ary_new3(3, rb_str_dup(str), str_new_empty(str), str_new_empty(str));
} }
/* /*