random-accessible 0.1.2 → 0.1.3

data/BSDL

@@ -0,0 +1,9 @@
+Copyright (c) 2011, Natsuki Kawai
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/random-accessible.rb

@@ -56,11 +56,7 @@ module RandomAccessible
   # See the docment of RandomReadable#collect.
   def collect!(&block)
     if block.nil?
-      Enumerator.new do |y|
-        size.times do |i|
-          self[i] = y.yield(at(i))
-        end
-      end
+      return Enumerator.new(self, :collect!)
     else
       replace(collect(&block))
     end
@@ -140,16 +136,7 @@ module RandomAccessible
   # if the class provides no size-provider.
   def reject!(&block)
     if block.nil?
-      return Enumerator.new do |y|
-        deleted = 0
-        size.times do |i|
-          val = self[i - deleted]
-          if y.yield(val)
-            delete_at(i - deleted)
-            deleted += 1
-          end
-        end
-      end
+      return Enumerator.new(self, :reject!)
     else
       deleted = 0
       size.times do |i|
@@ -174,15 +161,7 @@ module RandomAccessible
   # if the class provides no size-provider.
   def keep_if(&block)
     if block.nil?
-      e = reject!
-      return Enumerator.new do |y|
-        i = 0
-        e.each do
-          res = !y.yield(self[i])
-          i += 1 unless res
-          res
-        end
-      end
+      return Enumerator.new(self, :keep_if)
     else
       reject! do |el|
         !block.call(el)
@@ -313,17 +292,7 @@ module RandomAccessible
   def sort_by!(&block)
     # TODO: Optimize me.
     if block.nil?
-      data = []
-      Enumerator.new do |y|
-        each do |el|
-          data << y.yield(el)
-        end
-        i = -1
-        sort_by! do
-          i += 1
-          data[i]
-        end
-      end
+      return Enumerator.new(self, :sort_by!)
     else
       replace(sort_by(&block))
     end

data/lib/random-readable.rb

@@ -22,11 +22,9 @@ module RandomReadable
   # This method raises NotImplementedError
   # if the class provides neither size nor length method.
   def to_ary
-    Enumerator.new do |y|
-      size.times do |i|
-        y << at(i)
-      end
-    end.to_a
+    Array.new(size) do |i|
+      at(i)
+    end
   end
 
   alias :to_a :to_ary
@@ -113,17 +111,19 @@ module RandomReadable
       if has_size?
         return nil if start < -size || size < start
         return nil if len < 0
-        return Enumerator.new do |y|
-          len.times do |i|
-            y << at(start + i) if start + i < size
-          end
-        end.to_a
+        res = []
+        len.times do |i|
+          res << at(start + i) if start + i < size
+        end
+        return res
       else
-        return Enumerator.new do |y|
-          len.times do |i|
-            y << at(start + i)
+        if len < 0
+          return []
+        else
+          return Array.new(len) do |i|
+            at(start + i)
           end
-        end.to_a
+        end
       end
     elsif args[0].is_a? Range
       range = args[0]
@@ -139,11 +139,11 @@ module RandomReadable
         elsif first < 0 || size < first
           return nil
         end
-        return Enumerator.new do |y|
-          (first..last).each do |i|
-            y << at(i) if 0 <= i && i < size
-          end
-        end.to_a
+        res = []
+        (first..last).each do |i|
+          res << at(i) if 0 <= i && i < size
+        end
+        return res
       else
         range.map do |i|
           at(i)
@@ -202,11 +202,11 @@ module RandomReadable
   # This method raises NotImplementedError
   # if the class provides neither size nor length method.
   def compact
-    Enumerator.new do |y|
-      each do |el|
-        y << el unless el.nil?
-      end
-    end.to_a
+    res = []
+    each do |el|
+      res << el unless el.nil?
+    end
+    return res
   end
 
   # Same as Array's.
@@ -229,11 +229,7 @@ module RandomReadable
   # if the class provides neither size nor length method.
   def each(&block)
     if block.nil?
-      return Enumerator.new do |y|
-        size.times do |i|
-          y << self[i]
-        end
-      end
+      return Enumerator.new(self, :each)
     else
       size.times do |i|
         block.call(self[i])
@@ -378,14 +374,12 @@ module RandomReadable
   # if the class provides neither size nor length method.
   def last(n = nil)
     if n.nil?
-      at(size - 1)
+      return at(size - 1)
     else
       n = size if n > size
-      Enumerator.new do |y|
-        n.times do |i|
-          y << at(size - n + i)
-        end
-      end.to_a
+      return Array.new(n) do |i|
+        at(size - n + i)
+      end
     end
   end
 
@@ -458,11 +452,7 @@ module RandomReadable
   def reverse_each(&block)
     # Needs size.
     if block.nil?
-      Enumerator.new do |y|
-        (size - 1).downto 0 do |i|
-          y << at(i)
-        end
-      end
+      return Enumerator.new(self, :reverse_each)
     else
       (size - 1).downto 0 do |i|
         yield at(i)
@@ -560,23 +550,23 @@ module RandomReadable
   # The arguments must not be negative values
   # if the class does not provide size or length method.
   def values_at(*selectors)
-    Enumerator.new do |y|
-      selectors.each do |s|
-        if s.is_a? Range
-          subary = self[s]
-          unless subary.nil?
-            self[s].each do |el|
-              y << el
-            end
+    res = []
+    selectors.each do |s|
+      if s.is_a? Range
+        subary = self[s]
+        unless subary.nil?
+          self[s].each do |el|
+            res << el
           end
-          if has_size? && !s.exclude_end? && s.include?(size)
-            y << nil
-          end
-        else
-          y << self[s.to_int]
         end
+        if has_size? && !s.exclude_end? && s.include?(size)
+          res << nil
+        end
+      else
+        res << self[s.to_int]
       end
-    end.to_a
+    end
+    return res
   end
 
   # Same as Array's.