[multiple changes]

2004-02-21  Bud Davis  <bdavis@gfortran.org>

        PR fortran/20086
        * io/transfer.c (write_constant_string): accept an 'h' as
        the start of a hollerith format string.

2005-02-21  Bud Davis  <bdavis9659@comcast.net>

        PR fortran/20086
        * gfortran.dg/pr20086.f90: New test.

From-SVN: r95379

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dd742ed74b9b212681d3f0456b355f5cb1bd395c..87f91117297a35773dbbb88eeaccc7549a9ebae0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-21  Bud Davis  <bdavis9659@comcast.net>
+
+       PR fortran/20086
+       * gfortran.dg/pr20086.f90: New test.
+
 2005-02-21  Alexandre Oliva  <aoliva@redhat.com>
 
        PR tree-optimization/19786

diff --git a/gcc/testsuite/gfortran.dg/pr20086.f90 b/gcc/testsuite/gfortran.dg/pr20086.f90
new file mode 100644 (file)
index 0000000..e5759da
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr20086.f90
@@ -0,0 +1,14 @@
+! { dg-do run }     
+! PR 20086 - Missing characters in output with hollerith strings
+      implicit none
+      character*80 line
+      write(line,2070)
+      if (line.ne.'  stiffness reformed for this high step')call abort
+      write(line,2090)
+      if (line.ne.'  stiffness reformed for hello hello')call abort 
+      stop
+
+ 2070  format (2x,37hstiffness reformed for this high step)
+ 2090  format (2x,34hstiffness reformed for hello hello)
+
+      end

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 9c0561b04c34eb85013a44332d10b4f262a4a41c..39b835d5bc9e668402a7fcc82294ec2fd169c9ea 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-21  Bud Davis  <bdavis@gfortran.org>
+
+       PR fortran/20086
+       * io/transfer.c (write_constant_string): accept an 'h' as
+       the start of a hollerith format string.
+
 2005-02-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR libfortran/19302

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index a55936f9e6c6deb915b744fad4e6bc0878eb0440..0e4c619dc9897d436ddbc11f5c89b882ff60fbab 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -386,7 +386,7 @@ write_constant_string (fnode * f)
   for (; length > 0; length--)
     {
       c = *p++ = *q++;
-      if (c == delimiter && c != 'H')
+      if (c == delimiter && c != 'H' && c != 'h')
        q++;                    /* Skip the doubled delimiter.  */
     }
 }