diff options
author | Bud Davis <bdavis@gcc.gnu.org> | 2005-02-22 03:26:25 +0000 |
---|---|---|
committer | Bud Davis <bdavis@gcc.gnu.org> | 2005-02-22 03:26:25 +0000 |
commit | ec88bf8bb7285cad65bda54ce3bd83b70e928fd6 (patch) | |
tree | 2a0bd2fe7642d2a15c70400a42dd9b742e469119 | |
parent | f4294557b7ebb12ab58c9b57e1309d5f2fcfb019 (diff) | |
download | gcc-ec88bf8bb7285cad65bda54ce3bd83b70e928fd6.zip gcc-ec88bf8bb7285cad65bda54ce3bd83b70e928fd6.tar.gz gcc-ec88bf8bb7285cad65bda54ce3bd83b70e928fd6.tar.bz2 |
[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
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/pr20086.f90 | 14 | ||||
-rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
-rw-r--r-- | libgfortran/io/transfer.c | 2 |
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd742ed..87f9111 100644 --- 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 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 9c0561b..39b835d 100644 --- 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 a55936f..0e4c619 100644 --- 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. */ } } |