diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-02 09:44:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-02 09:44:09 +0000 |
| commit | c00b706cbe0cf0d93d3031b545506d9c06619bfd (patch) | |
| tree | d219267d5f6aca74c5151243f1bfd02681326c6e /vm_method.c | |
| parent | a59bfa76e51cb3ddf41fe15c239d3872b73a1e85 (diff) | |
check_definition: duplicated code
* vm_method.c (check_definition): moved duplicated code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/vm_method.c b/vm_method.c index 9c49007ac9..6bb8e6c709 100644 --- a/vm_method.c +++ b/vm_method.c @@ -758,10 +758,12 @@ rb_mod_method_defined(VALUE mod, VALUE mid) #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f)) static VALUE -check_definition(VALUE mod, ID mid, rb_method_flag_t noex) +check_definition(VALUE mod, VALUE mid, rb_method_flag_t noex) { const rb_method_entry_t *me; - me = rb_method_entry(mod, mid); + ID id = rb_check_id(&mid); + if (!id) return Qfalse; + me = rb_method_entry(mod, id); if (me) { if (VISI_CHECK(me->flag, noex)) return Qtrue; @@ -798,9 +800,7 @@ check_definition(VALUE mod, ID mid, rb_method_flag_t noex) static VALUE rb_mod_public_method_defined(VALUE mod, VALUE mid) { - ID id = rb_check_id(&mid); - if (!id) return Qfalse; - return check_definition(mod, id, NOEX_PUBLIC); + return check_definition(mod, mid, NOEX_PUBLIC); } /* @@ -832,9 +832,7 @@ rb_mod_public_method_defined(VALUE mod, VALUE mid) static VALUE rb_mod_private_method_defined(VALUE mod, VALUE mid) { - ID id = rb_check_id(&mid); - if (!id) return Qfalse; - return check_definition(mod, id, NOEX_PRIVATE); + return check_definition(mod, mid, NOEX_PRIVATE); } /* @@ -866,9 +864,7 @@ rb_mod_private_method_defined(VALUE mod, VALUE mid) static VALUE rb_mod_protected_method_defined(VALUE mod, VALUE mid) { - ID id = rb_check_id(&mid); - if (!id) return Qfalse; - return check_definition(mod, id, NOEX_PROTECTED); + return check_definition(mod, mid, NOEX_PROTECTED); } int |