From 36b02b16a134f67091ce238e6ac2eb0968a643a9 Mon Sep 17 00:00:00 2001 From: ocean Date: Mon, 17 May 2004 07:14:45 +0000 Subject: * numeric.c (flo_to_s): p 0.0 should be '0.0' not '0.0e+00'. * numeric.c (flo_to_s): the number of significand is correctly handled, there is assumption that DBL_DIG == 15 though. (p 0.00000000000000000001 was '9.999999999999999e-21', now is '1.0e-20') git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index ac5e125a8f..2d33b49bab 100644 --- a/numeric.c +++ b/numeric.c @@ -489,9 +489,7 @@ flo_to_s(flt) VALUE flt; { char buf[32]; - char *fmt = "%.15f"; double value = RFLOAT(flt)->value; - double avalue, d1, d2; char *p, *e; if (isinf(value)) @@ -499,19 +497,20 @@ flo_to_s(flt) else if(isnan(value)) return rb_str_new2("NaN"); - avalue = fabs(value); - if (avalue < 1.0e-7 || avalue >= 1.0e15) { - fmt = "%.16e"; - } - sprintf(buf, fmt, value); + sprintf(buf, "%#.15g", value); /* ensure to print decimal point */ if (!(e = strchr(buf, 'e'))) { e = buf + strlen(buf); } + if (!ISDIGIT(e[-1])) { /* reformat if ended with decimal point (ex 111111111111111.) */ + sprintf(buf, "%#.14e", value); + if (!(e = strchr(buf, 'e'))) { + e = buf + strlen(buf); + } + } p = e; - while (*--p=='0') - ; - if (*p == '.') *p++; - memmove(p+1, e, strlen(e)+1); + while (p[-1]=='0' && ISDIGIT(p[-2])) + p--; + memmove(p, e, strlen(e)+1); return rb_str_new2(buf); } -- cgit v1.2.3