diff options
Diffstat (limited to 'gcc-4.9/libgfortran')
-rw-r--r-- | gcc-4.9/libgfortran/ChangeLog | 7 | ||||
-rw-r--r-- | gcc-4.9/libgfortran/io/list_read.c | 16 |
2 files changed, 9 insertions, 14 deletions
diff --git a/gcc-4.9/libgfortran/ChangeLog b/gcc-4.9/libgfortran/ChangeLog index 91d283d6d..a70f9bb4a 100644 --- a/gcc-4.9/libgfortran/ChangeLog +++ b/gcc-4.9/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2014-05-10 Jerry DeLisle <jvdelisle@gcc.gnu> + + Backport from Trunk. + PR libfortran/61049 + * io/list_read.c (list_formatted_read_scalar): Use eat_separator + and delete extraneous code. + 2014-04-22 Release Manager * GCC 4.9.0 released. diff --git a/gcc-4.9/libgfortran/io/list_read.c b/gcc-4.9/libgfortran/io/list_read.c index 625ba0c85..2e739f2da 100644 --- a/gcc-4.9/libgfortran/io/list_read.c +++ b/gcc-4.9/libgfortran/io/list_read.c @@ -1923,20 +1923,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') @@ -1951,7 +1940,6 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, else goto cleanup; } - } else { |