From 18bbd05709a4d52704ac217f30c0d9f35830b7f0 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 3 Jun 2015 01:39:16 +0000 Subject: * method.h: split rb_method_definition_t::flag to several flags. `flag' contains several categories of attributes and it makes us confusion (at least, I had confused). * rb_method_visibility_t (flags::visi) * NOEX_UNDEF -> METHOD_VISI_UNDEF = 0 * NOEX_PUBLIC -> METHOD_VISI_PUBLIC = 1 * NOEX_PRIVATE -> METHOD_VISI_PRIVATE = 2 * NOEX_PROTECTED -> METHOD_VISI_PROTECTED = 3 * NOEX_SAFE(flag)) -> safe (flags::safe, 2 bits) * NOEX_BASIC -> basic (flags::basic, 1 bit) * NOEX_MODFUNC -> rb_scope_visibility_t in CREF * NOEX_SUPER -> MISSING_SUPER (enum missing_reason) * NOEX_VCALL -> MISSING_VCALL (enum missing_reason) * NOEX_RESPONDS -> BOUND_RESPONDS (macro) Now, NOEX_NOREDEF is not supported (I'm not sure it is needed). Background: I did not know what "NOEX" stands for. I asked Matz (who made this name) and his answer was "Nothing". "At first, it meant NO EXport (private), but the original meaning was gone." This is why I remove the mysterious word "NOEX" from MRI. * vm_core.h: introduce `enum missing_reason' to represent method_missing (NoMethodError) reason. * eval_intern.h: introduce rb_scope_visibility_t to represent scope visibility. It has 3 method visibilities (public/private/protected) and `module_function`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- proc.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 3d05264eeb..a661cb3d3b 100644 --- a/proc.c +++ b/proc.c @@ -1161,7 +1161,7 @@ mnew_missing(VALUE rclass, VALUE klass, VALUE obj, ID id, ID rid, VALUE mclass) data->id = rid; def = ZALLOC(rb_method_definition_t); - def->flag = 0; + def->flags.visi = METHOD_VISI_UNDEF; def->type = VM_METHOD_TYPE_MISSING; def->original_id = id; @@ -1182,7 +1182,7 @@ mnew_internal(const rb_method_entry_t *me, VALUE defined_class, VALUE klass, VALUE method; ID rid = id; rb_method_definition_t *def = 0; - rb_method_flag_t flag = NOEX_UNDEF; + rb_method_visibility_t visi = METHOD_VISI_UNDEF; again: if (UNDEFINED_METHOD_ENTRY_P(me)) { @@ -1193,11 +1193,11 @@ mnew_internal(const rb_method_entry_t *me, VALUE defined_class, VALUE klass, rb_print_undef(klass, id, 0); } def = me->def; - if (flag == NOEX_UNDEF) { - flag = def->flag; - if (scope && (flag & NOEX_MASK) != NOEX_PUBLIC) { + if (visi == METHOD_VISI_UNDEF) { + visi = def->flags.visi; + if (scope && (visi != METHOD_VISI_PUBLIC)) { if (!error) return Qnil; - rb_print_inaccessible(klass, id, flag & NOEX_MASK); + rb_print_inaccessible(klass, id, visi); } } if (def->type == VM_METHOD_TYPE_ZSUPER) { @@ -1658,11 +1658,12 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) { ID id; VALUE body; - rb_method_flag_t noex = NOEX_PUBLIC; const rb_cref_t *cref = rb_vm_cref_in_context(mod, mod); + const rb_scope_visibility_t default_scope_visi = {METHOD_VISI_PUBLIC, FALSE}; + const rb_scope_visibility_t *scope_visi = &default_scope_visi; if (cref) { - noex = (rb_method_flag_t)CREF_VISI(cref); + scope_visi = CREF_SCOPE_VISI(cref); } if (argc == 1) { @@ -1695,9 +1696,9 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) rb_class_name(rclass)); } } - rb_method_entry_set(mod, id, method->me, noex); - if (noex == NOEX_MODFUNC) { - rb_method_entry_set(rb_singleton_class(mod), id, method->me, NOEX_PUBLIC); + rb_method_entry_set(mod, id, method->me, scope_visi->method_visi); + if (scope_visi->module_func) { + rb_method_entry_set(rb_singleton_class(mod), id, method->me, METHOD_VISI_PUBLIC); } RB_GC_GUARD(body); } @@ -1712,9 +1713,9 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) proc->is_from_method = TRUE; proc->block.klass = mod; } - rb_add_method(mod, id, VM_METHOD_TYPE_BMETHOD, (void *)body, noex); - if (noex == NOEX_MODFUNC) { - rb_add_method(rb_singleton_class(mod), id, VM_METHOD_TYPE_BMETHOD, (void *)body, NOEX_PUBLIC); + rb_add_method(mod, id, VM_METHOD_TYPE_BMETHOD, (void *)body, scope_visi->method_visi); + if (scope_visi->module_func) { + rb_add_method(rb_singleton_class(mod), id, VM_METHOD_TYPE_BMETHOD, (void *)body, METHOD_VISI_PUBLIC); } } else { -- cgit v1.2.3