Re: [PATCH 2/4] gdb: Add completer for layout command.

[Keith Seitz <keiths at redhat dot com>]

On 05/20/2015 04:17 PM, Andrew Burgess wrote:
> Add layout name completion for the layout command.
> 
> gdb/ChangeLog:
> 
> 	* tui/tui-layout.c (layout_completer): New function.
> 	(_initialize_tui_layout): Set completer on layout command.
> 
> gdb/testsuite/ChangeLog:
> 
> 	* gdb.base/completion.exp: Add test for completion of layout
> 	names.
> ---
>  gdb/ChangeLog                         |  5 +++++
>  gdb/testsuite/ChangeLog               |  5 +++++
>  gdb/testsuite/gdb.base/completion.exp | 19 +++++++++++++++++++
>  gdb/tui/tui-layout.c                  | 35 ++++++++++++++++++++++++++++++++++-
>  4 files changed, 63 insertions(+), 1 deletion(-)
> 
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index 40c70e7..51d2bfc 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,5 +1,10 @@
>  2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
>  
> +	* tui/tui-layout.c (layout_completer): New function.
> +	(_initialize_tui_layout): Set completer on layout command.
> +
> +2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
> +
>  	* tui/tui-layout.c (tui_set_layout): Remove
>  	tui_register_display_type parameter.  Remove all checking of this
>  	parameter, and reindent function.  Update header comment.
> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index 3a947eb..15dae61 100644
> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,5 +1,10 @@
>  2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
>  
> +	* gdb.base/completion.exp: Add test for completion of layout
> +	names.
> +
> +2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
> +
>  	* lib/gdb.exp (skip_tui_tests): New proc.
>  	* gdb.base/tui-layout.exp: Check skip_tui_tests.
>  
> diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
> index f77bfe2..4c31bfc 100644
> --- a/gdb/testsuite/gdb.base/completion.exp
> +++ b/gdb/testsuite/gdb.base/completion.exp
> @@ -859,3 +859,22 @@ gdb_test_multiple "" "$test" {
>  	pass "$test"
>      }
>  }
> +
> +gdb_test_no_output "set max-completions unlimited"
> +
> +if {![skip_tui_tests]} {
> +    set test "test completion of layout names"
> +    send_gdb "layout\t\t\t"
> +    gdb_test_multiple "" "$test" {
> +	-re "asm *next *prev *regs *split *src *\r\n$gdb_prompt layout $" {
> +	    pass "$test"
> +	}
> +    }
> +    send_gdb "\003"
> +    set test "quit command input after testing layout completion"
> +    gdb_test_multiple "" "$test" {
> +	-re "$gdb_prompt $" {
> +	    pass "$test"
> +	}
> +    }
> +}
> diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
> index 44aca5d..45fa575 100644
> --- a/gdb/tui/tui-layout.c
> +++ b/gdb/tui/tui-layout.c
> @@ -350,6 +350,36 @@ tui_default_win_viewport_height (enum tui_win_type type,
>    return h;
>  }
>  
> +/* Complete possible layout names.  TEXT is the complete text entered so
> +   far, WORD is the word currently being completed.  */
> +
> +static VEC (char_ptr) *
> +layout_completer (struct cmd_list_element *ignore,
> +		  const char *text, const char *word)
> +{
> +  VEC (char_ptr) *return_val = NULL;
> +  const char **tmp, *p;
> +  size_t len;
> +
> +  static const char *layout_names [] =
> +    { "src", "asm", "split", "regs", "next", "prev", NULL };
> +
> +  gdb_assert (text != NULL);
> +  p = strchr (text, ' ');
> +  len = (p == NULL) ? strlen (text) : p - text;
> +
> +  for (tmp = layout_names; *tmp != NULL; ++tmp)
> +    {
> +      if (strncmp (text, *tmp, len) == 0)
> +	{
> +	  char *str = xstrdup (*tmp);
> +	  VEC_safe_push (char_ptr, return_val, str);
> +	}
> +    }
> +

One quick observation (having seen my fair share of completion functions
recently)... Most completer functions are using complete_on_enum to do
this sort of thing. Will that work here?

Keith