diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-05 04:05:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-05 04:05:48 +0000 |
commit | f6d18c3f2acaac0071ad38e06d9de8ea50489da1 (patch) | |
tree | 3fb0d50e336d12f469c988c78d5eebaaa5524fef /proc.c | |
parent | ed19ff6bdb7c194212bb3bcfd013472870cf4815 (diff) | |
download | ruby-f6d18c3f2acaac0071ad38e06d9de8ea50489da1.tar.gz |
* iseq.c (rb_iseq_parameters): proc arguments are always optional.
* proc.c (get_proc_iseq, rb_proc_parameters): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -25,7 +25,7 @@ VALUE rb_cMethod; VALUE rb_cBinding; VALUE rb_cProc; -VALUE rb_iseq_parameters(const rb_iseq_t *iseq); +VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc); static VALUE bmcall(VALUE, VALUE); static int method_arity(VALUE); @@ -611,19 +611,21 @@ rb_proc_arity(VALUE proc) } static rb_iseq_t * -get_proc_iseq(VALUE self) +get_proc_iseq(VALUE self, int *is_proc) { rb_proc_t *proc; rb_iseq_t *iseq; GetProcPtr(self, proc); iseq = proc->block.iseq; + if (is_proc) *is_proc = !proc->is_lambda; if (!RUBY_VM_NORMAL_ISEQ_P(iseq)) { NODE *node = (NODE *)iseq; iseq = 0; if (nd_type(node) == NODE_IFUNC && node->nd_cfnc == bmcall) { /* method(:foo).to_proc */ iseq = get_method_iseq(node->nd_tval); + if (is_proc) *is_proc = 0; } } return iseq; @@ -656,7 +658,7 @@ iseq_location(rb_iseq_t *iseq) VALUE rb_proc_location(VALUE self) { - return iseq_location(get_proc_iseq(self)); + return iseq_location(get_proc_iseq(self, 0)); } static VALUE @@ -688,11 +690,12 @@ unnamed_parameters(int arity) static VALUE rb_proc_parameters(VALUE self) { - rb_iseq_t *iseq = get_proc_iseq(self); + int is_proc; + rb_iseq_t *iseq = get_proc_iseq(self, &is_proc); if (!iseq) { return unnamed_parameters(proc_arity(self)); } - return rb_iseq_parameters(iseq); + return rb_iseq_parameters(iseq, is_proc); } /* @@ -1509,7 +1512,7 @@ get_method_iseq(VALUE method) body = data->body; switch (nd_type(body)) { case NODE_BMETHOD: - return get_proc_iseq(body->nd_cval); + return get_proc_iseq(body->nd_cval, 0); case RUBY_VM_METHOD_NODE: GetISeqPtr((VALUE)body->nd_body, iseq); if (RUBY_VM_NORMAL_ISEQ_P(iseq)) break; @@ -1547,7 +1550,7 @@ rb_method_parameters(VALUE method) if (!iseq) { return unnamed_parameters(method_arity(method)); } - return rb_iseq_parameters(iseq); + return rb_iseq_parameters(iseq, 0); } /* |