diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-03 01:39:16 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-03 01:39:16 +0000 |
| commit | 97119d8eb9ed654ba38cb3769c777bdb40492b1e (patch) | |
| tree | 3d4e87205d6917410a460a99b6ad15a46beb0572 /eval_intern.h | |
| parent | 83c95981d9c9e4eabc5526f7d30d4c7137c585ec (diff) | |
| download | ruby-97119d8eb9ed654ba38cb3769c777bdb40492b1e.tar.gz | |
* 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
Diffstat (limited to 'eval_intern.h')
| -rw-r--r-- | eval_intern.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/eval_intern.h b/eval_intern.h index 0c04a1c6c3..e503d15d9d 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -228,16 +228,25 @@ CREF_NEXT_SET(rb_cref_t *cref, const rb_cref_t *next_cref) RB_OBJ_WRITE(cref, &cref->next, next_cref); } -static inline long -CREF_VISI(const rb_cref_t *cref) +typedef struct rb_scope_visi_struct { + rb_method_visibility_t method_visi : 3; + unsigned int module_func : 1; +} rb_scope_visibility_t; + +static inline const rb_scope_visibility_t * +CREF_SCOPE_VISI(const rb_cref_t *cref) { - return (long)cref->visi; + return (const rb_scope_visibility_t *)&cref->scope_visi; } static inline void -CREF_VISI_SET(rb_cref_t *cref, long v) +CREF_SCOPE_VISI_COPY(const rb_cref_t *dst_cref, rb_cref_t *src_cref) { - cref->visi = v; + rb_scope_visibility_t *src = (rb_scope_visibility_t *)&src_cref->scope_visi; + rb_scope_visibility_t *dst = (rb_scope_visibility_t *)&dst_cref->scope_visi; + + dst->method_visi = src->method_visi; + dst->module_func = src->module_func; } static inline VALUE @@ -282,7 +291,7 @@ CREF_OMOD_SHARED_UNSET(rb_cref_t *cref) cref->flags &= ~NODE_FL_CREF_OMOD_SHARED_; } -void rb_frame_visibility_set(rb_method_flag_t); +void rb_frame_visibility_set(rb_method_visibility_t); void rb_thread_cleanup(void); void rb_thread_wait_other_threads(void); @@ -308,7 +317,7 @@ NORETURN(void rb_fiber_start(void)); NORETURN(void rb_print_undef(VALUE, ID, int)); NORETURN(void rb_print_undef_str(VALUE, VALUE)); -NORETURN(void rb_print_inaccessible(VALUE, ID, int)); +NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t)); NORETURN(void rb_vm_localjump_error(const char *,VALUE, int)); NORETURN(void rb_vm_jump_tag_but_local_jump(int)); NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, |