diff options
| -rw-r--r-- | gdb/ChangeLog | 18 | ||||
| -rw-r--r-- | gdb/completer.c | 97 | ||||
| -rw-r--r-- | gdb/completer.h | 2 | ||||
| -rw-r--r-- | gdb/top.c | 1 |
4 files changed, 95 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bbeaff9..ba5fb9f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,23 @@ 2009-03-25 Pierre Muller <muller@ics.u-strasbg.fr> + Fix completer problem for filename completion on the first try. + + * gdb/completer.h (gdb_completion_word_break_characters): New function. + * gdb/completer.c: Include gdb_assert.h. + (complete_line_internal_reason): New enum. + (complete_line_internal): Change last argument type to + complete_line_internal_reason. + Modify function to handle the different complete_line_internal_reason + argument values. + (complete_line): Adapt to change in complete_line_internal. + (command_completer): Ditto. + (gdb_completion_word_break_characters): Implement new function. + * top.c (init_main): Set rl_completion_word_break_hook to + gdb_completion_word_break_characters. + + +2009-03-25 Pierre Muller <muller@ics.u-strasbg.fr> + ARI fix: "strlen d_name" rule. * linux-nat.c (linux_nat_xfer_osdata): Use NAMELEN macro. diff --git a/gdb/completer.c b/gdb/completer.c index 43fcf7a..02e9511 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -22,6 +22,7 @@ #include "expression.h" #include "filenames.h" /* For DOSish file names. */ #include "language.h" +#include "gdb_assert.h" #include "cli/cli-decode.h" @@ -481,24 +482,45 @@ expression_completer (struct cmd_list_element *ignore, char *text, char *word) "file ../gdb.stabs/we" "ird" (needs to not break word at slash) */ -/* Generate completions all at once. Returns a NULL-terminated array - of strings. Both the array and each element are allocated with - xmalloc. It can also return NULL if there are no completions. +typedef enum +{ + handle_brkchars, + handle_completions, + handle_help +} +complete_line_internal_reason; + + +/* Internal function used to handle completions. + TEXT is the caller's idea of the "word" we are looking at. 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. - - FOR_HELP is true when completing a 'help' command. In this case, + + REASON is of type complete_line_internal_reason. + + If REASON is handle_brkchars: + Preliminary phase, called by gdb_completion_word_break_characters function, + is used to determine the correct set of chars that are word delimiters + depending on the current command in line_buffer. + No completion list should be generated; the return value should be NULL. + This is checked by an assertion in that function. + + If REASON is handle_completions: + Main phase, called by complete_line function, is used to get the list + of posible completions. + + If REASON is handle_help: + Special case 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) + complete_line_internal_reason reason) { char **list = NULL; char *tmp_command, *p; @@ -512,7 +534,6 @@ complete_line_internal (const char *text, char *line_buffer, int point, functions, which can be any string) then we will switch to the special word break set for command strings, which leaves out the '-' character used in some commands. */ - rl_completer_word_break_characters = current_language->la_word_break_characters(); @@ -575,12 +596,14 @@ complete_line_internal (const char *text, char *line_buffer, int point, This we can deal with. */ if (result_list) { - list = complete_on_cmdlist (*result_list->prefixlist, p, - word); + if (reason != handle_brkchars) + list = complete_on_cmdlist (*result_list->prefixlist, p, + word); } else { - list = complete_on_cmdlist (cmdlist, p, word); + if (reason != handle_brkchars) + list = complete_on_cmdlist (cmdlist, p, word); } /* Ensure that readline does the right thing with respect to inserting quotes. */ @@ -604,18 +627,20 @@ complete_line_internal (const char *text, char *line_buffer, int point, { /* It is a prefix command; what comes after it is a subcommand (e.g. "info "). */ - list = complete_on_cmdlist (*c->prefixlist, p, word); + if (reason != handle_brkchars) + list = complete_on_cmdlist (*c->prefixlist, p, word); /* Ensure that readline does the right thing with respect to inserting quotes. */ rl_completer_word_break_characters = gdb_completer_command_word_break_characters; } - else if (for_help) + else if (reason == handle_help) list = NULL; else if (c->enums) { - list = complete_on_enum (c->enums, p, word); + if (reason != handle_brkchars) + list = complete_on_enum (c->enums, p, word); rl_completer_word_break_characters = gdb_completer_command_word_break_characters; } @@ -651,7 +676,8 @@ complete_line_internal (const char *text, char *line_buffer, int point, p--) ; } - list = (*c->completer) (c, p, word); + if (reason != handle_brkchars) + list = (*c->completer) (c, p, word); } } else @@ -672,7 +698,8 @@ complete_line_internal (const char *text, char *line_buffer, int point, break; } - list = complete_on_cmdlist (result_list, q, word); + if (reason != handle_brkchars) + list = complete_on_cmdlist (result_list, q, word); /* Ensure that readline does the right thing with respect to inserting quotes. */ @@ -680,7 +707,7 @@ complete_line_internal (const char *text, char *line_buffer, int point, gdb_completer_command_word_break_characters; } } - else if (for_help) + else if (reason == handle_help) list = NULL; else { @@ -694,7 +721,8 @@ complete_line_internal (const char *text, char *line_buffer, int point, } else if (c->enums) { - list = complete_on_enum (c->enums, p, word); + if (reason != handle_brkchars) + list = complete_on_enum (c->enums, p, word); } else { @@ -719,27 +747,50 @@ complete_line_internal (const char *text, char *line_buffer, int point, p--) ; } - list = (*c->completer) (c, p, word); + if (reason != handle_brkchars) + list = (*c->completer) (c, p, word); } } } return list; } +/* Generate completions all at once. Returns a NULL-terminated array + of strings. Both the array and each element are allocated with + xmalloc. It can also return NULL if there are no completions. -/* Like complete_line_internal, but always passes 0 for FOR_HELP. */ + TEXT is the caller's idea of the "word" we are looking at. + + 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) { - return complete_line_internal (text, line_buffer, point, 0); + return complete_line_internal (text, line_buffer, point, handle_completions); } /* Complete on command names. Used by "help". */ char ** command_completer (struct cmd_list_element *ignore, char *text, char *word) { - return complete_line_internal (word, text, strlen (text), 1); + return complete_line_internal (word, text, strlen (text), handle_help); +} + +/* Get the list of chars that are considered as word breaks + for the current command. */ + +char * +gdb_completion_word_break_characters (void) +{ + char ** list; + list = complete_line_internal (rl_line_buffer, rl_line_buffer, rl_point, + handle_brkchars); + gdb_assert (list == NULL); + return rl_completer_word_break_characters; } /* Generate completions one by one for the completer. Each time we are diff --git a/gdb/completer.h b/gdb/completer.h index 6adbf1b..d0a5cee 100644 --- a/gdb/completer.h +++ b/gdb/completer.h @@ -33,6 +33,8 @@ extern char **command_completer (struct cmd_list_element *, char *, char *); extern char *get_gdb_completer_quote_characters (void); +extern char *gdb_completion_word_break_characters (void); + /* Exported to linespec.c */ extern char *skip_quoted_chars (char *, char *, char *); @@ -1543,6 +1543,7 @@ init_main (void) write_history_p = 0; /* Setup important stuff for command line editing. */ + rl_completion_word_break_hook = gdb_completion_word_break_characters; rl_completion_entry_function = readline_line_completion_function; rl_completer_word_break_characters = default_word_break_characters (); rl_completer_quote_characters = get_gdb_completer_quote_characters (); |