nagachika	2012-05-14 00:24:40 +0900 (Mon, 14 May 2012)

  New Revision: 35638

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35638

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/enumerator.c
    trunk/test/ruby/test_lazy_enumerator.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35637)
+++ ChangeLog	(revision 35638)
@@ -1,3 +1,12 @@
+Mon May 14 00:14:24 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* 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.
+
 Sun May 13 23:38:31 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
Index: enumerator.c
===================================================================
--- enumerator.c	(revision 35637)
+++ enumerator.c	(revision 35638)
@@ -1533,6 +1533,7 @@
 
     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 @@
 	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));
Index: test/ruby/test_lazy_enumerator.rb
===================================================================
--- test/ruby/test_lazy_enumerator.rb	(revision 35637)
+++ test/ruby/test_lazy_enumerator.rb	(revision 35638)
@@ -229,6 +229,14 @@
     assert_equal(nil, a.current)
   end
 
+  def test_take_recycle
+    bug6428 = '[ruby-dev:45634]'
+    a = Step.new(1..10)
+    take5 = a.lazy.take(5)
+    assert_equal((1..5).to_a, take5.force, bug6428)
+    assert_equal((1..5).to_a, take5.force, bug6428)
+  end
+
   def test_take_while
     a = Step.new(1..10)
     assert_equal(1, a.take_while {|i| i < 5}.first)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/