From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 26 Nov 2020 17:37:09 +0000 (+0100)
Subject: [Ada] Simplify check for extra parens
X-Git-Tag: basepoints/gcc-12~2188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d07d75d69d8d145329b6a81db1fc74f4e3c812b;p=thirdparty%2Fgcc.git

[Ada] Simplify check for extra parens

gcc/ada/

	* par-ch5.adb (P_Condition): Simplify condition for warning
	about extra parens and make it easier to understand.
---

diff --git a/gcc/ada/par-ch5.adb b/gcc/ada/par-ch5.adb
index ce02af727736..a8d49b1596fb 100644
--- a/gcc/ada/par-ch5.adb
+++ b/gcc/ada/par-ch5.adb
@@ -1306,14 +1306,16 @@ package body Ch5 is
       --  syntax rule.
 
       else
-         if Style_Check and then Paren_Count (Cond) > 0 then
-            if Nkind (Cond) not in N_If_Expression
-                                 | N_Case_Expression
+         if Style_Check
+           and then
+             Paren_Count (Cond) >
+               (if Nkind (Cond) in N_Case_Expression
+                                 | N_If_Expression
                                  | N_Quantified_Expression
-              or else Paren_Count (Cond) > 1
-            then
-               Style.Check_Xtra_Parens (First_Sloc (Cond));
-            end if;
+                then 1
+                else 0)
+         then
+            Style.Check_Xtra_Parens (First_Sloc (Cond));
          end if;
 
          --  And return the result