From: Keith Seitz <keiths@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 09/18] Implement completion limiting for interpreter_completer.
Date: Mon, 13 Apr 2015 19:23:00 -0000 [thread overview]
Message-ID: <20150413192323.29172.67305.stgit@valrhona.uglyboxes.com> (raw)
In-Reply-To: <20150413192235.29172.13097.stgit@valrhona.uglyboxes.com>
This is another simple patch which converts interpreter_completer
to use maybe_add_completion and adds some tests to make sure
that everything is working properly.
gdb/ChangeLog
* interps.c (interpreter_completer): Use maybe_add_completion.
gdb/testsuite/ChangeLog
* gdb.base/completion.exp: Test completion limiting on
interpreter name with "interpreter-exec".
---
gdb/interps.c | 19 ++++++++++++++++++-
gdb/testsuite/gdb.base/completion.exp | 16 ++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/gdb/interps.c b/gdb/interps.c
index ac1b512..085cac5 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -451,6 +451,7 @@ interpreter_completer (struct completer_data *cdata,
if (strncmp (interp->name, text, textlen) == 0)
{
char *match;
+ enum maybe_add_completion_enum add_status;
match = (char *) xmalloc (strlen (word) + strlen (interp->name) + 1);
if (word == text)
@@ -467,7 +468,23 @@ interpreter_completer (struct completer_data *cdata,
match[text - word] = '\0';
strcat (match, interp->name);
}
- VEC_safe_push (char_ptr, matches, match);
+
+ add_status = maybe_add_completion (cdata, match);
+ switch (add_status)
+ {
+ case MAYBE_ADD_COMPLETION_OK:
+ VEC_safe_push (char_ptr, matches, match);
+ break;
+ case MAYBE_ADD_COMPLETION_OK_MAX_REACHED:
+ VEC_safe_push (char_ptr, matches, match);
+ return matches;
+ case MAYBE_ADD_COMPLETION_MAX_REACHED:
+ xfree (match);
+ return matches;
+ case MAYBE_ADD_COMPLETION_DUPLICATE:
+ xfree (match);
+ break;
+ }
}
}
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 90cdb36..d07ca86 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -1021,3 +1021,19 @@ if {$num_signals > $max_completions} {
append msg "limiting in signal_handler ($num_signals)"
untested $msg
}
+
+# Test interpreter_completer. There are only four completions
+# available for this, so temporarily set max-completions to 3.
+with_test_prefix "interpreter_completer" {
+ set old_max $max_completions
+ set max_completions 3
+ gdb_test_no_output "set max-completions $max_completions"
+}
+
+test_completion_limit "interpreter-exec m" \
+ "interpreter-exec mi\[1-3\]?" $max_completions
+
+with_test_prefix "interpreter_completer reset" {
+ set max_completions $old_max
+ gdb_test_no_output "set max-completions $max_completions"
+}
next prev parent reply other threads:[~2015-04-13 19:23 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 19:23 [PATCH 00/18] Implement full completer limiting Keith Seitz
2015-04-13 19:23 ` [PATCH 10/18] Implement completion limiting for cmdpy_completer Keith Seitz
2015-04-13 19:23 ` [PATCH 14/18] Implement completion limiting in add_struct_fields Keith Seitz
2015-04-13 19:23 ` Keith Seitz [this message]
2015-04-13 19:23 ` [PATCH 06/18] Implement completion limiting for condition_completer Keith Seitz
2015-04-13 19:23 ` [PATCH 03/18] Implement completion limiting for complete_on_cmdlist Keith Seitz
2015-04-13 19:23 ` [PATCH 13/18] Implement completion limiting for complete_on_enum Keith Seitz
2015-04-13 19:23 ` [PATCH 17/18] Use the hashtable to accumulate completion results Keith Seitz
2015-04-13 19:23 ` [PATCH 16/18] Make the completion API completely opaque Keith Seitz
2015-04-13 19:23 ` [PATCH 01/18] Add struct completer_data to the completion API Keith Seitz
2015-04-13 19:23 ` [PATCH 12/18] Implement completion limiting for sim_command_completer Keith Seitz
2015-04-14 15:28 ` Mike Frysinger
2015-05-05 15:03 ` Keith Seitz
2015-05-05 15:34 ` Mike Frysinger
2015-05-05 15:53 ` Keith Seitz
2015-04-13 19:23 ` [PATCH 11/18] Implement completion limiting for reg_or_group_completer Keith Seitz
2015-04-13 19:23 ` [PATCH 08/18] Implement completion limiting for signal_completer Keith Seitz
2015-04-13 19:23 ` [PATCH 15/18] Implement completion limiting for scmcmd_add_completion Keith Seitz
2015-04-13 19:23 ` [PATCH 05/18] Implement completion limiting for ada_make_symbol_completion_list Keith Seitz
2015-04-13 19:23 ` [PATCH 07/18] Implement completion limiting for filename_completer Keith Seitz
2015-04-13 19:23 ` [PATCH 02/18] Remove completion_tracker_t from the public completion API Keith Seitz
2015-04-13 19:23 ` [PATCH 18/18] Remove the vector return result from the " Keith Seitz
2015-04-13 19:23 ` [PATCH 04/18] Implement completion limiting for add_filename_to_list Keith Seitz
2015-04-20 3:21 ` [PATCH 00/18] Implement full completer limiting Doug Evans
2015-04-29 19:19 ` Keith Seitz
2015-04-30 0:26 ` Doug Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150413192323.29172.67305.stgit@valrhona.uglyboxes.com \
--to=keiths@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).