From 53033b8cdd09897ae510bf9700b07523e7319d67 Mon Sep 17 00:00:00 2001
From: Denis Knauf <mkv5bu@sweb1.mobilkom.at>
Date: Fri, 16 Dec 2011 11:22:48 +0100
Subject: [PATCH] bugfixes; tap. v0.1.4

---
 VERSION           |  2 +-
 lib/functional.rb | 58 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/VERSION b/VERSION
index b1e80bb..845639e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/lib/functional.rb b/lib/functional.rb
index 4d2142c..715db4d 100644
--- a/lib/functional.rb
+++ b/lib/functional.rb
@@ -47,6 +47,7 @@ class Counter
 end
 
 class Functional
+	def self.__version__() '0.1.4' end
 	include Enumerable
 
 	class DEFAULT
@@ -161,6 +162,11 @@ class Functional
 	end
 
 	class Each <Base
+		def each_fun *a
+			@exe.call *a
+		end
+		alias call each_fun
+
 		def end
 			nil
 		end
@@ -213,25 +219,42 @@ class Functional
 			super *a, &exe
 			iv = Array.method :new  if ::Functional::DEFAULT == iv
 			@buf = if iv.kind_of?( ::Proc) || iv.kind_of?( ::Method)
-					p default: :proc, iv: iv
 					Hash.new {|h,k| h[k] = iv.call }
 				else
-					p default: :value, iv: iv
 					{}.tap {|h| h.default = iv }
 				end
 		end
 
-		def reduce_fun *a
-			@buf[ a[0]] = @exe.call @buf[ a[0]], *a[1..-1]
+		def reduce_fun k, *a
+			@buf[ k] = @exe.call k, @buf[ k], *a
 		end
 		alias call reduce_fun
 
 		def end
-			@buf.each {|i| @next.call *i}
+			@buf.each &@next.method( :call)
 			@next.end
 		end
 	end
 
+	class ToHash <Base
+		def initialize
+			super
+			@buf = {}
+		end
+
+		def to_hash_fun k, *a
+			@buf[k] = a
+		end
+		alias call to_hash_fun
+
+		def end
+			@buf
+		end
+
+		def clean
+		end
+	end
+
 	class Slice <Base
 		def initialize n
 			@buf, @n = [], n
@@ -343,6 +366,7 @@ class Functional
 	def filter &exe
 		push Filter.new( &exe)
 	end
+	alias reject filter
 
 	def compact
 		push Compact.new
@@ -362,8 +386,12 @@ class Functional
 
 	def each &exe
 		return self  unless exe
-		push Each.new
-		push exe
+		push Each.new( &exe)
+		run
+	end
+
+	def to_hash
+		push ToHash.new
 		run
 	end
 
@@ -402,19 +430,21 @@ class Functional
 	def with_index &exe
 		i = 0
 		exe ||= Array.method :[]
-		push Collect.new {|*a| exe.call i, *a }
+		push Collect.new {|*a| exe.call i, *a; i += 1 }
 	end
 
-	def slice n, &e
+	def slice n, &exe
 		push Slice.new( n)
-		push Collect.new( &e)  if e
-		self
+		block_given? ? self.collect( &exe) : self
 	end
 
-	def cons n, &e
+	def cons n, &exe
 		push Cons.new( n)
-		push Collect.new( &e)  if e
-		self
+		block_given? ? self.collect( &exe) : self
+	end
+
+	def tap &exe
+		push Tap.new( &exe)
 	end
 
 	class Save < Base