mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3b4949ffa8
commit
0c0f754400
3 changed files with 38 additions and 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>
|
Thu Aug 20 01:28:42 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* enumerator.c: implement Enumerator#{next_values,peek_values,feed}
|
* enumerator.c: implement Enumerator#{next_values,peek_values,feed}
|
||||||
|
|
|
@ -592,7 +592,6 @@ next_init(VALUE obj, struct enumerator *e)
|
||||||
e->dst = curr;
|
e->dst = curr;
|
||||||
e->fib = rb_fiber_new(next_i, obj);
|
e->fib = rb_fiber_new(next_i, obj);
|
||||||
e->lookahead = Qundef;
|
e->lookahead = Qundef;
|
||||||
e->feedvalue = Qundef;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -266,6 +266,40 @@ class TestEnumerator < Test::Unit::TestCase
|
||||||
assert_raise(TypeError) { e.feed 2 }
|
assert_raise(TypeError) { e.feed 2 }
|
||||||
end
|
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
|
def test_feed_yielder
|
||||||
x = nil
|
x = nil
|
||||||
e = Enumerator.new {|y| x = y.yield; 10 }
|
e = Enumerator.new {|y| x = y.yield; 10 }
|
||||||
|
|
Loading…
Reference in a new issue