This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
[patch, libgfortran] PR30918 Failure to skip commented out NAMELIST
- From: Jerry DeLisle <jvdelisle at verizon dot net>
- To: Fortran List <fortran at gcc dot gnu dot org>
- Cc: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 24 Feb 2007 18:25:05 -0800
- Subject: [patch, libgfortran] PR30918 Failure to skip commented out NAMELIST
The attached patch is trivial and obvious. Regression tested on
x86-64-Gnu/Linux. Test case attached.
I will commit to 4.3, 4.2, and 4.1.
Regards,
Jerry
2007-02-24 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/30918
* io/listread.c (namelist_read): Eat comment line.
Index: io/list_read.c
===================================================================
*** io/list_read.c (revision 122251)
--- io/list_read.c (working copy)
*************** find_nml_name:
*** 2567,2572 ****
--- 2567,2576 ----
case '&':
break;
+ case '!':
+ eat_line (dtp);
+ goto find_nml_name;
+
case '=':
c = next_char (dtp);
if (c == '?')
! { dg-do run }
! PR30918 Failure to skip commented out NAMELIST
! Before the patch, this read the commented out namelist and iuse would
! equal 2 when done. Test case from PR.
program gfcbug58
implicit none
integer :: iuse = 0, ios
integer, parameter :: nmlunit = 10 ! Namelist unit
!------------------
! Namelist 'REPORT'
!------------------
character(len=12) :: type, use
integer :: max_proc
namelist /REPORT/ type, use, max_proc
!------------------
! Set up the test file
!------------------
open(unit=nmlunit, status="scratch")
write(nmlunit, '(a)') "!================"
write(nmlunit, '(a)') "! Namelist REPORT"
write(nmlunit, '(a)') "!================"
write(nmlunit, '(a)') "! &REPORT use = 'ignore' / ! Comment"
write(nmlunit, '(a)') "!"
write(nmlunit, '(a)') " &REPORT type = 'SYNOP'"
write(nmlunit, '(a)') " use = 'active'"
write(nmlunit, '(a)') " max_proc = 20"
write(nmlunit, '(a)') " /"
rewind(nmlunit)
!-------------------------------------
! Loop to read namelist multiple times
!-------------------------------------
do
!----------------------------------------
! Preset namelist variables with defaults
!----------------------------------------
type = ''
use = ''
max_proc = -1
!--------------
! Read namelist
!--------------
read (nmlunit, nml=REPORT, iostat=ios)
if (ios /= 0) exit
iuse = iuse + 1
end do
if (iuse /= 1) call abort()
end program gfcbug58