hamster 0.2.5 → 0.2.6

data/History.rdoc

@@ -1,3 +1,19 @@
+=== 0.2.6 / 2010-01-29
+
+* Implement Array#to_list.
+
+* Simplify (and improve performance of) conversions from arrays to lists.
+
+* Speed up Set and List sorting.
+
+* Implement Hash#find (aliased as #detect).
+
+* Implement List#elem_indices, List#find_indices (aliased as #indices as appropriate).
+
+* Implement List#index as per MRI and alias as #elem_index, and #find_index as appropriate.
+
+* Remove some redundant construction of streams.
+
 === 0.2.5 / 2010-01-19
 
 * Implement Set#clear.

data/lib/hamster/core_ext/enumerable.rb

@@ -7,7 +7,9 @@ module Hamster
     module Enumerable
 
       def to_list
-        Hamster.list(*self)
+        list = EmptyList
+        reverse_each { |item| list = list.cons(item) }
+        list
       end
 
     end
@@ -21,3 +23,9 @@ module Enumerable
   include Hamster::CoreExt::Enumerable
 
 end
+
+class Array
+
+  include Hamster::CoreExt::Enumerable
+
+end

data/lib/hamster/hash.rb

@@ -113,6 +113,13 @@ module Hamster
       true
     end
 
+    def find
+      return nil unless block_given?
+      each { |key, value| return Tuple.new(key, value) if yield(key, value) }
+      nil
+    end
+    def_delegator :self, :find, :detect
+
     def eql?(other)
       other.is_a?(self.class) && @trie.eql?(other.instance_eval{@trie})
     end

data/lib/hamster/list.rb

@@ -1,7 +1,9 @@
 require 'forwardable'
 require 'thread'
 
+require 'hamster/core_ext/enumerable'
 require 'hamster/tuple'
+require 'hamster/sorter'
 require 'hamster/hash'
 require 'hamster/set'
 
@@ -12,7 +14,7 @@ module Hamster
     extend Forwardable
 
     def list(*items)
-      items.reverse.reduce(EmptyList) { |list, item| list.cons(item) }
+      items.to_list
     end
 
     def stream(&block)
@@ -78,11 +80,8 @@ module Hamster
     def map(&block)
       return self unless block_given?
       Stream.new do
-        if empty?
-          self
-        else
-          Sequence.new(yield(head), tail.map(&block))
-        end
+        next self if empty?
+        Sequence.new(yield(head), tail.map(&block))
       end
     end
     def_delegator :self, :map, :collect
@@ -104,13 +103,9 @@ module Hamster
     def filter(&block)
       return self unless block_given?
       Stream.new do
-        if empty?
-          self
-        elsif yield(head)
-          Sequence.new(head, tail.filter(&block))
-        else
-          tail.filter(&block)
-        end
+        next self if empty?
+        next Sequence.new(head, tail.filter(&block)) if yield(head)
+        tail.filter(&block)
       end
     end
     def_delegator :self, :filter, :select
@@ -126,50 +121,47 @@ module Hamster
     def take_while(&block)
       return self unless block_given?
       Stream.new do
-        if empty?
-          self
-        elsif yield(head)
-          Sequence.new(head, tail.take_while(&block))
-        else
-          EmptyList
-        end
+        next self if empty?
+        next Sequence.new(head, tail.take_while(&block)) if yield(head)
+        EmptyList
       end
     end
 
     def drop_while(&block)
+      # return self unless block_given?
+      # return self if empty?
+      # return self unless yield(head)
+      # tail.drop_while(&block)
       return self unless block_given?
       Stream.new do
-        if empty?
-          self
-        elsif yield(head)
-          tail.drop_while(&block)
-        else
-          self
+        list = self
+        while !list.empty? && yield(list.head)
+          list = list.tail
         end
+        list
       end
     end
 
     def take(number)
       Stream.new do
-        if empty?
-          self
-        elsif number > 0
-          Sequence.new(head, tail.take(number - 1))
-        else
-          EmptyList
-        end
+        next self if empty?
+        next Sequence.new(head, tail.take(number - 1)) if number > 0
+        EmptyList
       end
     end
 
     def drop(number)
