diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-02-12 19:52:13 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-02-12 19:52:13 +0000 |
| commit | 955ca6dc7723b98029a427b05cfe7707357f4c56 (patch) | |
| tree | 3ee4e8839e5f82fbae321cdbee84dd7d75e26a7e /gcc | |
| parent | 876217ae71cf0b34490f8f53bb2a12d99d8baa7a (diff) | |
| download | gcc-955ca6dc7723b98029a427b05cfe7707357f4c56.zip gcc-955ca6dc7723b98029a427b05cfe7707357f4c56.tar.gz gcc-955ca6dc7723b98029a427b05cfe7707357f4c56.tar.bz2 | |
re PR fortran/69668 (Error reading namelist opened with DELIM='NONE')
2016-02-12 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/69668
* io/list_read.c (read_character): Remove code related to DELIM_NONE.
PR libgfortran/69668
* gfortran.dg/namelist_38.f90: Update test.
* gfortran.dg/namelist_84.f90: Update test.
From-SVN: r233387
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/namelist_38.f90 | 14 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/namelist_84.f90 | 5 |
3 files changed, 17 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6d01ca3..7bed3ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-12 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libgfortran/69668 + * gfortran.dg/namelist_38.f90: Update test. + * gfortran.dg/namelist_84.f90: Update test. + 2016-02-12 David Malcolm <dmalcolm@redhat.com> PR other/69554 diff --git a/gcc/testsuite/gfortran.dg/namelist_38.f90 b/gcc/testsuite/gfortran.dg/namelist_38.f90 index 5578654..b51463c 100644 --- a/gcc/testsuite/gfortran.dg/namelist_38.f90 +++ b/gcc/testsuite/gfortran.dg/namelist_38.f90 @@ -5,6 +5,7 @@ program main implicit none character(len=3) :: a + character(25) :: b namelist /foo/ a open(10, status="scratch", delim="quote") @@ -28,9 +29,12 @@ program main open(10, status="scratch", delim="none") a = "a'a" write(10,foo) - rewind 10 - a = "" - read (10,foo) - if (a.ne."a'a") call abort - close (10) + rewind (10) + read(10,"(a)") b + if (b .ne. "&FOO") call abort + read(10,"(a)") b + if (b .ne. " A=a'a") call abort + read(10,"(a)") b + if (b .ne. " /") call abort + close(10) end program main diff --git a/gcc/testsuite/gfortran.dg/namelist_84.f90 b/gcc/testsuite/gfortran.dg/namelist_84.f90 index af139d9..14b68a4 100644 --- a/gcc/testsuite/gfortran.dg/namelist_84.f90 +++ b/gcc/testsuite/gfortran.dg/namelist_84.f90 @@ -17,12 +17,11 @@ program namelist_delim_none write(10, mylist) rewind(10) mystring = "xxxxx" - read(10,mylist) - if (any(mystring /= (/ 'mon', 'tue', 'wed', 'thu', 'fri' /))) call abort rewind(10) do i=1,5 read(10,'(a)') internal_unit - if (scan(internal_unit,"""'").ne.0) call abort + if (i.eq.2 .and. internal_unit .ne. " MYSTRING=mon tue wed thu fri ,") call abort + if (scan(internal_unit,"""'").ne.0) print *, internal_unit end do close(10) end program |