C: convert return type of lookup_name_fuzzy from tree to const char *

gcc/c-family/ChangeLog:
	* c-common.h (lookup_name_fuzzy): Convert return type from tree to
	const char *.

gcc/c/ChangeLog:
	* c-decl.c (implicit_decl_warning): Update for conversion of
	return type of lookup_name_fuzzy to const char *.
	(undeclared_variable): Likewise.
	(lookup_name_fuzzy): Convert return type from tree to
	const char *.
	* c-parser.c (c_parser_declaration_or_fndef): Update for
	conversion of return type of lookup_name_fuzzy to const char *.
	(c_parser_parameter_declaration): Likewise.

gcc/ChangeLog:
	* gcc-rich-location.c
	(gcc_rich_location::add_fixit_misspelled_id): New overload, taking
	a const char *.
	* gcc-rich-location.h
	(gcc_rich_location::add_fixit_misspelled_id): Likewise.

From-SVN: r238517

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8cafd56b5b26ddcd705308a84b72fb8eef845371..82eb3ccb396b4f0a26694aaf649dce0aa347d7c0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-07-20  David Malcolm  <dmalcolm@redhat.com>
+
+       * gcc-rich-location.c
+       (gcc_rich_location::add_fixit_misspelled_id): New overload, taking
+       a const char *.
+       * gcc-rich-location.h
+       (gcc_rich_location::add_fixit_misspelled_id): Likewise.
+
 2016-07-20  Georg-Johann Lay  <avr@gjlay.de>
 
        * target.def (addr_space): Add new diagnose_usage to hook vector.

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1376a39427f9ada6d4f8d6f3745aecdcb896f7f6..3842929d32c4d02f916964e58e1be62a6f5676cd 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-20  David Malcolm  <dmalcolm@redhat.com>
+
+       * c-common.h (lookup_name_fuzzy): Convert return type from tree to
+       const char *.
+
 2016-07-15  Jason Merrill  <jason@redhat.com>
 
        * c-opts.c (c_common_post_options): Update -fabi-version default to 11.

diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 0f068e6b556ab6d52f4cf7d156ad81b0c43fd6e2..8c80574a1469ab769cbbde9c1458b406ae9b6437 100644 (file)
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1000,7 +1000,7 @@ enum lookup_name_fuzzy_kind {
   /* Any name.  */
   FUZZY_LOOKUP_NAME
 };
-extern tree lookup_name_fuzzy (tree, enum lookup_name_fuzzy_kind);
+extern const char *lookup_name_fuzzy (tree, enum lookup_name_fuzzy_kind);
 
 extern bool vector_targets_convertible_p (const_tree t1, const_tree t2);
 extern bool vector_types_convertible_p (const_tree t1, const_tree t2, bool emit_lax_note);

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index bc1e9558774ed6b7612a2b6515a6cdd6911cbce2..d322761e87b89ca05ed6dc8b2fea8e13be2735bc 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-20  David Malcolm  <dmalcolm@redhat.com>
+
+       * c-decl.c (implicit_decl_warning): Update for conversion of
+       return type of lookup_name_fuzzy to const char *.
+       (undeclared_variable): Likewise.
+       (lookup_name_fuzzy): Convert return type from tree to
+       const char *.
+       * c-parser.c (c_parser_declaration_or_fndef): Update for
+       conversion of return type of lookup_name_fuzzy to const char *.
+       (c_parser_parameter_declaration): Likewise.
+
 2016-07-15  Cesar Philippidis  <cesar@codesourcery.com>
 
        * c-parser.c (c_parser_oacc_declare): Don't scan for

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 955c0e8da73b06a4718fce48508a32696eab927b..d9f2dd752dae6be57162c9d195fba48d9e661cd4 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -3088,7 +3088,7 @@ implicit_decl_warning (location_t loc, tree id, tree olddecl)
   if (warn_implicit_function_declaration)
     {
       bool warned;
-      tree hint = NULL_TREE;
+      const char *hint = NULL;
       if (!olddecl)
        hint = lookup_name_fuzzy (id, FUZZY_LOOKUP_FUNCTION_NAME);
 
@@ -3099,7 +3099,7 @@ implicit_decl_warning (location_t loc, tree id, tree olddecl)
            richloc.add_fixit_misspelled_id (loc, hint);
            warned = pedwarn_at_rich_loc
              (&richloc, OPT_Wimplicit_function_declaration,
-              "implicit declaration of function %qE; did you mean %qE?",
+              "implicit declaration of function %qE; did you mean %qs?",
               id, hint);
          }
        else
@@ -3112,7 +3112,7 @@ implicit_decl_warning (location_t loc, tree id, tree olddecl)
            richloc.add_fixit_misspelled_id (loc, hint);
            warned = warning_at_rich_loc
              (&richloc, OPT_Wimplicit_function_declaration,
-              G_("implicit declaration of function %qE;did you mean %qE?"),
+              G_("implicit declaration of function %qE;did you mean %qs?"),
               id, hint);
          }
        else