+      # return self unless block_given?
+      # return self if empty?
+      # return self unless number > 0
+      # tail.drop(number - 1)
       Stream.new do
-        if empty?
-          self
-        elsif number > 0
-          tail.drop(number - 1)
-        else
-          self
+        list = self
+        while !list.empty? && number > 0
+          number -= 1
+          list = list.tail
         end
+        list
       end
     end
 
@@ -240,11 +232,8 @@ module Hamster
 
     def append(other)
       Stream.new do
-        if empty?
-          other
-        else
-          Sequence.new(head, tail.append(other))
-        end
+        next other if empty?
+        Sequence.new(head, tail.append(other))
       end
     end
     def_delegator :self, :append, :concat
@@ -252,9 +241,7 @@ module Hamster
     def_delegator :self, :append, :+
 
     def reverse
-      Stream.new do
-        reduce(EmptyList) { |list, item| list.cons(item) }
-      end
+      Stream.new { reduce(EmptyList) { |list, item| list.cons(item) } }
     end
 
     def minimum(&block)
@@ -275,21 +262,15 @@ module Hamster
 
     def zip(other)
       Stream.new do
-        if empty? && other.empty?
-          self
-        else
-          Sequence.new(Sequence.new(head, Sequence.new(other.head)), tail.zip(other.tail))
-        end
+        next self if empty? && other.empty?
+        Sequence.new(Sequence.new(head, Sequence.new(other.head)), tail.zip(other.tail))
       end
     end
 
     def cycle
       Stream.new do
-        if empty?
-          self
-        else
-          Sequence.new(head, tail.append(self.cycle))
-        end
+        next self if empty?
+        Sequence.new(head, tail.append(self.cycle))
       end
     end
 
@@ -303,7 +284,7 @@ module Hamster
     end
 
     def break(&block)
-      return Tuple.new(self, EmptyList) unless block_given?
+      return span unless block_given?
       span { |item| !yield(item) }
     end
 
@@ -316,16 +297,12 @@ module Hamster
     end
 
     def sort(&block)
-      Stream.new do
-        Hamster.list(*to_a.sort(&block))
-      end
+      Stream.new { Sorter.new(self).sort(&block).to_list }
     end
 
     def sort_by(&block)
       return sort unless block_given?
-      Stream.new do
-        Hamster.list(*to_a.sort_by(&block))
-      end
+      Stream.new { Sorter.new(self).sort_by(&block).to_list }
     end
 
     def join(sep = "")
@@ -336,23 +313,16 @@ module Hamster
 
     def intersperse(sep)
       Stream.new do
-        if tail.empty?
-          self
-        else
-          Sequence.new(head, Sequence.new(sep, tail.intersperse(sep)))
-        end
+        next self if tail.empty?
+        Sequence.new(head, Sequence.new(sep, tail.intersperse(sep)))
       end
     end
 
     def uniq(items = Set.new)
       Stream.new do
-        if empty?
-          self
-        elsif items.include?(head)
-          tail.uniq(items)
-        else
-          Sequence.new(head, tail.uniq(items.add(head)))
-        end
+        next self if empty?
+        next tail.uniq(items) if items.include?(head)
+        Sequence.new(head, tail.uniq(items.add(head)))
       end
     end
     def_delegator :self, :uniq, :nub
@@ -386,32 +356,23 @@ module Hamster
 
     def tails
       Stream.new do
-        if empty?
-          Sequence.new(self)
-        else
-          Sequence.new(self, tail.tails)
-        end
+        next Sequence.new(self) if empty?
+        Sequence.new(self, tail.tails)
       end
     end
 
     def inits
       Stream.new do
-        if empty?
-          Sequence.new(self)
-        else
-          Sequence.new(EmptyList, tail.inits.map { |list| list.cons(head) })
-        end
+        next Sequence.new(self) if empty?
+        Sequence.new(EmptyList, tail.inits.map { |list| list.cons(head) })
       end
     end
 
     def combinations(number)
       return Sequence.new(EmptyList) if number == 0
       Stream.new do
