summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-20 10:55:03 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-20 10:55:03 +0000
commitd6da73039f46a29b59bb951c7fc56c4052c05d4c (patch)
tree6426d9088a34794eb37d2319f0f0768ab79ac42e /libgfortran
parentd51283e36424d4c473746cb6bfbdcbfc38b83571 (diff)
downloadgcc-d6da73039f46a29b59bb951c7fc56c4052c05d4c.tar.gz
2013-06-20 Tobias Burnus <burnus@net-b.de>
PR fortran/57633 * io/list_read.c (next_char, eat_separator): Don't set EOL for \r. 2013-06-20 Tobias Burnus <burnus@net-b.de> PR fortran/57633 * gfortran.dg/list_read_11.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200238 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/io/list_read.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d5ffcd2f03e..40f98d20599 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-20 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/57633
+ * io/list_read.c (next_char, eat_separator): Don't set EOL for \r.
+
2012-06-19 Uros Bizjak <ubizjak@gmail.com>
* config/fpu-387.h: Use __asm__ and __volatile__ consistently.
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index c8a1bdfc9d9..82a98a56e97 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -242,7 +242,7 @@ next_char (st_parameter_dt *dtp)
dtp->u.p.current_unit->strm_pos++;
}
done:
- dtp->u.p.at_eol = (c == '\n' || c == '\r' || c == EOF);
+ dtp->u.p.at_eol = (c == '\n' || c == EOF);
return c;
}
@@ -334,7 +334,6 @@ eat_separator (st_parameter_dt *dtp)
break;
case '\r':
- dtp->u.p.at_eol = 1;
if ((n = next_char(dtp)) == EOF)
return LIBERROR_END;
if (n != '\n')