1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring rb_method_call_status()

Browse Source
This commit is contained in:
Koichi Sasada 2021-01-29 12:54:43 +09:00
parent 1ecda21366
commit 98e27016c9
Notes: git 2021-01-29 16:22:40 +09:00 
Merged: https://github.com/ruby/ruby/pull/4129
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
vm_eval.c
View File

@ -770,45 +770,42 @@ rb_search_method_entry(VALUE recv, ID mid)
static inline enum method_missing_reason static inline enum method_missing_reason
rb_method_call_status(rb_execution_context_t *ec, const rb_callable_method_entry_t *me, call_type scope, VALUE self) rb_method_call_status(rb_execution_context_t *ec, const rb_callable_method_entry_t *me, call_type scope, VALUE self)
{ {
VALUE klass; if (UNLIKELY(UNDEFINED_METHOD_ENTRY_P(me))) {
ID oid;
rb_method_visibility_t visi;
if (UNDEFINED_METHOD_ENTRY_P(me)) {
goto undefined; goto undefined;
} }
if (me->def->type == VM_METHOD_TYPE_REFINED) { else if (UNLIKELY(me->def->type == VM_METHOD_TYPE_REFINED)) {
me = rb_resolve_refined_method_callable(Qnil, me); me = rb_resolve_refined_method_callable(Qnil, me);
if (UNDEFINED_METHOD_ENTRY_P(me)) goto undefined; if (UNDEFINED_METHOD_ENTRY_P(me)) goto undefined;
} }
klass = me->owner; rb_method_visibility_t visi = METHOD_ENTRY_VISI(me);
oid = me->def->original_id;
visi = METHOD_ENTRY_VISI(me);
if (oid != idMethodMissing) { /* receiver specified form for private method */
/* receiver specified form for private method */ if (UNLIKELY(visi != METHOD_VISI_PUBLIC)) {
if (UNLIKELY(visi != METHOD_VISI_PUBLIC)) { if (me->def->original_id == idMethodMissing) {
if (visi == METHOD_VISI_PRIVATE && scope == CALL_PUBLIC) { return MISSING_NONE;
return MISSING_PRIVATE; }
} else if (visi == METHOD_VISI_PRIVATE &&
scope == CALL_PUBLIC) {
return MISSING_PRIVATE;
}
/* self must be kind of a specified form for protected method */
else if (visi == METHOD_VISI_PROTECTED &&
scope == CALL_PUBLIC) {
/* self must be kind of a specified form for protected method */ VALUE defined_class = me->owner;
if (visi == METHOD_VISI_PROTECTED && scope == CALL_PUBLIC) { if (RB_TYPE_P(defined_class, T_ICLASS)) {
VALUE defined_class = klass; defined_class = RBASIC(defined_class)->klass;
}
if (RB_TYPE_P(defined_class, T_ICLASS)) { if (self == Qundef || !rb_obj_is_kind_of(self, defined_class)) {
defined_class = RBASIC(defined_class)->klass; return MISSING_PROTECTED;
} }
}
if (self == Qundef || !rb_obj_is_kind_of(self, defined_class)) {
return MISSING_PROTECTED;
}
}
}
} }
return MISSING_NONE; return MISSING_NONE;
undefined: undefined:
return scope == CALL_VCALL ? MISSING_VCALL : MISSING_NOENTRY; return scope == CALL_VCALL ? MISSING_VCALL : MISSING_NOENTRY;
} }