OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/50109 (Formatted namelist read with multiple "!" fails with: Cannot match namelist object name !)

Browse Source 
2011-08-18  Tobias Burnus  <burnus@net-b.de>

        PR fortran/50109
        * io/list_read.c (eat_separator): Fix skipping over "!" lines.

2011-08-18  Tobias Burnus  <burnus@net-b.de>

        PR fortran/50109
        * gfortran.dg/namelist_73.f90: New.

From-SVN: r177858
This commit is contained in:
Tobias Burnus 2011-08-18 16:23:41 +02:00 committed by Tobias Burnus
parent 4dee97188f
commit a2f3eae24d
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-18 Tobias Burnus <burnus@net-b.de>
PR fortran/50109
* gfortran.dg/namelist_73.f90: New.
2011-08-18 Jakub Jelinek <jakub@redhat.com>
* g++.dg/plugin/decl_plugin.c: Include diagnostic.h.

28
gcc/testsuite/gfortran.dg/namelist_73.f90 Normal file
View File

@ -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

5
libgfortran/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-18 Tobias Burnus <burnus@net-b.de>
PR fortran/50109
* io/list_read.c (eat_separator): Fix skipping over "!" lines.
2011-07-23 Andreas Schwab <schwab@linux-m68k.org>
* intrinsics/ctime.c: Include <stdlib.h>.

11
libgfortran/io/list_read.c
View File

@ -351,16 +351,7 @@ eat_separator (st_parameter_dt *dtp)
err = eat_line (dtp);
if (err)
return err;
if ((c = next_char (dtp)) == EOF)
return LIBERROR_END;
if (c == '!')
{
err = eat_line (dtp);
if (err)
return err;
if ((c = next_char (dtp)) == EOF)
return LIBERROR_END;
}
c = '\n';
}
}
while (c == '\n' || c == '\r' || c == ' ' || c == '\t');