|
 |
3db796 |
commit 366dbfaa2132186e5e8b0688df05662967e628c7
|
|
|
3db796 |
Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
|
3db796 |
Date: Wed Mar 28 11:59:06 2018 +0000
|
|
|
3db796 |
|
|
|
3db796 |
* gfortran.h (gfc_dt): Rename default_exp field to dec_ext.
|
|
|
3db796 |
* ioparm.def (IOPARM_dt_default_exp): Rename to ...
|
|
|
3db796 |
(IOPARM_dt_dec_ext): ... this.
|
|
|
3db796 |
* trans-io.c (build_dt): Adjust for default_exp renaming to
|
|
|
3db796 |
dec_ext and IOPARM_dt_default_exp renaming to IOPARM_dt_dec_ext.
|
|
|
3db796 |
* io.c (match_io): Likewise.
|
|
|
3db796 |
|
|
|
3db796 |
* io/io.h (IOPARM_DT_DEFAULT_EXP): Rename to ...
|
|
|
3db796 |
(IOPARM_DT_DEC_EXT): ... this.
|
|
|
3db796 |
* io/list_read.c (parse_real): Adjust for IOPARM_DT_DEFAULT_EXP
|
|
|
3db796 |
renaming to IOPARM_DT_DEC_EXT.
|
|
|
3db796 |
(read_real): Likewise.
|
|
|
3db796 |
* io/read.c (read_f): Likewise.
|
|
|
3db796 |
|
|
|
3db796 |
|
|
|
3db796 |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258920 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
3db796 |
|
|
|
3db796 |
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
|
|
|
3db796 |
index 2bfd1e3019d..507570ccbff 100644
|
|
|
3db796 |
--- a/gcc/fortran/gfortran.h
|
|
|
3db796 |
+++ b/gcc/fortran/gfortran.h
|
|
|
3db796 |
@@ -2437,7 +2437,7 @@ typedef struct
|
|
|
3db796 |
gfc_expr *io_unit, *format_expr, *rec, *advance, *iostat, *size, *iomsg,
|
|
|
3db796 |
*id, *pos, *asynchronous, *blank, *decimal, *delim, *pad, *round,
|
|
|
3db796 |
*sign, *extra_comma, *dt_io_kind, *udtio;
|
|
|
3db796 |
- char default_exp;
|
|
|
3db796 |
+ char dec_ext;
|
|
|
3db796 |
|
|
|
3db796 |
gfc_symbol *namelist;
|
|
|
3db796 |
/* A format_label of `format_asterisk' indicates the "*" format */
|
|
|
3db796 |
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
|
|
|
3db796 |
index 10b7e827dab..0aa31bb6a4f 100644
|
|
|
3db796 |
--- a/gcc/fortran/io.c
|
|
|
3db796 |
+++ b/gcc/fortran/io.c
|
|
|
3db796 |
@@ -4291,9 +4291,10 @@ get_io_list:
|
|
|
3db796 |
goto syntax;
|
|
|
3db796 |
}
|
|
|
3db796 |
|
|
|
3db796 |
- /* See if we want to use defaults for missing exponents in real transfers. */
|
|
|
3db796 |
+ /* See if we want to use defaults for missing exponents in real transfers
|
|
|
3db796 |
+ and other DEC runtime extensions. */
|
|
|
3db796 |
if (flag_dec)
|
|
|
3db796 |
- dt->default_exp = 1;
|
|
|
3db796 |
+ dt->dec_ext = 1;
|
|
|
3db796 |
|
|
|
3db796 |
/* A full IO statement has been matched. Check the constraints. spec_end is
|
|
|
3db796 |
supplied for cases where no locus is supplied. */
|
|
|
3db796 |
diff --git a/gcc/fortran/ioparm.def b/gcc/fortran/ioparm.def
|
|
|
3db796 |
index b9dc58f26a7..9ab3b58946e 100644
|
|
|
3db796 |
--- a/gcc/fortran/ioparm.def
|
|
|
3db796 |
+++ b/gcc/fortran/ioparm.def
|
|
|
3db796 |
@@ -118,5 +118,5 @@ IOPARM (dt, round, 1 << 23, char2)
|
|
|
3db796 |
IOPARM (dt, sign, 1 << 24, char1)
|
|
|
3db796 |
#define IOPARM_dt_f2003 (1 << 25)
|
|
|
3db796 |
#define IOPARM_dt_dtio (1 << 26)
|
|
|
3db796 |
-#define IOPARM_dt_default_exp (1 << 27)
|
|
|
3db796 |
+#define IOPARM_dt_dec_ext (1 << 27)
|
|
|
3db796 |
IOPARM (dt, u, 0, pad)
|
|
|
3db796 |
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
|
|
|
3db796 |
index 9058712c695..2626c4651e2 100644
|
|
|
3db796 |
--- a/gcc/fortran/trans-io.c
|
|
|
3db796 |
+++ b/gcc/fortran/trans-io.c
|
|
|
3db796 |
@@ -1958,8 +1958,8 @@ build_dt (tree function, gfc_code * code)
|
|
|
3db796 |
if (dt->udtio)
|
|
|
3db796 |
mask |= IOPARM_dt_dtio;
|
|
|
3db796 |
|
|
|
3db796 |
- if (dt->default_exp)
|
|
|
3db796 |
- mask |= IOPARM_dt_default_exp;
|
|
|
3db796 |
+ if (dt->dec_ext)
|
|
|
3db796 |
+ mask |= IOPARM_dt_dec_ext;
|
|
|
3db796 |
|
|
|
3db796 |
if (dt->namelist)
|
|
|
3db796 |
{
|
|
|
3db796 |
diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
|
|
|
3db796 |
index 3c2a2cae38a..ccbaf47ff90 100644
|
|
|
3db796 |
--- a/libgfortran/io/io.h
|
|
|
3db796 |
+++ b/libgfortran/io/io.h
|
|
|
3db796 |
@@ -442,7 +442,7 @@ st_parameter_inquire;
|
|
|
3db796 |
#define IOPARM_DT_HAS_SIGN (1 << 24)
|
|
|
3db796 |
#define IOPARM_DT_HAS_F2003 (1 << 25)
|
|
|
3db796 |
#define IOPARM_DT_HAS_UDTIO (1 << 26)
|
|
|
3db796 |
-#define IOPARM_DT_DEFAULT_EXP (1 << 27)
|
|
|
3db796 |
+#define IOPARM_DT_DEC_EXT (1 << 27)
|
|
|
3db796 |
/* Internal use bit. */
|
|
|
3db796 |
#define IOPARM_DT_IONML_SET (1u << 31)
|
|
|
3db796 |
|
|
|
3db796 |
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
|
|
|
3db796 |
index d052d1fa828..300c3bd23f3 100644
|
|
|
3db796 |
--- a/libgfortran/io/list_read.c
|
|
|
3db796 |
+++ b/libgfortran/io/list_read.c
|
|
|
3db796 |
@@ -1380,7 +1380,7 @@ parse_real (st_parameter_dt *dtp, void *buffer, int length)
|
|
|
3db796 |
if (!isdigit (c))
|
|
|
3db796 |
{
|
|
|
3db796 |
/* Extension: allow default exponent of 0 when omitted. */
|
|
|
3db796 |
- if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
|
|
|
3db796 |
+ if (dtp->common.flags & IOPARM_DT_DEC_EXT)
|
|
|
3db796 |
{
|
|
|
3db796 |
push_char (dtp, '0');
|
|
|
3db796 |
goto done;
|
|
|
3db796 |
@@ -1831,7 +1831,7 @@ read_real (st_parameter_dt *dtp, void *dest, int length)
|
|
|
3db796 |
if (!isdigit (c))
|
|
|
3db796 |
{
|
|
|
3db796 |
/* Extension: allow default exponent of 0 when omitted. */
|
|
|
3db796 |
- if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
|
|
|
3db796 |
+ if (dtp->common.flags & IOPARM_DT_DEC_EXT)
|
|
|
3db796 |
{
|
|
|
3db796 |
push_char (dtp, '0');
|
|
|
3db796 |
goto done;
|
|
|
3db796 |
diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
|
|
|
3db796 |
index 87adfb8a41d..976020af448 100644
|
|
|
3db796 |
--- a/libgfortran/io/read.c
|
|
|
3db796 |
+++ b/libgfortran/io/read.c
|
|
|
3db796 |
@@ -1093,7 +1093,7 @@ exponent:
|
|
|
3db796 |
if (w == 0)
|
|
|
3db796 |
{
|
|
|
3db796 |
/* Extension: allow default exponent of 0 when omitted. */
|
|
|
3db796 |
- if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
|
|
|
3db796 |
+ if (dtp->common.flags & IOPARM_DT_DEC_EXT)
|
|
|
3db796 |
goto done;
|
|
|
3db796 |
else
|
|
|
3db796 |
goto bad_float;
|