diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 15:27:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 15:27:59 +0000 |
| commit | 2fcdd7e080dffb39ad472a491e34be84099bc7b5 (patch) | |
| tree | cb8b09d12e1122bb13e4c9cae46437002b402e17 /vm_method.c | |
| parent | 0ab4b21d8159bd09d211652f8cb9e884613f8ff2 (diff) | |
* vm_method.c (rb_remove_method_id): no definition body is
undefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/vm_method.c b/vm_method.c index 61fc8cb793..d1a356a0ec 100644 --- a/vm_method.c +++ b/vm_method.c @@ -368,8 +368,8 @@ rb_method_entry(VALUE klass, ID id) return rb_get_method_entry(klass, id); } -void -rb_remove_method_id(VALUE klass, ID mid) +static void +remove_method_id(VALUE klass, ID mid) { st_data_t data; rb_method_entry_t *me = 0; @@ -386,19 +386,13 @@ rb_remove_method_id(VALUE klass, ID mid) rb_warn("removing `%s' may cause serious problems", rb_id2name(mid)); } - if (st_lookup(RCLASS_M_TBL(klass), mid, &data)) { - me = (rb_method_entry_t *)data; - if (!me || (me->def && me->def->type == VM_METHOD_TYPE_UNDEF)) { - me = 0; - } - else { - st_delete(RCLASS_M_TBL(klass), &mid, &data); - } - } - if (!me) { + if (!st_lookup(RCLASS_M_TBL(klass), mid, &data) || + !(me = (rb_method_entry_t *)data) || + (!me->def || me->def->type == VM_METHOD_TYPE_UNDEF)) { rb_name_error(mid, "method `%s' not defined in %s", rb_id2name(mid), rb_class2name(klass)); } + st_delete(RCLASS_M_TBL(klass), &mid, &data); rb_vm_check_redefinition_opt_method(me); rb_clear_cache_for_undef(klass, mid); @@ -412,7 +406,11 @@ rb_remove_method_id(VALUE klass, ID mid) } } -#define remove_method(klass, mid) rb_remove_method_id(klass, mid) +void +rb_remove_method_id(VALUE klass, ID mid) +{ + remove_method(klass, mid); +} void rb_remove_method(VALUE klass, const char *name) |