diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-19 08:04:54 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-19 08:04:54 +0000 |
| commit | 23c98e52a4f3d119aa589a46e352d205f146916b (patch) | |
| tree | c4f1927c505c786a12733637b06e952e950621a9 /vm_method.c | |
| parent | c42cf2358c791e43afbb2ef8574c1de62daab9dc (diff) | |
merge revision(s) 49222:
method.h: UNDEFINED_REFINED_METHOD_P
* method.h (UNDEFINED_REFINED_METHOD_P): macro to tell if refined
original method is defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vm_method.c b/vm_method.c index bb13d12b1f..3159b22fa2 100644 --- a/vm_method.c +++ b/vm_method.c @@ -837,8 +837,7 @@ rb_export_method(VALUE klass, ID name, rb_method_flag_t noex) } if (UNDEFINED_METHOD_ENTRY_P(me) || - (me->def->type == VM_METHOD_TYPE_REFINED && - UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) { + UNDEFINED_REFINED_METHOD_P(me->def)) { rb_print_undef(klass, name, 0); } @@ -937,8 +936,7 @@ rb_undef(VALUE klass, ID id) me = search_method(klass, id, 0); if (UNDEFINED_METHOD_ENTRY_P(me) || - (me->def->type == VM_METHOD_TYPE_REFINED && - UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) { + UNDEFINED_REFINED_METHOD_P(me->def)) { const char *s0 = " class"; VALUE c = klass; @@ -1285,8 +1283,7 @@ rb_alias(VALUE klass, ID name, ID def) orig_me = search_method(klass, def, &defined_class); if (UNDEFINED_METHOD_ENTRY_P(orig_me) || - (orig_me->def->type == VM_METHOD_TYPE_REFINED && - UNDEFINED_METHOD_ENTRY_P(orig_me->def->body.orig_me))) { + UNDEFINED_REFINED_METHOD_P(orig_me->def)) { if ((!RB_TYPE_P(klass, T_MODULE)) || (orig_me = search_method(rb_cObject, def, 0), UNDEFINED_METHOD_ENTRY_P(orig_me))) { |