diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-29 07:49:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-29 07:49:22 +0000 |
commit | b0c4ac77799fdf60a489f9e735158647c630865a (patch) | |
tree | 9ce10d018542a7dc056975f659fa064ce0c1c9e8 /proc.c | |
parent | 2d55537dce5fde5e3581351bd274ecabf1e284d7 (diff) | |
download | ruby-b0c4ac77799fdf60a489f9e735158647c630865a.tar.gz |
proc.c: original arity
* proc.c (rb_mod_method_arity): return original arity of the method if
aliased because of visibility change, like as Method#arity.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -1743,10 +1743,26 @@ method_arity(VALUE method) return rb_method_entry_arity(data->me); } +static rb_method_entry_t * +original_method_entry(VALUE mod, ID id) +{ + VALUE rclass; + rb_method_entry_t *me; + while ((me = rb_method_entry(mod, id, &rclass)) != 0) { + rb_method_definition_t *def = me->def; + if (!def) break; + if (def->type != VM_METHOD_TYPE_ZSUPER) break; + mod = RCLASS_SUPER(rclass); + id = def->original_id; + } + return me; +} + int rb_mod_method_arity(VALUE mod, ID id) { - rb_method_entry_t *me = rb_method_entry(mod, id, 0); + rb_method_entry_t *me = original_method_entry(mod, id); + if (!me) return 0; /* should raise? */ return rb_method_entry_arity(me); } |