diff options
author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2014-05-07 01:31:42 +0000 |
---|---|---|
committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2014-05-07 01:31:42 +0000 |
commit | 022275639339eada225fbad59322cdb523aedd46 (patch) | |
tree | de2bbbd9e319ef8e13d5e245dbe94cfa6f0587b3 /libgfortran/io | |
parent | f03d1bb9cb133152bec127a1e6fef3da263d075f (diff) | |
download | gcc-022275639339eada225fbad59322cdb523aedd46.zip gcc-022275639339eada225fbad59322cdb523aedd46.tar.gz gcc-022275639339eada225fbad59322cdb523aedd46.tar.bz2 |
re PR libfortran/61049 (NIST test FM906 fails)
2014-05-06 Jerry DeLisle <jvdelisle@gcc.gnu>
PR libfortran/61049
* io/list_read.c (list_formatted_read_scalar): Use eat_separator
and delete extraneous code.
From-SVN: r210134
Diffstat (limited to 'libgfortran/io')
-rw-r--r-- | libgfortran/io/list_read.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index b052c06..893815e 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2054,20 +2054,9 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, } if (is_separator (c)) { - /* Found a null value. Do not use eat_separator here otherwise - we will do an extra read from stdin. */ + /* Found a null value. */ dtp->u.p.repeat_count = 0; - - /* Set comma_flag. */ - if ((c == ';' - && dtp->u.p.current_unit->decimal_status == DECIMAL_COMMA) - || - (c == ',' - && dtp->u.p.current_unit->decimal_status == DECIMAL_POINT)) - { - dtp->u.p.comma_flag = 1; - goto cleanup; - } + eat_separator (dtp); /* Set end-of-line flag. */ if (c == '\n' || c == '\r') @@ -2082,7 +2071,6 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, else goto cleanup; } - } else { |