From ad6512f359fe38d587715c618380e245af586be1 Mon Sep 17 00:00:00 2001 From: 卜部昌平 Date: Fri, 19 Jun 2020 10:46:55 +0900 Subject: rb_enc_synmane_type: 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. --- symbol.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'symbol.c') diff --git a/symbol.c b/symbol.c index 185c6a8c82..b40af8883f 100644 --- a/symbol.c +++ b/symbol.c @@ -316,7 +316,11 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a default: type = rb_sym_constant_char_p(m, e-m, enc) ? ID_CONST : ID_LOCAL; - id: + goto id; + } + goto stophere; + + id: if (m >= e || (*m != '_' && !ISALPHA(*m) && ISASCII(*m))) { if (len > 1 && *(e-1) == '=') { type = rb_enc_symname_type(name, len-1, enc, allowed_attrset); @@ -325,7 +329,7 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a return -1; } while (m < e && is_identchar(m, e, enc)) m += rb_enc_mbclen(m, e, enc); - if (m >= e) break; + if (m >= e) goto stophere; switch (*m) { case '!': case '?': if (type == ID_GLOBAL || type == ID_CLASS || type == ID_INSTANCE) return -1; @@ -339,8 +343,8 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a ++m; break; } - break; - } + + stophere: return m == e ? type : -1; } -- cgit v1.2.3