From abeedb0875f3fb8e8d1329b8dc885b159cb61841 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Sep 2012 15:42:26 +0000
Subject: 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
---
 enum.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'enum.c')

diff --git a/enum.c b/enum.c
index ac86c9d550..0e4cf33d12 100644
--- a/enum.c
+++ b/enum.c
@@ -2010,6 +2010,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
     if (!allary) {
 	CONST_ID(conv, "to_enum");
 	for (i=0; i<argc; i++) {
+	    if (!rb_respond_to(argv[i], id_each)) Check_Type(argv[i], T_ARRAY);
 	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
 	}
     }
-- 
cgit v1.2.3