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.

1 files changed, 17 insertions, 3 deletions

diff --git a/gcc/ada/styleg.adb b/gcc/ada/styleg.adb
index 0bb406f..01a650a 100644
--- 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;