kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix space flag when Inf/NaN and width==3

Browse source 
* sprintf.c (rb_str_format): while `"% 2f"` and `"% 4f"` result in
  `" Inf"` and `" Inf"` respectively, `"% 3f"` results in
  `"Inf"` (no space).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-23 01:04:39 +00:00
parent a6f0ec21e9
commit 6f8f950cc3
2 changed files with 53 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprintf.c
View file

@ -1136,7 +1136,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
expr = "Inf";
}
need = (int)strlen(expr);
if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
if ((!isnan(fval) && fval < 0.0) || (flags & (FPLUS|FSPACE)))
need++;
if ((flags & FWIDTH) && need < width)
need = width;
@ -1157,8 +1157,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
buf[blen + need - strlen(expr) - 1] = '-';
else if (flags & FPLUS)
buf[blen + need - strlen(expr) - 1] = '+';
else if ((flags & FSPACE) && need > width)
blen++;
memcpy(&buf[blen + need - strlen(expr)], expr,
strlen(expr));
}

52
test/ruby/test_sprintf.rb
View file

@ -84,6 +84,18 @@ class TestSprintf < Test::Unit::TestCase
assert_equal("NaN", sprintf("%-f", nan))
assert_equal("+NaN", sprintf("%+f", nan))
assert_equal("NaN", sprintf("%3f", nan))
assert_equal("NaN", sprintf("%-3f", nan))
assert_equal("+NaN", sprintf("%+3f", nan))
assert_equal(" NaN", sprintf("% 3f", nan))
assert_equal(" NaN", sprintf("%- 3f", nan))
assert_equal("+NaN", sprintf("%+ 3f", nan))
assert_equal(" NaN", sprintf("% 03f", nan))
assert_equal(" NaN", sprintf("%- 03f", nan))
assert_equal("+NaN", sprintf("%+ 03f", nan))
assert_equal(" NaN", sprintf("%8f", nan))
assert_equal("NaN ", sprintf("%-8f", nan))
assert_equal(" +NaN", sprintf("%+8f", nan))
@ -107,6 +119,26 @@ class TestSprintf < Test::Unit::TestCase
assert_equal("Inf", sprintf("%-f", inf))
assert_equal("+Inf", sprintf("%+f", inf))
assert_equal(" Inf", sprintf("% f", inf))
assert_equal(" Inf", sprintf("%- f", inf))
assert_equal("+Inf", sprintf("%+ f", inf))
assert_equal(" Inf", sprintf("% 0f", inf))
assert_equal(" Inf", sprintf("%- 0f", inf))
assert_equal("+Inf", sprintf("%+ 0f", inf))
assert_equal("Inf", sprintf("%3f", inf))
assert_equal("Inf", sprintf("%-3f", inf))
assert_equal("+Inf", sprintf("%+3f", inf))
assert_equal(" Inf", sprintf("% 3f", inf))
assert_equal(" Inf", sprintf("%- 3f", inf))
assert_equal("+Inf", sprintf("%+ 3f", inf))
assert_equal(" Inf", sprintf("% 03f", inf))
assert_equal(" Inf", sprintf("%- 03f", inf))
assert_equal("+Inf", sprintf("%+ 03f", inf))
assert_equal(" Inf", sprintf("%8f", inf))
assert_equal("Inf ", sprintf("%-8f", inf))
assert_equal(" +Inf", sprintf("%+8f", inf))
@ -127,6 +159,26 @@ class TestSprintf < Test::Unit::TestCase
assert_equal("-Inf", sprintf("%-f", -inf))
assert_equal("-Inf", sprintf("%+f", -inf))
assert_equal("-Inf", sprintf("% f", -inf))
assert_equal("-Inf", sprintf("%- f", -inf))
assert_equal("-Inf", sprintf("%+ f", -inf))
assert_equal("-Inf", sprintf("% 0f", -inf))
assert_equal("-Inf", sprintf("%- 0f", -inf))
assert_equal("-Inf", sprintf("%+ 0f", -inf))
assert_equal("-Inf", sprintf("%4f", -inf))
assert_equal("-Inf", sprintf("%-4f", -inf))
assert_equal("-Inf", sprintf("%+4f", -inf))
assert_equal("-Inf", sprintf("% 4f", -inf))
assert_equal("-Inf", sprintf("%- 4f", -inf))
assert_equal("-Inf", sprintf("%+ 4f", -inf))
assert_equal("-Inf", sprintf("% 04f", -inf))
assert_equal("-Inf", sprintf("%- 04f", -inf))
assert_equal("-Inf", sprintf("%+ 04f", -inf))
assert_equal(" -Inf", sprintf("%8f", -inf))
assert_equal("-Inf ", sprintf("%-8f", -inf))
assert_equal(" -Inf", sprintf("%+8f", -inf))