Remove DEF_VEC_P (varobj_p)

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

diff --git a/gdb/completer.c b/gdb/completer.c
index 5d81f24bddedbcbe2e0c51ad3ed3189f3880ff55..68e91716deb8333e258113f8d97439b91327e1c6 100644 (file)
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -499,6 +499,7 @@ complete_files_symbols (completion_tracker &tracker,
     {
       collect_file_symbol_completion_matches (tracker,
                                              complete_symbol_mode::EXPRESSION,
+                                             symbol_name_match_type::EXPRESSION,
                                              symbol_start, word,
                                              file_to_match);
       xfree (file_to_match);
@@ -509,6 +510,7 @@ complete_files_symbols (completion_tracker &tracker,
 
       collect_symbol_completion_matches (tracker,
                                         complete_symbol_mode::EXPRESSION,
+                                        symbol_name_match_type::EXPRESSION,
                                         symbol_start, word);
       /* If text includes characters which cannot appear in a file
         name, they cannot be asking for completion on files.  */
@@ -551,6 +553,7 @@ complete_files_symbols (completion_tracker &tracker,
         on the entire text as a symbol.  */
       collect_symbol_completion_matches (tracker,
                                         complete_symbol_mode::EXPRESSION,
+                                        symbol_name_match_type::EXPRESSION,
                                         orig_text, word);
     }
 }
@@ -699,7 +702,7 @@ collect_explicit_location_matches (completion_tracker &tracker,
             keyword.  */
          if (keyword != word)
            {
-             keyword = skip_spaces_const (keyword);
+             keyword = skip_spaces (keyword);
 
              tracker.advance_custom_word_point_by (keyword - word);
              complete_on_enum (tracker, linespec_keywords, keyword, keyword);
@@ -729,7 +732,7 @@ skip_keyword (completion_tracker &tracker,
              const char * const *keywords, const char **text_p)
 {
   const char *text = *text_p;
-  const char *after = skip_to_space_const (text);
+  const char *after = skip_to_space (text);
   size_t len = after - text;
 
   if (text[len] != ' ')
@@ -1104,6 +1107,7 @@ symbol_completer (struct cmd_list_element *ignore,
                  const char *text, const char *word)
 {
   collect_symbol_completion_matches (tracker, complete_symbol_mode::EXPRESSION,
+                                    symbol_name_match_type::EXPRESSION,
                                     text, word);
 }
 
@@ -1447,6 +1451,7 @@ complete_line_internal (completion_tracker &tracker,
       if (except.error != MAX_COMPLETIONS_REACHED_ERROR)
        throw_exception (except);
     }
+  END_CATCH
 }
 
 /* See completer.h.  */
@@ -1903,7 +1908,7 @@ expand_preserving_ws (const char *orig, size_t orig_len,
        {
          while (p_orig < orig_end && *p_orig == ' ')
            res += *p_orig++;
-         p_lcd = skip_spaces_const (p_lcd);
+         p_lcd = skip_spaces (p_lcd);
        }
       else
        {