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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b88b27ba784981c8c7953875c3ce57912b94161e..85fcaae0890c13b0a2135b7bd272d05787cba95f 100644 (file)
--- 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 2bfd1e3019da5576cf212cb53093b725b1c4d5af..507570ccbff2c03b8b3c7972b30aaeb9a682fd63 100644 (file)
--- 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 10b7e827dab05967522c9e14a37ee5d6d3ae2e79..0aa31bb6a4f7830df35ebd71a91b5b81d4919bcb 100644 (file)
--- 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 b9dc58f26a7e4c14d61fe00356bc5b97d223959a..9ab3b58946e34ce3f29ebc567513bfc48b2f63ee 100644 (file)
--- 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 9058712c69558da71f2aa3925097101bf1c4ff67..2626c4651e2d78702cb156983fff54b35de5a7d2 100644 (file)
--- 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)
        {

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1c84d2b9fe20c500fe47da1367ad919dcf845e5d..8c6a71060ec6cbbf32df7b722036c33562c5bbad 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,12 @@
+2018-03-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * 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.
+
 2018-03-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR libgfortran/84880

diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 3c2a2cae38a3d1b5fe613626b3bac61dea985fb5..ccbaf47ff907ab5aa797c9bff4502df5f3bfc31f 100644 (file)
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -442,7 +442,7 @@ st_parameter_inquire;
 #define IOPARM_DT_HAS_SIGN                     (1 << 24)
 #define IOPARM_DT_HAS_F2003                     (1 << 25)
 #define IOPARM_DT_HAS_UDTIO                     (1 << 26)
-#define IOPARM_DT_DEFAULT_EXP                  (1 << 27)
+#define IOPARM_DT_DEC_EXT                      (1 << 27)
 /* Internal use bit.  */
 #define IOPARM_DT_IONML_SET                    (1u << 31)
 

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index d052d1fa828e313f2ed486e7609ad89048308930..300c3bd23f300465dc0a85143479f36737a75fc0 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -1380,7 +1380,7 @@ parse_real (st_parameter_dt *dtp, void *buffer, int length)
   if (!isdigit (c))
     {
       /* Extension: allow default exponent of 0 when omitted.  */
-      if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
+      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
        {
          push_char (dtp, '0');
          goto done;
@@ -1831,7 +1831,7 @@ read_real (st_parameter_dt *dtp, void *dest, int length)
   if (!isdigit (c))
     {
       /* Extension: allow default exponent of 0 when omitted.  */
-      if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
+      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
        {
          push_char (dtp, '0');
          goto done;

diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
index 87adfb8a41db1c9f776aa292788ee8786af623d5..976020af448019dbe236ffa5b521f83f1fd7daf6 100644 (file)
--- a/libgfortran/io/read.c
+++ b/libgfortran/io/read.c
@@ -1093,7 +1093,7 @@ exponent:
   if (w == 0)
     {
       /* Extension: allow default exponent of 0 when omitted.  */
-      if (dtp->common.flags & IOPARM_DT_DEFAULT_EXP)
+      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
        goto done;
       else
        goto bad_float;