enumerable_lz 0.1.1 → 0.1.2

data/ChangeLog

@@ -6,3 +6,7 @@
 
 * Improve performance (except for MacRuby)
 
+== 0.1.2 / 2011-05-01
+
+* Improve performance more
+

data/lib/enumerable_lz/filter.rb

@@ -16,15 +16,13 @@ module Enumerable
       @init_block = init_block unless init_block.nil?
       super() do |y|
         @init_block.call unless @init_block.nil?
-        the_enum = (@filter||[]).inject(@org_enum) do |r,f|
-          Enumerator.new do |iy|
-            r.each do |el|
-              iy.yield el if f.call(el)
-            end
-          end
+        compiled_filter = (@filter||[Proc.new{true}]).inject do |r,f|
+          Proc.new{|el| r===el && f===el}
         end
         catch :do_break do
-          the_enum.each {|el| y.yield el}
+          @org_enum.each do |el|
+            y.yield el if compiled_filter===el
+          end
         end
       end
       filter! the_filter if the_filter
@@ -58,11 +56,15 @@ module Enumerable
       case pattern
       when nil
         Proc.new{true}
-      when Proc
-        pattern
-      else
-        pattern.respond_to?(:to_proc) ? pattern.to_proc : Proc.new{|el|pattern===el}
+      else  # Proc#=== is equal to Proc#call on Ruby1.9.x
+        pattern.respond_to?(:to_proc) ? pattern.to_proc : pattern
       end
     end
   end
+end
+#against the Bug on JRuby <1.6.2
+if !(Proc.new{true}===true)
+  class Proc
+    alias :=== :call
+  end
 end

data/lib/enumerable_lz/filter_18.rb

@@ -20,11 +20,13 @@ module Enumerable
     def each &block
       return self unless block_given?
       @init_block.call unless @init_block.nil?
-      the_enum = (@filter||[]).inject(@org_enum) do |r,f|
-        CompliedFilter.new r, f
+      compiled_filter = (@filter||[Proc.new{true}]).inject do |r,f|
+        Proc.new{|el| r[el] && f[el]}
       end
       catch :do_break do
-        the_enum.each{|el| block.call(el)}
+        @org_enum.each do |el|
+          block.call(el) if compiled_filter[el]
+        end
       end
       self
     end
@@ -63,18 +65,5 @@ module Enumerable
         pattern.respond_to?(:to_proc) ? pattern.to_proc : Proc.new{|el|pattern===el}
       end
     end
-
-    class CompliedFilter
-      def initialize org_enum, filter
-        @org_enum = org_enum
-        @filter = filter
-      end
-
-      def each &block
-        @org_enum.each do |el|
-          block.call(el) if @filter.call(el)
-        end
-      end
-    end
   end
 end

data/lib/enumerable_lz/filter_mrb.rb

@@ -19,9 +19,10 @@ module Enumerable
         define_method :each do
           return outer unless block_given?
           init_block.call unless init_block.nil?
+          compiled_filter = outer.__send__(:compile_filter)
           catch :do_break do
-            obj.each do |*el|
-              yield *el if outer.__send__(:matches_filter?, *el)
+            obj.each do |el|
+              yield el if compiled_filter===el
             end
           end
           outer
@@ -33,9 +34,9 @@ module Enumerable
     def filter! pattern=nil, &block
       @filter||=[]
       if pattern.is_a? Array
-        @filter.push(*pattern)
+        pattern.each{|el| @filter << conv_proc(el)}
       else
-        @filter<<(pattern || block)
+        @filter<<conv_proc(pattern || block)
       end
       self
     end
@@ -54,18 +55,17 @@ module Enumerable
     end
 
     private
-    def matches_filter? obj, *others
-      return true if @filter.nil?
-      args = [obj, *others]
-      @filter.all? do |filter|
-        case filter
-        when nil
-          true
-        when Proc
-          filter[*args]
-        else
-          filter===obj
-        end
+    def conv_proc pattern
+      case pattern
+      when nil
+        Proc.new{true}
+      else  # Proc#=== is equal to Proc#call on Ruby1.9.x
+        pattern.respond_to?(:to_proc) ? pattern.to_proc : pattern
+      end
+    end
+    def compile_filter
+      @filter.inject do |r,f|
+        Proc.new{|el| r===el && f===el}
       end
     end
   end

data/lib/enumerable_lz/transform.rb

@@ -8,8 +8,9 @@ module Enumerable
     def initialize obj, &transformer
       @org_enum = obj
       super() do |y|
-        obj.each do |*el|
-          y << apply_transform(*el)
+        the_transformer = compile_transformer
+        obj.each do |el|
+          y << the_transformer[el]
         end
       end
       transform! &transformer if block_given?
@@ -31,19 +32,12 @@ module Enumerable
       cp.transform! &block
     end
 
-#    def clone
-#      cp = super
-#      cp.instance_eval { @transformer = @transformer.nil? ? [] : @transformer.clone }
-#      cp
-#    end
-
     private
-    def apply_transform *args
-      result = args
-      @transformer.each do |transformer|
-        result = transformer[*result] unless transformer.nil?
-      end unless @transformer.nil?
-      result
+    def compile_transformer
+      return Proc.new{|a|a} if @transformer.nil? || @transformer.size==0
+      @transformer.inject do |r,f|
+        Proc.new{|el|f[r[el]]}
+      end
     end
   end
 end

data/lib/enumerable_lz/transform_18.rb

@@ -12,8 +12,9 @@ module Enumerable
 
     def each &block
       return self unless block_given?
-      @org_enum.each do |*el|
-        block.call apply_transform(*el)
+      the_transformer = compile_transformer
+      @org_enum.each do |el|
+        block.call the_transformer[el]
       end
       self
     end
@@ -35,12 +36,11 @@ module Enumerable
     end
 
     private
-    def apply_transform *args
-      result = args
-      @transformer.each do |transformer|
-        result = transformer[*result] unless transformer.nil?
-      end unless @transformer.nil?
-      result
+    def compile_transformer
+      return Proc.new{|a|a} if @transformer.nil? || @transformer.size==0
+      @transformer.inject do |r,f|
+        Proc.new{|el|f[r[el]]}
+      end
     end
   end
 end

data/lib/enumerable_lz/transform_mrb.rb

@@ -11,8 +11,9 @@ module Enumerable
       super Class.new {
         define_method :each do
           return outer unless block_given?
-          obj.each do |*el|
-            yield outer.__send__(:apply_transform, *el)
+          the_transformer = outer.__send__(:compile_transformer)
+          obj.each do |el|
+            yield the_transformer[el]
           end
         end
       }.new
@@ -36,12 +37,11 @@ module Enumerable
     end
 
     private
-    def apply_transform *args
-      result = args
-      @transformer.each do |transformer|
-        result = transformer[*result] unless transformer.nil?
-      end unless @transformer.nil?
-      result
+    def compile_transformer
+      return Proc.new{|a|a} if @transformer.nil? || @transformer.size==0
+      @transformer.inject do |r,f|
+        Proc.new{|el|f[r[el]]}
+      end
     end
   end
 end

data/lib/enumerable_lz.rb

@@ -13,6 +13,6 @@ end
 
 module Enumerable
   module EnumerableLz
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: enumerable_lz
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - antimon2
@@ -56,23 +52,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: enumerable_lz
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Add Enumerable#filter, Enumerable#transform and some equivalent methods on Enumerable with suffix '_lz'.