Commit fe9a58c1 authored by KOBAYASHI Shuji's avatar KOBAYASHI Shuji

Drop dependency from `mruby-enum-chain` to `mruby-enum-ext`

parent 2f0a9576
...@@ -40,8 +40,11 @@ class Enumerator ...@@ -40,8 +40,11 @@ class Enumerator
end end
def rewind def rewind
@enums.reverse_each do |e| i = @enums.size - 1
while 0 <= i
e = @enums[i]
e.rewind if e.respond_to?(:rewind) e.rewind if e.respond_to?(:rewind)
i -= 1
end end
self self
......
...@@ -14,7 +14,7 @@ end ...@@ -14,7 +14,7 @@ end
assert("Enumerable#+") do assert("Enumerable#+") do
a = [].each a = [].each
b = {}.reverse_each b = {}.each
c = Object.new # not has #each method c = Object.new # not has #each method
assert_kind_of Enumerator::Chain, a + b assert_kind_of Enumerator::Chain, a + b
...@@ -46,13 +46,13 @@ assert("Enumerator::Chain#each") do ...@@ -46,13 +46,13 @@ assert("Enumerator::Chain#each") do
assert_kind_of Enumerator, aa.each assert_kind_of Enumerator, aa.each
assert_equal [1, 2, 3, 1, 2, 3], aa.each.to_a assert_equal [1, 2, 3, 1, 2, 3], aa.each.to_a
aa = a.chain(a.reverse_each) aa = a.chain(6..9)
assert_kind_of Enumerator, aa.each assert_kind_of Enumerator, aa.each
assert_equal [1, 2, 3, 3, 2, 1], aa.each.to_a assert_equal [1, 2, 3, 6, 7, 8, 9], aa.each.to_a
aa = a.chain(a.reverse_each, a) aa = a.chain((-3..-2).each_with_index, a)
assert_kind_of Enumerator, aa.each assert_kind_of Enumerator, aa.each
assert_equal [1, 2, 3, 3, 2, 1, 1, 2, 3], aa.each.to_a assert_equal [1, 2, 3, [-3, 0], [-2, 1], 1, 2, 3], aa.each.to_a
aa = a.chain(Object.new) aa = a.chain(Object.new)
assert_kind_of Enumerator, aa.each assert_kind_of Enumerator, aa.each
...@@ -65,12 +65,22 @@ assert("Enumerator::Chain#size") do ...@@ -65,12 +65,22 @@ assert("Enumerator::Chain#size") do
aa = a.chain(a) aa = a.chain(a)
assert_equal 6, aa.size assert_equal 6, aa.size
aa = a.chain(a.reverse_each) aa = a.chain(3..4)
assert_nil aa.size assert_nil aa.size
aa = a.chain(a.reverse_each, a) aa = a.chain(3..4, a)
assert_nil aa.size assert_nil aa.size
aa = a.chain(Object.new) aa = a.chain(Object.new)
assert_nil aa.size assert_nil aa.size
end end
assert("Enumerator::Chain#rewind") do
rewound = []
e1 = [1, 2]
e2 = (4..6)
(class << e1; self end).define_method(:rewind) { rewound << __id__ }
(class << e2; self end).define_method(:rewind) { rewound << __id__ }
c = e1.chain(e2).each{}.rewind
assert_equal [e2.__id__, e1.__id__], rewound
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment