kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

merge revision(s) 58453,58454: [Backport #13499] 

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

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

	* sprintf.c (rb_str_format): as for non-finite float, calculate
	  the exact needed size with the space flag.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-06-30 10:47:34 +00:00
parent ef763e7d0c
commit d25b9efdaa
4 changed files with 78 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Jun 30 19:46:46 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): while "% 2f" and "% 4f" result in " Inf"
and " Inf" respectively, "% 3f" results in "Inf" (no space).
* sprintf.c (rb_str_format): as for non-finite float, calculate the
exact needed size with the space flag.
Fri Jun 30 19:41:48 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_win32.c (w32_wait_events): do not acquire GVL, to fix deadlock

37
sprintf.c
View File

@ -1147,6 +1147,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
fval = RFLOAT_VALUE(rb_Float(val));
if (isnan(fval) || isinf(fval)) {
const char *expr;
int elen;
char sign = '\0';
if (isnan(fval)) {
expr = "NaN";
@ -1155,33 +1157,28 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
expr = "Inf";
}
need = (int)strlen(expr);
if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
need++;
elen = need;
i = 0;
if (!isnan(fval) && fval < 0.0)
sign = '-';
else if (flags & (FPLUS|FSPACE))
sign = (flags & FPLUS) ? '+' : ' ';
if (sign)
++need;
if ((flags & FWIDTH) && need < width)
need = width;
CHECK(need + 1);
snprintf(&buf[blen], need + 1, "%*s", need, "");
FILL(' ', need);
if (flags & FMINUS) {
if (!isnan(fval) && fval < 0.0)
buf[blen++] = '-';
else if (flags & FPLUS)
buf[blen++] = '+';
else if (flags & FSPACE)
blen++;
memcpy(&buf[blen], expr, strlen(expr));
if (sign)
buf[blen - need--] = sign;
memcpy(&buf[blen - need], expr, elen);
}
else {
if (!isnan(fval) && fval < 0.0)
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));
if (sign)
buf[blen - elen - 1] = sign;
memcpy(&buf[blen - elen], expr, elen);
}
blen += strlen(&buf[blen]);
break;
}

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))

2
version.h
View File

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
#define RUBY_PATCHLEVEL 314
#define RUBY_PATCHLEVEL 315
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6