diff options
| author | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-23 00:40:51 +0000 |
|---|---|---|
| committer | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-23 00:40:51 +0000 |
| commit | 14b5bae1fd51987b27a755138c7155f54591dbf2 (patch) | |
| tree | e5e8c746f9bcb41da40d8a8a3636e8972be8c2aa | |
| parent | e46a3ff0012318f047b5efee226268bdfd129c5e (diff) | |
| download | gcc-14b5bae1fd51987b27a755138c7155f54591dbf2.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230734 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/fmt_t_8.f90 | 6 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 11 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3074642b247..5c670114c74 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + * gfortran.dg/fmt_t_8.f90: New test. + 2015-11-23 Kugan Vivekanandarajah <kuganv@linaro.org> PR target/68390 diff --git a/gcc/testsuite/gfortran.dg/fmt_t_8.f90 b/gcc/testsuite/gfortran.dg/fmt_t_8.f90 new file mode 100644 index 00000000000..d56d19bb364 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/fmt_t_8.f90 @@ -0,0 +1,6 @@ +! { dg-do run } +! PR52251 Tabs with advance = 'no' +write( *, '( t25 )', advance = 'no' ) +write( *, '( "hello" )' ) ! { dg-output " hello(\n|\r\n|\r)" } +end + diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f90d5301df8..48db71b8df7 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 746bb6dcc6c..94f1edaa679 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 = |