diff options
author | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-21 21:23:52 +0000 |
---|---|---|
committer | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-21 21:23:52 +0000 |
commit | 4749905db26b07ca790a968c41f7e080f9c0dbd2 (patch) | |
tree | a2782d026ced11088ac3bddad90c020959504cdf /libgfortran/io/write.c | |
parent | 7133c3fde2b5fabad1d09481e852154a496543ae (diff) |
2008-12-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/38398
* io/io.h (st_parameter_dt): Add new bit to keep track of when to
suppress blanks for g0 formatting.
* io/transfer.c (formatted_transfer_scalar): Always call write_real_g0
for g0 formatting.
* io.c (write.c): Do not use ES formatting and use new bit to suppress
blanks.
* io/write_float.def (output_float): Adjust the location of setting the
width so that it can be adjusted when suppressing blanks. Set number of
blanks to zero when dtp->u.p.g0_no_blanks is set. Do some minor code
clean-up and add some white space for readability.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142871 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/io/write.c')
-rw-r--r-- | libgfortran/io/write.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 3cd67b39ba79..e3d38e638e80 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1010,13 +1010,12 @@ void write_real_g0 (st_parameter_dt *dtp, const char *source, int length, int d) { fnode f ; - int org_scale = dtp->u.p.scale_factor; - dtp->u.p.scale_factor = 1; set_fnode_default (dtp, &f, length); - f.format = FMT_ES; - f.u.real.d = d; + if (d > 0) + f.u.real.d = d; + dtp->u.p.g0_no_blanks = 1; write_float (dtp, &f, source , length); - dtp->u.p.scale_factor = org_scale; + dtp->u.p.g0_no_blanks = 0; } |