ada: Improve -gnatyx style check

Check redundant parentheses in many more places, for now only under
-gnatdQ, while pending violations are fixed.

gcc/ada/

	* par-ch3.adb, sem_ch4.adb (P_Discrete_Range, Analyze_Logical_Op,
	Analyze_Short_Circuit): Add calls to Check_Xtra_Parentheses.
	* par-ch5.adb (P_Condition): Move logic to Check_Xtra_Parentheses.
	* style.ads, styleg.adb, styleg.ads (Check_Xtra_Parens): Move logic
	related to expressions requiring parentheses here.

diff --git a/gcc/ada/par-ch3.adb b/gcc/ada/par-ch3.adb
index b763d41476312ffbfa509529f43e6b8c4bb47923..7126afbfbeb4d44fb8cb9c7edd9c9aa34a200976 100644 (file)
--- a/gcc/ada/par-ch3.adb
+++ b/gcc/ada/par-ch3.adb
@@ -3064,10 +3064,20 @@ package body Ch3 is
       elsif Token = Tok_Dot_Dot then
          Range_Node := New_Node (N_Range, Token_Ptr);
          Set_Low_Bound (Range_Node, Expr_Node);
+
+         if Style_Check then
+            Style.Check_Xtra_Parens (Expr_Node);
+         end if;
+
          Scan; -- past ..
          Expr_Node := P_Expression;
          Check_Simple_Expression (Expr_Node);
          Set_High_Bound (Range_Node, Expr_Node);
+
+         if Style_Check then
+            Style.Check_Xtra_Parens (Expr_Node);
+         end if;
+
          return Range_Node;
 
       --  Otherwise we must have a subtype mark, or an Ada 2012 iterator

diff --git a/gcc/ada/par-ch5.adb b/gcc/ada/par-ch5.adb
index 8f7224517bc3044f3201fdb7493d703c7a2f4ea5..6099a78effba91c649663c44dcfe97c6c642b937 100644 (file)
--- a/gcc/ada/par-ch5.adb
+++ b/gcc/ada/par-ch5.adb
@@ -1355,22 +1355,11 @@ package body Ch5 is
 
          return Cond;
 
-      --  Otherwise check for redundant parentheses but do not emit messages
-      --  about expressions that require parentheses (e.g. conditional,
-      --  quantified or declaration expressions).
+      --  Otherwise check for redundant parentheses
 
       else
-         if Style_Check
-           and then
-             Paren_Count (Cond) >
-               (if Nkind (Cond) in N_Case_Expression
-                                 | N_Expression_With_Actions
-                                 | N_If_Expression
-                                 | N_Quantified_Expression
-                then 1
-                else 0)
-         then
-            Style.Check_Xtra_Parens (First_Sloc (Cond));
+         if Style_Check then
+            Style.Check_Xtra_Parens (Cond, Enable => True);
          end if;
 
          --  And return the result

diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 03737db90d4c5fc9e1c33ce455d79bb5e96cff45..e9c5b9f8a33d112beb72ccc69fc287edea0a18e5 100644 (file)
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -65,6 +65,7 @@ with Sinfo;          use Sinfo;
 with Sinfo.Nodes;    use Sinfo.Nodes;
 with Sinfo.Utils;    use Sinfo.Utils;
 with Snames;         use Snames;
+with Style;          use Style;
 with Tbuild;         use Tbuild;
 with Uintp;          use Uintp;
 with Warnsw;         use Warnsw;
@@ -3134,6 +3135,20 @@ package body Sem_Ch4 is
 
       Operator_Check (N);
       Check_Function_Writable_Actuals (N);
+
+      if Style_Check then
+         if Nkind (L) not in N_Short_Circuit | N_Op_And | N_Op_Or | N_Op_Xor
+           and then Is_Boolean_Type (Etype (L))
+         then
+            Check_Xtra_Parens (L);
+         end if;
+
+         if Nkind (R) not in N_Short_Circuit | N_Op_And | N_Op_Or | N_Op_Xor
+           and then Is_Boolean_Type (Etype (R))
+         then
+            Check_Xtra_Parens (R);
+         end if;
+      end if;
    end Analyze_Logical_Op;
 
    ---------------------------
@@ -6006,6 +6021,18 @@ package body Sem_Ch4 is
          Resolve (R, Standard_Boolean);
          Set_Etype (N, Standard_Boolean);
       end if;
