From 4007da1792091c8a3fae0380c139f7f3a434c0af Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 13 May 2012 15:24:40 +0000
Subject: * enumerator.c (lazy_take_func, lazy_take): multiple calls of  
 force/to_a method to Enumerator::Lazy#take should return same   results.
 [ruby-dev:45634] [Bug #6428]

* test/ruby/test_lazy_enumerator.rb (test_take_recycle): add test for
  above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enumerator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'enumerator.c')

diff --git a/enumerator.c b/enumerator.c
index 2563de54ab..3d26b0bc76 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -1533,6 +1533,7 @@ lazy_take_func(VALUE val, VALUE args, int argc, VALUE *argv)
 
     rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
     if (--memo->u3.cnt == 0) {
+	memo->u3.cnt = memo->u2.argc;
 	return Qundef;
     }
     else {
@@ -1557,7 +1558,7 @@ lazy_take(VALUE obj, VALUE n)
 	argv[2] = INT2NUM(0);
 	argc = 3;
     }
-    memo = NEW_MEMO(0, 0, len);
+    memo = NEW_MEMO(0, len, len);
     return lazy_set_method(rb_block_call(rb_cLazy, id_new, argc, argv,
 					 lazy_take_func, (VALUE) memo),
 			   rb_ary_new3(1, n));
-- 
cgit v1.2.3