diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2017-12-03 16:47:12 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2017-12-03 16:47:12 +0000 |
| commit | c4508d0ad7fb8fe23517a6b5e874c4573fdec8a0 (patch) | |
| tree | 20e444c84db177bd87ead91a4dd32bcdd4acf3c4 /libgfortran/io/write.c | |
| parent | 7c731281574f7d89c6fed487fe646176603ad98f (diff) | |
| download | gcc-c4508d0ad7fb8fe23517a6b5e874c4573fdec8a0.zip gcc-c4508d0ad7fb8fe23517a6b5e874c4573fdec8a0.tar.gz gcc-c4508d0ad7fb8fe23517a6b5e874c4573fdec8a0.tar.bz2 | |
re PR fortran/83191 (Writing a namelist with repeated complex numbers)
2017-12-03 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Dominique d'Humieres <dominiq@lps.ens.fr>
PR libgfortran/83191
* io/transfer.c (list_formatted_read_scalar): Do not set
namelist_mode bit here. (namelist_read): Likewise.
(data_transfer_init): Clear the mode bit here.
(finalize_transfer): Do set the mode bit just before any calls
to namelist_read or namelist_write. It can now be referred to
in complex_write.
^ io/write.c (write_complex): Suppress the leading blanks when
namelist_mode bit is not set to 1.
* gfortran.dg/namelist_95.f90: New test.
Co-Authored-By: Dominique d'Humieres <dominiq@lps.ens.fr>
From-SVN: r255365
Diffstat (limited to 'libgfortran/io/write.c')
| -rw-r--r-- | libgfortran/io/write.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 582d196..926d510 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1809,9 +1809,11 @@ write_complex (st_parameter_dt *dtp, const char *source, int kind, size_t size) precision, buf_size, result1, &res_len1); get_float_string (dtp, &f, source + size / 2 , kind, 0, buffer, precision, buf_size, result2, &res_len2); - lblanks = width - res_len1 - res_len2 - 3; - - write_x (dtp, lblanks, lblanks); + if (!dtp->u.p.namelist_mode) + { + lblanks = width - res_len1 - res_len2 - 3; + write_x (dtp, lblanks, lblanks); + } write_char (dtp, '('); write_float_string (dtp, result1, res_len1); write_char (dtp, semi_comma); |