* sol-thread.c (_initialize_sol_thread): Add FIXME regarding

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

diff --git a/gdb/completer.c b/gdb/completer.c
index 163a9dcfc83184c2c703845ce5ebd79b96609fef..e7ee817aa89e218265b0dff40c4a031614d52344 100644 (file)
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -387,7 +387,7 @@ char **
 expression_completer (char *text, char *word)
 {
   struct type *type;
-  char *fieldname;
+  char *fieldname, *p;
 
   /* Perform a tentative parse of the expression, to see whether a
      field completion is required.  */
@@ -418,18 +418,17 @@ expression_completer (char *text, char *word)
        }
     }
 
-  /* Not ideal but it is what we used to do before... */
-  return location_completer (text, word);
-}
+  /* Commands which complete on locations want to see the entire
+     argument.  */
+  for (p = word;
+       p > text && p[-1] != ' ' && p[-1] != '\t';
+       p--)
+    ;
 
-/* Complete on command names.  Used by "help".  */
-char **
-command_completer (char *text, char *word)
-{
-  return complete_on_cmdlist (cmdlist, text, word);
+  /* Not ideal but it is what we used to do before... */
+  return location_completer (p, word);
 }
 
-
 /* Here are some useful test cases for completion.  FIXME: These should
    be put in the test suite.  They should be tested with both M-? and TAB.
 
@@ -460,10 +459,16 @@ command_completer (char *text, char *word)
 
    LINE_BUFFER is available to be looked at; it contains the entire text
    of the line.  POINT is the offset in that line of the cursor.  You
-   should pretend that the line ends at POINT.  */
-
-char **
-complete_line (const char *text, char *line_buffer, int point)
+   should pretend that the line ends at POINT.
+   
+   FOR_HELP is true when completing a 'help' command.  In this case,
+   once sub-command completions are exhausted, we simply return NULL.
+   When FOR_HELP is false, we will call a sub-command's completion
+   function.  */
+
+static char **
+complete_line_internal (const char *text, char *line_buffer, int point,
+                       int for_help)
 {
   char **list = NULL;
   char *tmp_command, *p;
@@ -576,6 +581,8 @@ complete_line (const char *text, char *line_buffer, int point)
                  rl_completer_word_break_characters =
                    gdb_completer_command_word_break_characters;
                }
+             else if (for_help)
+               list = NULL;
              else if (c->enums)
                {
                  list = complete_on_enum (c->enums, p, word);
@@ -604,8 +611,7 @@ complete_line (const char *text, char *line_buffer, int point)
                      rl_completer_word_break_characters =
                        gdb_completer_file_name_break_characters;
                    }
-                 else if (c->completer == location_completer
-                          || c->completer == expression_completer)
+                 else if (c->completer == location_completer)
                    {
                      /* Commands which complete on locations want to
                         see the entire argument.  */
@@ -644,6 +650,8 @@ complete_line (const char *text, char *line_buffer, int point)
                gdb_completer_command_word_break_characters;
            }
        }
+      else if (for_help)
+       list = NULL;
       else
        {
          /* There is non-whitespace beyond the command.  */
@@ -673,8 +681,7 @@ complete_line (const char *text, char *line_buffer, int point)
                  rl_completer_word_break_characters =
                    gdb_completer_file_name_break_characters;
                }
-             else if (c->completer == location_completer
-                      || c->completer == expression_completer)
+             else if (c->completer == location_completer)
                {
                  for (p = word;
                       p > tmp_command
@@ -690,6 +697,21 @@ complete_line (const char *text, char *line_buffer, int point)
   return list;
 }
 
+/* Like complete_line_internal, but always passes 0 for FOR_HELP.  */
+
+char **
+complete_line (const char *text, char *line_buffer, int point)
+{
+  return complete_line_internal (text, line_buffer, point, 0);
+}
+
+/* Complete on command names.  Used by "help".  */
+char **
+command_completer (char *text, char *word)
+{
+  return complete_line_internal (word, text, strlen (text), 1);
+}
+
 /* Generate completions one by one for the completer.  Each time we are
    called return another potential completion to the caller.
    line_completion just completes on commands or passes the buck to the