summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-enum-lazy/mrblib
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-11-30 12:54:20 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2016-11-30 12:54:20 +0900
commit779c2629fe3aff49caae35e1b7e0d15d2648cd58 (patch)
tree6df73d32caae523cfc9fd9a79b55dc88a2d899f2 /mrbgems/mruby-enum-lazy/mrblib
parent3cf66a82187f8a34eaaddb0697803916ab6b5f24 (diff)
parent0f90227907b15f879319600cfa523be5928c5da9 (diff)
downloadmruby-779c2629fe3aff49caae35e1b7e0d15d2648cd58.tar.gz
mruby-779c2629fe3aff49caae35e1b7e0d15d2648cd58.zip
resolve conflict; ref #3306
Diffstat (limited to 'mrbgems/mruby-enum-lazy/mrblib')
-rw-r--r--mrbgems/mruby-enum-lazy/mrblib/lazy.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/mrbgems/mruby-enum-lazy/mrblib/lazy.rb b/mrbgems/mruby-enum-lazy/mrblib/lazy.rb
index c9c3cc5fd..b650072e2 100644
--- a/mrbgems/mruby-enum-lazy/mrblib/lazy.rb
+++ b/mrbgems/mruby-enum-lazy/mrblib/lazy.rb
@@ -2,7 +2,7 @@ module Enumerable
# = Enumerable#lazy implementation
#
- # Enumerable#lazy returns an instance of Enumerable::Lazy.
+ # Enumerable#lazy returns an instance of Enumerator::Lazy.
# You can use it just like as normal Enumerable object,
# except these methods act as 'lazy':
#
@@ -16,9 +16,11 @@ module Enumerable
# - flat_map collect_concat
# - zip
def lazy
- Lazy.new(self)
+ Enumerator::Lazy.new(self)
end
+end
+class Enumerator
# == Acknowledgements
#
# Based on https://github.com/yhara/enumerable-lazy