diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | proc.c | 18 | ||||
| -rw-r--r-- | test/ruby/test_proc.rb | 1 |
3 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Tue Jul 17 00:18:41 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + Revert r33924. + + * proc.c (rb_proc_arity): Fix Proc#arity in case of optional + arguments + [bug #5694] [rubyspec:b8b259] [rubyspec:184c8100f] + Mon Jul 16 23:20:24 2012 Tanaka Akira <akr@fsij.org> * bignum.c (rb_integer_float_cmp): use FIXNUM_MIN and FIXNUM_MAX, @@ -622,14 +622,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 @@ -648,7 +648,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 { diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 3deb5c0109..ac8d568cde 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -68,6 +68,7 @@ class TestProc < Test::Unit::TestCase assert_equal(-1, proc{|*|}.arity) assert_equal(-3, proc{|x, *y, z|}.arity) assert_equal(-4, proc{|x, *y, z, a|}.arity) + assert_equal(-1, ->(a=42){}.arity) assert_arity(0) {} assert_arity(0) {||} |