From a422ee4896fb56786d98aae44e221c278fc0214e Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 19 Aug 2011 13:55:16 +0200 Subject: [PATCH] backport: re PR fortran/50109 (Formatted namelist read with multiple "!" fails with: Cannot match namelist object name !) 2011-08-19 Tobias Burnus Backport from mainline 2011-08-18 Tobias Burnus PR fortran/50109 * io/list_read.c (eat_separator): Fix skipping over "!" lines. 2011-08-19 Tobias Burnus Backport from mainline 2011-08-18 Tobias Burnus PR fortran/50109 * gfortran.dg/namelist_73.f90: New. From-SVN: r177895 --- gcc/testsuite/ChangeLog | 8 +++++++ gcc/testsuite/gfortran.dg/namelist_73.f90 | 28 +++++++++++++++++++++++ libgfortran/ChangeLog | 8 +++++++ libgfortran/io/list_read.c | 7 +----- 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/namelist_73.f90 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 05aaf2940221..f8b966e7d926 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-08-19 Tobias Burnus + + Backport from mainline + 2011-08-18 Tobias Burnus + + PR fortran/50109 + * gfortran.dg/namelist_73.f90: New. + 2011-07-31 Uros Bizjak PR target/49920 diff --git a/gcc/testsuite/gfortran.dg/namelist_73.f90 b/gcc/testsuite/gfortran.dg/namelist_73.f90 new file mode 100644 index 000000000000..8fc88aa1ed92 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/namelist_73.f90 @@ -0,0 +1,28 @@ +! { dg-do run } +! +! PR fortran/50109 +! +! Contributed by Jim Hanson +! + program namelist_test + + integer nfp + namelist /indata/ nfp + + nfp = 99 + open(unit=4, status='scratch') + write(4,'(a)') '$indata' + write(4,'(a)') 'NFP = 5,' + write(4,'(a)') "! " + write(4,'(a)') "! " + write(4,'(a)') "! " + write(4,'(a)') '/' + + rewind(4) + read (4,nml=indata) + close(4) + +! write(*,*) nfp + if (nfp /= 5) call abort() + + end diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 214d78c981bf..5168865824f4 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2011-08-19 Tobias Burnus + + Backport from mainline + 2011-08-18 Tobias Burnus + + PR fortran/50109 + * io/list_read.c (eat_separator): Fix skipping over "!" lines. + 2011-07-28 Tobias Burnus Backport from mainline diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index d33eaa6fbea9..9f24d8df843c 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -351,12 +351,7 @@ eat_separator (st_parameter_dt *dtp) if (c == '!') { eat_line (dtp); - c = next_char (dtp); - if (c == '!') - { - eat_line (dtp); - c = next_char (dtp); - } + c = '\n'; } } while (c == '\n' || c == '\r' || c == ' ' || c == '\t'); -- 2.47.2