diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-19 15:42:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-19 15:42:26 +0000 |
commit | abeedb0875f3fb8e8d1329b8dc885b159cb61841 (patch) | |
tree | 015944ec5e97a34f9f989c320aadfb2a6896d049 /test | |
parent | b70f99d15f3f139523aa8f1dcb200fa8a8aaa16b (diff) | |
download | ruby-abeedb0875f3fb8e8d1329b8dc885b159cb61841.tar.gz |
array.c, enum.c: TypeError in zip
* array.c (take_items), enum.c (enum_zip): raise TypeError at
non-enumerable objects, not NoMethodError. [ruby-dev:46145]
[Bug #7038]
* vm_eval.c (rb_check_block_call): check_funcall variant with block
function.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_array.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_enum.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 137c124f60..60b08cd1bc 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1890,7 +1890,7 @@ class TestArray < Test::Unit::TestCase ary = Object.new def ary.to_a; [1, 2]; end - assert_raise(NoMethodError){ %w(a b).zip(ary) } + assert_raise(TypeError, NoMethodError) {%w(a b).zip(ary)} def ary.each; [3, 4].each{|e|yield e}; end assert_equal([['a', 3], ['b', 4]], %w(a b).zip(ary)) def ary.to_ary; [5, 6]; end diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 1d509b59de..65e9135d69 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -277,7 +277,7 @@ class TestEnumerable < Test::Unit::TestCase ary = Object.new def ary.to_a; [1, 2]; end - assert_raise(NoMethodError){ %w(a b).zip(ary) } + assert_raise(TypeError, NoMethodError) {%w(a b).zip(ary)} def ary.each; [3, 4].each{|e|yield e}; end assert_equal([[1, 3], [2, 4], [3, nil], [1, nil], [2, nil]], @obj.zip(ary)) def ary.to_ary; [5, 6]; end |