diff options
| author | bdavis <bdavis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-12 12:50:54 +0000 |
|---|---|---|
| committer | bdavis <bdavis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-12 12:50:54 +0000 |
| commit | b77066d315ccaf58e8914ef4f68e560b2515c5f2 (patch) | |
| tree | b352ec80ae8b4024e59c79a5dd8215afaac2ac8e /libgfortran | |
| parent | e75781d3758b5acb0072d16510571797c8cd4849 (diff) | |
| download | gcc-b77066d315ccaf58e8914ef4f68e560b2515c5f2.tar.gz | |
2004-06-12 Bud Davis <bdavis9659@comcast.net>
PR gfortran/12839
* gfortran.fortran-torture/execute/nan_inf_fmt.f90: New test.
* io/write.c(write_float): format inf and nan IAW F2003.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83024 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 24 |
2 files changed, 22 insertions, 7 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index e9f17ee05bd..a00f03faf34 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2004-06-12 Bud Davis <bdavis9659@comcast.net> + + PR gfortran/12839 + * io/write.c(write_float): format inf and nan IAW F2003. + 2004-06-09 Bud Davis <bdavis9659@comcaste.net> PR gfortran/14897 diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 0719f88ff1d..e4f597cbd04 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -515,11 +515,14 @@ write_float (fnode *f, const char *source, int len) if (res == 0) { nb = f->u.real.w; - if (nb <= 4) - nb = 4; p = write_block (nb); - memset (p, ' ' , 1); - + if (nb < 3) + { + memset (p, '*',nb); + return; + } + + memset(p, ' ', nb); res = isinf (n); if (res != 0) { @@ -527,11 +530,18 @@ write_float (fnode *f, const char *source, int len) fin = '+'; else fin = '-'; - - memset (p + 1, fin, nb - 1); + + if (nb > 7) + memcpy(p + nb - 8, "Infinity", 8); + else + memcpy(p + nb - 3, "Inf", 3); + if (nb < 8) + memset(p + nb - 4, fin, 1); + else if (nb > 8) + memset(p + nb - 9, fin, 1); } else - sprintf(p + 1, "NaN"); + memcpy(p + nb - 3, "NaN", 3); return; } } |