Fix behavior of Comparable methods

when <=> return nil
This commit is contained in:
ksss
2014-03-21 11:58:47 +09:00
parent 2c44f96e78
commit 72fe192259
2 changed files with 24 additions and 16 deletions
+4 -4
View File
@@ -13,7 +13,7 @@ module Comparable
def < other
cmp = self <=> other
if cmp.nil?
false
raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
elsif cmp < 0
true
else
@@ -30,7 +30,7 @@ module Comparable
def <= other
cmp = self <=> other
if cmp.nil?
false
raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
elsif cmp <= 0
true
else
@@ -62,7 +62,7 @@ module Comparable
def > other
cmp = self <=> other
if cmp.nil?
false
raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
elsif cmp > 0
true
else
@@ -79,7 +79,7 @@ module Comparable
def >= other
cmp = self <=> other
if cmp.nil?
false
raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
elsif cmp >= 0
true
else
+20 -12
View File
@@ -3,22 +3,26 @@ assert('Comparable#<', '15.3.3.2.1') do
class Foo
include Comparable
def <=>(x)
0
x
end
end
assert_false(Foo.new < Foo.new)
assert_false(Foo.new < 0)
assert_false(Foo.new < 1)
assert_true(Foo.new < -1)
assert_raise(ArgumentError){ Foo.new < nil }
end
assert('Comparable#<=', '15.3.3.2.2') do
class Foo
include Comparable
def <=>(x)
0
x
end
end
assert_true(Foo.new <= Foo.new)
assert_true(Foo.new <= 0)
assert_false(Foo.new <= 1)
assert_true(Foo.new <= -1)
assert_raise(ArgumentError){ Foo.new <= nil }
end
assert('Comparable#==', '15.3.3.2.3') do
@@ -36,22 +40,26 @@ assert('Comparable#>', '15.3.3.2.4') do
class Foo
include Comparable
def <=>(x)
0
x
end
end
assert_false(Foo.new > Foo.new)
assert_false(Foo.new > 0)
assert_true(Foo.new > 1)
assert_false(Foo.new > -1)
assert_raise(ArgumentError){ Foo.new > nil }
end
assert('Comparable#>=', '15.3.3.2.5') do
class Foo
include Comparable
def <=>(x)
0
x
end
end
assert_true(Foo.new >= Foo.new)
assert_true(Foo.new >= 0)
assert_true(Foo.new >= 1)
assert_false(Foo.new >= -1)
assert_raise(ArgumentError){ Foo.new >= nil }
end
assert('Comparable#between?', '15.3.3.2.6') do