+
+      if Style_Check then
+         if Nkind (L) not in N_Short_Circuit | N_Op_And | N_Op_Or | N_Op_Xor
+         then
+            Check_Xtra_Parens (L);
+         end if;
+
+         if Nkind (R) not in N_Short_Circuit | N_Op_And | N_Op_Or | N_Op_Xor
+         then
+            Check_Xtra_Parens (R);
+         end if;
+      end if;
    end Analyze_Short_Circuit;
 
    -------------------

diff --git a/gcc/ada/style.ads b/gcc/ada/style.ads
index 35118f4d0943b5e3afc8fe6aafc4faacacfc582e..4a7faff31e31c22e14e3cb17bcb0f2e8e29e718f 100644 (file)
--- a/gcc/ada/style.ads
+++ b/gcc/ada/style.ads
@@ -28,6 +28,7 @@
 --  gathered in a separate package so that they can more easily be customized.
 --  Calls to these subprograms are only made if Opt.Style_Check is set True.
 
+with Debug; use Debug;
 with Errout;
 with Styleg;
 with Types;    use Types;
@@ -192,10 +193,10 @@ package Style is
      renames Style_Inst.Check_Vertical_Bar;
    --  Called after scanning a vertical bar to check spacing
 
-   procedure Check_Xtra_Parens (Loc : Source_Ptr)
+   procedure Check_Xtra_Parens (N : Node_Id; Enable : Boolean := Debug_Flag_QQ)
      renames Style_Inst.Check_Xtra_Parens;
-   --  Called after scanning an if, case or quantified expression that has at
-   --  least one level of parentheses around the entire expression.
+   --  Called after scanning an expression (N) that does not require an extra
+   --  level of parentheses around the entire expression.
 
    function Mode_In_Check return Boolean
      renames Style_Inst.Mode_In_Check;

diff --git a/gcc/ada/styleg.adb b/gcc/ada/styleg.adb
index 0bb406fb9bb3faf7528e0945ee27f25b72fd9fac..01a650ab18182a0077e4e29ea5aa87f2b5ffa95c 100644 (file)
--- a/gcc/ada/styleg.adb
+++ b/gcc/ada/styleg.adb
@@ -33,6 +33,7 @@ with Csets;          use Csets;
 with Einfo;          use Einfo;
 with Einfo.Utils;    use Einfo.Utils;
 with Err_Vars;       use Err_Vars;
+with Errout;
 with Opt;            use Opt;
 with Scans;          use Scans;
 with Sinfo;          use Sinfo;
@@ -1118,11 +1119,24 @@ package body Styleg is
    -- Check_Xtra_Parens --
    -----------------------
 
-   procedure Check_Xtra_Parens (Loc : Source_Ptr) is
+   procedure Check_Xtra_Parens (N : Node_Id; Enable : Boolean) is
    begin
-      if Style_Check_Xtra_Parens then
+      --  Do not emit messages about expressions that may require parentheses
+
+      if Style_Check_Xtra_Parens
+        and then Enable
+        and then
+          Paren_Count (N) >
+            (if Nkind (N) in N_Case_Expression
+                           | N_Expression_With_Actions
+                           | N_If_Expression
+                           | N_Quantified_Expression
+                           | N_Raise_Expression
+             then 1
+             else 0)
+      then
          Error_Msg -- CODEFIX
-           ("(style) redundant parentheses?x?", Loc);
+           ("(style) redundant parentheses?x?", Errout.First_Sloc (N));
       end if;
    end Check_Xtra_Parens;
 

diff --git a/gcc/ada/styleg.ads b/gcc/ada/styleg.ads
index 6f7fbfc3e4ef249a55aa65ff3a5807dcfb9dcb3a..aa4f65e7d99ca0e9abeceda01a361bcc5f966355 100644 (file)
--- a/gcc/ada/styleg.ads
+++ b/gcc/ada/styleg.ads
@@ -160,9 +160,10 @@ package Styleg is
    procedure Check_Vertical_Bar;
    --  Called after scanning a vertical bar to check spacing
 
-   procedure Check_Xtra_Parens (Loc : Source_Ptr);
-   --  Called after scanning an if, case, or quantified expression that has at
-   --  least one level of parentheses around the entire expression.
+   procedure Check_Xtra_Parens (N : Node_Id; Enable : Boolean);
+   --  Called after scanning an expression (N) that does not require an extra
+   --  level of parentheses around the entire expression.
+   --  Enable is a temporary parameter before enabling these checks by default.
 
    function Mode_In_Check return Boolean;
    pragma Inline (Mode_In_Check);