Re: [RFC] Add ada-exception-catchpoints to -list-features command output.

[Joel Brobecker <brobecker at adacore dot com>]

> > Thanks for the review. As discussed with Tom, I've decided to
> > merge the two entries into one. Attached is a patch that does that,
> > together with a revised manual update.  Can you tell me what you think?
> > In particular, I am wondering whether the "all related to Ada
> > exceptions" really brings anything in this context other than noise.
> 
> Looks good to me, although I suggest a minor correction below.
> 
> > +Indicates support for the following commands, all related to Ada
> > +exceptions:                                   ^^^^^^^^^^^
> 
> I suggest "all of them related" here.

I made the correction you suggested, and pushed the attached patch.

Thank you!

-- 
Joel

>From 93973826c486a6b7b03eddb201e3ce994dd0fb5b Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Tue, 12 Nov 2013 13:43:44 +0400
Subject: [PATCH] Replace "info-ada-exceptions" by "ada-exceptions" in
 -list-features

Rather than having -list-features report support for the GDB/MI
commands providing access to Ada exception catchpoints with one entry,
and the GDB/MI command providing the list of Ada exceptions with
a second entry, this patch merges it all within one single entry.
This is OK, because all these commands were added within a short
amount of time, and within the same release cycle; and it reduces
a bit the size of the output.

gdb/ChangeLog:

        * mi/mi-main.c (mi_cmd_list_features): Replace "info-ada-exceptions"
        entry with "ada-exceptions".

gdb/doc/ChangeLog:

        * gdb.texinfo (GDB/MI Miscellaneous Commands): Delete
        the documentation of "info-ada-exceptions" in the output
        of the "-list-features" command.  Add the documentation
        of the "ada-exception" entry instead.
---
 gdb/ChangeLog       | 5 +++++
 gdb/doc/ChangeLog   | 8 ++++++++
 gdb/doc/gdb.texinfo | 6 ++++--
 gdb/mi/mi-main.c    | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 279e3e2..6c20cce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-13  Joel Brobecker  <brobecker@adacore.com>
 
+	* mi/mi-main.c (mi_cmd_list_features): Replace "info-ada-exceptions"
+	entry with "ada-exceptions".
+
+2013-11-13  Joel Brobecker  <brobecker@adacore.com>
+
 	* symfile.c (reread_symbols): Move call to set_objfile_per_bfd
 	after re-initialization of OBJFILE's obstack.
 
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 2b13843..968201e 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,5 +1,13 @@
+2013-11-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.texinfo (GDB/MI Miscellaneous Commands): Delete
+	the documentation of "info-ada-exceptions" in the output
+	of the "-list-features" command.  Add the documentation
+	of the "ada-exception" entry instead.
+
 2013-11-12  Joel Brobecker  <brobecker@adacore.com>
 
+
 	* gdb.texinfo (GDB/MI Miscellaneous Commands): Fix the first
 	word of a couple of sentences to start with a capital letter.
 
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index de419ea..84acd5c 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -35080,8 +35080,10 @@ Indicates that changes to breakpoints and breakpoints created via the
 CLI will be announced via async records.
 @item ada-task-info
 Indicates support for the @code{-ada-task-info} command.
-@item info-ada-exceptions
-Indicates support for the @code{-info-ada-exceptions} command.
+@item ada-exceptions
+Indicates support for the following commands, all of them related to Ada
+exceptions: @code{-info-ada-exceptions}, @code{-catch-assert} and
+@code{-catch-exception}.
 @end table
 
 @subheading The @code{-list-target-features} Command
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index bf0fce3..c3f7221 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1815,7 +1815,7 @@ mi_cmd_list_features (char *command, char **argv, int argc)
       ui_out_field_string (uiout, NULL, "data-read-memory-bytes");
       ui_out_field_string (uiout, NULL, "breakpoint-notifications");
       ui_out_field_string (uiout, NULL, "ada-task-info");
-      ui_out_field_string (uiout, NULL, "info-ada-exceptions");
+      ui_out_field_string (uiout, NULL, "ada-exceptions");
       
 #if HAVE_PYTHON
       if (gdb_python_initialized)
-- 
1.8.1.2