proc.c: local variable

* proc.c (umethod_bind): extract a local variable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-31 04:30:28 +00:00
parent 378161fe68
commit bdbda951d1

10
proc.c
View File

@ -1918,18 +1918,20 @@ static VALUE
umethod_bind(VALUE method, VALUE recv) umethod_bind(VALUE method, VALUE recv)
{ {
struct METHOD *data, *bound; struct METHOD *data, *bound;
VALUE methclass;
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
if (!RB_TYPE_P(data->rclass, T_MODULE) && methclass = data->rclass;
data->rclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, data->rclass)) { if (!RB_TYPE_P(methclass, T_MODULE) &&
if (FL_TEST(data->rclass, FL_SINGLETON)) { methclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, methclass)) {
if (FL_TEST(methclass, FL_SINGLETON)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"singleton method called for a different object"); "singleton method called for a different object");
} }
else { else {
rb_raise(rb_eTypeError, "bind argument must be an instance of %s", rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
rb_class2name(data->rclass)); rb_class2name(methclass));
} }
} }