diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2024-07-24 10:29:08 -0700 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2024-07-28 19:05:58 +0200 |
| commit | a68e9d31f80ac189053319dd65095988ceb3336a (patch) | |
| tree | 39c4ad77ae9bb23ac5021ac1287a8381e7a2facb | |
| parent | a22bc48f22bf86187d22aa35ce0b1c5dd098a808 (diff) | |
| download | gcc-a68e9d31f80ac189053319dd65095988ceb3336a.zip gcc-a68e9d31f80ac189053319dd65095988ceb3336a.tar.gz gcc-a68e9d31f80ac189053319dd65095988ceb3336a.tar.bz2 | |
Fortran: Suppress wrong End Of File error with user defined IO.
PR libfortran/105361
libgfortran/ChangeLog:
* io/list_read.c (finish_list_read): Add a condition check for
a user defined derived type IO operation to avoid calling the
EOF error.
gcc/testsuite/ChangeLog:
* gfortran.dg/pr105361.f90: New test.
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr105361.f90 | 41 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 3 |
2 files changed, 43 insertions, 1 deletions
diff --git a/gcc/testsuite/gfortran.dg/pr105361.f90 b/gcc/testsuite/gfortran.dg/pr105361.f90 new file mode 100644 index 0000000..e2d3b07 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105361.f90 @@ -0,0 +1,41 @@ +! { dg-do run } + +module x + implicit none + type foo + real :: r + end type foo + interface read(formatted) + module procedure read_formatted + end interface read(formatted) +contains + subroutine read_formatted (dtv, unit, iotype, vlist, iostat, iomsg) + class (foo), intent(inout) :: dtv + integer, intent(in) :: unit + character (len=*), intent(in) :: iotype + integer, intent(in) :: vlist(:) + integer, intent(out) :: iostat + character (len=*), intent(inout) :: iomsg + read (unit,*,iostat=iostat,iomsg=iomsg) dtv%r + !print *,dtv%r + end subroutine read_formatted +end module x + +program main + use x + implicit none + type(foo) :: a, b + real :: c, d + open(10, access="stream") + write(10) "1 2" ! // NEW_LINE('A') + close(10) + open(10) + read(10,*) c, d + if ((c /= 1.0) .or. (d /= 2.0)) stop 1 + rewind(10) + !print *, c,d + read (10,*) a, b + close(10, status="delete") + if ((a%r /= 1.0) .or. (b%r /= 2.0)) stop 2 + !print *, a,b +end program main diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 5bbbef2..96b2efe 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2431,7 +2431,8 @@ finish_list_read (st_parameter_dt *dtp) /* Set the next_char and push_char worker functions. */ set_workers (dtp); - if (likely (dtp->u.p.child_saved_iostat == LIBERROR_OK)) + if (likely (dtp->u.p.child_saved_iostat == LIBERROR_OK) + && ((dtp->common.flags & IOPARM_DT_HAS_UDTIO) == 0)) { c = next_char (dtp); if (c == EOF) |