Update help text in ada-lang.c

I noticed that the "catch assert" help text erroneously claimed to
accept an argument, and while fixing this I went ahead and added
"Usage" text and made other minor updates to the commands in
ada-lang.c.

Tested on x86-64 Fedora 29.

gdb/ChangeLog
2019-06-10  Tom Tromey  <tromey@adacore.com>

	* ada-lang.c (_initialize_ada_language): Update help text.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59dde119b70b6cb5b8cd8d6130da293aea16113b..d539e813f6805fb617efb97d8bde155a12b4c216 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-10  Tom Tromey  <tromey@adacore.com>
+
+       * ada-lang.c (_initialize_ada_language): Update help text.
+

 2019-06-10  Tom Tromey  <tromey@adacore.com>
 
        * m32c-tdep.c (m32c_m16c_address_to_pointer): Don't end warning
 2019-06-10  Tom Tromey  <tromey@adacore.com>
 
        * m32c-tdep.c (m32c_m16c_address_to_pointer): Don't end warning

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 22c51fbf082473932192596ff02defe0c67c437a..1f0ada35902422a61245e688cddd6a20758b0f03 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -14407,14 +14407,15 @@ overloads selection menu is activated"),
 
   add_catch_command ("exception", _("\
 Catch Ada exceptions, when raised.\n\
 
   add_catch_command ("exception", _("\
 Catch Ada exceptions, when raised.\n\

-Usage: catch exception [ ARG ]\n\
-\n\
+Usage: catch exception [ARG] [if CONDITION]\n\

 Without any argument, stop when any Ada exception is raised.\n\
 If ARG is \"unhandled\" (without the quotes), only stop when the exception\n\
 being raised does not have a handler (and will therefore lead to the task's\n\
 termination).\n\
 Otherwise, the catchpoint only stops when the name of the exception being\n\
 Without any argument, stop when any Ada exception is raised.\n\
 If ARG is \"unhandled\" (without the quotes), only stop when the exception\n\
 being raised does not have a handler (and will therefore lead to the task's\n\
 termination).\n\
 Otherwise, the catchpoint only stops when the name of the exception being\n\

-raised is the same as ARG."),
+raised is the same as ARG.\n\
+CONDITION is a boolean expression that is evaluated to see whether the\n\
+exception should cause a stop."),

                     catch_ada_exception_command,
                     catch_ada_completer,
                     CATCH_PERMANENT,
                     catch_ada_exception_command,
                     catch_ada_completer,
                     CATCH_PERMANENT,


@@ -14422,14 +14423,20 @@ raised is the same as ARG."),
 
   add_catch_command ("handlers", _("\
 Catch Ada exceptions, when handled.\n\
 
   add_catch_command ("handlers", _("\
 Catch Ada exceptions, when handled.\n\

-With an argument, catch only exceptions with the given name."),
+Usage: catch handlers [ARG] [if CONDITION]\n\
+Without any argument, stop when any Ada exception is handled.\n\
+With an argument, catch only exceptions with the given name.\n\
+CONDITION is a boolean expression that is evaluated to see whether the\n\
+exception should cause a stop."),

                     catch_ada_handlers_command,
                      catch_ada_completer,
                     CATCH_PERMANENT,
                     CATCH_TEMPORARY);
   add_catch_command ("assert", _("\
 Catch failed Ada assertions, when raised.\n\
                     catch_ada_handlers_command,
                      catch_ada_completer,
                     CATCH_PERMANENT,
                     CATCH_TEMPORARY);
   add_catch_command ("assert", _("\
 Catch failed Ada assertions, when raised.\n\

-With an argument, catch only exceptions with the given name."),
+Usage: catch assert [if CONDITION]\n\
+CONDITION is a boolean expression that is evaluated to see whether the\n\
+exception should cause a stop."),

                     catch_assert_command,
                      NULL,
                     CATCH_PERMANENT,
                     catch_assert_command,
                      NULL,
                     CATCH_PERMANENT,


@@ -14447,6 +14454,7 @@ and exceeds this limit will cause an error."),
   add_info ("exceptions", info_exceptions_command,
            _("\
 List all Ada exception names.\n\
   add_info ("exceptions", info_exceptions_command,
            _("\
 List all Ada exception names.\n\

+Usage: info exceptions [REGEXP]\n\

 If a regular expression is passed as an argument, only those matching\n\
 the regular expression are listed."));
 
 If a regular expression is passed as an argument, only those matching\n\
 the regular expression are listed."));