From ba5b04cd1b94a9d83bbac0bec430fd6066258cb0 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 22 Jun 2004 10:28:12 +0000 Subject: * 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 --- ChangeLog | 5 +++++ sprintf.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index 696b62f987..cefdd2e881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 22 19:24:59 2004 NAKAMURA Usaku + + * 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] + Tue Jun 22 15:28:12 2004 Michal Rokos * compar.c: Remove explicit NIL_P() checks since rb_cmpint() does it diff --git a/sprintf.c b/sprintf.c index df586c4a15..be22578a8d 100644 --- a/sprintf.c +++ b/sprintf.c @@ -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') { -- cgit v1.2.3