* sprintf.c (rb_f_sprintf): support FZERO and FSPACE with NaN/Inf.

* test/ruby/test_sprintf.rb (test_nan, test_inf): add tests.


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

1 files changed, 66 insertions, 0 deletions

diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb
index 8716e7021d..c72eadb218 100644
--- a/test/ruby/test_sprintf.rb
+++ b/test/ruby/test_sprintf.rb
@@ -72,4 +72,70 @@ class TestSprintf < Test::Unit::TestCase
     assert_equal(" +0010", sprintf("%+6.4b", 2))
     assert_equal(" -0001", sprintf("%+6.4b", -1))
   end
+
+  def test_nan
+    nan = 0.0 / 0.0
+    assert_equal("NaN", sprintf("%f", nan))
+    assert_equal("NaN", sprintf("%-f", nan))
+    assert_equal("+NaN", sprintf("%+f", nan))
+
+    assert_equal("     NaN", sprintf("%8f", nan))
+    assert_equal("NaN     ", sprintf("%-8f", nan))
+    assert_equal("    +NaN", sprintf("%+8f", nan))
+
+    assert_equal("00000NaN", sprintf("%08f", nan))
+    assert_equal("NaN     ", sprintf("%-08f", nan))
+    assert_equal("+0000NaN", sprintf("%+08f", nan))
+
+    assert_equal("     NaN", sprintf("% 8f", nan))
+    assert_equal(" NaN    ", sprintf("%- 8f", nan))
+    assert_equal("    +NaN", sprintf("%+ 8f", nan))
+
+    assert_equal(" 0000NaN", sprintf("% 08f", nan))
+    assert_equal(" NaN    ", sprintf("%- 08f", nan))
+    assert_equal("+0000NaN", sprintf("%+ 08f", nan))
+  end
+
+  def test_inf
+    inf = 1.0 / 0.0
+    assert_equal("Inf", sprintf("%f", inf))
+    assert_equal("Inf", sprintf("%-f", inf))
+    assert_equal("+Inf", sprintf("%+f", inf))
+
+    assert_equal("     Inf", sprintf("%8f", inf))
+    assert_equal("Inf     ", sprintf("%-8f", inf))
+    assert_equal("    +Inf", sprintf("%+8f", inf))
+
+    assert_equal("00000Inf", sprintf("%08f", inf))
+    assert_equal("Inf     ", sprintf("%-08f", inf))
+    assert_equal("+0000Inf", sprintf("%+08f", inf))
+
+    assert_equal("     Inf", sprintf("% 8f", inf))
+    assert_equal(" Inf    ", sprintf("%- 8f", inf))
+    assert_equal("    +Inf", sprintf("%+ 8f", inf))
+
+    assert_equal(" 0000Inf", sprintf("% 08f", inf))
+    assert_equal(" Inf    ", sprintf("%- 08f", inf))
+    assert_equal("+0000Inf", sprintf("%+ 08f", inf))
+
+    assert_equal("-Inf", sprintf("%f", -inf))
+    assert_equal("-Inf", sprintf("%-f", -inf))
+    assert_equal("-Inf", sprintf("%+f", -inf))
+
+    assert_equal("    -Inf", sprintf("%8f", -inf))
+    assert_equal("-Inf    ", sprintf("%-8f", -inf))
+    assert_equal("    -Inf", sprintf("%+8f", -inf))
+
+    assert_equal("-0000Inf", sprintf("%08f", -inf))
+    assert_equal("-Inf    ", sprintf("%-08f", -inf))
+    assert_equal("-0000Inf", sprintf("%+08f", -inf))
+
+    assert_equal("    -Inf", sprintf("% 8f", -inf))
+    assert_equal("-Inf    ", sprintf("%- 8f", -inf))
+    assert_equal("    -Inf", sprintf("%+ 8f", -inf))
+
+    assert_equal("-0000Inf", sprintf("% 08f", -inf))
+    assert_equal("-Inf    ", sprintf("%- 08f", -inf))
+    assert_equal("-0000Inf", sprintf("%+ 08f", -inf))
+  end
 end