diff options
| author | bdavis <bdavis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-11 08:03:02 +0000 |
|---|---|---|
| committer | bdavis <bdavis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-11 08:03:02 +0000 |
| commit | 57825007304f2b6f71742e5096cba24edfeeb6d6 (patch) | |
| tree | 411601a3cc2297dfd35f8ff0cb7349f27c25de3f /libgfortran | |
| parent | c860f88ec9cc331115b7dda39265b5fbd24e4c57 (diff) | |
| download | gcc-57825007304f2b6f71742e5096cba24edfeeb6d6.tar.gz | |
2005-03-12 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR libfortran/20124
* gfortran.dg/pr20124.f90: New Test
2005-03-11 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR libfortran/20124
* write.c (output_float): Adds a nzero_real variable to store
the number of leading zeros whatever the format width is. Corrects
the rounding of numbers less than 10^(-width). Fixes typo in an
error message. Updates copyright years
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96291 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 18 |
2 files changed, 25 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 2e3bd391b40..ac7e067e5c9 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2005-03-11 Francois-Xavier Coudert <coudert@clipper.ens.fr> + + PR libfortran/20124 + * write.c (output_float): Adds a nzero_real variable to store + the number of leading zeros whatever the format width is. Corrects + the rounding of numbers less than 10^(-width). Fixes typo in an + error message. Updates copyright years + 2005-02-27 Toon Moene <toon@moene.indiv.nluug.nl> * runtime/environ.c: Update copyright years. diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 1babd20463f..9c255d7d69e 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -286,6 +286,8 @@ output_float (fnode *f, double value, int len) int nzero; /* Number of digits after the decimal point. */ int nafter; + /* Number of zeros after the decimal point, whatever the precision. */ + int nzero_real; int leadzero; int nblanks; int i; @@ -295,6 +297,9 @@ output_float (fnode *f, double value, int len) w = f->u.real.w; d = f->u.real.d; + nzero_real = -1; + + /* We should always know the field width and precision. */ if (d < 0) internal_error ("Unspecified precision"); @@ -359,6 +364,7 @@ output_float (fnode *f, double value, int len) if (nbefore < 0) { nzero = -nbefore; + nzero_real = nzero; if (nzero > d) nzero = d; nafter = d - nzero; @@ -436,7 +442,17 @@ output_float (fnode *f, double value, int len) /* Round the value. */ if (nbefore + nafter == 0) - ndigits = 0; + { + ndigits = 0; + if (nzero_real == d && digits[0] >= '5') + { + /* We rounded to zero but shouldn't have */ + nzero--; + nafter = 1; + digits[0] = '1'; + ndigits = 1; + } + } else if (nbefore + nafter < ndigits) { ndigits = nbefore + nafter; |