* configure.in: Check nextafter() availability.

* include/ruby/missing.h (nextafter): New optional declaration.

* missing/nextafter.c: New file.

* numeric.c: Float#next_float and Float#prev_float implemented.

   [ruby-core:62562] [Feature #9834]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 92 insertions, 0 deletions

diff --git a/test/-ext-/float/test_nextafter.rb b/test/-ext-/float/test_nextafter.rb
new file mode 100644
index 0000000000..e3a3e726c7
--- /dev/null
+++ b/test/-ext-/float/test_nextafter.rb
@@ -0,0 +1,57 @@
+require 'test/unit'
+require "-test-/float"
+
+class TestFloatExt < Test::Unit::TestCase
+  NEXTAFTER_VALUES = [
+    -Float::INFINITY,
+    -Float::MAX,
+    -100.0,
+    -1.0-Float::EPSILON,
+    -1.0,
+    -Float::EPSILON,
+    -Float::MIN/2,
+    -Math.ldexp(0.5, Float::MIN_EXP - Float::MANT_DIG + 1),
+    -0.0,
+    0.0,
+    Math.ldexp(0.5, Float::MIN_EXP - Float::MANT_DIG + 1),
+    Float::MIN/2,
+    Float::MIN,
+    Float::EPSILON,
+    1.0,
+    1.0+Float::EPSILON,
+    100.0,
+    Float::MAX,
+    Float::INFINITY,
+    Float::NAN
+  ]
+
+  test_number = 0
+  NEXTAFTER_VALUES.each {|n1|
+    NEXTAFTER_VALUES.each {|n2|
+      tag = n2.infinite? ? "ruby" : "other"
+      test_name = "test_nextafter_#{test_number}_#{tag}_#{n1}_#{n2}"
+      test_number += 1
+      define_method(test_name) {
+        v1 = Bug::Float.missing_nextafter(n1, n2)
+        v2 = Bug::Float.system_nextafter(n1, n2)
+        assert_kind_of(Float, v1)
+        assert_kind_of(Float, v2)
+        if v1.nan?
+          assert(v2.nan?, "Bug::Float.system_nextafter(#{n1}, #{n2}).nan?")
+        else
+          assert_equal(v1, v2,
+            "Bug::Float.missing_nextafter(#{'%a' % n1}, #{'%a' % n2}) = #{'%a' % v1} != " +
+            "#{'%a' % v2} = Bug::Float.system_nextafter(#{'%a' % n1}, #{'%a' % n2})")
+          if v1 == 0
+            s1 = 1.0/v1 < 0 ? "negative-zero" : "positive-zero"
+            s2 = 1.0/v2 < 0 ? "negative-zero" : "positive-zero"
+            assert_equal(s1, s2,
+            "Bug::Float.missing_nextafter(#{'%a' % n1}, #{'%a' % n2}) = #{'%a' % v1} != " +
+            "#{'%a' % v2} = Bug::Float.system_nextafter(#{'%a' % n1}, #{'%a' % n2})")
+          end
+        end
+      }
+    }
+  }
+
+end
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index 3ee0a23a63..ed8f2992ed 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -619,4 +619,39 @@ class TestFloat < Test::Unit::TestCase
     assert_in_epsilon(10.0, ("1."+"1"*300000).to_f*9)
     end;
   end
+
+  def test_next_float
+    smallest = 0.0.next_float
+    assert_equal(-Float::MAX, (-Float::INFINITY).next_float)
+    assert_operator(-Float::MAX, :<, (-Float::MAX).next_float)
+    assert_equal(Float::EPSILON/2, (-1.0).next_float + 1.0)
+    assert_operator(0.0, :<, smallest)
+    assert_operator([0.0, smallest], :include?, smallest/2)
+    assert_equal(Float::EPSILON, 1.0.next_float - 1.0)
+    assert_equal(Float::INFINITY, Float::MAX.next_float)
+    assert_equal(Float::INFINITY, Float::INFINITY.next_float)
+    assert(Float::NAN.next_float.nan?)
+  end
+
+  def test_prev_float
+    smallest = 0.0.next_float
+    assert_equal(-Float::INFINITY, (-Float::INFINITY).prev_float)
+    assert_equal(-Float::INFINITY, (-Float::MAX).prev_float)
+    assert_equal(-Float::EPSILON, (-1.0).prev_float + 1.0)
+    assert_equal(-smallest, 0.0.prev_float)
+    assert_operator([0.0, 0.0.prev_float], :include?, 0.0.prev_float/2)
+    assert_equal(-Float::EPSILON/2, 1.0.prev_float - 1.0)
+    assert_operator(Float::MAX, :>, Float::MAX.prev_float)
+    assert_equal(Float::MAX, Float::INFINITY.prev_float)
+    assert(Float::NAN.prev_float.nan?)
+  end
+
+  def test_next_prev_float_zero
+    z = 0.0.next_float.prev_float
+    assert_equal(0.0, z)
+    assert_equal(Float::INFINITY, 1.0/z)
+    z = 0.0.prev_float.next_float
+    assert_equal(0.0, z)
+    assert_equal(-Float::INFINITY, 1.0/z)
+  end
 end