aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry DeLisle <jvdelisle@gcc.gnu.org>2014-03-21 22:19:44 +0000
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2014-03-21 22:19:44 +0000
commit09e40ffe1005b4f546d3530cd3f7e2f11814dc74 (patch)
treea864f5e30903844711d63682be1f1973b173b564
parente6e2778862bd82c03fd192682901b5b273955ca4 (diff)
downloadgcc-09e40ffe1005b4f546d3530cd3f7e2f11814dc74.zip
gcc-09e40ffe1005b4f546d3530cd3f7e2f11814dc74.tar.gz
gcc-09e40ffe1005b4f546d3530cd3f7e2f11814dc74.tar.bz2
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
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/io/transfer.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2dcea7d..6d92f9a 100644
--- 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 cadbcab..cfe92ca 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;
}