diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2017-08-22 01:02:15 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2017-08-22 01:02:15 +0000 |
| commit | bef016bff7ed63c87dedfcdeac0e00653de3565a (patch) | |
| tree | 7dbdbdbd1d20c200d72d383fb98cd9534dc3e20e /gcc/fortran/trans-io.c | |
| parent | 4f1aa9fbd40bc474ca1f757f8787762626e5e80a (diff) | |
| download | gcc-bef016bff7ed63c87dedfcdeac0e00653de3565a.zip gcc-bef016bff7ed63c87dedfcdeac0e00653de3565a.tar.gz gcc-bef016bff7ed63c87dedfcdeac0e00653de3565a.tar.bz2 | |
re PR fortran/81296 (derived type I/o problem)
2017-08-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/81296
* trans-io.c (get_dtio_proc): Add check for format label and set
formatted flag accordingly. Reorganize the code a little.
* gfortran.dg/dtio_12.f90: Update test.
From-SVN: r251254
Diffstat (limited to 'gcc/fortran/trans-io.c')
| -rw-r--r-- | gcc/fortran/trans-io.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index c3c56f2..aa974eb 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -2214,18 +2214,24 @@ get_dtio_proc (gfc_typespec * ts, gfc_code * code, gfc_symbol **dtio_sub) bool formatted = false; gfc_dt *dt = code->ext.dt; - if (dt && dt->format_expr) + if (dt) { - char *fmt; - fmt = gfc_widechar_to_char (dt->format_expr->value.character.string, - -1); - if (strtok (fmt, "DT") != NULL) + char *fmt = NULL; + + if (dt->format_label == &format_asterisk) + { + /* List directed io must call the formatted DTIO procedure. */ + formatted = true; + } + else if (dt->format_expr) + fmt = gfc_widechar_to_char (dt->format_expr->value.character.string, + -1); + else if (dt->format_label) + fmt = gfc_widechar_to_char (dt->format_label->format->value.character.string, + -1); + if (fmt && strtok (fmt, "DT") != NULL) formatted = true; - } - else if (dt && dt->format_label == &format_asterisk) - { - /* List directed io must call the formatted DTIO procedure. */ - formatted = true; + } if (ts->type == BT_CLASS) |