diff mbox series

options: Fix 'enabledby_negargs' typo in 'LangEnabledBy' option property diagnostics (was: r193303 - in /trunk/gcc: ChangeLog opt-function...)

Message ID 87h77h9kr2.fsf@euler.schwinge.homeip.net
State Committed
Headers
Series options: Fix 'enabledby_negargs' typo in 'LangEnabledBy' option property diagnostics (was: r193303 - in /trunk/gcc: ChangeLog opt-function...) |

Commit Message

Thomas Schwinge March 29, 2022, 9:21 a.m. UTC 
  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  <manu@gcc.gnu.org>
>
>       * 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
diff mbox series

Patch

From 2788d42bdc66988449d40bf638f203a7cffc6cd9 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
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