re PR libfortran/20755 (gfortran - prints the same number with 1p4G12.3 two different...

	PR libfortran/20755
	* write.c (write_float): A G edit descriptor may locally change
	the scale factor, but it needs to be restored afterwards.

	* gfortran.dg/pr20755.f: New test.

From-SVN: r97627

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 58d473c18bb61388d13ad24ff2bd69055333aa56..3c67aa3e98937c036aa1dcf4f35a7238f0555f6b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+       PR libfortran/20755
+       * gfortran.dg/pr20755.f: New test.
+
 2005-04-05  Feng Wang  <fengwang@nudt.edu.cn>
 
        * gfortran.dg/pr15959.f90: New test.

diff --git a/gcc/testsuite/gfortran.dg/pr20755.f b/gcc/testsuite/gfortran.dg/pr20755.f
new file mode 100644 (file)
index 0000000..07c72ae
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr20755.f
@@ -0,0 +1,10 @@
+! PR libfortran/20755
+! { dg-do run }
+      character*30 s
+      
+      write (s,2000) 0.0, 0.02
+      if (s .ne. "    0.00       2.000E-02") call abort
+      write (s,2000) 0.01, 0.02
+      if (s .ne. "   1.000E-02   2.000E-02") call abort
+ 2000 format (1P2G12.3)
+      end

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index ebcac0bb919365da9f9812d724aa690a1437add1..51fe4a18ecd1eb0e8544775a65bbbe3c89cefdb7 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-05  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+       PR libfortran/20755
+       * write.c (write_float): A G edit descriptor may locally change
+       the scale factor, but it needs to be restored afterwards.
+
 2005-04-03  Dale Ranta  <dir@lanl.gov>
             Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 

diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
index 556adea268ba701d1fb75ff5ab4a3562e84f2e28..d97caec8bc7958f71107b046ebc88d75690120b4 100644 (file)
--- a/libgfortran/io/write.c
+++ b/libgfortran/io/write.c
@@ -674,7 +674,7 @@ static void
 write_float (fnode *f, const char *source, int len)
 {
   double n;
-  int nb =0, res;
+  int nb =0, res, save_scale_factor;
   char * p, fin;
   fnode *f2 = NULL;
 
@@ -723,8 +723,10 @@ write_float (fnode *f, const char *source, int len)
     }
   else
     {
+      save_scale_factor = g.scale_factor;
       f2 = calculate_G_format(f, n, len, &nb);
       output_float (f2, n, len);
+      g.scale_factor = save_scale_factor;
       if (f2 != NULL)
         free_mem(f2);