From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27904 invoked by alias); 12 Jun 2019 23:28:03 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 27876 invoked by uid 9683); 12 Jun 2019 23:28:03 -0000 Date: Wed, 12 Jun 2019 23:28:00 -0000 Message-ID: <20190612232803.27875.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Pedro Alves To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix latent bug with custom word point completers X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: 00b56dbe7016bc33f882525a47faab943fdeda9a X-Git-Newrev: 3844e605e61777555aed09ab8ce88db2da95bc0b X-SW-Source: 2019-06/txt/msg00041.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3844e605e61777555aed09ab8ce88db2da95bc0b commit 3844e605e61777555aed09ab8ce88db2da95bc0b Author: Pedro Alves Date: Thu Jun 13 00:06:52 2019 +0100 Fix latent bug with custom word point completers Completion routines that use a custom word point, and that then recurse into complete_line (e.g., if we make "thread apply" a custom word point completer, and complete on the command passed as argument), we stumble on this latent bug: (gdb) thread apply all pri[TAB] (gdb) thread apply all priprint The problem is that there's a spot in complete_line_internal_1 that rewinds the completion word but does not reflect that change in the custom word point in the tracker. This patch fixes it. gdb/ChangeLog: 2019-06-13 Pedro Alves * completer.c (complete_line_internal_1): Rewind completion word point. (completion_tracker::advance_custom_word_point_by): Change parameter type to int. * completer.h (completion_tracker::advance_custom_word_point_by): Likewise. Diff: --- gdb/ChangeLog | 9 +++++++++ gdb/completer.c | 5 ++++- gdb/completer.h | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 19b2a7d..cd81cfe 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-06-13 Pedro Alves + * completer.c (complete_line_internal_1): Rewind completion word + point. + (completion_tracker::advance_custom_word_point_by): Change + parameter type to int. + * completer.h (completion_tracker::advance_custom_word_point_by): + Likewise. + +2019-06-13 Pedro Alves + * completer.c (advance_to_completion_word): Handle delimiters. 2019-06-11 Bernhard Heckel diff --git a/gdb/completer.c b/gdb/completer.c index 03d0d0e..5dd9a99 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -1403,6 +1403,9 @@ complete_line_internal_1 (completion_tracker &tracker, break; } + /* Move the custom word point back too. */ + tracker.advance_custom_word_point_by (q - p); + if (reason != handle_brkchars) complete_on_cmdlist (result_list, tracker, q, word, ignore_help_classes); @@ -1972,7 +1975,7 @@ completion_tracker::recompute_lowest_common_denominator /* See completer.h. */ void -completion_tracker::advance_custom_word_point_by (size_t len) +completion_tracker::advance_custom_word_point_by (int len) { m_custom_word_point += len; } diff --git a/gdb/completer.h b/gdb/completer.h index 38a0132..27371b6 100644 --- a/gdb/completer.h +++ b/gdb/completer.h @@ -357,7 +357,7 @@ public: { m_custom_word_point = point; } /* Advance the custom word point by LEN. */ - void advance_custom_word_point_by (size_t len); + void advance_custom_word_point_by (int len); /* Whether to tell readline to skip appending a whitespace after the completion. See m_suppress_append_ws. */