From fd949663d2229419a1e53e69351205cd27157653 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 19 Oct 2012 21:09:34 +0900 Subject: Enumerable#inject should handle empty enumerable; http://www.tbn.co.jp/blog/?p=813 --- mrblib/enum.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 2699a18af..666ada294 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -200,13 +200,18 @@ module Enumerable # ISO 15.3.2.2.11 def inject(*args, &block) raise ArgumentError, "too many arguments" if args.size > 2 - flag = true # 1st element? - result = nil + if args.empty? + flag = true # no initial argument + result = nil + else + flag = false + result = args[0] + end self.each{|val| if flag - # 1st element - result = (args.empty?)? val: block.call(args[0], val) + # push first element as initial flag = false + result = val else result = block.call(result, val) end -- cgit v1.2.3 From 17278e8ca69d79f4d37e65830c95cc6004c2d8f5 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 19 Oct 2012 21:16:18 +0900 Subject: add symbol style to Enumerable#inject --- mrblib/enum.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 666ada294..29422716c 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -199,7 +199,12 @@ module Enumerable # # ISO 15.3.2.2.11 def inject(*args, &block) - raise ArgumentError, "too many arguments" if args.size > 2 + raise ArgumentError, "too many arguments" if args.size > 3 + if Symbol === args[-1] + sym = args[-1] + block = ->(x,y){x.send(sym,y)} + args.pop + end if args.empty? flag = true # no initial argument result = nil @@ -218,6 +223,7 @@ module Enumerable } result end + alias reduce inject ## # Alias for collect -- cgit v1.2.3 From 3efbea3fab1fedf1f6b783204fd226653e908f6e Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 19 Oct 2012 21:44:58 +0900 Subject: wrong check of argument numbers --- mrblib/enum.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 29422716c..2774bc856 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -199,7 +199,7 @@ module Enumerable # # ISO 15.3.2.2.11 def inject(*args, &block) - raise ArgumentError, "too many arguments" if args.size > 3 + raise ArgumentError, "too many arguments" if args.size > 2 if Symbol === args[-1] sym = args[-1] block = ->(x,y){x.send(sym,y)} -- cgit v1.2.3