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

backport: re PR libfortran/49791 (Formatted namelist reads fails with: Cannot match namelist object) 

2011-07-28  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2011-07-23  Tobias Burnus  <burnus@net-b.de>

        PR fortran/49791
        * io/list_read.c (nml_parse_qualifier): Remove check to
        enabled extended read for another case.

2011-07-28  Tobias Burnus  <burnus@net-b.de>

        Backported from mainline
        2011-07-23  Tobias Burnus  <burnus@net-b.de>

        PR fortran/49791
        * gfortran.dg/namelist_72.f: New.

From-SVN: r176857
This commit is contained in:
Tobias Burnus 2011-07-28 07:38:54 +02:00 committed by Tobias Burnus
parent 11fb47e17d
commit 7fe6f16069
4 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2011-07-28 Tobias Burnus <burnus@net-b.de>
Backported from mainline
2011-07-23 Tobias Burnus <burnus@net-b.de>
PR fortran/49791
* gfortran.dg/namelist_72.f: New.
2011-07-27 Uros Bizjak <ubizjak@gmail.com>
* gcc.target/i386/avx-os-support.h: New.

33
gcc/testsuite/gfortran.dg/namelist_72.f Normal file
View File

@ -0,0 +1,33 @@
! { dg-do run }
!
! PR fortran/49791
!
! Contributed by Elliott Sales de Andrade
!
program namelist_test
dimension xpos(5000), ypos(5000)
namelist /geometry/ xpos, ypos
xpos = -huge(xpos)
ypos = -huge(ypos)
open(unit=4,file='geometry.in')
write(4,'(a)') '$geometry'
write(4,'(a)') ' xpos(1)= 0.00, 0.10, 0.20, 0.30, 0.40,'
write(4,'(a)') ' ypos(1)= 0.50, 0.60, 0.70, 0.80, 0.90,'
write(4,'(a)') '$end'
close(4)
open (unit=4,file='geometry.in',status='old',form='formatted')
read (4,geometry)
close(4, status='delete')
!print *, 'xpos', xpos(1:10), 'ypos', ypos(1:10)
if (any (xpos(1:5) /= [0.00, 0.10, 0.20, 0.30, 0.40]))call abort()
if (any (ypos(1:5) /= [0.50, 0.60, 0.70, 0.80, 0.90]))call abort()
if (any (xpos(6:) /= -huge(xpos))) call abort ()
if (any (ypos(6:) /= -huge(ypos))) call abort ()
end

9
libgfortran/ChangeLog
View File

@ -1,3 +1,12 @@
2011-07-28 Tobias Burnus <burnus@net-b.de>
Backport from mainline
2011-07-23 Tobias Burnus <burnus@net-b.de>
PR fortran/49791
* io/list_read.c (nml_parse_qualifier): Remove check to
enabled extended read for another case.
2011-04-16 Release Manager
* GCC 4.4.6 released.

1
libgfortran/io/list_read.c
View File

@ -2079,7 +2079,6 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad,
do not allow excess data to be processed. */
if (is_array_section == 1
|| !(compile_options.allow_std & GFC_STD_GNU)
|| !dtp->u.p.ionml->touched
|| dtp->u.p.ionml->type == GFC_DTYPE_DERIVED)
ls[dim].end = ls[dim].start;
else