From 09e40ffe1005b4f546d3530cd3f7e2f11814dc74 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Fri, 21 Mar 2014 22:19:44 +0000 Subject: [PATCH] re PR fortran/60148 (strings in NAMELIST do not honor DELIM= in open statement) 2014-03-21 Jerry DeLisle 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 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/io/transfer.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 2dcea7d94bb..6d92f9a655f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2014-03-21 Jerry DeLisle + + 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 * configure.ac: Check for presence of fcntl. diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index cadbcabeda4..cfe92ca0655 100644 --- 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; }