1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check_definition: duplicated code

Browse Source 
* 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
This commit is contained in:
nobu 2012-04-02 09:44:09 +00:00
parent a59bfa76e5
commit c00b706cbe
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vm_method.c
View File

@ -758,10 +758,12 @@ rb_mod_method_defined(VALUE mod, VALUE mid)
#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f)) #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
static VALUE 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; 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 (me) {
if (VISI_CHECK(me->flag, noex)) if (VISI_CHECK(me->flag, noex))
return Qtrue; return Qtrue;
@ -798,9 +800,7 @@ check_definition(VALUE mod, ID mid, rb_method_flag_t noex)
static VALUE static VALUE
rb_mod_public_method_defined(VALUE mod, VALUE mid) rb_mod_public_method_defined(VALUE mod, VALUE mid)
{ {
ID id = rb_check_id(&mid); return check_definition(mod, mid, NOEX_PUBLIC);
if (!id) return Qfalse;
return check_definition(mod, id, NOEX_PUBLIC);
} }
/* /*
@ -832,9 +832,7 @@ rb_mod_public_method_defined(VALUE mod, VALUE mid)
static VALUE static VALUE
rb_mod_private_method_defined(VALUE mod, VALUE mid) rb_mod_private_method_defined(VALUE mod, VALUE mid)
{ {
ID id = rb_check_id(&mid); return check_definition(mod, mid, NOEX_PRIVATE);
if (!id) return Qfalse;
return check_definition(mod, id, NOEX_PRIVATE);
} }
/* /*
@ -866,9 +864,7 @@ rb_mod_private_method_defined(VALUE mod, VALUE mid)
static VALUE static VALUE
rb_mod_protected_method_defined(VALUE mod, VALUE mid) rb_mod_protected_method_defined(VALUE mod, VALUE mid)
{ {
ID id = rb_check_id(&mid); return check_definition(mod, mid, NOEX_PROTECTED);
if (!id) return Qfalse;
return check_definition(mod, id, NOEX_PROTECTED);
} }
int int