diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | eval_error.c | 2 | ||||
| -rw-r--r-- | eval_intern.h | 2 | ||||
| -rw-r--r-- | proc.c | 2 | ||||
| -rw-r--r-- | vm_method.c | 6 |
5 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Sun Jan 3 13:56:49 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> + + * eval_error.c (rb_print_undef): Use `rb_method_visibility_t` + instead of `int`. + * eval_intern.h (rb_print_undef): ditto + * proc.c (mnew_internal): ditto + * vm_method.c (rb_export_method): ditto + [Misc #11649] [ruby-core:71311] [fix GH-1078] + Sun Jan 3 12:12:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * acinclude.m4: rename aclocal.m4, which should be generated by diff --git a/eval_error.c b/eval_error.c index 24bab9eab9..aa111714f7 100644 --- a/eval_error.c +++ b/eval_error.c @@ -215,7 +215,7 @@ ruby_error_print(void) undef_mesg_for(v, "class")) void -rb_print_undef(VALUE klass, ID id, int visi) +rb_print_undef(VALUE klass, ID id, rb_method_visibility_t visi) { const int is_mod = RB_TYPE_P(klass, T_MODULE); VALUE mesg; diff --git a/eval_intern.h b/eval_intern.h index 9c2b8960dc..78861b32fb 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -264,7 +264,7 @@ NORETURN(void rb_method_name_error(VALUE, VALUE)); NORETURN(void rb_fiber_start(void)); -NORETURN(void rb_print_undef(VALUE, ID, int)); +NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t)); NORETURN(void rb_print_undef_str(VALUE, VALUE)); NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t)); NORETURN(void rb_vm_localjump_error(const char *,VALUE, int)); @@ -1272,7 +1272,7 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass, return mnew_missing(klass, obj, id, rid, mclass); } if (!error) return Qnil; - rb_print_undef(klass, id, 0); + rb_print_undef(klass, id, METHOD_VISI_UNDEF); } if (visi == METHOD_VISI_UNDEF) { visi = METHOD_ENTRY_VISI(me); diff --git a/vm_method.c b/vm_method.c index 24f37dc85f..f15917e711 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1036,7 +1036,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi) if (UNDEFINED_METHOD_ENTRY_P(me) || UNDEFINED_REFINED_METHOD_P(me->def)) { - rb_print_undef(klass, name, 0); + rb_print_undef(klass, name, METHOD_VISI_UNDEF); } if (METHOD_ENTRY_VISI(me) != visi) { @@ -1538,7 +1538,7 @@ rb_alias(VALUE klass, ID alias_name, ID original_name) if ((!RB_TYPE_P(klass, T_MODULE)) || (orig_me = search_method(rb_cObject, original_name, &defined_class), UNDEFINED_METHOD_ENTRY_P(orig_me))) { - rb_print_undef(klass, original_name, 0); + rb_print_undef(klass, original_name, METHOD_VISI_UNDEF); } } @@ -1842,7 +1842,7 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) me = search_method(rb_cObject, id, 0); } if (UNDEFINED_METHOD_ENTRY_P(me)) { - rb_print_undef(module, id, 0); + rb_print_undef(module, id, METHOD_VISI_UNDEF); } if (me->def->type != VM_METHOD_TYPE_ZSUPER) { break; /* normal case: need not to follow 'super' link */ |