Skip to content

Commit 0458acc

Browse files
Lillian ZhangNicolas Laurent
authored andcommitted
Use Primitive.nil? instead of beginless? and endless?
1 parent 9208aeb commit 0458acc

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

src/main/ruby/truffleruby/core/range.rb

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def bsearch(&block)
9999
end
100100

101101
private def bsearch_float(&block)
102-
normalized_begin = Truffle::RangeOperations.beginless?(self) ? -Float::INFINITY : self.begin.to_f
103-
normalized_end = Truffle::RangeOperations.endless?(self) ? Float::INFINITY : self.end.to_f
102+
normalized_begin = Primitive.nil?(self.begin) ? -Float::INFINITY : self.begin.to_f
103+
normalized_end = Primitive.nil?(self.end) ? Float::INFINITY : self.end.to_f
104104
normalized_end = normalized_end.prev_float if self.exclude_end?
105105
min = normalized_begin
106106
max = normalized_end
@@ -263,12 +263,10 @@ def bsearch(&block)
263263
end
264264

265265
def count(item = undefined)
266-
if Truffle::RangeOperations.beginless?(self) || Truffle::RangeOperations.endless?(self)
266+
if Primitive.nil?(self.begin) || Primitive.nil?(self.end)
267267
return Float::INFINITY unless block_given? || !Primitive.undefined?(item)
268268
end
269269

270-
p "count for here"
271-
272270
super
273271
end
274272

@@ -386,15 +384,15 @@ def inspect
386384
end
387385

388386
def last(n=undefined)
389-
raise RangeError, 'cannot get the last element of endless range' if Truffle::RangeOperations.endless?(self)
387+
raise RangeError, 'cannot get the last element of endless range' if Primitive.nil? self.end
390388
return self.end if Primitive.undefined? n
391389

392390
to_a.last(n)
393391
end
394392

395393
def max
396-
raise RangeError, 'cannot get the maximum of endless range' if Truffle::RangeOperations.endless?(self)
397-
if Truffle::RangeOperations.beginless?(self)
394+
raise RangeError, 'cannot get the maximum of endless range' if Primitive.nil? self.end
395+
if Primitive.nil? self.begin
398396
raise RangeError, 'cannot get the maximum of beginless range with custom comparison method' if block_given?
399397
return exclude_end? ? self.end - 1 : self.end
400398
end
@@ -415,8 +413,8 @@ def max
415413
end
416414

417415
def min
418-
raise RangeError, 'cannot get the minimum of beginless range' if Truffle::RangeOperations.beginless?(self)
419-
if Truffle::RangeOperations.endless?(self)
416+
raise RangeError, 'cannot get the minimum of beginless range' if Primitive.nil? self.begin
417+
if Primitive.nil? self.end
420418
raise RangeError, 'cannot get the minimum of endless range with custom comparison method' if block_given?
421419
return self.begin
422420
end
@@ -519,9 +517,9 @@ def cover?(value)
519517
end
520518

521519
def size
522-
return Float::INFINITY if Truffle::RangeOperations.beginless?(self)
520+
return Float::INFINITY if Primitive.nil? self.begin
523521
return nil unless self.begin.kind_of?(Numeric)
524-
return Float::INFINITY if Truffle::RangeOperations.endless?(self)
522+
return Float::INFINITY if Primitive.nil? self.end
525523

526524
delta = self.end - self.begin
527525
return 0 if delta < 0

src/main/ruby/truffleruby/core/truffle/range_operations.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def self.cover?(range, value)
113113
return false unless beg_compare
114114

115115
if Comparable.compare_int(beg_compare) <= 0
116-
return true if endless?(range)
116+
return true if Primitive.nil? range.end
117117
end_compare = (value <=> range.end)
118118

119119
if range.exclude_end?
@@ -126,14 +126,6 @@ def self.cover?(range, value)
126126
false
127127
end
128128

129-
def self.beginless?(range)
130-
Primitive.nil? range.begin
131-
end
132-
133-
def self.endless?(range)
134-
Primitive.nil? range.end
135-
end
136-
137129
# MRI: r_less
138130
def self.range_less(a, b)
139131
compare = a <=> b

0 commit comments

Comments
 (0)