kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* proc.c (rb_proc_parameters): unnamed_parameters() expects int

Browse source 
not VALUE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-14 08:59:12 +00:00
parent 1f43321991
commit 07167378cb
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 14 17:59:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (rb_proc_parameters): unnamed_parameters() expects in
not VALUE.
Sat Mar 14 17:54:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_each_words): assume no string exceeds INT_MAX.

25
proc.c
View file

@ -575,6 +575,13 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
static VALUE
proc_arity(VALUE self)
{
int arity = rb_proc_arity(self);
return INT2FIX(arity);
}
int
rb_proc_arity(VALUE proc)
{
rb_proc_t *proc;
rb_iseq_t *iseq;
@ -583,27 +590,21 @@ proc_arity(VALUE self)
if (iseq) {
if (BUILTIN_TYPE(iseq) != T_NODE) {
if (iseq->arg_rest < 0) {
return INT2FIX(iseq->argc);
return iseq->argc;
}
else {
return INT2FIX(-(iseq->argc + 1 + iseq->arg_post_len));
return -(iseq->argc + 1 + iseq->arg_post_len);
}
}
else {
NODE *node = (NODE *)iseq;
if (nd_type(node) == NODE_IFUNC && node->nd_cfnc == bmcall) {
/* method(:foo).to_proc.arity */
return INT2FIX(method_arity(node->nd_tval));
return method_arity(node->nd_tval);
}
}
}
return INT2FIX(-1);
}
int
rb_proc_arity(VALUE proc)
{
return FIX2INT(proc_arity(proc));
return -1;
}
static rb_iseq_t *
@ -689,7 +690,7 @@ rb_proc_parameters(VALUE self)
int is_proc;
rb_iseq_t *iseq = get_proc_iseq(self, &is_proc);
if (!iseq) {
return unnamed_parameters(proc_arity(self));
return unnamed_parameters(rb_proc_arity(self));
}
return rb_iseq_parameters(iseq, is_proc);
}
@ -1814,7 +1815,7 @@ curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
static VALUE
proc_curry(int argc, VALUE *argv, VALUE self)
{
int sarity, marity = FIX2INT(proc_arity(self));
int sarity, marity = rb_proc_arity(self);
VALUE arity, opt = Qfalse;
if (marity < 0) {