summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2020-09-01 09:18:44 -0700
committerJeremy Evans <code@jeremyevans.net>2020-09-01 10:52:47 -0700
commite080a4cdeeb55dddb6247ffd2563d2dc8b84c919 (patch)
treef4baeaf92261d00d710dad565f69df6ca74e5383
parent94430d009a7018c9d6447fe6814a51b664ad46a9 (diff)
Revert "Special case Range#max for integer beginning and Float::Infinity end"
This reverts commit 05bf811c2839628aaef3d565daedb28be80d47ef.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3500
-rw-r--r--range.c9
-rw-r--r--test/ruby/test_range.rb6
2 files changed, 0 insertions, 15 deletions
diff --git a/range.c b/range.c
index 6d507ea124..124d9faa51 100644
--- a/range.c
+++ b/range.c
@@ -1255,15 +1255,6 @@ range_max(int argc, VALUE *argv, VALUE range)
return rb_funcall(e, '-', 1, INT2FIX(1));
}
if (RB_INTEGER_TYPE_P(b) && !RB_INTEGER_TYPE_P(e)) {
- if (RB_TYPE_P(e, T_FLOAT)) {
- VALUE inf = rb_funcall(e, rb_intern("infinite?"), 0);
- if (inf != Qnil) {
- /* For backwards compatibility, return end if the end
- * is Float::Infinity and the beginning is integer.
- If end is -Float::Infinity, return nil. */
- return(inf == INT2FIX(1) ? e : Qnil);
- }
- }
e = rb_funcall(e, rb_intern("floor"), 0);
}
return e;
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index 0dc66445e9..0b3f6c68f6 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -131,9 +131,6 @@ class TestRange < Test::Unit::TestCase
assert_equal(2, (..2).max)
assert_raise(TypeError) { (...2).max }
assert_raise(TypeError) { (...2.0).max }
-
- assert_equal(Float::INFINITY, (1..Float::INFINITY).max)
- assert_nil((1..-Float::INFINITY).max)
end
def test_minmax
@@ -160,9 +157,6 @@ class TestRange < Test::Unit::TestCase
assert_equal(['a', 'c'], ('a'..'c').minmax)
assert_equal(['a', 'b'], ('a'...'c').minmax)
-
- assert_equal([1, Float::INFINITY], (1..Float::INFINITY).minmax)
- assert_equal([nil, nil], (1..-Float::INFINITY).minmax)
end
def test_initialize_twice