From: Andrew Burgess <aburgess@redhat.com>
To: "Maciej W. Rozycki" <macro@embecosm.com>, gdb-patches@sourceware.org
Cc: Simon Sobisch <simonsobisch@web.de>, Tom Tromey <tom@tromey.com>
Subject: Re: [PATCH v5 1/8] GDB: Remove extraneous full stops from `set' command error messages
Date: Fri, 24 Jun 2022 15:32:11 +0100 [thread overview]
Message-ID: <87a6a2b09g.fsf@redhat.com> (raw)
In-Reply-To: <alpine.DEB.2.20.2203301056370.11552@tpp.orcam.me.uk>
"Maciej W. Rozycki" <macro@embecosm.com> writes:
> With errors given for bad commands such as `set annotate' or `set width'
> we produce an extraneous full stop within parentheses:
>
> (gdb) set annotate
> Argument required (integer to set it to.).
> (gdb) set width
> Argument required (integer to set it to, or "unlimited".).
> (gdb)
>
> This is grammatically incorrect, so remove the full stop and adjust the
> testsuite accordingly.
LGTM.
Thanks,
Andrew
> ---
> No change from v4.
>
> New change in v4.
> ---
> gdb/cli/cli-setshow.c | 10 +++++-----
> gdb/testsuite/gdb.base/with.exp | 8 ++++----
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> gdb-parse-cli-var-integer-msg-stop.diff
> Index: src/gdb/cli/cli-setshow.c
> ===================================================================
> --- src.orig/gdb/cli/cli-setshow.c
> +++ src/gdb/cli/cli-setshow.c
> @@ -195,9 +195,9 @@ parse_cli_var_uinteger (var_types var_ty
> if (*arg == nullptr || **arg == '\0')
> {
> if (var_type == var_uinteger)
> - error_no_arg (_("integer to set it to, or \"unlimited\"."));
> + error_no_arg (_("integer to set it to, or \"unlimited\""));
> else
> - error_no_arg (_("integer to set it to."));
> + error_no_arg (_("integer to set it to"));
> }
>
> if (var_type == var_uinteger && is_unlimited_literal (arg, expression))
> @@ -228,7 +228,7 @@ parse_cli_var_zuinteger_unlimited (const
> LONGEST val;
>
> if (*arg == nullptr || **arg == '\0')
> - error_no_arg (_("integer to set it to, or \"unlimited\"."));
> + error_no_arg (_("integer to set it to, or \"unlimited\""));
>
> if (is_unlimited_literal (arg, expression))
> val = -1;
> @@ -418,9 +418,9 @@ do_set_command (const char *arg, int fro
> if (*arg == '\0')
> {
> if (c->var->type () == var_integer)
> - error_no_arg (_("integer to set it to, or \"unlimited\"."));
> + error_no_arg (_("integer to set it to, or \"unlimited\""));
> else
> - error_no_arg (_("integer to set it to."));
> + error_no_arg (_("integer to set it to"));
> }
>
> if (c->var->type () == var_integer && is_unlimited_literal (&arg, true))
> Index: src/gdb/testsuite/gdb.base/with.exp
> ===================================================================
> --- src.orig/gdb/testsuite/gdb.base/with.exp
> +++ src/gdb/testsuite/gdb.base/with.exp
> @@ -99,14 +99,14 @@ with_test_prefix "maint" {
> test_with_error "boolean" "2" "\"on\" or \"off\" expected\\."
> test_with_error "uinteger" "-1" "integer -1 out of range"
> test_with_error "uinteger" "" \
> - "Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
> + "Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
> test_with_error "zuinteger" "-1" "integer -1 out of range"
> test_with_error "zuinteger" "" \
> - "Argument required \\(integer to set it to\\.\\)\\."
> + "Argument required \\(integer to set it to\\)\\."
> test_with_error "zuinteger-unlimited" "-2" \
> "only -1 is allowed to set as unlimited"
> test_with_error "zuinteger-unlimited" "" \
> - "Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
> + "Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
> test_with_error "filename" "" \
> "Argument required \\(filename to set it to\\.\\)\\."
> test_with_error "enum" "" \
> @@ -243,7 +243,7 @@ with_test_prefix "errors" {
> "Cannot use this setting with the \"with\" command"
>
> gdb_test "with print elements -- p 1" \
> - "Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
> + "Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
>
> gdb_test "with -- p 1" \
> "Missing setting before '--' delimiter"
next prev parent reply other threads:[~2022-06-24 14:32 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 10:23 [PATCH v5 0/8] gdb: split array and string limiting options Maciej W. Rozycki
2022-03-30 10:23 ` [PATCH v5 1/8] GDB: Remove extraneous full stops from `set' command error messages Maciej W. Rozycki
2022-06-24 14:32 ` Andrew Burgess [this message]
2022-06-29 14:29 ` Maciej W. Rozycki
2022-03-30 10:23 ` [PATCH v5 2/8] GDB/Python: Use None for `var_zuinteger_unlimited' value set to `unlimited' Maciej W. Rozycki
2022-03-30 10:35 ` Simon Sobisch
2022-03-30 10:40 ` Maciej W. Rozycki
2022-03-30 10:50 ` Simon Sobisch
2022-03-30 11:52 ` Maciej W. Rozycki
2022-06-24 14:40 ` Andrew Burgess
2022-06-29 16:48 ` Maciej W. Rozycki
2022-03-30 10:24 ` [PATCH v5 3/8] GDB: Add `NUMBER' completion to `set' integer commands Maciej W. Rozycki
2022-05-25 18:36 ` Bruno Larsen
2022-05-26 10:09 ` Maciej W. Rozycki
2022-05-26 11:46 ` Bruno Larsen
2022-05-26 14:24 ` Maciej W. Rozycki
2022-06-24 15:08 ` Andrew Burgess
2022-06-30 14:24 ` [PATCH v6 " Maciej W. Rozycki
2022-06-30 15:53 ` Eli Zaretskii
2022-06-30 18:59 ` Maciej W. Rozycki
2022-06-30 16:01 ` Andrew Burgess
2022-03-30 10:24 ` [PATCH v5 4/8] GDB/testsuite: Tighten `set print elements' error check Maciej W. Rozycki
2022-06-24 15:09 ` Andrew Burgess
2022-06-29 14:29 ` Maciej W. Rozycki
2022-03-30 10:24 ` [PATCH v5 5/8] GDB/testsuite: Add coverage for `print -elements' command Maciej W. Rozycki
2022-06-24 15:57 ` Andrew Burgess
2022-07-07 11:04 ` Maciej W. Rozycki
2022-03-30 10:24 ` [PATCH v5 6/8] GDB: Allow arbitrary keywords in integer set commands Maciej W. Rozycki
2022-03-30 10:42 ` Simon Sobisch
2022-03-30 10:58 ` Maciej W. Rozycki
2022-06-28 14:04 ` Andrew Burgess
2022-08-17 22:03 ` Maciej W. Rozycki
2022-03-30 10:24 ` [PATCH v5 7/8] GDB: Add a character string limiting option Maciej W. Rozycki
2022-03-30 12:29 ` Eli Zaretskii
2022-03-30 10:24 ` [PATCH v5 8/8] GDB/testsuite: Expand for character string limiting options Maciej W. Rozycki
2022-04-13 11:20 ` [PING][PATCH v5 0/8] gdb: split array and " Maciej W. Rozycki
2022-04-13 12:10 ` Simon Sobisch
2022-04-13 12:18 ` Maciej W. Rozycki
2022-04-20 19:17 ` [PING^2][PATCH " Maciej W. Rozycki
2022-04-26 19:57 ` Simon Sobisch
2022-04-27 12:00 ` Maciej W. Rozycki
2022-04-27 12:02 ` [PING^3][PATCH " Maciej W. Rozycki
2022-05-04 10:05 ` [PING^4][PATCH " Maciej W. Rozycki
2022-05-12 21:20 ` [PING^5][PATCH " Maciej W. Rozycki
2022-05-20 10:49 ` [PING^6][PATCH " Maciej W. Rozycki
2022-05-25 15:52 ` [PING^7][PATCH " Maciej W. Rozycki
2022-05-25 19:20 ` [PATCH " Bruno Larsen
2022-06-02 17:55 ` [PING^8][PATCH " Maciej W. Rozycki
2022-06-07 17:23 ` Simon Sobisch
2022-06-15 22:47 ` [PING^9][PATCH " Maciej W. Rozycki
2022-06-22 11:25 ` [PING^10][PATCH " Maciej W. Rozycki
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=87a6a2b09g.fsf@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=macro@embecosm.com \
--cc=simonsobisch@web.de \
--cc=tom@tromey.com \
/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).