re PR libfortran/48589 (Invalid G0/G0.d editing for NaN/infinity)

2011-04-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/48589
	* io/write_float.def (write_infnan): Set width properly for G0.

From-SVN: r172502

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8d53c6f16afe965cba58edeba520dbefdbcb1223..5dae754a9ce75abfdfd6d428ee4dee974ea870a5 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/48589
+       * io/write_float.def (write_infnan): Set width properly for G0.
+
 2011-04-15  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/18918
@@ -15,6 +20,7 @@
        * intrinsics/system_clock.c: Use weakrefs only when needed and
        supported.
 
+>>>>>>> .r172501
 2011-04-12  Janne Blomqvist  <jb@gcc.gnu.org>
 
        * configure.ac: Use AC_TYPE_* to make sure we have (u)intptr_t,

diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def
index b72cf9f566522bb31973b25071a66ea2ce8ed7d1..ea9c99f50f9cbeab2e67c460f76a0da5d5c40a60 100644 (file)
--- a/libgfortran/io/write_float.def
+++ b/libgfortran/io/write_float.def
@@ -654,11 +654,11 @@ write_infnan (st_parameter_dt *dtp, const fnode *f, int isnan_flag, int sign_bit
       mark = (sign == S_PLUS || sign == S_MINUS) ? 8 : 7;
 
       nb =  f->u.real.w;
-  
+
       /* If the field width is zero, the processor must select a width 
         not zero.  4 is chosen to allow output of '-Inf' or '+Inf' */
      
-      if (nb == 0)
+      if ((nb == 0) || dtp->u.p.g0_no_blanks)
        {
          if (isnan_flag)
            nb = 3;