enumerable_lz 0.1.3 → 0.1.4

data/ChangeLog

@@ -6,7 +6,11 @@
 
 * Improve performance (except for MacRuby)
 
-== 0.1.2 / 2011-05-01
+== 0.1.2, 0.1.3 / 2011-05-01
 
 * Improve performance more
 
+== 0.1.4 / 2011-05-07
+
+* Improve performance much more
+

data/README.md

@@ -51,10 +51,10 @@ These expanded methods are inplemented with fundamental filter and transformatio
 
 ## Supported Rubies
 
-* Ruby 1.9.x (testing 1.9.2-p0, 1.9.2 p-136)
-* Ruby 1.8.7 (testing 1.8.7-p330)
-* JRuby 1.5.x (testing 1.5.6)
-* MacRuby 0.8
+* Ruby 1.9.x (testing 1.9.2 p-180)
+* Ruby 1.8.7 (testing 1.8.7-p334)
+* JRuby (testing 1.5.6, 1.6.0)
+* MacRuby (testing 0.9)
 
 ## Installation
 

data/lib/enumerable_lz/filter.rb

@@ -16,9 +16,13 @@ module Enumerable
       @init_block = init_block unless init_block.nil?
       super() do |y|
         @init_block.call unless @init_block.nil?
-        compiled_filter = (@filter||[Proc.new{true}]).inject do |r,f|
-          Proc.new{|el| r===el && f===el}
-        end
+        compiled_filter = @filter.nil? ? Proc.new{true} : lambda{|f|
+          break f[0] if f.size==1
+          codes = f.size.times.map do |idx|
+            "f[#{idx}]===el"
+          end
+          eval "Proc.new{|el|"+codes.join(" && ")+"}"
+        }.call(@filter)
         catch :do_break do
           @org_enum.each do |el|
             y.yield el if compiled_filter===el

data/lib/enumerable_lz/filter_18.rb

@@ -20,9 +20,16 @@ module Enumerable
     def each &block
       return self unless block_given?
       @init_block.call unless @init_block.nil?
-      compiled_filter = (@filter||[Proc.new{true}]).inject do |r,f|
-        Proc.new{|el| r[el] && f[el]}
-      end
+      # compiled_filter = (@filter||[Proc.new{true}]).inject do |r,f|
+      #   Proc.new{|el| r[el] && f[el]}
+      # end
+      compiled_filter = @filter.nil? ? Proc.new{true} : lambda{|f|
+        break f[0] if f.size==1
+        codes = f.size.times.map do |idx|
+          "f[#{idx}][el]"
+        end
+        eval "Proc.new{|el|"+codes.join(" && ")+"}"
+      }.call(@filter)
       catch :do_break do
         @org_enum.each do |el|
           block.call(el) if compiled_filter[el]

data/lib/enumerable_lz/filter_mrb.rb

@@ -64,9 +64,14 @@ module Enumerable
       end
     end
     def compile_filter
-      @filter.inject do |r,f|
-        Proc.new{|el| r===el && f===el}
-      end
+      return Proc.new{true} if @filter.nil?
+      return @filter[0] if @filter.size==1
+      lambda{|f|
+        codes = f.size.times.map do |idx|
+          "f[#{idx}]===el"
+        end
+        eval "Proc.new{|el|"+codes.join(" && ")+"}"
+      }.call(@filter)
     end
   end
 end

data/lib/enumerable_lz/transform.rb

@@ -35,9 +35,13 @@ module Enumerable
     private
     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
+      return @transformer[0] if @transformer.size==1
+      lambda{|t|
+        codes = t.size.times.inject "el" do |r,idx|
+          "t[#{idx}][#{r}]"
+        end
+        eval "Proc.new{|el|"+codes+"}"
+      }.call(@transformer)
     end
   end
 end

data/lib/enumerable_lz/transform_18.rb

@@ -38,9 +38,13 @@ module Enumerable
     private
     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
+      return @transformer[0] if @transformer.size==1
+      lambda{|t|
+        codes = t.size.times.inject "el" do |r,idx|
+          "t[#{idx}][#{r}]"
+        end
+        eval "Proc.new{|el|"+codes+"}"
+      }.call(@transformer)
     end
   end
 end

data/lib/enumerable_lz/transform_mrb.rb

@@ -42,6 +42,14 @@ module Enumerable
       @transformer.inject do |r,f|
         Proc.new{|el|f[r[el]]}
       end
+      ### MacRuby has a Problem of Nesting Proc Definition
+      # return @transformer[0] if @transformer.size==1
+      # lambda{|t|
+      #   codes = t.size.times.inject "el" do |r,idx|
+      #     "t[#{idx}][#{r}]"
+      #   end
+      #   eval "Proc.new{|el|"+codes+"}"
+      # }.call(@transformer)
     end
   end
 end

data/lib/enumerable_lz.rb

@@ -13,6 +13,6 @@ end
 
 module Enumerable
   module EnumerableLz
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: enumerable_lz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - antimon2
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +09:00
+date: 2011-05-07 00:00:00 +09:00
 default_executable: 
 dependencies: []