diff options
author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2015-11-23 00:40:51 +0000 |
---|---|---|
committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2015-11-23 00:40:51 +0000 |
commit | 6e9966e8303f5f39870a11d96a64b376a2fab347 (patch) | |
tree | e5e8c746f9bcb41da40d8a8a3636e8972be8c2aa /libgfortran | |
parent | b9eaa775ca199b995fe1290aa012dbb9e82e8199 (diff) | |
download | gcc-6e9966e8303f5f39870a11d96a64b376a2fab347.zip gcc-6e9966e8303f5f39870a11d96a64b376a2fab347.tar.gz gcc-6e9966e8303f5f39870a11d96a64b376a2fab347.tar.bz2 |
re PR fortran/52251 (Nonadvancing I/O and the t edit descriptor)
2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/52251
* io/transfer.c (formatted_transfer_scalar_write): Reset skips count.
(finalize_transfer): For ADVANCE_NO, emit pending spaces and reset the
skip count.
2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* gfortran.dg/fmt_t_8.f90: New test.
From-SVN: r230734
Diffstat (limited to 'libgfortran')
-rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
-rw-r--r-- | libgfortran/io/transfer.c | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f90d530..48db71b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,12 @@ 2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + PR libfortran/52251 + * io/transfer.c (formatted_transfer_scalar_write): Reset skips count. + (finalize_transfer): For ADVANCE_NO, emit pending spaces and reset the + skip count. + +2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + * io/write_float.def (output_float): Move block determining room for leading zero to before checkng g0 formatting. diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 746bb6d..94f1eda 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1641,6 +1641,7 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin - dtp->u.p.current_unit->bytes_left); dtp->u.p.max_pos = dtp->u.p.max_pos > tmp ? dtp->u.p.max_pos : tmp; + dtp->u.p.skips = 0; } if (dtp->u.p.skips < 0) { @@ -3600,6 +3601,16 @@ finalize_transfer (st_parameter_dt *dtp) next I/O operation if needed. */ if (dtp->u.p.advance_status == ADVANCE_NO) { + if (dtp->u.p.skips > 0) + { + int tmp; + write_x (dtp, dtp->u.p.skips, dtp->u.p.pending_spaces); + tmp = (int)(dtp->u.p.current_unit->recl + - dtp->u.p.current_unit->bytes_left); + dtp->u.p.max_pos = + dtp->u.p.max_pos > tmp ? dtp->u.p.max_pos : tmp; + dtp->u.p.skips = 0; + } int bytes_written = (int) (dtp->u.p.current_unit->recl - dtp->u.p.current_unit->bytes_left); dtp->u.p.current_unit->saved_pos = |