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 AF2223858C74 for ; Wed, 9 Mar 2022 19:17:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AF2223858C74 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 j26so4634573wrb.1 for ; Wed, 09 Mar 2022 11:17:53 -0800 (PST) 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=iYiGPsZcleu8BKWBkjs0DwRGfENSBUkfVTsySltmLkQ=; b=M070Gnl4IIiuyjUkDMhbsyA0DwLGHsbrCou7x/R4Bh++3tYMIKx8hPjufRFC96L2o6 /U+QAPKtFWDJcpP0jPm7SIg/pUj+YVMoblZBMESkh+6EfpQev8A9BJP2ATbHarWZNFNg YDCLJCCWVJJtfpVVWGpLKvv/CcG6AbA4WmgdcaKgj1gYVLJjg/i7160eo7Z1rf3AX5H6 M3ihnz5C41w2VsO38G+R8ErhAdwgbxBo0CdRhuA6E8nmVbLrbxzjEiCTOO52z407accX 0x937vdY/326849NCcXEG2PTGV8a90mQ2gLm7r2sLOsV0Y4CV2TrpPC25ws1vzoyKaY7 3AmQ== 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=iYiGPsZcleu8BKWBkjs0DwRGfENSBUkfVTsySltmLkQ=; b=QQ/VdZDAqf1isHOyZgJqYlPXDfqXnSVTxsfVTcEpEUyH7wzEGsrRY+45h5mm7ZT5EM N+UfsghfKkXuVquSGuhlo5vef+/MOsIpZ3MP2h0wzhmFsaq3SCAh/LlbNNgBQT7kw1Bm wiAgisMgB7ZAtHA6CNzsBBwn21JwdtncpRBdYwQOhYHsbVs7MMf6FbolWyeiefNJC35b PzoxOaVhbS3Z7Me3hx0x8BW3PQRfeNw/2/dVjbmdvbUPaDeo+wBGpgw1bNIsY6311+yh UnFrZLtPREcndNdbLSUsTpfYMR4bCzfhzI1IcAqIK0fjBU4CLHQQ0LzsdQOYgyt4qn2O umpA== X-Gm-Message-State: AOAM533Pow1yoCRjljxN/0+7g6aWN/yKCoUNtQG/AFdfhwGxWZLTD5iO 9Bnlbm0bC5kPu0YS3tY0lKYXj0Bz4oky6A== X-Google-Smtp-Source: ABdhPJzmRApPauIXGedjTOc7QDaUBlqgHFicPt/ED285Gp3d74SObIj3X/ekcm6V0CFY2zzSHpQdMw== X-Received: by 2002:a05:6000:18ae:b0:1f1:f7f8:5a4d with SMTP id b14-20020a05600018ae00b001f1f7f85a4dmr830020wri.43.1646853472697; Wed, 09 Mar 2022 11:17:52 -0800 (PST) Received: from tpp.orcam.me.uk (tpp.orcam.me.uk. [2001:8b0:154:0:ea6a:64ff:fe24:f2fc]) by smtp.gmail.com with ESMTPSA id x3-20020a5d6b43000000b001e317fb86ecsm2302161wrw.57.2022.03.09.11.17.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2022 11:17:52 -0800 (PST) Date: Wed, 9 Mar 2022 19:17:51 +0000 (GMT) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Simon Marchi , Tom Tromey , Simon Sobisch Subject: [PATCH v4 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.4 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, 09 Mar 2022 19:17:56 -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. --- 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"