1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (flo_to_s): reduce fragments if no precision lost.

Browse Source 
c.f. [ruby-core:23075]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-06 16:08:23 +00:00
parent aa75b002de
commit 8ebd0d4320
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Apr 7 01:08:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_to_s): reduce fragments if no precision lost.
c.f. [ruby-core:23075]
Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CFLAGS, CXXFLAGS): override with $cflags and * configure.in (CFLAGS, CXXFLAGS): override with $cflags and

9
numeric.c
View File

@ -522,7 +522,7 @@ static VALUE
flo_to_s(VALUE flt) flo_to_s(VALUE flt)
{ {
enum {decimal_mant = DBL_MANT_DIG-DBL_DIG}; enum {decimal_mant = DBL_MANT_DIG-DBL_DIG};
enum {float_dig = DBL_DIG+2}; enum {float_dig = DBL_DIG+1};
char buf[float_dig + (decimal_mant + CHAR_BIT - 1) / CHAR_BIT + 10]; char buf[float_dig + (decimal_mant + CHAR_BIT - 1) / CHAR_BIT + 10];
double value = RFLOAT_VALUE(flt); double value = RFLOAT_VALUE(flt);
char *p, *e; char *p, *e;
@ -532,12 +532,15 @@ flo_to_s(VALUE flt)
else if(isnan(value)) else if(isnan(value))
return rb_usascii_str_new2("NaN"); return rb_usascii_str_new2("NaN");
snprintf(buf, sizeof(buf), "%#.*g", float_dig, value); /* ensure to print decimal point */ # define FLOFMT(buf, size, fmt, prec, val) snprintf(buf, size, fmt, prec, val), \
(void)((atof(buf) == val) || snprintf(buf, size, fmt, (prec)+1, val))
FLOFMT(buf, sizeof(buf), "%#.*g", float_dig, value); /* ensure to print decimal point */
if (!(e = strchr(buf, 'e'))) { if (!(e = strchr(buf, 'e'))) {
e = buf + strlen(buf); e = buf + strlen(buf);
} }
if (!ISDIGIT(e[-1])) { /* reformat if ended with decimal point (ex 111111111111111.) */ if (!ISDIGIT(e[-1])) { /* reformat if ended with decimal point (ex 111111111111111.) */
snprintf(buf, sizeof(buf), "%#.*e", float_dig - 1, value); FLOFMT(buf, sizeof(buf), "%#.*e", float_dig - 1, value);
if (!(e = strchr(buf, 'e'))) { if (!(e = strchr(buf, 'e'))) {
e = buf + strlen(buf); e = buf + strlen(buf);
} }

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-04-06" #define RUBY_RELEASE_DATE "2009-04-07"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 6 #define RUBY_RELEASE_DAY 7
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];