diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-03-28 13:59:06 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-03-28 13:59:06 +0200 |
| commit | 7ee4f6f3ec4c51221a8fc44f98f5da4c95f779ae (patch) | |
| tree | ae5de4e2be1e263ebdf5ccaeda1ee67d7c62326b /gcc | |
| parent | 5b1a758d26d594569fbf2ca1381fa27ec416fd23 (diff) | |
| download | gcc-7ee4f6f3ec4c51221a8fc44f98f5da4c95f779ae.zip gcc-7ee4f6f3ec4c51221a8fc44f98f5da4c95f779ae.tar.gz gcc-7ee4f6f3ec4c51221a8fc44f98f5da4c95f779ae.tar.bz2 | |
gfortran.h (gfc_dt): Rename default_exp field to dec_ext.
* gfortran.h (gfc_dt): Rename default_exp field to dec_ext.
* ioparm.def (IOPARM_dt_default_exp): Rename to ...
(IOPARM_dt_dec_ext): ... this.
* trans-io.c (build_dt): Adjust for default_exp renaming to
dec_ext and IOPARM_dt_default_exp renaming to IOPARM_dt_dec_ext.
* io.c (match_io): Likewise.
* io/io.h (IOPARM_DT_DEFAULT_EXP): Rename to ...
(IOPARM_DT_DEC_EXT): ... this.
* io/list_read.c (parse_real): Adjust for IOPARM_DT_DEFAULT_EXP
renaming to IOPARM_DT_DEC_EXT.
(read_real): Likewise.
* io/read.c (read_f): Likewise.
From-SVN: r258920
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 2 | ||||
| -rw-r--r-- | gcc/fortran/io.c | 5 | ||||
| -rw-r--r-- | gcc/fortran/ioparm.def | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans-io.c | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b88b27b..85fcaae 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2018-03-28 Jakub Jelinek <jakub@redhat.com> + + * gfortran.h (gfc_dt): Rename default_exp field to dec_ext. + * ioparm.def (IOPARM_dt_default_exp): Rename to ... + (IOPARM_dt_dec_ext): ... this. + * trans-io.c (build_dt): Adjust for default_exp renaming to + dec_ext and IOPARM_dt_default_exp renaming to IOPARM_dt_dec_ext. + * io.c (match_io): Likewise. + 2018-03-27 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/85084 diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 2bfd1e3..507570c 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -2437,7 +2437,7 @@ typedef struct gfc_expr *io_unit, *format_expr, *rec, *advance, *iostat, *size, *iomsg, *id, *pos, *asynchronous, *blank, *decimal, *delim, *pad, *round, *sign, *extra_comma, *dt_io_kind, *udtio; - char default_exp; + char dec_ext; gfc_symbol *namelist; /* A format_label of `format_asterisk' indicates the "*" format */ diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 10b7e82..0aa31bb 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -4291,9 +4291,10 @@ get_io_list: goto syntax; } - /* See if we want to use defaults for missing exponents in real transfers. */ + /* See if we want to use defaults for missing exponents in real transfers + and other DEC runtime extensions. */ if (flag_dec) - dt->default_exp = 1; + dt->dec_ext = 1; /* A full IO statement has been matched. Check the constraints. spec_end is supplied for cases where no locus is supplied. */ diff --git a/gcc/fortran/ioparm.def b/gcc/fortran/ioparm.def index b9dc58f..9ab3b58 100644 --- a/gcc/fortran/ioparm.def +++ b/gcc/fortran/ioparm.def @@ -118,5 +118,5 @@ IOPARM (dt, round, 1 << 23, char2) IOPARM (dt, sign, 1 << 24, char1) #define IOPARM_dt_f2003 (1 << 25) #define IOPARM_dt_dtio (1 << 26) -#define IOPARM_dt_default_exp (1 << 27) +#define IOPARM_dt_dec_ext (1 << 27) IOPARM (dt, u, 0, pad) diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index 9058712..2626c46 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -1958,8 +1958,8 @@ build_dt (tree function, gfc_code * code) if (dt->udtio) mask |= IOPARM_dt_dtio; - if (dt->default_exp) - mask |= IOPARM_dt_default_exp; + if (dt->dec_ext) + mask |= IOPARM_dt_dec_ext; if (dt->namelist) { |