archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 49222:

Browse source 
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
This commit is contained in:
naruse 2015-02-19 08:04:54 +00:00
parent c42cf2358c
commit 23c98e52a4
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -9,11 +9,11 @@ Thu Feb 19 16:14:04 2015 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (remove_method): When remove refined * vm_method.c (remove_method): When remove refined
method, raise a NameError if the method is not method, raise a NameError if the method is not
defined in refined class. defined in refined class.
But if the method is defined in refined class, But if the method is defined in refined class,
it should keep refined method and remove original it should keep refined method and remove original
method. method.
Patch by Seiei Higa. [ruby-core:67722] [Bug #10765] Patch by Seiei Higa. [ruby-core:67722] [Bug #10765]
Thu Feb 19 16:07:03 2015 Seiei Higa <hanachin@gmail.com> Thu Feb 19 16:07:03 2015 Seiei Higa <hanachin@gmail.com>

3
method.h
View file

@ -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_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); 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); rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex);

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-19" #define RUBY_RELEASE_DATE "2015-02-19"
#define RUBY_PATCHLEVEL 58 #define RUBY_PATCHLEVEL 59
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2

9
vm_method.c
View file

@ -837,8 +837,7 @@ rb_export_method(VALUE klass, ID name, rb_method_flag_t noex)
} }
if (UNDEFINED_METHOD_ENTRY_P(me) || if (UNDEFINED_METHOD_ENTRY_P(me) ||
(me->def->type == VM_METHOD_TYPE_REFINED && UNDEFINED_REFINED_METHOD_P(me->def)) {
UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) {
rb_print_undef(klass, name, 0); rb_print_undef(klass, name, 0);
} }
@ -937,8 +936,7 @@ rb_undef(VALUE klass, ID id)
me = search_method(klass, id, 0); me = search_method(klass, id, 0);
if (UNDEFINED_METHOD_ENTRY_P(me) || if (UNDEFINED_METHOD_ENTRY_P(me) ||
(me->def->type == VM_METHOD_TYPE_REFINED && UNDEFINED_REFINED_METHOD_P(me->def)) {
UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) {
const char *s0 = " class"; const char *s0 = " class";
VALUE c = klass; VALUE c = klass;
@ -1285,8 +1283,7 @@ rb_alias(VALUE klass, ID name, ID def)
orig_me = search_method(klass, def, &defined_class); orig_me = search_method(klass, def, &defined_class);
if (UNDEFINED_METHOD_ENTRY_P(orig_me) || if (UNDEFINED_METHOD_ENTRY_P(orig_me) ||
(orig_me->def->type == VM_METHOD_TYPE_REFINED && UNDEFINED_REFINED_METHOD_P(orig_me->def)) {
UNDEFINED_METHOD_ENTRY_P(orig_me->def->body.orig_me))) {
if ((!RB_TYPE_P(klass, T_MODULE)) || if ((!RB_TYPE_P(klass, T_MODULE)) ||
(orig_me = search_method(rb_cObject, def, 0), (orig_me = search_method(rb_cObject, def, 0),
UNDEFINED_METHOD_ENTRY_P(orig_me))) { UNDEFINED_METHOD_ENTRY_P(orig_me))) {