From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id C7E733888C44 for ; Wed, 30 Mar 2022 10:23:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C7E733888C44 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x435.google.com with SMTP id u3so28609885wrg.3 for ; Wed, 30 Mar 2022 03:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=kWxRCXvGChPFFGG17j/fuWc7Evxy9wyz1muCttuYx1c=; b=bNmJsEIehCkXN5Vg0/Q6hGD0XV1WWZLMHsSqSxagU5Zupi73kVq6rSMVhmd/Nb/mJr KRe6XswSmbjZOP6+p+Eddt0+KqyzCIRFXymNl+aZdqfuwHvkNxkTSX4IH5lv6XV1dUjc 3Zy6GbTzTiNSyuXM5w5/xoFt35L3dk0ZQaHfpastCJH419vEKC0tIVdmR8WMe6XXp9HO 23jmTnc7BrLwGY2BpowpBMEN+v9q/WiHV75khaT3ThQ/4YKwsLxuQBPSAxZMYLWQ908g PaAmIbkckuySdHyUyPxNP86q7LsJdl84aFmrrGQeXusZGzKoDn5JrCmzP9eWwfQhY3RQ mJrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=kWxRCXvGChPFFGG17j/fuWc7Evxy9wyz1muCttuYx1c=; b=22XPNTVtqOS6MqfgE5oZmlzwWWwQKj0DIDhk6ulo4NGAQYUL51p8RlbD4vWEYhe2g6 5a07YzsARXwg9dz+CmODTXuDdOYiPzcOMtUAM2hiu0IFRqhIHtZBlIjMJuSeV6Jnbyz3 /LvJTtarrGo18HHNEowkl7CAl4Ev5aHjU5dK7YPH3x1XCQSOZakCoRLp7he2FkmONpYC n2LbARO6YApDnjdtsdESfO9CkuVZXuXA7bLdTgv+Z9s4T2i6gmL/SzOIsuhd7DISiwWo q+92TrNqUHabU58fLOZAqD0NPzZzlKbAXYgkJ5iaPJ7bHFuGRjqHfS0S90Jsat5GxKEp g1Lw== X-Gm-Message-State: AOAM530xEZVeIHEhE9LFX857ohpLcDRhBbWqfmhegQnWZOqZHev4m0my AseheaUi/wXCv/yk6UM41skgogsdkOsjlQ== X-Google-Smtp-Source: ABdhPJwye0rsDWdLzrkluAEO/6c1kFPQx367jt2WnRJ4ETdIr4LKx5fzVhWedevFiNSLMGpCSNAq5g== X-Received: by 2002:a5d:6d8a:0:b0:204:909:2d9a with SMTP id l10-20020a5d6d8a000000b0020409092d9amr36847966wrs.435.1648635831502; Wed, 30 Mar 2022 03:23:51 -0700 (PDT) Received: from [192.168.0.201] ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c4fc900b0038cd93a59e4sm4720875wmq.28.2022.03.30.03.23.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2022 03:23:51 -0700 (PDT) Date: Wed, 30 Mar 2022 11:23:50 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Simon Marchi , Tom Tromey , Simon Sobisch Subject: [PATCH v5 1/8] GDB: Remove extraneous full stops from `set' command error messages In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Wed, 30 Mar 2022 10:23:54 -0000 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. --- 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"