aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2011-08-18 16:23:41 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2011-08-18 16:23:41 +0200
commita2f3eae24de6e78302ea2b10c3f57635ca954ec2 (patch)
tree3a4715f06a5a521be4ad8ca35bbf677fe8012264 /libgfortran
parent4dee97188f81ded9083171093ec08484f0ddd594 (diff)
downloadgcc-a2f3eae24de6e78302ea2b10c3f57635ca954ec2.zip
gcc-a2f3eae24de6e78302ea2b10c3f57635ca954ec2.tar.gz
gcc-a2f3eae24de6e78302ea2b10c3f57635ca954ec2.tar.bz2
re PR fortran/50109 (Formatted namelist read with multiple "!" fails with: Cannot match namelist object name !)
2011-08-18 Tobias Burnus <burnus@net-b.de> PR fortran/50109 * io/list_read.c (eat_separator): Fix skipping over "!" lines. 2011-08-18 Tobias Burnus <burnus@net-b.de> PR fortran/50109 * gfortran.dg/namelist_73.f90: New. From-SVN: r177858
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/io/list_read.c11
2 files changed, 6 insertions, 10 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index a30f264..f846b08 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-18 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/50109
+ * io/list_read.c (eat_separator): Fix skipping over "!" lines.
+
2011-07-23 Andreas Schwab <schwab@linux-m68k.org>
* intrinsics/ctime.c: Include <stdlib.h>.
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 01272d0..11a35c9 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -351,16 +351,7 @@ eat_separator (st_parameter_dt *dtp)
err = eat_line (dtp);
if (err)
return err;
- if ((c = next_char (dtp)) == EOF)
- return LIBERROR_END;
- if (c == '!')
- {
- err = eat_line (dtp);
- if (err)
- return err;
- if ((c = next_char (dtp)) == EOF)
- return LIBERROR_END;
- }
+ c = '\n';
}
}
while (c == '\n' || c == '\r' || c == ' ' || c == '\t');