diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-11-07 03:06:20 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-11-07 03:06:20 +0000 |
| commit | 67732fbced89c42dabea4a3bc160da80d0db046a (patch) | |
| tree | feabf2ec8e1c3d38e1b267137d531abd42748a24 /libgfortran/io/transfer.c | |
| parent | ce6c0a20b5875c18a8416d60950febea76a4b9d3 (diff) | |
| download | gcc-67732fbced89c42dabea4a3bc160da80d0db046a.zip gcc-67732fbced89c42dabea4a3bc160da80d0db046a.tar.gz gcc-67732fbced89c42dabea4a3bc160da80d0db046a.tar.bz2 | |
re PR libfortran/90374 (Fortran 2018: Support d0.d, e0.d, es0.d, en0.d, g0.d and ew.d e0 edit descriptors for output)
2019-11-06 Jerry DeLisle <jvdelisle@gcc.ngu.org>
PR fortran/90374
* io.c (check_format): Allow zero width for D, E, EN, and ES
specifiers as default and when -std=F2018 is given. Retain
existing errors when using the -fdec family of flags.
* libgfortran/io/format.c (parse_format_list): Relax format checking for
zero width as default and when -std=f2018.
io/format.h (format_token): Move definition to io.h.
io/io.h (format_token): Add definition here to allow access to
this definition at higher levels. Rename the declaration of
write_real_g0 to write_real_w0 and add a new format_token
argument, allowing higher level functions to pass in the
token for handling of g0 vs the other zero width specifiers.
io/transfer.c (formatted_transfer_scalar_write): Add checks for
zero width and call write_real_w0 to handle it.
io/write.c (write_real_g0): Remove.
(write_real_w0): Add new, same as previous write_real_g0 except
check format token to handle the g0 case.
* gfortran.dg/fmt_error_10.f: Modify for new constraints.
* gfortran.dg/fmt_error_7.f: Add dg-options "-std=f95".
* gfortran.dg/fmt_error_9.f: Modify for new constraints.
* gfortran.dg/fmt_zero_width.f90: New test.
From-SVN: r277905
Diffstat (limited to 'libgfortran/io/transfer.c')
| -rw-r--r-- | libgfortran/io/transfer.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 4c5e210..6382d0d 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -2008,7 +2008,10 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin goto need_data; if (require_type (dtp, BT_REAL, type, f)) return; - write_d (dtp, f, p, kind); + if (f->u.real.w == 0) + write_real_w0 (dtp, p, kind, FMT_D, f->u.real.d); + else + write_d (dtp, f, p, kind); break; case FMT_DT: @@ -2071,7 +2074,10 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin goto need_data; if (require_type (dtp, BT_REAL, type, f)) return; - write_e (dtp, f, p, kind); + if (f->u.real.w == 0) + write_real_w0 (dtp, p, kind, FMT_E, f->u.real.d); + else + write_e (dtp, f, p, kind); break; case FMT_EN: @@ -2079,7 +2085,10 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin goto need_data; if (require_type (dtp, BT_REAL, type, f)) return; - write_en (dtp, f, p, kind); + if (f->u.real.w == 0) + write_real_w0 (dtp, p, kind, FMT_EN, f->u.real.d); + else + write_en (dtp, f, p, kind); break; case FMT_ES: @@ -2087,7 +2096,10 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin goto need_data; if (require_type (dtp, BT_REAL, type, f)) return; - write_es (dtp, f, p, kind); + if (f->u.real.w == 0) + write_real_w0 (dtp, p, kind, FMT_ES, f->u.real.d); + else + write_es (dtp, f, p, kind); break; case FMT_F: @@ -2117,7 +2129,7 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin break; case BT_REAL: if (f->u.real.w == 0) - write_real_g0 (dtp, p, kind, f->u.real.d); + write_real_w0 (dtp, p, kind, FMT_G, f->u.real.d); else write_d (dtp, f, p, kind); break; |