re PR fortran/84389 (Defined output: unexpected compiler error with the use of "...

2018-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/84389
	* io.c (check_format): Allow FMT_COLON.

	* gfortran.dg/dtio_33.f90: New test.

From-SVN: r257795

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8ecc90af879225b224f2a32833754ad10cb2ff2c..01f9c5e6065d4669b85f96ab3293bbc7d99a1493 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/84389
+       * io.c (check_format): Allow FMT_COLON.
+
 2018-02-18  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/80945

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 9b7c2de16f440f4bcce1362ae20c4c5bc36d32aa..d9f0fb1d4ac9e35ba5d1ad8bcadc7b74be82925d 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -985,6 +985,9 @@ data_desc:
        case FMT_COMMA:
          goto format_item;
 
+       case FMT_COLON:
+         goto format_item_1;
+
        case FMT_LPAREN:
 
   dtio_vlist:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 274bd74b1a4415156837505dea33eca1c7a930cb..50643570f3df57e6394de2cd0efd0d0b08e21dd8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/84389
+       * gfortran.dg/dtio_33.f90: New test.
+
 2018-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libgfortran/84412

diff --git a/gcc/testsuite/gfortran.dg/dtio_33.f90 b/gcc/testsuite/gfortran.dg/dtio_33.f90
new file mode 100644 (file)
index 0000000..2deca43
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dtio_33.f90
@@ -0,0 +1,28 @@
+! { dg-do run }
+! PR84389 rejected valid use of ':' in format
+module m
+   type :: t
+   integer :: i
+   contains
+      procedure, pass(this) :: write_t
+      generic, public :: write(formatted) => write_t
+   end type
+contains
+   subroutine write_t(this, lun, iotype, vlist, istat, imsg)
+      ! argument definitions
+      class(t), intent(in)            :: this
+      integer, intent(in)             :: lun
+      character(len=*), intent(in)    :: iotype
+      integer, intent(in)             :: vlist(:)
+      integer, intent(out)            :: istat
+      character(len=*), intent(inout) :: imsg
+      write(lun, fmt=*, iostat=istat, iomsg=imsg) "Hello World!"
+   end subroutine write_t
+end module
+program p
+   use m, only : t
+   character(50) :: str
+   type(t) :: foo(2)
+   write(str, "(*(dt:,','))") foo
+   if (str.ne." Hello World!, Hello World!") stop 1
+end program