зеркало из https://github.com/github/ruby.git
* proc.c (rb_proc_arity): Fix Proc#arity in case of optional arguments
[bug #5694] [rubyspec:b8b259] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
b0f588fe0e
Коммит
c6dec37649
|
@ -1,3 +1,8 @@
|
|||
Thu Dec 1 20:33:22 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||
|
||||
* proc.c (rb_proc_arity): Fix Proc#arity in case of optional
|
||||
arguments. [bug #5694] [rubyspec:b8b259]
|
||||
|
||||
Thu Dec 1 16:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/socket/extconf.rb: add arguments for macro calls.
|
||||
|
|
18
proc.c
18
proc.c
|
@ -615,14 +615,14 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
|
|||
* arguments. A <code>proc</code> with no argument declarations
|
||||
* is the same a block declaring <code>||</code> as its arguments.
|
||||
*
|
||||
* Proc.new {}.arity #=> 0
|
||||
* Proc.new {||}.arity #=> 0
|
||||
* Proc.new {|a|}.arity #=> 1
|
||||
* Proc.new {|a,b|}.arity #=> 2
|
||||
* Proc.new {|a,b,c|}.arity #=> 3
|
||||
* Proc.new {|*a|}.arity #=> -1
|
||||
* Proc.new {|a,*b|}.arity #=> -2
|
||||
* Proc.new {|a,*b, c|}.arity #=> -3
|
||||
* Proc.new {}.arity #=> 0
|
||||
* Proc.new {||}.arity #=> 0
|
||||
* Proc.new {|a|}.arity #=> 1
|
||||
* Proc.new {|a, b|}.arity #=> 2
|
||||
* Proc.new {|a, b, c|}.arity #=> 3
|
||||
* Proc.new {|*a|}.arity #=> -1
|
||||
* Proc.new {|a, b=42|}.arity #=> -2
|
||||
* Proc.new {|a, *b, c|}.arity #=> -3
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
|
@ -641,7 +641,7 @@ rb_proc_arity(VALUE self)
|
|||
iseq = proc->block.iseq;
|
||||
if (iseq) {
|
||||
if (BUILTIN_TYPE(iseq) != T_NODE) {
|
||||
if (iseq->arg_rest < 0) {
|
||||
if (iseq->arg_rest < 0 && iseq->arg_opts == 0) {
|
||||
return iseq->argc;
|
||||
}
|
||||
else {
|
||||
|
|
Загрузка…
Ссылка в новой задаче