From 3644f1ba360a4de402f7e89354e4dc50b01f8a7e Mon Sep 17 00:00:00 2001 From: mirichi Date: Sat, 26 Apr 2014 09:37:37 +0900 Subject: Refactoring Comparable --- mrblib/compar.rb | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/mrblib/compar.rb b/mrblib/compar.rb index 44595974a..84b962598 100644 --- a/mrblib/compar.rb +++ b/mrblib/compar.rb @@ -14,11 +14,8 @@ module Comparable cmp = self <=> other if cmp.nil? raise ArgumentError, "comparison of #{self.class} with #{other.class} failed" - elsif cmp < 0 - true - else - false end + cmp < 0 end ## @@ -31,11 +28,8 @@ module Comparable cmp = self <=> other if cmp.nil? raise ArgumentError, "comparison of #{self.class} with #{other.class} failed" - elsif cmp <= 0 - true - else - false end + cmp <= 0 end ## @@ -46,11 +40,7 @@ module Comparable # ISO 15.3.3.2.3 def == other cmp = self <=> other - if cmp == 0 - true - else - false - end + cmp == 0 end ## @@ -63,11 +53,8 @@ module Comparable cmp = self <=> other if cmp.nil? raise ArgumentError, "comparison of #{self.class} with #{other.class} failed" - elsif cmp > 0 - true - else - false end + cmp > 0 end ## @@ -80,11 +67,8 @@ module Comparable cmp = self <=> other if cmp.nil? raise ArgumentError, "comparison of #{self.class} with #{other.class} failed" - elsif cmp >= 0 - true - else - false end + cmp >= 0 end ## @@ -95,10 +79,6 @@ module Comparable # # ISO 15.3.3.2.6 def between?(min, max) - if self < min or self > max - false - else - true - end + self >= min and self <= max end end -- cgit v1.2.3