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

1 files changed, 22 insertions, 0 deletions

diff --git a/vm_eval.c b/vm_eval.c
index 897b0b0659..ef588dd1f6 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -976,6 +976,28 @@ rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv,
     return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
 }
 
+static VALUE
+iterate_check_method(VALUE obj)
+{
+    const struct iter_method_arg * arg =
+      (struct iter_method_arg *) obj;
+
+    return rb_check_funcall(arg->obj, arg->mid, arg->argc, arg->argv);
+}
+
+VALUE
+rb_check_block_call(VALUE obj, ID mid, int argc, VALUE * argv,
+		    VALUE (*bl_proc) (ANYARGS), VALUE data2)
+{
+    struct iter_method_arg arg;
+
+    arg.obj = obj;
+    arg.mid = mid;
+    arg.argc = argc;
+    arg.argv = argv;
+    return rb_iterate(iterate_check_method, (VALUE)&arg, bl_proc, data2);
+}
+
 VALUE
 rb_each(VALUE obj)
 {