From 5f926b2b0013fc196ba627e70b7961a71aabca11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 18 Jun 2020 16:55:52 +0900 Subject: [PATCH] rb_str_partition: 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. --- string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/string.c b/string.c index c74e8ebbb7..903222e0e4 100644 --- a/string.c +++ b/string.c @@ -9939,8 +9939,7 @@ rb_str_partition(VALUE str, VALUE sep) if (RB_TYPE_P(sep, T_REGEXP)) { pos = rb_reg_search(sep, str, 0, 0); if (pos < 0) { - failed: - return rb_ary_new3(3, rb_str_dup(str), str_new_empty(str), str_new_empty(str)); + goto failed; } sep = rb_str_subpat(str, sep, INT2FIX(0)); } @@ -9952,6 +9951,9 @@ rb_str_partition(VALUE str, VALUE sep) sep, rb_str_subseq(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)); } /*