Add tests for r36415.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 45 insertions, 12 deletions

diff --git a/proc.c b/proc.c
index 9502f98772..5612f95fac 100644
--- a/proc.c
+++ b/proc.c
@@ -622,18 +622,25 @@ 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
- *     lambda { |a = 0| }.arity      #=> -1
- *     lambda { |a, b = 0| }.arity   #=> -2
- *     lambda { |a, b = 0, c = 0| }.arity #=> -2
- *     lambda { |(a, b), c = 0| }.arity   #=> -2
+ *     proc {}.arity          #=>  0
+ *     proc {||}.arity        #=>  0
+ *     proc {|a|}.arity       #=>  1
+ *     proc {|a,b|}.arity     #=>  2
+ *     proc {|a,b,c|}.arity   #=>  3
+ *     proc {|*a|}.arity      #=> -1
+ *     proc {|a,*b|}.arity    #=> -2
+ *     proc {|a,*b, c|}.arity #=> -3
+ *
+ *     proc   { |x = 0| }.arity       #=> 0
+ *     lambda { |a = 0| }.arity       #=> -1
+ *     proc   { |x=0, y| }.arity      #=> 0
+ *     lambda { |x=0, y| }.arity      #=> -2
+ *     proc   { |x=0, y=0| }.arity    #=> 0
+ *     lambda { |x=0, y=0| }.arity    #=> -1
+ *     proc   { |x, y=0| }.arity      #=> 1
+ *     lambda { |x, y=0| }.arity      #=> -2
+ *     proc   { |(x, y), z=0| }.arity #=> 1
+ *     lambda { |(x, y), z=0| }.arity #=> -2
  */
 
 static VALUE
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 3deb5c0109..909b42cb8d 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -62,13 +62,39 @@ class TestProc < Test::Unit::TestCase
     assert_equal(0, proc{}.arity)
     assert_equal(0, proc{||}.arity)
     assert_equal(1, proc{|x|}.arity)
+    assert_equal(0, proc{|x=1|}.arity)
     assert_equal(2, proc{|x, y|}.arity)
+    assert_equal(0, proc{|x=0, y|}.arity)
+    assert_equal(0, proc{|x=0, y=0|}.arity)
+    assert_equal(1, proc{|x, y=0|}.arity)
     assert_equal(-2, proc{|x, *y|}.arity)
+    assert_equal(-1, proc{|x=0, *y|}.arity)
     assert_equal(-1, proc{|*x|}.arity)
     assert_equal(-1, proc{|*|}.arity)
     assert_equal(-3, proc{|x, *y, z|}.arity)
+    assert_equal(-2, proc{|x=0, *y, z|}.arity)
+    assert_equal(2, proc{|(x, y), z|}.arity)
+    assert_equal(1, proc{|(x, y), z=0|}.arity)
     assert_equal(-4, proc{|x, *y, z, a|}.arity)
 
+    assert_equal(0, lambda{}.arity)
+    assert_equal(0, lambda{||}.arity)
+    assert_equal(1, lambda{|x|}.arity)
+    assert_equal(-1, lambda{|x=1|}.arity) # different from proc
+    assert_equal(2, lambda{|x, y|}.arity)
+    assert_equal(-2, lambda{|x=0, y|}.arity) # different from proc
+    assert_equal(-1, lambda{|x=0, y=0|}.arity) # different from proc
+    assert_equal(-2, lambda{|x, y=0|}.arity) # different from proc
+    assert_equal(-2, lambda{|x, *y|}.arity)
+    assert_equal(-1, lambda{|x=0, *y|}.arity)
+    assert_equal(-1, lambda{|*x|}.arity)
+    assert_equal(-1, lambda{|*|}.arity)
+    assert_equal(-3, lambda{|x, *y, z|}.arity)
+    assert_equal(-2, lambda{|x=0, *y, z|}.arity)
+    assert_equal(2, lambda{|(x, y), z|}.arity)
+    assert_equal(-2, lambda{|(x, y), z=0|}.arity)
+    assert_equal(-4, lambda{|x, *y, z, a|}.arity)
+
     assert_arity(0) {}
     assert_arity(0) {||}
     assert_arity(1) {|x|}