@@ -3433,14 +3433,14 @@ undeclared_variable (location_t loc, tree id)
 
   if (current_function_decl == 0)
     {
-      tree guessed_id = lookup_name_fuzzy (id, FUZZY_LOOKUP_NAME);
+      const char *guessed_id = lookup_name_fuzzy (id, FUZZY_LOOKUP_NAME);
       if (guessed_id)
        {
          gcc_rich_location richloc (loc);
          richloc.add_fixit_misspelled_id (loc, guessed_id);
          error_at_rich_loc (&richloc,
                             "%qE undeclared here (not in a function);"
-                            " did you mean %qE?",
+                            " did you mean %qs?",
                             id, guessed_id);
        }
       else
@@ -3451,7 +3451,7 @@ undeclared_variable (location_t loc, tree id)
     {
       if (!objc_diagnose_private_ivar (id))
        {
-         tree guessed_id = lookup_name_fuzzy (id, FUZZY_LOOKUP_NAME);
+         const char *guessed_id = lookup_name_fuzzy (id, FUZZY_LOOKUP_NAME);
          if (guessed_id)
            {
              gcc_rich_location richloc (loc);
@@ -3459,7 +3459,7 @@ undeclared_variable (location_t loc, tree id)
              error_at_rich_loc
                (&richloc,
                 "%qE undeclared (first use in this function);"
-                " did you mean %qE?",
+                " did you mean %qs?",
                 id, guessed_id);
            }
          else
@@ -4010,7 +4010,7 @@ find_closest_macro_cpp_cb (cpp_reader *, cpp_hashnode *hashnode,
    It also looks for start_typename keywords, to detect "singed" vs "signed"
    typos.  */
 
-tree
+const char *
 lookup_name_fuzzy (tree name, enum lookup_name_fuzzy_kind kind)
 {
   gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
@@ -4100,7 +4100,11 @@ lookup_name_fuzzy (tree name, enum lookup_name_fuzzy_kind kind)
        }
     }
 
-  return bm.get_best_meaningful_candidate ();
+  tree best = bm.get_best_meaningful_candidate ();
+  if (best)
+    return IDENTIFIER_POINTER (best);
+  else
+    return NULL;
 }
 
 \f

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 45e32ba49d4fdd7bfe9576b97eff0adfeecdb34b..8952bca363a72b67bc1b88c1ba413ac4732564a8 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -1698,12 +1698,12 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
        }
       else
        {
-         tree hint = lookup_name_fuzzy (name, FUZZY_LOOKUP_TYPENAME);
+         const char *hint = lookup_name_fuzzy (name, FUZZY_LOOKUP_TYPENAME);
          if (hint)
            {
              richloc.add_fixit_misspelled_id (here, hint);
              error_at_rich_loc (&richloc,
-                                "unknown type name %qE; did you mean %qE?",
+                                "unknown type name %qE; did you mean %qs?",
                                 name, hint);
            }
          else
@@ -3853,14 +3853,14 @@ c_parser_parameter_declaration (c_parser *parser, tree attrs)
       c_parser_set_source_position_from_token (token);
       if (c_parser_next_tokens_start_typename (parser, cla_prefer_type))
        {
-         tree hint = lookup_name_fuzzy (token->value, FUZZY_LOOKUP_TYPENAME);
+         const char *hint = lookup_name_fuzzy (token->value,
+                                               FUZZY_LOOKUP_TYPENAME);
          if (hint)
            {
-             gcc_assert (TREE_CODE (hint) == IDENTIFIER_NODE);
              gcc_rich_location richloc (token->location);
              richloc.add_fixit_misspelled_id (token->location, hint);
              error_at_rich_loc (&richloc,
-                                "unknown type name %qE; did you mean %qE?",
+                                "unknown type name %qE; did you mean %qs?",
                                 token->value, hint);
            }
          else

diff --git a/gcc/gcc-rich-location.c b/gcc/gcc-rich-location.c
index 15c0700a25b7b110e0c7160b500a3bd77691853f..09475ffc2cf38b8e1a7c4be2db399b142cdd36c3 100644 (file)
--- a/gcc/gcc-rich-location.c
+++ b/gcc/gcc-rich-location.c
@@ -74,3 +74,16 @@ gcc_rich_location::add_fixit_misspelled_id (location_t misspelled_token_loc,
     = get_range_from_loc (line_table, misspelled_token_loc);
   add_fixit_replace (misspelled_token_range, IDENTIFIER_POINTER (hint_id));
 }
+
+/* As above, but with a const char * for the suggested replacement.  */
+
+void
+gcc_rich_location::add_fixit_misspelled_id (location_t misspelled_token_loc,
+                                           const char *hint)
+{
+  gcc_assert (hint);
+
+  source_range misspelled_token_range
+    = get_range_from_loc (line_table, misspelled_token_loc);
+  add_fixit_replace (misspelled_token_range, hint);
+}

diff --git a/gcc/gcc-rich-location.h b/gcc/gcc-rich-location.h
index 9c8a7904c15cc4a390a44b86d76a2290f6029a71..aa69b2eff14ce29098e50995b381ac7796fff94f 100644 (file)
--- a/gcc/gcc-rich-location.h
+++ b/gcc/gcc-rich-location.h
@@ -45,6 +45,8 @@ class gcc_rich_location : public rich_location
 
   void add_fixit_misspelled_id (location_t misspelled_token_loc,
                                tree hint_id);
+  void add_fixit_misspelled_id (location_t misspelled_token_loc,
+                               const char *hint);
 };
 
 #endif /* GCC_RICH_LOCATION_H */