From patchwork Tue Mar 29 09:21:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 52438 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5B1F3888C7F for ; Tue, 29 Mar 2022 09:22:24 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 92C703858C50; Tue, 29 Mar 2022 09:22:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 92C703858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.90,219,1643702400"; d="scan'208,223";a="73773764" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 29 Mar 2022 01:22:05 -0800 IronPort-SDR: mwKuvyaK+sO6D0itnD5Z/pvcsI1ppeHlsmalHcbco6uB3w9QMtxmZeIZkLxNTGQ18Y4gcjWWIb 4WNk0cvkQM7PUO3qxF5FzP0qQTpt6g2Llhg0TY/Iyy9js0GNYntZ4fIF0lWFshmuwlqF3CQ60C JjKtdWrKE/voXcMOpQoJg/HUs2mdw9lcGIuRymapUWjahhgxztMW2rfTVCL0H8v+Gr/xK1yE1O Uh14UpjWaGZyVFyuHhLIQNZP0GCUK2Q9TpQkcCz4QQGbhNQMqjmObYaOfdwxcXVBNHGbPt9iA+ foM= From: Thomas Schwinge To: , Subject: options: Fix 'enabledby_negargs' typo in 'LangEnabledBy' option property diagnostics (was: r193303 - in /trunk/gcc: ChangeLog opt-function...) In-Reply-To: <20121107181102.28015.qmail@sourceware.org> References: <20121107181102.28015.qmail@sourceware.org> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Tue, 29 Mar 2022 11:21:53 +0200 Message-ID: <87h77h9kr2.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph Myers Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2012-11-07T18:11:02+0000, manu@gcc.gnu.org wrote: > Author: manu > Date: Wed Nov 7 18:11:01 2012 > New Revision: 193303 > > URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=193303 > Log: > 2012-11-07 Manuel López-Ibáñez > > * optc-gen.awk: Factor code out to... > * opt-functions.awk (lang_enabled_by): ... this new function. > > Modified: > trunk/gcc/ChangeLog > trunk/gcc/opt-functions.awk > trunk/gcc/optc-gen.awk In improving the diagnostic, this has introduced a 'enabledby_negargs' typo: | --- gcc/optc-gen.awk | +++ gcc/optc-gen.awk | [...] | - enabledby_negarg = nth_arg(3, enabledby_arg) | [...] | - if (enabledby_posarg != "" && enabledby_negarg != "") { | - with_args = "," enabledby_posarg "," enabledby_negarg | - } else if (enabledby_posarg == "" && enabledby_negarg == "") { | - with_args = "" | - } else { | - print "#error LangEnabledBy with three arguments, it should have either 2 or 4" | - } | [...] | + lang_enabled_by(enabledby_langs, enabledby_name, enabledby_posarg, enabledby_negarg); | [...] | --- gcc/opt-functions.awk | +++ gcc/opt-functions.awk | [...] | +function lang_enabled_by(enabledby_langs, enabledby_name, enabledby_posarg, enabledby_negarg) | +{ | [...] | + if (enabledby_posarg != "" && enabledby_negarg != "") { | + with_args = "," enabledby_posarg "," enabledby_negarg | + } else if (enabledby_posarg == "" && enabledby_negarg == "") { | + with_args = "" | + } else { | + print "#error LangEnabledBy("enabledby_langs","enabledby_name", " \ | + enabledby_posarg", " enabledby_negargs \ | + ") with three arguments, it should have either 2 or 4" | [...] As obvious, pushed to master branch commit 2788d42bdc66988449d40bf638f203a7cffc6cd9 "options: Fix 'enabledby_negargs' typo in 'LangEnabledBy' option property diagnostics", see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 2788d42bdc66988449d40bf638f203a7cffc6cd9 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 28 Mar 2022 10:25:16 +0200 Subject: [PATCH] options: Fix 'enabledby_negargs' typo in 'LangEnabledBy' option property diagnostics Originally introduced almost ten years ago in r193303/commit 0829c7f7c5210cd1581042115cfe95c97283f44c "optc-gen.awk: Factor code out to...". gcc/ * opt-functions.awk (lang_enabled_by): Fix 'enabledby_negargs' typo. --- gcc/opt-functions.awk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/opt-functions.awk b/gcc/opt-functions.awk index 5b0bc6634f5..9eccf9b0409 100644 --- a/gcc/opt-functions.awk +++ b/gcc/opt-functions.awk @@ -388,7 +388,7 @@ function lang_enabled_by(enabledby_langs, enabledby_name, enabledby_posarg, enab with_args = "" } else { print "#error " opts[i] " LangEnabledBy("enabledby_langs","enabledby_name", " \ - enabledby_posarg", " enabledby_negargs \ + enabledby_posarg", " enabledby_negarg \ ") with three arguments, it should have either 2 or 4" } @@ -397,7 +397,7 @@ function lang_enabled_by(enabledby_langs, enabledby_name, enabledby_posarg, enab enabledby_index = opt_numbers[enabledby_array[k]]; if (enabledby_index == "") { print "#error " opts[i] " LangEnabledBy("enabledby_langs","enabledby_name", " \ - enabledby_posarg", " enabledby_negargs"), unknown option '" enabledby_name "'" + enabledby_posarg", " enabledby_negarg"), unknown option '" enabledby_name "'" } else { for (j = 1; j <= n_enabledby_arg_langs; j++) { lang_name = lang_sanitized_name(enabledby_arg_langs[j]); -- 2.35.1