From b0f840dbea672635796ad94b583dcd7432da3f03 Mon Sep 17 00:00:00 2001 From: yui-knk Date: Tue, 3 Nov 2015 12:59:08 +0900 Subject: [PATCH] Use `rb_method_visibility_t` instead of `int` in `rb_print_undef` Same as `rb_print_inaccessible`, change `rb_print_undef` to use `rb_method_visibility_t`. --- eval_error.c | 2 +- eval_intern.h | 2 +- proc.c | 2 +- vm_method.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eval_error.c b/eval_error.c index 24bab9e..aa11171 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 6b5ca7f..8c14790 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -286,7 +286,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)); diff --git a/proc.c b/proc.c index 5ba4b61..4578efa 100644 --- a/proc.c +++ b/proc.c @@ -1255,7 +1255,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 7d658b0..9ddd2a0 100644 --- a/vm_method.c +++ b/vm_method.c @@ -984,7 +984,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) { @@ -1474,7 +1474,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); } } @@ -1777,7 +1777,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 */ -- 2.3.2 (Apple Git-55)