From f6d18c3f2acaac0071ad38e06d9de8ea50489da1 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 5 Dec 2008 04:05:48 +0000 Subject: * 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 --- test/ruby/test_proc.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 79668a69a2..59afb5472e 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -677,17 +677,17 @@ class TestProc < Test::Unit::TestCase def test_parameters assert_equal([], proc {}.parameters) assert_equal([], proc {||}.parameters) - assert_equal([[:req, :a]], proc {|a|}.parameters) - assert_equal([[:req, :a], [:req, :b]], proc {|a, b|}.parameters) + assert_equal([[:opt, :a, nil]], proc {|a|}.parameters) + assert_equal([[:opt, :a, nil], [:opt, :b, nil]], proc {|a, b|}.parameters) assert_equal([[:opt, :a, :a], [:block, :b]], proc {|a=:a, &b|}.parameters) - assert_equal([[:req, :a], [:opt, :b, :b]], proc {|a, b=:b|}.parameters) + assert_equal([[:opt, :a, nil], [:opt, :b, :b]], proc {|a, b=:b|}.parameters) assert_equal([[:rest, :a]], proc {|*a|}.parameters) - assert_equal([[:req, :a], [:rest, :b], [:block, :c]], proc {|a, *b, &c|}.parameters) - assert_equal([[:req, :a], [:rest, :b], [:req, :c]], proc {|a, *b, c|}.parameters) - assert_equal([[:req, :a], [:rest, :b], [:req, :c], [:block, :d]], proc {|a, *b, c, &d|}.parameters) - assert_equal([[:req, :a], [:opt, :b, :b], [:rest, :c], [:req, :d], [:block, :e]], proc {|a, b=:b, *c, d, &e|}.parameters) - assert_equal([[:req], [:block, :b]], proc {|(a), &b|}.parameters) - assert_equal([[:req, :a], [:req, :b], [:opt, :c, :c], [:opt, :d, :d], [:rest, :e], [:req, :f], [:req, :g], [:block, :h]], proc {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters) + assert_equal([[:opt, :a, nil], [:rest, :b], [:block, :c]], proc {|a, *b, &c|}.parameters) + assert_equal([[:opt, :a, nil], [:rest, :b], [:opt, :c, nil]], proc {|a, *b, c|}.parameters) + assert_equal([[:opt, :a, nil], [:rest, :b], [:opt, :c, nil], [:block, :d]], proc {|a, *b, c, &d|}.parameters) + assert_equal([[:opt, :a, nil], [:opt, :b, :b], [:rest, :c], [:opt, :d, nil], [:block, :e]], proc {|a, b=:b, *c, d, &e|}.parameters) + assert_equal([[:opt, nil, nil], [:block, :b]], proc {|(a), &b|}.parameters) + assert_equal([[:opt, :a, nil], [:opt, :b, nil], [:opt, :c, :c], [:opt, :d, :d], [:rest, :e], [:opt, :f, nil], [:opt, :g, nil], [:block, :h]], proc {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters) end def pm0() end -- cgit v1.2.3