Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Fix regression: expression completer and scope operator (PR gdb/22584)

Browse Source 
I noticed this regression in the expression completer:

 "(gdb) p std::[TAB]" => "(gdb) p std::std::"

obviously we should have not completed to "std::std::".

The problem is that in the earlier big completer rework, I missed
taking into account the fact that with expressions, the completion
word point is not always at the start of the symbol name (it is with
linespecs).

The fix is to run the common prefix / LCD string (what readline uses
to expand the input line) through make_completion_match_str too.

New testcase included, exercising both TAB completion and the complete
command.

gdb/ChangeLog:
2017-12-13  Pedro Alves  <palves@redhat.com>

	* completer.c (completion_tracker::maybe_add_completion): New
	'text' and 'word' parameters.  Use make_completion_match_str.
	(completion_tracker::add_completion): New 'text' and 'word'
	parameters.  Pass down.
	(completion_tracker::recompute_lowest_common_denominator): Change
	parameter type to gdb::unique_xmalloc_ptr rval ref.  Adjust.
	* completer.h (completion_tracker::add_completion): New 'text' and
	'word' parameters.
	(completion_tracker::recompute_lowest_common_denominator): Change
	parameter type to gdb::unique_xmalloc_ptr rval ref.
	(completion_tracker::recompute_lowest_common_denominator): Change
	parameter type to gdb::unique_xmalloc_ptr rval ref.
	* symtab.c (completion_list_add_name): Pass down 'text' and 'word'
	as well.

gdb/testsuite/ChangeLog:
2017-12-13  Pedro Alves  <palves@redhat.com>

	* gdb.cp/cpcompletion.exp: Load completion-support.exp.
	("expression with namespace"): New set of tests.
	* gdb.cp/pr9594.cc (Test_NS::foo, Test_NS::bar)
	(Nested::Test_NS::qux): New.
	* lib/completion-support.exp (test_gdb_complete_cmd_multiple): Add
	defaults to 'start_quote_char' and 'end_quote_char' parameters.
This commit is contained in:
Pedro Alves
2017-12-13 16:38:50 +00:00
parent 60a20c1907
commit a22ecf7026
8 changed files with 104 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/completer.c
View File

@@ -1510,7 +1510,8 @@ completion_tracker::~completion_tracker ()
bool
completion_tracker::maybe_add_completion
(gdb::unique_xmalloc_ptr<char> name,
completion_match_for_lcd *match_for_lcd)
completion_match_for_lcd *match_for_lcd,
const char *text, const char *word)
{
void **slot;
@@ -1531,7 +1532,10 @@ completion_tracker::maybe_add_completion
if (match_for_lcd_str == NULL)
match_for_lcd_str = name.get ();
recompute_lowest_common_denominator (match_for_lcd_str);
gdb::unique_xmalloc_ptr<char> lcd
= make_completion_match_str (match_for_lcd_str, text, word);
recompute_lowest_common_denominator (std::move (lcd));
*slot = name.get ();
m_entries_vec.push_back (std::move (name));
@@ -1544,9 +1548,10 @@ completion_tracker::maybe_add_completion
void
completion_tracker::add_completion (gdb::unique_xmalloc_ptr<char> name,
completion_match_for_lcd *match_for_lcd)
completion_match_for_lcd *match_for_lcd,
const char *text, const char *word)
{
if (!maybe_add_completion (std::move (name), match_for_lcd))
if (!maybe_add_completion (std::move (name), match_for_lcd, text, word))
throw_error (MAX_COMPLETIONS_REACHED_ERROR, _("Max completions reached."));
}
@@ -1904,21 +1909,23 @@ completion_find_completion_word (completion_tracker &tracker, const char *text,
/* See completer.h. */
void
completion_tracker::recompute_lowest_common_denominator (const char *new_match)
completion_tracker::recompute_lowest_common_denominator
(gdb::unique_xmalloc_ptr<char> &&new_match_up)
{
if (m_lowest_common_denominator == NULL)
{
/* We don't have a lowest common denominator yet, so simply take
the whole NEW_MATCH as being it. */
m_lowest_common_denominator = xstrdup (new_match);
the whole NEW_MATCH_UP as being it. */
m_lowest_common_denominator = new_match_up.release ();
m_lowest_common_denominator_unique = true;
}
else
{
/* Find the common denominator between the currently-known
lowest common denominator and NEW_MATCH. That becomes the
lowest common denominator and NEW_MATCH_UP. That becomes the
new lowest common denominator. */
size_t i;
const char *new_match = new_match_up.get ();
for (i = 0;
(new_match[i] != '\0'