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

rb_mod_remove_cvar: 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-22 10:18:28 +09:00
parent 1e9d58391c
commit b95b249784
Notes: git 2020-06-29 11:06:37 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
variable.c
View File

@ -3335,9 +3335,7 @@ rb_mod_remove_cvar(VALUE mod, VALUE name)
st_data_t val, n = id; st_data_t val, n = id;
if (!id) { if (!id) {
not_defined: goto not_defined;
rb_name_err_raise("class variable %1$s not defined for %2$s",
mod, name);
} }
rb_check_frozen(mod); rb_check_frozen(mod);
if (RCLASS_IV_TBL(mod) && st_delete(RCLASS_IV_TBL(mod), &n, &val)) { if (RCLASS_IV_TBL(mod) && st_delete(RCLASS_IV_TBL(mod), &n, &val)) {
@ -3346,7 +3344,9 @@ rb_mod_remove_cvar(VALUE mod, VALUE name)
if (rb_cvar_defined(mod, id)) { if (rb_cvar_defined(mod, id)) {
rb_name_err_raise("cannot remove %1$s for %2$s", mod, ID2SYM(id)); rb_name_err_raise("cannot remove %1$s for %2$s", mod, ID2SYM(id));
} }
goto not_defined; not_defined:
rb_name_err_raise("class variable %1$s not defined for %2$s",
mod, name);
} }
VALUE VALUE