-        if empty?
-          self
-        else
-          tail.combinations(number - 1).map { |list| list.cons(head) }.append(tail.combinations(number))
-        end
+        next self if empty?
+        tail.combinations(number - 1).map { |list| list.cons(head) }.append(tail.combinations(number))
       end
     end
     def_delegator :self, :combinations, :combination
@@ -422,12 +383,9 @@ module Hamster
 
     def chunk(number)
       Stream.new do
-        if empty?
-          self
-        else
-          first, remainder = split_at(number)
-          Sequence.new(first, remainder.chunk(number))
-        end
+        next self if empty?
+        first, remainder = split_at(number)
+        Sequence.new(first, remainder.chunk(number))
       end
     end
 
@@ -438,13 +396,9 @@ module Hamster
 
     def flatten
       Stream.new do
-        if empty?
-          self
-        elsif head.is_a?(List)
-          head.append(tail.flatten)
-        else
-          Sequence.new(head, tail.flatten)
-        end
+        next self if empty?
+        next head.append(tail.flatten) if head.is_a?(List)
+        Sequence.new(head, tail.flatten)
       end
     end
 
@@ -466,6 +420,50 @@ module Hamster
     end
     def_delegator :self, :slice, :[]
 
+    def find_index
+    # def find_index(i = 0, &block)
+      # return nil if empty?
+      # return nil unless block_given?
+      # return i if yield(head)
+      # tail.find_index(i + 1, &block)
+      return nil unless block_given?
+      i = 0
+      list = self
+      loop do
+        return nil if list.empty?
+        return i if yield(list.head)
+        i += 1
+        list = list.tail
+      end
+    end
+
+    def elem_index(object)
+      find_index { |item| item == object }
+    end
+
+    def index(object = Undefined, &block)
+      return elem_index(object) unless object.equal?(Undefined)
+      find_index(&block)
+    end
+
+    def find_indices(i = 0, &block)
+      return EmptyList unless block_given?
+      Stream.new do
+        next EmptyList if empty?
+        next Sequence.new(i, tail.find_indices(i + 1, &block)) if yield(head)
+        tail.find_indices(i + 1, &block)
+      end
+    end
+
+    def elem_indices(object)
+      find_indices { |item| item == object }
+    end
+
+    def indices(object = Undefined, &block)
+      return elem_indices(object) unless object.equal?(Undefined)
+      find_indices(&block)
+    end
+
     def eql?(other)
       # return true if other.equal?(self)
       # return false unless other.is_a?(List)
@@ -511,11 +509,8 @@ module Hamster
     private
 
     def method_missing(name, *args, &block)
-      if CADR === name.to_s
-        accessor($1)
-      else
-        super
-      end
+      return accessor($1) if CADR === name.to_s
+      super
     end
 
     # Perform compositions of <tt>car</tt> and <tt>cdr</tt> operations. Their names consist of a 'c', followed by at
@@ -552,6 +547,8 @@ module Hamster
 
   class Stream
 
+    extend Forwardable
+
     include List
 
     def initialize(&block)
@@ -559,6 +556,10 @@ module Hamster
       @lock = Mutex.new
     end
 
+    def_delegator :target, :head
+    def_delegator :target, :tail
+    def_delegator :target, :empty?
+
     def head
       target.head
     end

data/lib/hamster/set.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 
 require 'hamster/tuple'
+require 'hamster/sorter'
 require 'hamster/trie'
 require 'hamster/list'
 
@@ -48,7 +49,6 @@ module Hamster
       else
         self.class.new(trie)
       end
-
     end
 
     def each
@@ -152,11 +152,12 @@ module Hamster
     end
 
     def sort(&block)
-      to_list.sort(&block)
+      Stream.new { Sorter.new(self).sort(&block).to_list }
     end
 
     def sort_by(&block)
-      to_list.sort_by(&block)
+      return sort unless block_given?
+      Stream.new { Sorter.new(self).sort_by(&block).to_list }
     end
 
     def join(sep = nil)