mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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/trunk@49222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1abd51ad91
commit
a11e25432b
2 changed files with 6 additions and 6 deletions
3
method.h
3
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);
|
||||
|
|
|
@ -831,8 +831,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);
|
||||
}
|
||||
|
||||
|
@ -931,8 +930,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;
|
||||
|
||||
|
@ -1279,8 +1277,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))) {
|
||||
|
|
Loading…
Add table
Reference in a new issue