From b9632bce46fc8cb6739cdaad403c8bf4b2a35b2a Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Sun, 16 Mar 2014 18:27:06 +0900 Subject: Refactor Enumerable#all? --- mrblib/enum.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 53f2119b0..47e7399bf 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 ## -- cgit v1.2.3 From a21088b2d7dffa1c13fa5eba35f230167f4b7d32 Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Sun, 16 Mar 2014 19:11:37 +0900 Subject: Refactor Enumerable#any? --- mrblib/enum.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 47e7399bf..6fa0c1ebb 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -48,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 ## -- cgit v1.2.3 From bdeef827ac0037e2807c52e2f74075fb166ff7c9 Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Sun, 16 Mar 2014 19:15:03 +0900 Subject: Refactor Enumerable#include? --- mrblib/enum.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mrblib/enum.rb') diff --git a/mrblib/enum.rb b/mrblib/enum.rb index 6fa0c1ebb..59d4b9b0f 100644 --- a/mrblib/enum.rb +++ b/mrblib/enum.rb @@ -176,14 +176,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 ## -- cgit v1.2.3