language_get_symbol_name_matcher -> get_symbol_name_matcher

[deliverable/binutils-gdb.git] / gdb / language.c

diff --git a/gdb/language.c b/gdb/language.c
index 073039e32666803587ad16895105bed1b59a27f3..0d8604b8268bca403840a6d8a10f3213d40e5338 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -1,6 +1,6 @@
 /* Multiple source language support for GDB.
 
 /* Multiple source language support for GDB.
 

-   Copyright (C) 1991-2017 Free Software Foundation, Inc.
+   Copyright (C) 1991-2018 Free Software Foundation, Inc.

 
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.
 
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.


@@ -46,16 +46,10 @@
 #include "c-lang.h"
 #include <algorithm>
 
 #include "c-lang.h"
 #include <algorithm>
 

-extern void _initialize_language (void);
-

 static void unk_lang_error (const char *);
 
 static int unk_lang_parser (struct parser_state *);
 
 static void unk_lang_error (const char *);
 
 static int unk_lang_parser (struct parser_state *);
 

-static void show_check (char *, int);
-
-static void set_check (char *, int);
-

 static void set_range_case (void);
 
 static void unk_lang_emit_char (int c, struct type *type,
 static void set_range_case (void);
 
 static void unk_lang_emit_char (int c, struct type *type,


@@ -161,7 +155,8 @@ show_language_command (struct ui_file *file, int from_tty,
 
 /* Set command.  Change the current working language.  */
 static void
 
 /* Set command.  Change the current working language.  */
 static void

-set_language_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_language_command (const char *ignore,
+                     int from_tty, struct cmd_list_element *c)

 {
   enum language flang = language_unknown;
 
 {
   enum language flang = language_unknown;
 


@@ -258,7 +253,8 @@ show_range_command (struct ui_file *file, int from_tty,
 
 /* Set command.  Change the setting for range checking.  */
 static void
 
 /* Set command.  Change the setting for range checking.  */
 static void

-set_range_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_range_command (const char *ignore,
+                  int from_tty, struct cmd_list_element *c)

 {
   if (strcmp (range, "on") == 0)
     {
 {
   if (strcmp (range, "on") == 0)
     {


@@ -332,7 +328,7 @@ show_case_command (struct ui_file *file, int from_tty,
 /* Set command.  Change the setting for case sensitivity.  */
 
 static void
 /* Set command.  Change the setting for case sensitivity.  */
 
 static void

-set_case_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_case_command (const char *ignore, int from_tty, struct cmd_list_element *c)

 {
    if (strcmp (case_sensitive, "on") == 0)
      {
 {
    if (strcmp (case_sensitive, "on") == 0)
      {


@@ -480,7 +476,7 @@ range_error (const char *string,...)
 /* Return the language enum for a given language string.  */
 
 enum language
 /* Return the language enum for a given language string.  */
 
 enum language

-language_enum (char *str)
+language_enum (const char *str)

 {
   for (const auto &lang : languages)
     if (strcmp (lang->la_name, str) == 0)
 {
   for (const auto &lang : languages)
     if (strcmp (lang->la_name, str) == 0)


@@ -509,7 +505,7 @@ language_str (enum language lang)
 }
 
 static void
 }
 
 static void

-set_check (char *ignore, int from_tty)
+set_check (const char *ignore, int from_tty)

 {
   printf_unfiltered (
      "\"set check\" must be followed by the name of a check subcommand.\n");
 {
   printf_unfiltered (
      "\"set check\" must be followed by the name of a check subcommand.\n");


@@ -517,7 +513,7 @@ set_check (char *ignore, int from_tty)
 }
 
 static void
 }
 
 static void

-show_check (char *ignore, int from_tty)
+show_check (const char *ignore, int from_tty)

 {
   cmd_show_list (showchecklist, from_tty, "");
 }
 {
   cmd_show_list (showchecklist, from_tty, "");
 }


@@ -703,6 +699,49 @@ default_get_string (struct value *value, gdb_byte **buffer, int *length,
   error (_("Getting a string is unsupported in this language."));
 }
 
   error (_("Getting a string is unsupported in this language."));
 }
 

+/* See language.h.  */
+
+bool
+default_symbol_name_matcher (const char *symbol_search_name,
+                            const lookup_name_info &lookup_name,
+                            completion_match_result *comp_match_res)
+{
+  const std::string &name = lookup_name.name ();
+  completion_match_for_lcd *match_for_lcd
+    = (comp_match_res != NULL ? &comp_match_res->match_for_lcd : NULL);
+  strncmp_iw_mode mode = (lookup_name.completion_mode ()
+                         ? strncmp_iw_mode::NORMAL
+                         : strncmp_iw_mode::MATCH_PARAMS);
+
+  if (strncmp_iw_with_mode (symbol_search_name, name.c_str (), name.size (),
+                           mode, language_minimal, match_for_lcd) == 0)
+    {
+      if (comp_match_res != NULL)
+       comp_match_res->set_match (symbol_search_name);
+      return true;
+    }
+  else
+    return false;
+}
+
+/* See language.h.  */
+
+symbol_name_matcher_ftype *
+get_symbol_name_matcher (const language_defn *lang,
+                        const lookup_name_info &lookup_name)
+{
+  /* If currently in Ada mode, and the lookup name is wrapped in
+     '<...>', hijack all symbol name comparisons using the Ada
+     matcher, which handles the verbatim matching.  */
+  if (current_language->la_language == language_ada
+      && lookup_name.ada ().verbatim_p ())
+    return current_language->la_get_symbol_name_matcher (lookup_name);
+
+  if (lang->la_get_symbol_name_matcher != nullptr)
+    return lang->la_get_symbol_name_matcher (lookup_name);
+  return default_symbol_name_matcher;
+}
+

 /* Define the language that is no language.  */
 
 static int
 /* Define the language that is no language.  */
 
 static int


@@ -841,8 +880,9 @@ const struct language_defn unknown_language_defn =
   default_pass_by_reference,
   default_get_string,
   c_watch_location_expression,
   default_pass_by_reference,
   default_get_string,
   c_watch_location_expression,

-  NULL,                                /* la_get_symbol_name_cmp */
+  NULL,                                /* la_get_symbol_name_matcher */

   iterate_over_symbols,
   iterate_over_symbols,

+  default_search_name_hash,

   &default_varobj_ops,
   NULL,
   NULL,
   &default_varobj_ops,
   NULL,
   NULL,


@@ -891,8 +931,9 @@ const struct language_defn auto_language_defn =
   default_pass_by_reference,
   default_get_string,
   c_watch_location_expression,
   default_pass_by_reference,
   default_get_string,
   c_watch_location_expression,

-  NULL,                                /* la_get_symbol_name_cmp */
+  NULL,                                /* la_get_symbol_name_matcher */

   iterate_over_symbols,
   iterate_over_symbols,

+  default_search_name_hash,

   &default_varobj_ops,
   NULL,
   NULL,
   &default_varobj_ops,
   NULL,
   NULL,