From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id BA8D53841454 for ; Fri, 24 Jun 2022 14:32:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA8D53841454 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-ZGOhma1UOiSdm6a0R0jnBA-1; Fri, 24 Jun 2022 10:32:15 -0400 X-MC-Unique: ZGOhma1UOiSdm6a0R0jnBA-1 Received: by mail-wr1-f71.google.com with SMTP id i17-20020adfaad1000000b0021b883a2892so378116wrc.22 for ; Fri, 24 Jun 2022 07:32:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=3KALAWaNykI12zS/p81QPiWud4D9w5AH8ibpdkxIyas=; b=bK1n1HMG3GpLZBUJwIw/JRy6cvzGjq0C31dEuaaeLw4MuF+b+g+2sn6JIef5z+sDZb iN0bfpM7qId3RYmzUYrjPMsb8wIVw1h9FKDXo86NvT09DGjrXl/7yfIoZTy8N4Nr+iBN rsm/tV6FdZY/5/zq7GEbp7NIk8BWUpgXnj4Yy6kjIED5XF4Vv0DWPXnBAvlu7muH+oxi YeIP2j0eRWhL4yRgpPjnMMYwdSFkjnbPcKXu72oR4/rfpRLmCSHo6LYlhz02okJHFTQI MTpnZntUUvSdXUsl/XFrZy+6LHyfx31eY+sFjVdwga5wXl/aHwrIkDr0ugqAjf0bjg8O pngQ== X-Gm-Message-State: AJIora/fQ3/Yn5wv6Z+O3ymIw4HZuUqXgrdJ3+h7H2zTJah+OZvK6X1/ Zpk9wmNcC4wv4sUnsW7jUWfs5sIO3cCP7DU+ZNJrpTvOCvBoTYqfnq7LFaYqxFAcsE4pyQJdyIO jDpav6C6MERctAIs927ykhQ== X-Received: by 2002:adf:ce8f:0:b0:21b:b56a:fa24 with SMTP id r15-20020adfce8f000000b0021bb56afa24mr3050217wrn.173.1656081133616; Fri, 24 Jun 2022 07:32:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t2JB01RnCWqOH+C3L0EqHOCUdxqnXQeI8RA0heNcgzyXHdXD0O66aZIzxmICsF8v79m3IJ0g== X-Received: by 2002:adf:ce8f:0:b0:21b:b56a:fa24 with SMTP id r15-20020adfce8f000000b0021bb56afa24mr3050195wrn.173.1656081133360; Fri, 24 Jun 2022 07:32:13 -0700 (PDT) Received: from localhost ([195.213.152.79]) by smtp.gmail.com with ESMTPSA id j25-20020a5d4539000000b0021b86dbad37sm2387782wra.68.2022.06.24.07.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jun 2022 07:32:12 -0700 (PDT) From: Andrew Burgess To: "Maciej W. Rozycki" , gdb-patches@sourceware.org Cc: Simon Sobisch , Tom Tromey Subject: Re: [PATCH v5 1/8] GDB: Remove extraneous full stops from `set' command error messages In-Reply-To: References: Date: Fri, 24 Jun 2022 15:32:11 +0100 Message-ID: <87a6a2b09g.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 14:32:18 -0000 "Maciej W. Rozycki" 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"