re PR fortran/79968 (diagnostics: merge similar diagnostics containing -fdec-structure)

2017-05-18  Fritz Reese <fritzoreese@gmail.com>

    PR fortran/79968

    gcc/fortran/ChangeLog:

	PR fortran/79968
	* decl.c (match_attr_spec, gfc_match_automatic,
	gfc_match_static, gfc_match_structure_decl): Unify diagnostic
	errors regarding -fdec options.
	* io.c (match_dec_etag, match_dec_vtag, match_dec_ftag): Ditto.

From-SVN: r248188

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 703060d32ab7b8fc3c23f9c67ddc4b203c10469a..9a8b3e1c396298fca5581f1449fe3aee9891ccd9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-18  Fritz Reese <fritzoreese@gmail.com>
+
+       PR fortran/79968
+       * decl.c (match_attr_spec, gfc_match_automatic,
+       gfc_match_static, gfc_match_structure_decl): Unify diagnostic
+       errors regarding -fdec options.
+       * io.c (match_dec_etag, match_dec_vtag, match_dec_ftag): Ditto.
+
 2017-05-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/80741

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 1cbf23819a94fbbc3617603ebc724939b4b473df..80d073d624d748e3fb3148adfb037232f815b806 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -4230,7 +4230,8 @@ match_attr_spec (void)
       if ((d == DECL_STATIC || d == DECL_AUTOMATIC)
          && !flag_dec_static)
        {
-         gfc_error ("%s at %L is a DEC extension, enable with -fdec-static",
+         gfc_error ("%s at %L is a DEC extension, enable with "
+                    "%<-fdec-static%>",
                     d == DECL_STATIC ? "STATIC" : "AUTOMATIC", &seen_at[d]);
          m = MATCH_ERROR;
          goto cleanup;
@@ -7909,8 +7910,10 @@ gfc_match_automatic (void)
 
   if (!flag_dec_static)
     {
-      gfc_error ("AUTOMATIC at %C is a DEC extension, enable with "
-                "-fdec-static");
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec-static%>",
+                "AUTOMATIC"
+                );
       return MATCH_ERROR;
     }
 
@@ -7963,7 +7966,9 @@ gfc_match_static (void)
 
   if (!flag_dec_static)
     {
-      gfc_error ("STATIC at %C is a DEC extension, enable with -fdec-static");
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec-static%>",
+                "STATIC");
       return MATCH_ERROR;
     }
 
@@ -8722,8 +8727,9 @@ gfc_match_structure_decl (void)
 
   if (!flag_dec_structure)
     {
-      gfc_error ("STRUCTURE at %C is a DEC extension, enable with "
-                "-fdec-structure");
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec-structure%>",
+                "STRUCTURE");
       return MATCH_ERROR;
     }
 

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 5f0e579ad6ca2833440e782c49c1cd92f20adca7..2c3d761982ba6f35a105595a90e8286f2b1f67c6 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -1515,8 +1515,8 @@ match_dec_etag (const io_tag *tag, gfc_expr **e)
     return m;
   else if (m != MATCH_NO)
     {
-      gfc_error ("%s is a DEC extension at %C, re-compile with "
-         "-fdec to enable", tag->name);
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec%>", tag->name);
       return MATCH_ERROR;
     }
   return m;
@@ -1532,8 +1532,8 @@ match_dec_vtag (const io_tag *tag, gfc_expr **e)
     return m;
   else if (m != MATCH_NO)
     {
-      gfc_error ("%s is a DEC extension at %C, re-compile with "
-         "-fdec to enable", tag->name);
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec%>", tag->name);
       return MATCH_ERROR;
     }
   return m;
@@ -1553,8 +1553,8 @@ match_dec_ftag (const io_tag *tag, gfc_open *o)
 
   if (!flag_dec)
     {
-      gfc_error ("%s is a DEC extension at %C, re-compile with "
-                "-fdec to enable", tag->name);
+      gfc_error ("%s at %C is a DEC extension, enable with "
+                "%<-fdec%>", tag->name);
       return MATCH_ERROR;
     }