kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rb_enc_symname_type: refactor split

Browse source 
Reduce goto by splitting the function.
This commit is contained in:
卜部昌平 2020-06-25 14:03:23 +09:00
parent 2bd0f37e2b
commit a523eca1c2
Notes: git 2020-06-29 11:06:31 +09:00
1 changed files with 93 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

135
symbol.c
View file

@ -238,89 +238,138 @@ rb_sym_constant_char_p(const char *name, long nlen, rb_encoding *enc)
#define IDSET_ATTRSET_FOR_SYNTAX ((1U<<ID_LOCAL)|(1U<<ID_CONST)) #define IDSET_ATTRSET_FOR_SYNTAX ((1U<<ID_LOCAL)|(1U<<ID_CONST))
#define IDSET_ATTRSET_FOR_INTERN (~(~0U<<(1<<ID_SCOPE_SHIFT)) & ~(1U<<ID_ATTRSET)) #define IDSET_ATTRSET_FOR_INTERN (~(~0U<<(1<<ID_SCOPE_SHIFT)) & ~(1U<<ID_ATTRSET))
int struct enc_synmane_type_leading_chars_tag {
rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int allowed_attrset) const enum { invalid, stophere, needmore, } kind;
const enum ruby_id_types type;
const long nread;
};
#define t struct enc_synmane_type_leading_chars_tag
static struct enc_synmane_type_leading_chars_tag
enc_synmane_type_leading_chars(const char *name, long len, const rb_encoding *enc, int allowed_attrset)
{ {
const char *m = name; const char *m = name;
const char *e = m + len; const char *e = m + len;
int type = ID_JUNK;
if (!rb_enc_asciicompat(enc)) return -1; if (! rb_enc_asciicompat(enc)) {
if (!m || len <= 0) return -1; return (t) { invalid, 0, 0, };
}
else if (! m) {
return (t) { invalid, 0, 0, };
}
else if ( len <= 0 ) {
return (t) { invalid, 0, 0, };
}
switch (*m) { switch (*m) {
case '\0': case '\0':
return -1; return (t) { invalid, 0, 0, };
case '$': case '$':
type = ID_GLOBAL; if (is_special_global_name(++m, e, enc)) {
if (is_special_global_name(++m, e, enc)) return type; return (t) { stophere, ID_GLOBAL, len, };
goto id; }
else {
return (t) { needmore, ID_GLOBAL, 1, };
}
case '@': case '@':
type = ID_INSTANCE; switch (*++m) {
if (*++m == '@') { default: return (t) { needmore, ID_INSTANCE, 1, };
++m; case '@': return (t) { needmore, ID_CLASS, 2, };
type = ID_CLASS;
} }
goto id;
case '<': case '<':
switch (*++m) { switch (*++m) {
case '<': ++m; break; default: return (t) { stophere, ID_JUNK, 1, };
case '=': if (*++m == '>') ++m; break; case '<': return (t) { stophere, ID_JUNK, 2, };
default: break; case '=':
switch (*++m) {
default: return (t) { stophere, ID_JUNK, 2, };
case '>': return (t) { stophere, ID_JUNK, 3, };
}
} }
break;
case '>': case '>':
switch (*++m) { switch (*++m) {
case '>': case '=': ++m; break; default: return (t) { stophere, ID_JUNK, 1, };
case '>': case '=': return (t) { stophere, ID_JUNK, 2, };
} }
break;
case '=': case '=':
switch (*++m) { switch (*++m) {
case '~': ++m; break; default: return (t) { invalid, 0, 1, };
case '=': if (*++m == '=') ++m; break; case '~': return (t) { stophere, ID_JUNK, 2, };
default: return -1; case '=':
switch (*++m) {
default: return (t) { stophere, ID_JUNK, 2, };
case '=': return (t) { stophere, ID_JUNK, 3, };
}
} }
break;
case '*': case '*':
if (*++m == '*') ++m; switch (*++m) {
break; default: return (t) { stophere, ID_JUNK, 1, };
case '*': return (t) { stophere, ID_JUNK, 2, };
}
case '+': case '-': case '+': case '-':
if (*++m == '@') ++m; switch (*++m) {
break; default: return (t) { stophere, ID_JUNK, 1, };
case '@': return (t) { stophere, ID_JUNK, 2, };
}
case '|': case '^': case '&': case '/': case '%': case '~': case '`': case '|': case '^': case '&': case '/': case '%': case '~': case '`':
++m; return (t) { stophere, ID_JUNK, 1, };
break;
case '[': case '[':
if (m[1] != ']') goto id; switch (*++m) {
++m; default: return (t) { needmore, ID_JUNK, 0, };
if (*++m == '=') ++m; case ']':
break; switch (*++m) {
default: return (t) { stophere, ID_JUNK, 2, };
case '=': return (t) { stophere, ID_JUNK, 3, };
}
}
case '!': case '!':
if (len == 1) return ID_JUNK;
switch (*++m) { switch (*++m) {
case '=': case '~': ++m; break; case '=': case '~': return (t) { stophere, ID_JUNK, 2, };
default: default:
if (allowed_attrset & (1U << ID_JUNK)) goto id; if (allowed_attrset & (1U << ID_JUNK)) {
return -1; return (t) { needmore, ID_JUNK, 1, };
}
else {
return (t) { stophere, ID_JUNK, 1, };
}
} }
break;
default: default:
type = rb_sym_constant_char_p(m, e-m, enc) ? ID_CONST : ID_LOCAL; if (rb_sym_constant_char_p(name, len, enc)) {
goto id; return (t) { needmore, ID_CONST, 0, };
}
else {
return (t) { needmore, ID_LOCAL, 0, };
}
}
}
#undef t
int
rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int allowed_attrset)
{
const struct enc_synmane_type_leading_chars_tag f =
enc_synmane_type_leading_chars(name, len, enc, allowed_attrset);
const char *m = name + f.nread;
const char *e = name + len;
int type = (int)f.type;
switch (f.kind) {
case invalid: return -1;
case stophere: goto stophere;
case needmore: break;
} }
goto stophere;
id:
if (m >= e || (*m != '_' && !ISALPHA(*m) && ISASCII(*m))) { if (m >= e || (*m != '_' && !ISALPHA(*m) && ISASCII(*m))) {
if (len > 1 && *(e-1) == '=') { if (len > 1 && *(e-1) == '=') {
type = rb_enc_symname_type(name, len-1, enc, allowed_attrset); type = rb_enc_symname_type(name, len-1, enc, allowed_attrset);