aboutsummaryrefslogtreecommitdiffstats
path: root/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/proc.c b/proc.c
index 551a135e02..b81d14ed46 100644
--- a/proc.c
+++ b/proc.c
@@ -1771,21 +1771,23 @@ VALUE
rb_obj_singleton_method(VALUE obj, VALUE vid)
{
const rb_method_entry_t *me;
- VALUE klass = RCLASS_ORIGIN(rb_singleton_class_get(obj));
+ VALUE klass = rb_singleton_class_get(obj);
ID id = rb_check_id(&vid);
+ if (NIL_P(klass) || NIL_P(klass = RCLASS_ORIGIN(klass))) {
+ undef:
+ rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
+ obj, vid);
+ }
if (!id) {
- if (!NIL_P(klass) &&
- respond_to_missing_p(klass, obj, vid, FALSE)) {
+ if (respond_to_missing_p(klass, obj, vid, FALSE)) {
id = rb_intern_str(vid);
return mnew_missing(klass, obj, id, rb_cMethod);
}
- undef:
- rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
- obj, vid);
+ goto undef;
}
- if (NIL_P(klass) ||
- UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) ||
+ me = rb_method_entry_at(klass, id);
+ if (UNDEFINED_METHOD_ENTRY_P(me) ||
UNDEFINED_REFINED_METHOD_P(me->def)) {
vid = ID2SYM(id);
goto undef;