diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-05-24 06:11:21 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-05-24 06:11:21 +0000 |
| commit | e3f365343fa1c2a9469fdd9526b171eeab0c1752 (patch) | |
| tree | e03b0fad5c3cb032e3479dd8b183c841dd06d8ed /libgfortran | |
| parent | 85d5c27d78e0698914c3442acf7273c4ea4b1863 (diff) | |
| download | gcc-e3f365343fa1c2a9469fdd9526b171eeab0c1752.zip gcc-e3f365343fa1c2a9469fdd9526b171eeab0c1752.tar.gz gcc-e3f365343fa1c2a9469fdd9526b171eeab0c1752.tar.bz2 | |
re PR libfortran/70684 (incorrect reading of values from file on Windows)
2016-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/70684
* io/list_read (eat_spaces): Eat '\r' as part of spaces.
* gfortran.dg/namelist_90.f: New test
From-SVN: r236628
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6d16d64..549a5aa 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,8 +1,12 @@ +2016-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libgfortran/70684 + * io/list_read (eat_spaces): Eat '\r' as part of spaces. + 2016-04-19 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/70684 * io/list_read (check_buffers): Add '\r' to check for end of line. - factor. 2016-03-30 Jerry DeLisle <jvdelisle@gcc.gnu.org> Dominique d'Humieres <dominiq@lps.ens.fr> diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index b8e174c..244430d 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -418,7 +418,7 @@ eat_spaces (st_parameter_dt *dtp) /* Now skip spaces, EOF and EOL are handled in next_char. */ do c = next_char (dtp); - while (c != EOF && (c == ' ' || c == '\t')); + while (c != EOF && (c == ' ' || c == '\r' || c == '\t')); unget_char (dtp, c); return c; |