admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4599 from shuujii/drop-dependency-from-mruby-enum-chain-to-mruby-enum-ext

Browse Source 
Drop dependency from `mruby-enum-chain` to `mruby-enum-ext`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-07-27 21:38:20 +09:00
committed by GitHub
parent 2f0a95768b fe9a58c193
commit 8c6cd2da76
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-enum-chain/mrblib/chain.rb
+4 -1
View File
@@ -40,8 +40,11 @@ class Enumerator
end
def rewind
@enums.reverse_each do |e|
i = @enums.size - 1
while 0 <= i
e = @enums[i]
e.rewind if e.respond_to?(:rewind)
i -= 1
end
self
mrbgems/mruby-enum-chain/test/enum_chain.rb
+17 -7
View File
@@ -14,7 +14,7 @@ end
assert("Enumerable#+") do
a = [].each
b = {}.reverse_each
b = {}.each
c = Object.new # not has #each method
assert_kind_of Enumerator::Chain, a + b
@@ -46,13 +46,13 @@ assert("Enumerator::Chain#each") do
assert_kind_of Enumerator, aa.each
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_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_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)
assert_kind_of Enumerator, aa.each
@@ -65,12 +65,22 @@ assert("Enumerator::Chain#size") do
aa = a.chain(a)
assert_equal 6, aa.size
aa = a.chain(a.reverse_each)
aa = a.chain(3..4)
assert_nil aa.size
aa = a.chain(a.reverse_each, a)
aa = a.chain(3..4, a)
assert_nil aa.size
aa = a.chain(Object.new)
assert_nil aa.size
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