From 23c98e52a4f3d119aa589a46e352d205f146916b Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 19 Feb 2015 08:04:54 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++-- method.h | 3 +++ version.h | 2 +- vm_method.c | 9 +++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 322cf57e13..0bb8500d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,11 +9,11 @@ Thu Feb 19 16:14:04 2015 Shugo Maeda * vm_method.c (remove_method): When remove refined method, raise a NameError if the method is not defined in refined class. - + But if the method is defined in refined class, it should keep refined method and remove original method. - + Patch by Seiei Higa. [ruby-core:67722] [Bug #10765] Thu Feb 19 16:07:03 2015 Seiei Higa diff --git a/method.h b/method.h index 82678092c2..25d73be65f 100644 --- a/method.h +++ b/method.h @@ -108,6 +108,9 @@ struct unlinked_method_entry_list_entry { }; #define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF) +#define UNDEFINED_REFINED_METHOD_P(def) \ + ((def)->type == VM_METHOD_TYPE_REFINED && \ + UNDEFINED_METHOD_ENTRY_P((def)->body.orig_me)) void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex); rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex); diff --git a/version.h b/version.h index 9eaea6b815..bdf14118e6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-19" -#define RUBY_PATCHLEVEL 58 +#define RUBY_PATCHLEVEL 59 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 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))) {