Format GNATcheck sources following changes in GNATformat

Author: HugoGGuerrier

lkql_checker/src/gnatcheck-compiler.adb

@@ -157,15 +157,17 @@ package body Gnatcheck.Compiler is
              (declare
                 Idx : constant Natural := Index (Diag, "warning: ");
               begin
-                (if Idx = 0 then Diag
+                (if Idx = 0
+                 then Diag
                  else
                    Diag (Diag'First .. Idx - 1)
                    & Diag (Idx + 9 .. Diag'Last))),
            when Style =>
              (declare
                 Idx : constant Natural := Index (Diag, "(style) ");
               begin
-                (if Idx = 0 then Diag
+                (if Idx = 0
+                 then Diag
                  else
                    Diag (Diag'First .. Idx - 1)
                    & Diag (Idx + 8 .. Diag'Last))),
@@ -349,11 +351,14 @@ package body Gnatcheck.Compiler is
                  Index (Source => Msg (Last + 1 .. Msg_End), Pattern => "|");
 
                Rule_Name     : constant String :=
-                 (if Name_Split /= 0 then Msg (Name_Split + 1 .. Msg_End - 1)
-                  elsif Last /= 0 then Msg (Last + 1 .. Msg_End - 1)
+                 (if Name_Split /= 0
+                  then Msg (Name_Split + 1 .. Msg_End - 1)
+                  elsif Last /= 0
+                  then Msg (Last + 1 .. Msg_End - 1)
                   else "");
                Instance_Name : constant String :=
-                 (if Name_Split /= 0 then Msg (Last + 1 .. Name_Split - 1)
+                 (if Name_Split /= 0
+                  then Msg (Last + 1 .. Name_Split - 1)
                   else "");
 
                Instance : Rule_Instance_Access := null;
@@ -364,7 +369,8 @@ package body Gnatcheck.Compiler is
                end if;
                Instance :=
                  Get_Instance
-                   (if Instance_Name = "" then To_Lower (Rule_Name)
+                   (if Instance_Name = ""
+                    then To_Lower (Rule_Name)
                     else To_Lower (Instance_Name));
                Store_Diagnosis
                  (Full_File_Name => Gnatcheck.Source_Table.File_Name (SF),
@@ -378,7 +384,7 @@ package body Gnatcheck.Compiler is
                return;
             end;
 
-            --  An error message has been emitted
+         --  An error message has been emitted
          elsif Msg (Msg_Start .. Msg_Start + 6) = "error: " then
             Message_Kind := Error;
 
@@ -392,7 +398,7 @@ package body Gnatcheck.Compiler is
 
             Errors := True;
 
-            --  A warning has been emitted by gprbuild
+         --  A warning has been emitted by gprbuild
          elsif Msg (Msg_Start .. Msg_Start + 8) = "warning: " then
             if Index (Msg (Msg_Start .. Msg_End), ": violation of restriction")
               /= 0
@@ -410,11 +416,11 @@ package body Gnatcheck.Compiler is
                Message_Kind := Warning;
             end if;
 
-            --  A style check violation has been emitted
+         --  A style check violation has been emitted
          elsif Msg (Msg_Start .. Msg_Start + 6) = "(style)" then
             Message_Kind := Style;
 
-            --  Ignore anything else
+         --  Ignore anything else
          else
             return;
          end if;
@@ -436,7 +442,8 @@ package body Gnatcheck.Compiler is
             Diagnosis_Kind => Kind,
             SF             => SF,
             Rule           =>
-              (if Message_Kind = Error then No_Rule_Id
+              (if Message_Kind = Error
+               then No_Rule_Id
                else Get_Rule_Id (Message_Kind)));
       end Analyze_Line;
 
@@ -1323,7 +1330,7 @@ package body Gnatcheck.Compiler is
             Style_To_Instance.Include ([C], Name);
          end loop;
 
-         --  Else, process the argument as a sequence of "gnaty" parameters.
+      --  Else, process the argument as a sequence of "gnaty" parameters.
 
       else
          I := Param'First;
@@ -1936,7 +1943,8 @@ package body Gnatcheck.Compiler is
       else
          First_Idx := First_Idx + String_To_Search'Length;
          Last_Idx :=
-           (if Diag (First_Idx) in '.' | '_' then First_Idx + 1
+           (if Diag (First_Idx) in '.' | '_'
+            then First_Idx + 1
             else First_Idx);
       end if;
 

lkql_checker/src/gnatcheck-diagnoses.adb

@@ -541,13 +541,15 @@ package body Gnatcheck.Diagnoses is
 
    function Auxiliary_List_File_Name (S : String) return String is
       Prj_Out_File   : constant String :=
-        (if Text_Report_ON then Base_Name (Get_Report_File_Name)
+        (if Text_Report_ON
+         then Base_Name (Get_Report_File_Name)
          else Base_Name (Get_XML_Report_File_Name));
       Prj_Out_First  : constant Natural := Prj_Out_File'First;
       Prj_Out_Last   : constant Natural := Prj_Out_File'Last;
       Prj_Out_Dot    : Natural := Index (Prj_Out_File, ".", Backward);
       Prj_Out_Suffix : constant String :=
-        (if Prj_Out_Dot = 0 then ""
+        (if Prj_Out_Dot = 0
+         then ""
          else Prj_Out_File (Prj_Out_Dot .. Prj_Out_Last));
 
       Suff_Start : Natural;
@@ -839,7 +841,8 @@ package body Gnatcheck.Diagnoses is
          if Gnatcheck_Prj.Is_Specified then
             XML_Report
               (" project="""
-               & (if Arg.Aggregated_Project then Get_Aggregated_Project
+               & (if Arg.Aggregated_Project
+                  then Get_Aggregated_Project
                   else Gnatcheck_Prj.Source_Prj)
                & """>");
          else
@@ -1261,7 +1264,8 @@ package body Gnatcheck.Diagnoses is
 
          Append
            (Res,
-            (if Rule in Warnings_Id | Style_Checks_Id then El
+            (if Rule in Warnings_Id | Style_Checks_Id
+             then El
              else GNAT.Case_Util.To_Mixed (El)));
 
          Count := Count + 1;
@@ -2060,7 +2064,8 @@ package body Gnatcheck.Diagnoses is
                declare
                   Sep_Idx          : constant Natural := Index (Param, "=");
                   Restriction_Name : constant String :=
-                    (if Sep_Idx = 0 then Param
+                    (if Sep_Idx = 0
+                     then Param
                      else Param (Param'First .. Sep_Idx - 1));
                begin
                   if Is_Restriction_Active (Restriction_Name) then
@@ -2137,7 +2142,7 @@ package body Gnatcheck.Diagnoses is
                    Exempted_Name => To_Unbounded_String (Exempted_Name),
                    Detected      => 0));
 
-               --  Else, some actuals parameters has been provided
+            --  Else, some actuals parameters has been provided
 
             else
                --  Check that the object is not exempted with the same params
@@ -2301,7 +2306,8 @@ package body Gnatcheck.Diagnoses is
              .To_String;
 
          Just : constant String :=
-           (if Matches (4) = No_Match then ""
+           (if Matches (4) = No_Match
+            then ""
             else
               To_XString (Text (Matches (4).First .. Matches (4).Last))
                 .Trim
@@ -2342,8 +2348,10 @@ package body Gnatcheck.Diagnoses is
             end;
          else
             Process_Exempt_Action
-              (((if State = "on" then Exempt_Off
-                 elsif State = "off" then Exempt_On
+              (((if State = "on"
+                 then Exempt_Off
+                 elsif State = "off"
+                 then Exempt_On
                  else raise Constraint_Error with "should not happen"),
                 To_Unbounded_String (Rule),
                 Params              => <>,
@@ -2503,7 +2511,8 @@ package body Gnatcheck.Diagnoses is
          Diag_Column : constant Positive := Positive (Diag.Sloc.Column);
          SF          : constant SF_Id := Diag.SF;
          R_Name      : constant String :=
-           (if Diag.Diagnosis_Kind = Rule_Violation then Rule_Name (Diag.Rule)
+           (if Diag.Diagnosis_Kind = Rule_Violation
+            then Rule_Name (Diag.Rule)
             else "");
          I_Name      : constant String :=
            (if Diag.Instance /= null and then Diag.Instance.Is_Alias
@@ -2882,7 +2891,8 @@ package body Gnatcheck.Diagnoses is
       use Ada.Directories;
       File_Name : constant Unbounded_String :=
         To_Unbounded_String
-          (if Arg.Full_Source_Locations.Get then Full_File_Name
+          (if Arg.Full_Source_Locations.Get
+           then Full_File_Name
            else Simple_Name (Full_File_Name));
       Tmp       : Diag_Message :=
         (Text           => To_Unbounded_String (Message),
@@ -2992,10 +3002,14 @@ package body Gnatcheck.Diagnoses is
       M_Start     : Natural := Message'First;
    begin
       XML_Report_No_EOL
-        ((if Diag.Diagnosis_Kind = Exemption_Warning then "<exemption-problem"
-          elsif Diag.Diagnosis_Kind = Compiler_Error then "<compiler-error"
-          elsif Diag.Diagnosis_Kind = Internal_Error then "<internal-error"
-          elsif Exempted then "<exempted-violation"
+        ((if Diag.Diagnosis_Kind = Exemption_Warning
+          then "<exemption-problem"
+          elsif Diag.Diagnosis_Kind = Compiler_Error
+          then "<compiler-error"
+          elsif Diag.Diagnosis_Kind = Internal_Error
+          then "<internal-error"
+          elsif Exempted
+          then "<exempted-violation"
           else "<violation"),
          Indent_Level => Indentation);
 
@@ -3047,9 +3061,12 @@ package body Gnatcheck.Diagnoses is
       XML_Report
         ((if Diag.Diagnosis_Kind = Exemption_Warning
           then "</exemption-problem>"
-          elsif Diag.Diagnosis_Kind = Compiler_Error then "</compiler-error>"
-          elsif Diag.Diagnosis_Kind = Internal_Error then "</internal-error>"
-          elsif Exempted then "</exempted-violation>"
+          elsif Diag.Diagnosis_Kind = Compiler_Error
+          then "</compiler-error>"
+          elsif Diag.Diagnosis_Kind = Internal_Error
+          then "</internal-error>"
+          elsif Exempted
+          then "</exempted-violation>"
           else "</violation>"),
          Indent_Level => Indentation);
    end XML_Report_Diagnosis;

lkql_checker/src/gnatcheck-output.adb

@@ -159,7 +159,8 @@ package body Gnatcheck.Output is
 
    function Get_Number return String is
       Report_File_Name : constant String :=
-        (if Text_Report_ON then Get_Report_File_Name
+        (if Text_Report_ON
+         then Get_Report_File_Name
          else Get_XML_Report_File_Name);
 
       Idx_1, Idx_2 : Natural;
@@ -446,13 +447,14 @@ package body Gnatcheck.Output is
               new String'
                 (Normalize_Pathname
                    (Global_Report_Dir.all
-                    & (if Report_File_Name = null then Executable & ".out"
+                    & (if Report_File_Name = null
+                       then Executable & ".out"
                        else Report_File_Name.all)));
          end if;
 
-         --  And in case of Aggregated_Project we already have in
-         --  Report_File_Name the needed name with full path in absolute
-         --  form
+      --  And in case of Aggregated_Project we already have in
+      --  Report_File_Name the needed name with full path in absolute
+      --  form
 
       end if;
 
@@ -492,13 +494,14 @@ package body Gnatcheck.Output is
               new String'
                 (Normalize_Pathname
                    (Global_Report_Dir.all
-                    & (if XML_Report_File_Name = null then Executable & ".xml"
+                    & (if XML_Report_File_Name = null
+                       then Executable & ".xml"
                        else XML_Report_File_Name.all)));
          end if;
 
-         --  And in case of Aggregated_Project we already have in
-         --  Report_File_Name the needed name with full path in absolute
-         --  form
+      --  And in case of Aggregated_Project we already have in
+      --  Report_File_Name the needed name with full path in absolute
+      --  form
 
       end if;
 

lkql_checker/src/gnatcheck-projects-aggregate.adb

@@ -172,15 +172,17 @@ package body Gnatcheck.Projects.Aggregate is
       Prj_Out_Last   : constant Natural := Prj_Out_File'Last;
       Prj_Out_Dot    : Natural := Index (Prj_Out_File, ".", Backward);
       Prj_Out_Suffix : constant String :=
-        (if Prj_Out_Dot = 0 then ""
+        (if Prj_Out_Dot = 0
+         then ""
          else Prj_Out_File (Prj_Out_Dot .. Prj_Out_Last));
 
       Prj_XML_File   : constant String := XML_Report_File_Name;
       Prj_XML_First  : constant Natural := Prj_XML_File'First;
       Prj_XML_Last   : constant Natural := Prj_XML_File'Last;
       Prj_XML_Dot    : Natural := Index (Prj_XML_File, ".", Backward);
       Prj_XML_Suffix : constant String :=
-        (if Prj_XML_Dot = 0 then ""
+        (if Prj_XML_Dot = 0
+         then ""
          else Prj_XML_File (Prj_XML_Dot .. Prj_XML_Last));
 
       Prj_Args       : Argument_List (1 .. 2);
@@ -290,7 +292,8 @@ package body Gnatcheck.Projects.Aggregate is
             Expected_XML_Out_File  =>
               (if XML_Report_ON
                then
-                 (if Out_Args_Count = 2 then Out_Args (2).all
+                 (if Out_Args_Count = 2
+                  then Out_Args (2).all
                   else Out_Args (4).all)
                else ""));
 

lkql_checker/src/gnatcheck-projects.adb

@@ -213,7 +213,8 @@ package body Gnatcheck.Projects is
          return GNAT.OS_Lib.Argument_List_Access
       is
          Attr : constant GPR2.Project.Attribute.Object :=
-           (if Indexed then Proj.Attribute (Attr_Id, Ada_Idx)
+           (if Indexed
+            then Proj.Attribute (Attr_Id, Ada_Idx)
             else Proj.Attribute (Attr_Id));
          Res  : GNAT.OS_Lib.Argument_List_Access;
       begin
@@ -929,7 +930,8 @@ package body Gnatcheck.Projects is
      (My_Project : in out Arg_Project_Type; Project_File_Name : String)
    is
       Ext : constant String :=
-        (if Has_Suffix (Project_File_Name, Suffix => ".gpr") then ""
+        (if Has_Suffix (Project_File_Name, Suffix => ".gpr")
+         then ""
          else ".gpr");
 
    begin
@@ -1102,7 +1104,8 @@ package body Gnatcheck.Projects is
       use Ada.Strings.Unbounded;
 
       Resolved_File : constant String :=
-        (if Is_Absolute_Path (File) then File
+        (if Is_Absolute_Path (File)
+         then File
          else
            (if Project_Relative
             then Gnatcheck_Prj.Get_Project_Relative_File (File)