diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 10:28:12 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 10:28:12 +0000 |
commit | ba5b04cd1b94a9d83bbac0bec430fd6066258cb0 (patch) | |
tree | 54e8fc4110ff9883216547e05e0bd59598cb9bc8 /sprintf.c | |
parent | 03f3e5e99408acd7fc47b7cb752072a808dc871c (diff) |
* sprintf.c (rb_f_sprintf): unify output of NaN, Inf and -Inf with
"%f" or etc on all platform. [ruby-dev:23704], [ruby-dev:23747]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 36 |
1 files changed, 36 insertions, 0 deletions
@@ -688,6 +688,42 @@ rb_f_sprintf(argc, argv) char fbuf[32]; fval = RFLOAT(rb_Float(val))->value; + if (isnan(fval) || isinf(fval)) { + char *expr; + + if (isnan(fval)) { + expr = "NaN"; + } + else { + expr = "Inf"; + } + need = strlen(expr); + if (fval < 0.0 || (flags & FPLUS)) + need++; + if ((flags & FWIDTH) && need < width) + need = width; + + CHECK(need); + sprintf(&buf[blen], "%*s", need, ""); + if (flags & FMINUS) { + if (fval < 0.0) + buf[blen++] = '-'; + else if (flags & FPLUS) + buf[blen++] = '+'; + strncpy(&buf[blen], expr, strlen(expr)); + } + else { + if (fval < 0.0) + buf[blen + need - strlen(expr) - 1] = '-'; + else if (flags & FPLUS) + buf[blen + need - strlen(expr) - 1] = '+'; + strncpy(&buf[blen + need - strlen(expr)], expr, + strlen(expr)); + } + blen += strlen(&buf[blen]); + break; + } + fmt_setup(fbuf, *p, flags, width, prec); need = 0; if (*p != 'e' && *p != 'E') { |