re PR fortran/60148 (strings in NAMELIST do not honor DELIM= in open statement)

2014-03-21  Jerry DeLisle  <jvdelisle@gcc.gnu>

	PR libfortran/60148
	* io/transfer.c (data_transfer_init): If std= was specified, set
	delim status to DELIM_NONE of no other was specified.

From-SVN: r208759

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2dcea7d94bb96a1531ba868a931b2772d3b8d24e..6d92f9a655fe997b92b275ef06ba6c7d7b6bcb6c 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-21  Jerry DeLisle  <jvdelisle@gcc.gnu>
+
+       PR libfortran/60148
+       * io/transfer.c (data_transfer_init): If std= was specified, set
+       delim status to DELIM_NONE of no other was specified.
+
 2014-03-18  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * configure.ac: Check for presence of fcntl.

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index cadbcabeda42f3a8354256e5c531c7ab6cbd80ac..cfe92ca06552df80571aa28dc165db61a683f387 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -2674,7 +2674,8 @@ data_transfer_init (st_parameter_dt *dtp, int read_flag)
   if (dtp->u.p.current_unit->delim_status == DELIM_UNSPECIFIED)
     {
       if (ionml && dtp->u.p.current_unit->flags.delim == DELIM_UNSPECIFIED)
-       dtp->u.p.current_unit->delim_status = DELIM_QUOTE;
+       dtp->u.p.current_unit->delim_status =
+         compile_options.allow_std & GFC_STD_GNU ? DELIM_QUOTE : DELIM_NONE;
       else
        dtp->u.p.current_unit->delim_status = dtp->u.p.current_unit->flags.delim;
     }