From fe9a58c193f73c85d79de214152b2444b7cfe483 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sat, 27 Jul 2019 20:45:14 +0900 Subject: Drop dependency from `mruby-enum-chain` to `mruby-enum-ext` --- mrbgems/mruby-enum-chain/mrblib/chain.rb | 5 ++++- mrbgems/mruby-enum-chain/test/enum_chain.rb | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'mrbgems/mruby-enum-chain') diff --git a/mrbgems/mruby-enum-chain/mrblib/chain.rb b/mrbgems/mruby-enum-chain/mrblib/chain.rb index 98515ea14..52f5f0656 100644 --- a/mrbgems/mruby-enum-chain/mrblib/chain.rb +++ b/mrbgems/mruby-enum-chain/mrblib/chain.rb @@ -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 diff --git a/mrbgems/mruby-enum-chain/test/enum_chain.rb b/mrbgems/mruby-enum-chain/test/enum_chain.rb index 4dd59bd37..9aea783b9 100644 --- a/mrbgems/mruby-enum-chain/test/enum_chain.rb +++ b/mrbgems/mruby-enum-chain/test/enum_chain.rb @@ -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 -- cgit v1.2.3 From 27e3d92a305576befda7eff927c19e176288daf5 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sun, 28 Jul 2019 22:12:02 +0900 Subject: Remove `Enumerator::Chain#initialize_copy` I think `Enumerator::Chain#initialize_copy` is unnecessary because CRuby doesn't clone elements. --- mrbgems/mruby-enum-chain/mrblib/chain.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'mrbgems/mruby-enum-chain') diff --git a/mrbgems/mruby-enum-chain/mrblib/chain.rb b/mrbgems/mruby-enum-chain/mrblib/chain.rb index 52f5f0656..562620165 100644 --- a/mrbgems/mruby-enum-chain/mrblib/chain.rb +++ b/mrbgems/mruby-enum-chain/mrblib/chain.rb @@ -20,10 +20,6 @@ class Enumerator @enums = args end - def initialize_copy(orig) - @enums = orig.__copy_enums - end - def each(&block) return to_enum unless block_given? @@ -53,11 +49,5 @@ class Enumerator def inspect "#<#{self.class}: #{@enums.inspect}>" end - - def __copy_enums - @enums.each_with_object([]) do |e, a| - a << e.clone - end - end end end -- cgit v1.2.3 From 7f80a5f73cb3823e562f37c12a25d6d43d9b512d Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sun, 28 Jul 2019 22:52:24 +0900 Subject: Define `#+` to `Enumerator` and `Enumerator#Chain` instead of `Enumerable` --- mrbgems/mruby-enum-chain/mrblib/chain.rb | 10 +++++++--- mrbgems/mruby-enum-chain/test/enum_chain.rb | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'mrbgems/mruby-enum-chain') diff --git a/mrbgems/mruby-enum-chain/mrblib/chain.rb b/mrbgems/mruby-enum-chain/mrblib/chain.rb index 52f5f0656..03acfb7ef 100644 --- a/mrbgems/mruby-enum-chain/mrblib/chain.rb +++ b/mrbgems/mruby-enum-chain/mrblib/chain.rb @@ -6,13 +6,13 @@ module Enumerable def chain(*args) Enumerator::Chain.new(self, *args) end +end +class Enumerator def +(other) - Enumerator::Chain.new(self, other) + Chain.new(self, other) end -end -class Enumerator class Chain include Enumerable @@ -50,6 +50,10 @@ class Enumerator self end + def +(other) + self.class.new(self, other) + end + def inspect "#<#{self.class}: #{@enums.inspect}>" end diff --git a/mrbgems/mruby-enum-chain/test/enum_chain.rb b/mrbgems/mruby-enum-chain/test/enum_chain.rb index 9aea783b9..1d3d691ca 100644 --- a/mrbgems/mruby-enum-chain/test/enum_chain.rb +++ b/mrbgems/mruby-enum-chain/test/enum_chain.rb @@ -12,7 +12,7 @@ assert("Enumerable#chain") do assert_raise(NoMethodError) { c.chain } end -assert("Enumerable#+") do +assert("Enumerator#+") do a = [].each b = {}.each c = Object.new # not has #each method @@ -24,7 +24,7 @@ assert("Enumerable#+") do assert_raise(NoMethodError) { c + a } end -assert("Enumerator.new") do +assert("Enumerator::Chain.new") do a = [] b = {} c = Object.new # not has #each method @@ -84,3 +84,14 @@ assert("Enumerator::Chain#rewind") do c = e1.chain(e2).each{}.rewind assert_equal [e2.__id__, e1.__id__], rewound end + +assert("Enumerator::Chain#+") do + a = [].chain + b = {}.chain + c = Object.new # not has #each method + + assert_kind_of Enumerator::Chain, a + b + assert_kind_of Enumerator::Chain, a + c + assert_kind_of Enumerator::Chain, b + a + assert_kind_of Enumerator::Chain, b + c +end -- cgit v1.2.3 From 66211394e1597e403f14aada81a993f5b1429066 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Fri, 30 Aug 2019 15:46:29 +0900 Subject: `Enumerator::Chain#rewind` shouldn't rewind elements aren't iterated ### Example: ```ruby # example.rb e = [1] def e.rewind; p :r end c = e.chain(e) c.each{break c}.rewind ``` #### Before this patch: ```terminal $ bin/mruby example.rb :r :r ``` #### After this patch (same as Ruby): ```terminal $ bin/mruby example.rb :r ``` --- mrbgems/mruby-enum-chain/mrblib/chain.rb | 19 ++++++++++++------- mrbgems/mruby-enum-chain/test/enum_chain.rb | 21 ++++++++++++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) (limited to 'mrbgems/mruby-enum-chain') diff --git a/mrbgems/mruby-enum-chain/mrblib/chain.rb b/mrbgems/mruby-enum-chain/mrblib/chain.rb index 55474eb92..43d0926c8 100644 --- a/mrbgems/mruby-enum-chain/mrblib/chain.rb +++ b/mrbgems/mruby-enum-chain/mrblib/chain.rb @@ -17,13 +17,19 @@ class Enumerator include Enumerable def initialize(*args) - @enums = args + @enums = args.freeze + @pos = -1 end def each(&block) - return to_enum unless block_given? + return to_enum unless block - @enums.each { |e| e.each(&block) } + i = 0 + while i < @enums.size + @pos = i + @enums[i].each(&block) + i += 1 + end self end @@ -36,11 +42,10 @@ class Enumerator end def rewind - i = @enums.size - 1 - while 0 <= i - e = @enums[i] + while 0 <= @pos && @pos < @enums.size + e = @enums[@pos] e.rewind if e.respond_to?(:rewind) - i -= 1 + @pos -= 1 end self diff --git a/mrbgems/mruby-enum-chain/test/enum_chain.rb b/mrbgems/mruby-enum-chain/test/enum_chain.rb index 1d3d691ca..45bbc9a77 100644 --- a/mrbgems/mruby-enum-chain/test/enum_chain.rb +++ b/mrbgems/mruby-enum-chain/test/enum_chain.rb @@ -76,13 +76,24 @@ assert("Enumerator::Chain#size") do end assert("Enumerator::Chain#rewind") do - rewound = [] + rewound = nil 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 + (class << e1; self end).define_method(:rewind) { rewound << self } + (class << e2; self end).define_method(:rewind) { rewound << self } + c = e1.chain(e2) + + rewound = [] + c.rewind + assert_equal [], rewound + + rewound = [] + c.each{break c}.rewind + assert_equal [e1], rewound + + rewound = [] + c.each{}.rewind + assert_equal [e2, e1], rewound end assert("Enumerator::Chain#+") do -- cgit v1.2.3