summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-25 00:11:16 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-25 00:11:16 +0000
commit9158c76842538fda9740f4ff2a848eec28697e5f (patch)
tree7138253fd313becfdcb63072c72c271ab5a24970
parent87c91cb99456b08b2b2e8dd2ddb15acc1fce8b0b (diff)
downloadruby-9158c76842538fda9740f4ff2a848eec28697e5f.tar.gz
ruby-9158c76842538fda9740f4ff2a848eec28697e5f.tar.xz
ruby-9158c76842538fda9740f4ff2a848eec28697e5f.zip
* enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enum.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 69fb3c41c..9158bc7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Wed Oct 25 00:58:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/mkexports.rb, win32/resource.rb: use unique variable names.
+Tue Oct 24 18:51:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
+
Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (r_object0): use return value from proc given as the
diff --git a/enum.c b/enum.c
index 419a2b98e..4836aef72 100644
--- a/enum.c
+++ b/enum.c
@@ -1178,6 +1178,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
for (i=0; i<argc; i++) {
argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
}
+ RETURN_ENUMERATOR(obj, argc, argv);
result = rb_block_given_p() ? Qnil : rb_ary_new();
memo[0] = result;
memo[1] = rb_ary_new4(argc, argv);