From 71bed2dba6c0706633ead4994cc89e063abf28ea Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 3 May 2019 17:03:40 -0600 Subject: [PATCH] Add completion for Ada catch commands This patch adds a completion function to the "catch exception" and "catch handlers" commands. Tested on x86-64 Fedora 29; reviewed off-list by Joel. gdb/ChangeLog 2019-05-10 Tom Tromey * ada-lang.c (catch_ada_completer): New function. (_initialize_ada_language): Use it. gdb/testsuite/ChangeLog 2019-05-10 Tom Tromey * gdb.ada/info_exc.exp: Add "complete" test. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 20 ++++++++++++++++++-- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.ada/info_exc.exp | 4 ++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 82d6206f726..f1c39a4aa3f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-05-10 Tom Tromey + + * ada-lang.c (catch_ada_completer): New function. + (_initialize_ada_language): Use it. + 2019-05-10 Tom Tromey * thread.c (print_thread_info): Make "requested_threads" const. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index e513280a415..dee3a83f98c 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13342,6 +13342,22 @@ catch_ada_handlers_command (const char *arg_entry, int from_tty, from_tty); } +/* Completion function for the Ada "catch" commands. */ + +static void +catch_ada_completer (struct cmd_list_element *cmd, completion_tracker &tracker, + const char *text, const char *word) +{ + std::vector exceptions = ada_exceptions_list (NULL); + + for (const ada_exc_info &info : exceptions) + { + if (startswith (info.name, word)) + tracker.add_completion + (gdb::unique_xmalloc_ptr (xstrdup (info.name))); + } +} + /* Split the arguments specified in a "catch assert" command. ARGS contains the command's arguments (or the empty string if @@ -14562,7 +14578,7 @@ termination).\n\ Otherwise, the catchpoint only stops when the name of the exception being\n\ raised is the same as ARG."), catch_ada_exception_command, - NULL, + catch_ada_completer, CATCH_PERMANENT, CATCH_TEMPORARY); @@ -14570,7 +14586,7 @@ raised is the same as ARG."), Catch Ada exceptions, when handled.\n\ With an argument, catch only exceptions with the given name."), catch_ada_handlers_command, - NULL, + catch_ada_completer, CATCH_PERMANENT, CATCH_TEMPORARY); add_catch_command ("assert", _("\ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 867dc874ccc..252a183d979 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-05-10 Tom Tromey + + * gdb.ada/info_exc.exp: Add "complete" test. + 2019-05-09 Tom de Vries * gdb.arch/amd64-tailcall-self.S: Make DW_FORM_ref4 references diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp index 9a117094586..48bd2cd96f0 100644 --- a/gdb/testsuite/gdb.ada/info_exc.exp +++ b/gdb/testsuite/gdb.ada/info_exc.exp @@ -49,3 +49,7 @@ gdb_test "info exceptions const.aint" \ "constraint_error: $hex" \ "const.aint_global_gdb_e: $hex"] +foreach cmd {exception handlers} { + gdb_test "complete catch $cmd const.a" \ + "catch $cmd const.aint_global_gdb_e" +} -- 2.30.2