Introduce class completion_tracker & rewrite completion<->readline interaction

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

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 053ccef0fa2c081b46beb4fe8d9a5609135ee7eb..a848aea77af6d3d0b88350e9440541827add406b 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1042,8 +1042,9 @@ set_breakpoint_condition (struct breakpoint *b, const char *exp,
 
 /* Completion for the "condition" command.  */
 
-static VEC (char_ptr) *
+static void
 condition_completer (struct cmd_list_element *cmd,
+                    completion_tracker &tracker,
                     const char *text, const char *word)
 {
   const char *space;
@@ -1059,9 +1060,9 @@ condition_completer (struct cmd_list_element *cmd,
       if (text[0] == '$')
        {
          /* We don't support completion of history indices.  */
-         if (isdigit (text[1]))
-           return NULL;
-         return complete_internalvar (&text[1]);
+         if (!isdigit (text[1]))
+           complete_internalvar (tracker, &text[1]);
+         return;
        }
 
       /* We're completing the breakpoint number.  */
@@ -1074,15 +1075,18 @@ condition_completer (struct cmd_list_element *cmd,
          xsnprintf (number, sizeof (number), "%d", b->number);
 
          if (strncmp (number, text, len) == 0)
-           VEC_safe_push (char_ptr, result, xstrdup (number));
+           {
+             gdb::unique_xmalloc_ptr<char> copy (xstrdup (number));
+             tracker.add_completion (std::move (copy));
+           }
        }
 
-      return result;
+      return;
     }
 
   /* We're completing the expression part.  */
   text = skip_spaces_const (space);
-  return expression_completer (cmd, text, word);
+  expression_completer (cmd, tracker, text, word);
 }
 
 /* condition N EXP -- set break condition of breakpoint N to EXP.  */