ruby-changes:62061
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Mon, 29 Jun 2020 11:08:35 +0900 (JST)
Subject: [ruby-changes:62061] 268962077a (master): rb_mod_const_location: do not goto into a branch
https://git.ruby-lang.org/ruby.git/commit/?id=268962077a From 268962077a84d4d24401986af56992aeb39a8146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= <shyouhei@r...> Date: Tue, 16 Jun 2020 10:53:31 +0900 Subject: rb_mod_const_location: 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. diff --git a/object.c b/object.c index cec3890..c0481d7 100644 --- a/object.c +++ b/object.c @@ -2835,8 +2835,7 @@ rb_mod_const_source_location(int argc, VALUE *argv, VALUE mod) https://github.com/ruby/ruby/blob/trunk/object.c#L2835 pend = path + RSTRING_LEN(name); if (p >= pend || !*p) { - wrong_name: - rb_name_err_raise(wrong_constant_name, mod, name); + goto wrong_name; } if (p + 2 < pend && p[0] == ':' && p[1] == ':') { @@ -2902,6 +2901,9 @@ rb_mod_const_source_location(int argc, VALUE *argv, VALUE mod) https://github.com/ruby/ruby/blob/trunk/object.c#L2901 } return loc; + + wrong_name: + rb_name_err_raise(wrong_constant_name, mod, name); } /* -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/