diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-19 17:32:56 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-19 17:32:56 +0000 |
commit | 0c0f75440092adc29c5b6edac00ded1899c67805 (patch) | |
tree | 60289302826d01d45edc91006c0c6db06d92332e | |
parent | 3b4949ffa8602bf5b8fb4be880b9c73c9375d8fa (diff) | |
download | ruby-0c0f75440092adc29c5b6edac00ded1899c67805.tar.gz |
* enumerator.c (next_init): don't clear feedvalue.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | enumerator.c | 1 | ||||
-rw-r--r-- | test/ruby/test_enumerator.rb | 34 |
3 files changed, 38 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Aug 20 02:32:08 2009 Tanaka Akira <akr@fsij.org> + + * enumerator.c (next_init): don't clear feedvalue. + Thu Aug 20 01:28:42 2009 Tanaka Akira <akr@fsij.org> * enumerator.c: implement Enumerator#{next_values,peek_values,feed} diff --git a/enumerator.c b/enumerator.c index a8120aa79b..ad49de8820 100644 --- a/enumerator.c +++ b/enumerator.c @@ -592,7 +592,6 @@ next_init(VALUE obj, struct enumerator *e) e->dst = curr; e->fib = rb_fiber_new(next_i, obj); e->lookahead = Qundef; - e->feedvalue = Qundef; } /* diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 333dac79cb..e70a783a00 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -266,6 +266,40 @@ class TestEnumerator < Test::Unit::TestCase assert_raise(TypeError) { e.feed 2 } end + def test_feed_before_first_next + o = Object.new + def o.each(ary) + ary << yield + ary << yield + ary << yield + end + ary = [] + e = o.to_enum(:each, ary) + e.feed 1 + e.next + e.next + assert_equal([1], ary) + end + + def test_rewind_clear_feed + o = Object.new + def o.each(ary) + ary << yield + ary << yield + ary << yield + end + ary = [] + e = o.to_enum(:each, ary) + e.next + e.feed 1 + e.next + e.feed 2 + e.rewind + e.next + e.next + assert_equal([1,nil], ary) + end + def test_feed_yielder x = nil e = Enumerator.new {|y| x = y.yield; 10 } |