diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 16 |
2 files changed, 8 insertions, 14 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index e78a498..003f7ca 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +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. + 2014-04-30 Tobias Burnus <burnus@net-b.de> * caf/libcaf.h (_gfortran_caf_this_image, _gfortran_caf_num_images): 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 { |