aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2004-08-31 14:56:09 +0000
committerPaul Brook <pbrook@gcc.gnu.org>2004-08-31 14:56:09 +0000
commitc789f36b216c9318b7f5fadb3a632f91513e3156 (patch)
treec1642cc23568ef73452f24fc424e0b5dddae9522
parentd7177ab25e9cfef12aa2b0e2a2f68d7f3c81735a (diff)
downloadgcc-c789f36b216c9318b7f5fadb3a632f91513e3156.zip
gcc-c789f36b216c9318b7f5fadb3a632f91513e3156.tar.gz
gcc-c789f36b216c9318b7f5fadb3a632f91513e3156.tar.bz2
list_read.c (eat_separator): Set at_eo when a '/' is seen.
* list_read.c (eat_separator): Set at_eo when a '/' is seen. testsuite/ * gfortran.dg/list_read_1.f90: New file. From-SVN: r86830
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gfortran.dg/list_read_1.f9022
-rw-r--r--libgfortran/ChangeLog4
-rw-r--r--libgfortran/io/list_read.c1
4 files changed, 31 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e6d1be..0bca0f1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31 Paul Brook <paul@codesourcery.com>
+
+ * gfortran.dg/list_read_1.f90: New file.
+
2004-08-30 Mark Mitchell <mark@codesourcery.com>
* g++.dg/opt/loop1.C: XFAIL.
diff --git a/gcc/testsuite/gfortran.dg/list_read_1.f90 b/gcc/testsuite/gfortran.dg/list_read_1.f90
new file mode 100644
index 0000000..6fba90a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/list_read_1.f90
@@ -0,0 +1,22 @@
+! { dg-do run }
+! Program to test terminators in list-directed input
+program list_read_1
+ character(len=5) :: s
+
+ open (unit=11, status="SCRATCH")
+ ! The / terminator was causing the next value to be skipped.
+ write (11, '(a)') " 42 /"
+ write (11, '(a)') " 43"
+ write (11, '(a)') " 44"
+
+ rewind(11)
+
+ read (11, *) i
+ if (i .ne. 42) call abort
+ read (11, *) i
+ if (i .ne. 43) call abort
+ read (11, *) i
+ if (i .ne. 44) call abort
+ close (11)
+end
+
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index ecc104e..28329d2 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31 Paul Brook <paul@codesourcery.com>
+
+ * list_read.c (eat_separator): Set at_eo when a '/' is seen.
+
2004-08-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
* libgfortran.h: Replace 'gfc_strlen_type' by
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 95b5b88..8b00a5e 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -210,6 +210,7 @@ eat_separator (void)
case '/':
input_complete = 1;
next_record (0);
+ at_eol = 1;
break;
case '\n':