diff options
Diffstat (limited to 'mrblib/enum.rb')
| -rw-r--r-- | mrblib/enum.rb | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 53f2119b0..5a33ed3c5 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -23,23 +23,20 @@ module Enumerable # # ISO 15.3.2.2.1 def all?(&block) - st = true if block self.each{|val| unless block.call(val) - st = false - break + return false end } else self.each{|val| unless val - st = false - break + return false end } end - st + true end ## @@ -51,23 +48,20 @@ module Enumerable # # ISO 15.3.2.2.2 def any?(&block) - st = false if block self.each{|val| if block.call(val) - st = true - break + return true end } else self.each{|val| if val - st = true - break + return true end } end - st + false end ## @@ -81,8 +75,8 @@ module Enumerable return to_enum :collect unless block_given? ary = [] - self.each{|val| - ary.push(block.call(val)) + self.each{|*val| + ary.push(block.call(*val)) } ary end @@ -97,9 +91,9 @@ module Enumerable # ISO 15.3.2.2.4 def detect(ifnone=nil, &block) ret = ifnone - self.each{|val| - if block.call(val) - ret = val + self.each{|*val| + if block.call(*val) + ret = val.__svalue break end } @@ -115,8 +109,8 @@ module Enumerable # ISO 15.3.2.2.5 def each_with_index(&block) i = 0 - self.each{|val| - block.call(val, i) + self.each{|*val| + block.call(val.__svalue, i) i += 1 } self @@ -129,8 +123,9 @@ module Enumerable # ISO 15.3.2.2.6 def entries ary = [] - self.each{|val| - ary.push val + self.each{|*val| + # __svalue is an internal method + ary.push val.__svalue } ary end @@ -150,8 +145,8 @@ module Enumerable # ISO 15.3.2.2.8 def find_all(&block) ary = [] - self.each{|val| - ary.push(val) if block.call(val) + self.each{|*val| + ary.push(val.__svalue) if block.call(*val) } ary end @@ -182,14 +177,12 @@ module Enumerable # # ISO 15.3.2.2.10 def include?(obj) - st = false self.each{|val| if val == obj - st = true - break + return true end } - st + false end ## @@ -214,7 +207,8 @@ module Enumerable flag = false result = args[0] end - self.each{|val| + self.each{|*val| + val = val.__svalue if flag # push first element as initial flag = false @@ -243,7 +237,8 @@ module Enumerable def max(&block) flag = true # 1st element? result = nil - self.each{|val| + self.each{|*val| + val = val.__svalue if flag # 1st element result = val @@ -269,7 +264,8 @@ module Enumerable def min(&block) flag = true # 1st element? result = nil - self.each{|val| + self.each{|*val| + val = val.__svalue if flag # 1st element result = val @@ -304,11 +300,11 @@ module Enumerable def partition(&block) ary_T = [] ary_F = [] - self.each{|val| - if block.call(val) - ary_T.push(val) + self.each{|*val| + if block.call(*val) + ary_T.push(val.__svalue) else - ary_F.push(val) + ary_F.push(val.__svalue) end } [ary_T, ary_F] @@ -323,8 +319,8 @@ module Enumerable # ISO 15.3.2.2.17 def reject(&block) ary = [] - self.each{|val| - ary.push(val) unless block.call(val) + self.each{|*val| + ary.push(val.__svalue) unless block.call(*val) } ary end @@ -385,8 +381,8 @@ module Enumerable # ISO 15.3.2.2.19 def sort(&block) ary = [] - self.each{|val| ary.push(val)} - unless ary.empty? + self.each{|*val| ary.push(val.__svalue)} + if ary.size > 1 __sort_sub__(ary, ::Array.new(ary.size), 0, 0, ary.size - 1, &block) end ary |