diff options
author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2005-05-29 14:22:49 +0200 |
---|---|---|
committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2005-05-29 12:22:49 +0000 |
commit | c9330b0331b05cb271bc9a18970d10894b370765 (patch) | |
tree | d80d5771a74496d12a3ce051f6bbac51455b8a76 /libgfortran/io/transfer.c | |
parent | 12bcc2c1d5754920bd84fd94425501264be56503 (diff) | |
download | gcc-c9330b0331b05cb271bc9a18970d10894b370765.zip gcc-c9330b0331b05cb271bc9a18970d10894b370765.tar.gz gcc-c9330b0331b05cb271bc9a18970d10894b370765.tar.bz2 |
re PR libfortran/20006 ($ format extension doesn't work)
PR libfortran/20006
* io.c (format_item_1): Add check and extension warning for
$ edit descriptor.
* io/format.c (parse_format_list): Set repeat count of $ format
node to 1.
* io/transfer.c (read_sf): Add g.seen_dollar to the test
concerning advancing I/O.
(data_transfer_init): Likewise.
(finalize_transfer): Likewise.
From-SVN: r100314
Diffstat (limited to 'libgfortran/io/transfer.c')
-rw-r--r-- | libgfortran/io/transfer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index b51da52..46bec83 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -191,7 +191,7 @@ read_sf (int *length) /* If we see an EOR during non-advancing I/O, we need to skip the rest of the I/O statement. Set the corresponding flag. */ - if (advance_status == ADVANCE_NO) + if (advance_status == ADVANCE_NO || g.seen_dollar) eor_condition = 1; /* Without padding, terminate the I/O statement without assigning @@ -1187,7 +1187,7 @@ data_transfer_init (int read_flag) } else { - if (advance_status == ADVANCE_YES) + if (advance_status == ADVANCE_YES && !g.seen_dollar) current_unit->read_bad = 1; } @@ -1459,11 +1459,12 @@ finalize_transfer (void) { free_fnodes (); - if (advance_status == ADVANCE_NO) + if (advance_status == ADVANCE_NO || g.seen_dollar) { /* Most systems buffer lines, so force the partial record to be written out. */ flush (current_unit->s); + g.seen_dollar = 0; return; } |