diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-25 15:13:25 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-25 15:13:25 +0000 |
| commit | 18a2c293da3a27ff303a67ef7e610145e914e444 (patch) | |
| tree | 0d68d47c3efd09f056898b183cdfed46a6e9ebd3 /libgfortran | |
| parent | be4beff1fd988b04b84bad1ce00d3e46fff51aab (diff) | |
| download | gcc-18a2c293da3a27ff303a67ef7e610145e914e444.tar.gz | |
2009-03-25 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r15061
* gcc/basilys.h: (ppl_Coefficient_t, ppl_Linear_Expression_t)
(ppl_Constraint_t, ppl_Constraint_System_t, ppl_Generator_t)
(ppl_Generator_System_t): typedef copied from <ppl_c.h>.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@145063 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 4613306ce79..500280604f0 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2009-03-24 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libfortran/39528 + * io/list_read.c (list_formatted_read_scalar): Move check for read + completion to just after the check for a repeated value. + 2009-03-08 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/39402 diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 1f1023c10d2..6b22d34a0b6 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 +/* Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Andy Vaught Namelist input contributed by Paul Thomas @@ -1720,9 +1720,6 @@ list_formatted_read_scalar (st_parameter_dt *dtp, volatile bt type, void *p, } else { - if (dtp->u.p.input_complete) - goto cleanup; - if (dtp->u.p.repeat_count > 0) { if (check_type (dtp, type, kind)) @@ -1730,6 +1727,9 @@ list_formatted_read_scalar (st_parameter_dt *dtp, volatile bt type, void *p, goto set_value; } + if (dtp->u.p.input_complete) + goto cleanup; + if (dtp->u.p.at_eol) finish_separator (dtp); else |