admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3630 from nobu/bug/sprintf-sp3inf

Browse Source 
Fix space flag with inf/nan
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-24 09:06:57 +09:00
committed by GitHub
parent 72bdb6a93f cd4e9a0518
commit 6088276cc8
2 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-sprintf/src/sprintf.c
+14 -22
View File
@@ -1040,6 +1040,7 @@ retry:
if (!isfinite(fval)) {
const char *expr;
const int elen = 3;
char sign = '\0';
if (isnan(fval)) {
expr = "NaN";
@@ -1048,35 +1049,26 @@ retry:
expr = "Inf";
}
need = elen;
if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
need++;
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);
n = snprintf(&buf[blen], need + 1, "%*s", need, "");
if (n < 0) {
mrb_raise(mrb, E_RUNTIME_ERROR, "formatting error");
}
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, elen);
if (sign)
buf[blen - need--] = sign;
memcpy(&buf[blen - need], expr, elen);
}
else {
if (!isnan(fval) && fval < 0.0)
buf[blen + need - elen - 1] = '-';
else if (flags & FPLUS)
buf[blen + need - elen - 1] = '+';
else if ((flags & FSPACE) && need > width)
blen++;
memcpy(&buf[blen + need - elen], expr, elen);
if (sign)
buf[blen - elen - 1] = sign;
memcpy(&buf[blen - elen], expr, elen);
}
blen += strlen(&buf[blen]);
break;
}
mrbgems/mruby-sprintf/test/sprintf.rb
+56
View File
@@ -8,6 +8,62 @@ assert('String#%') do
assert_equal 15, ("%b" % (1<<14)).size
end
assert('String#% with inf') do
inf = Float::INFINITY
assert_equal "Inf", "%f" % inf
assert_equal "Inf", "%2f" % inf
assert_equal "Inf", "%3f" % inf
assert_equal " Inf", "%4f" % inf
assert_equal " Inf", "%5f" % inf
assert_equal "+Inf", "%+f" % inf
assert_equal "+Inf", "%+2f" % inf
assert_equal "+Inf", "%+3f" % inf
assert_equal "+Inf", "%+4f" % inf
assert_equal " +Inf", "%+5f" % inf
assert_equal "Inf", "%-f" % inf
assert_equal "Inf", "%-2f" % inf
assert_equal "Inf", "%-3f" % inf
assert_equal "Inf ", "%-4f" % inf
assert_equal "Inf ", "%-5f" % inf
assert_equal " Inf", "% f" % inf
assert_equal " Inf", "% 2f" % inf
assert_equal " Inf", "% 3f" % inf
assert_equal " Inf", "% 4f" % inf
assert_equal " Inf", "% 5f" % inf
end
assert('String#% with nan') do
nan = Float::NAN
assert_equal "NaN", "%f" % nan
assert_equal "NaN", "%2f" % nan
assert_equal "NaN", "%3f" % nan
assert_equal " NaN", "%4f" % nan
assert_equal " NaN", "%5f" % nan
assert_equal "+NaN", "%+f" % nan
assert_equal "+NaN", "%+2f" % nan
assert_equal "+NaN", "%+3f" % nan
assert_equal "+NaN", "%+4f" % nan
assert_equal " +NaN", "%+5f" % nan
assert_equal "NaN", "%-f" % nan
assert_equal "NaN", "%-2f" % nan
assert_equal "NaN", "%-3f" % nan
assert_equal "NaN ", "%-4f" % nan
assert_equal "NaN ", "%-5f" % nan
assert_equal " NaN", "% f" % nan
assert_equal " NaN", "% 2f" % nan
assert_equal " NaN", "% 3f" % nan
assert_equal " NaN", "% 4f" % nan
assert_equal " NaN", "% 5f" % nan
end
assert("String#% with invalid chr") do
begin
class Fixnum