re PR fortran/68815 (Error/warning diagnostic: '%s' should be converted to %qs-like...

2014-12-12  Tobias Burnus  <burnus@net-b.de>

gcc/c-family/
        PR fortran/68815
        * c-format.c (gcc_gfc_char_table): Add 'q' flag to remaining
        specifiers (%d, %i,%u and %c).

gcc/fortran/
        PR fortran/68815
        * check.c (gfc_check_reshape): Replace %<%d%> by %qd.
        * matchexp.c (gfc_match_defined_op_name): Use %qc.
        * symbol.c (gfc_add_new_implicit_range,
        gfc_merge_new_implicit): Ditto.

From-SVN: r231584

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0c8e74f3a061df4b55e95e72b6446d6d3b7d93bf..0f557c77e61f9e182b390efadc732152f695816e 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-12  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/68815
+       * c-format.c (gcc_gfc_char_table): Add 'q' flag to remaining
+       specifiers (%d, %i,%u and %c).
+
 2015-12-10  David Malcolm  <dmalcolm@redhat.com>
 
        * c.opt (Wmisleading-indentation): Add to -Wall for C and C++.

diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 6e372655cd8d6755610e28e8d863edf7d1d9501d..de07b6cced56fb3cf9252fd758589ac6a4fdb2b8 100644 (file)
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -809,9 +809,9 @@ static const format_char_info gcc_cxxdiag_char_table[] =
 static const format_char_info gcc_gfc_char_table[] =
 {
   /* C89 conversion specifiers.  */
-  { "di",  0, STD_C89, { T89_I,   BADLEN,  BADLEN,  T89_L,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "", "", NULL },
-  { "u",   0, STD_C89, { T89_UI,  BADLEN,  BADLEN,  T89_UL,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "", "", NULL },
-  { "c",   0, STD_C89, { T89_I,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "", "", NULL },
+  { "di",  0, STD_C89, { T89_I,   BADLEN,  BADLEN,  T89_L,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q", "", NULL },
+  { "u",   0, STD_C89, { T89_UI,  BADLEN,  BADLEN,  T89_UL,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q", "", NULL },
+  { "c",   0, STD_C89, { T89_I,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q", "", NULL },
   { "s",   1, STD_C89, { T89_C,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q", "cR", NULL },
 
   /* gfc conversion specifiers.  */

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 413318de8318c39cf18e02113b3f93be1dde1b09..749d5223d03de007913473697628555d266edc60 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-12  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/68815
+       * check.c (gfc_check_reshape): Replace %<%d%> by %qd.
+       * matchexp.c (gfc_match_defined_op_name): Use %qc.
+       * symbol.c (gfc_add_new_implicit_range,
+       gfc_merge_new_implicit): Ditto.
+
 2015-12-10  David Malcolm  <dmalcolm@redhat.com>
 
        * io.c (gfc_match_open): Fix indentation.

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 6dc7f3e264b86bb1eeebea25332e6b38b5916c42..3f1bdd315aee89ce880d7e3831b1168efd497d3a 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -3863,7 +3863,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
                {
                  gfc_error ("%qs argument of %qs intrinsic at %L has "
                             "invalid permutation of dimensions (dimension "
-                            "%<%d%> duplicated)",
+                            "%qd duplicated)",
                             gfc_current_intrinsic_arg[3]->name,
                             gfc_current_intrinsic, &e->where, dim);
                  return false;

diff --git a/gcc/fortran/matchexp.c b/gcc/fortran/matchexp.c
index 02f43a04db19ac08b7e8305a5982777a08efd656..c14ef59846736fbfe97cb1de99bc0539fb0a6363 100644 (file)
--- a/gcc/fortran/matchexp.c
+++ b/gcc/fortran/matchexp.c
@@ -69,7 +69,7 @@ gfc_match_defined_op_name (char *result, int error_flag)
   for (i = 0; name[i]; i++)
     if (!ISALPHA (name[i]))
       {
-       gfc_error ("Bad character %<%c%> in OPERATOR name at %C", name[i]);
+       gfc_error ("Bad character %qc in OPERATOR name at %C", name[i]);
        return MATCH_ERROR;
       }
 

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 311f743f8ff1f6ff1f8d35d49a31b107c7fa243c..678a2318c9af656c18b9f66eef885264b649fff6 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -165,7 +165,7 @@ gfc_add_new_implicit_range (int c1, int c2)
     {
       if (new_flag[i])
        {
-         gfc_error ("Letter %<%c%> already set in IMPLICIT statement at %C",
+         gfc_error ("Letter %qc already set in IMPLICIT statement at %C",
                     i + 'A');
          return false;
        }
@@ -197,7 +197,7 @@ gfc_merge_new_implicit (gfc_typespec *ts)
        {
          if (gfc_current_ns->set_flag[i])
            {
-             gfc_error ("Letter %c already has an IMPLICIT type at %C",
+             gfc_error ("Letter %qc already has an IMPLICIT type at %C",
                         i + 'A');
              return false;
            }