From patchwork Mon May 4 19:18:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Seitz X-Patchwork-Id: 6556 Received: (qmail 90921 invoked by alias); 4 May 2015 19:18:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 90715 invoked by uid 89); 4 May 2015 19:18:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 04 May 2015 19:18:36 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t44JIY3E006544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 4 May 2015 15:18:34 -0400 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t44JIYxj032410 for ; Mon, 4 May 2015 15:18:34 -0400 Subject: [PATCH v2 11/18] Implement completion limiting for reg_or_group_completer. From: Keith Seitz To: gdb-patches@sourceware.org Date: Mon, 04 May 2015 12:18:34 -0700 Message-ID: <20150504191834.20434.44106.stgit@valrhona.uglyboxes.com> In-Reply-To: <20150504191734.20434.68053.stgit@valrhona.uglyboxes.com> References: <20150504191734.20434.68053.stgit@valrhona.uglyboxes.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes This patch converts reg_or_group_completer to use add_completion and adds tests for this new behavior. gdb/ChangeLog * completer.c (reg_or_group_completer): Use add_completion. gdb/testsuite/ChangeLog * gdb.base/completion.exp: Add tests for limit completing "info reigsters". --- gdb/completer.c | 15 ++++++++++----- gdb/testsuite/gdb.base/completion.exp | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gdb/completer.c b/gdb/completer.c index 85f8d30..bef6953 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -1067,17 +1067,22 @@ reg_or_group_completer (struct completer_data *cdata, (name = user_reg_map_regnum_to_name (gdbarch, i)) != NULL; i++) { - if (*name != '\0' && strncmp (word, name, len) == 0) - VEC_safe_push (char_ptr, result, xstrdup (name)); + if (*name != '\0' && strncmp (word, name, len) == 0 + && (add_completion (cdata, &result, xstrdup (name)) + == ADD_COMPLETION_MAX_REACHED)) + return result; } for (group = reggroup_next (gdbarch, NULL); group != NULL; group = reggroup_next (gdbarch, group)) { - name = reggroup_name (group); - if (strncmp (word, name, len) == 0) - VEC_safe_push (char_ptr, result, xstrdup (name)); + char *match = xstrdup (reggroup_name (group)); + + if (strncmp (word, match, len) == 0 + && (add_completion (cdata, &result, match) + == ADD_COMPLETION_MAX_REACHED)) + return result; } return result; diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index d07ca86..4a35cd1 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -1037,3 +1037,7 @@ with_test_prefix "interpreter_completer reset" { set max_completions $old_max gdb_test_no_output "set max-completions $max_completions" } + +# Test reg_or_group_completer. +test_completion_limit "info registers " \ + "info registers \[a-zA-Z0-9\]+" $max_completions