compiler_wrappers-gcc.adb: minor reformattings

Author: pmderodat

tools/gnatcov/compiler_wrappers-gcc.adb

@@ -212,9 +212,8 @@ is
    -- Split_Args --
    ----------------
 
-   function Split_Args (Command : String) return String_Vectors.Vector
-   is
-      Arg : Unbounded_String;
+   function Split_Args (Command : String) return String_Vectors.Vector is
+      Arg    : Unbounded_String;
       Result : String_Vectors.Vector;
    begin
       for C of Command loop
@@ -260,9 +259,9 @@ is
       Commands_Filename   : constant String :=
         Tmp_Dir.Directory_Name / "commands";
    begin
-      --  Expand the command line using gcc's -### option. TODO??? check if
-      --  the command we are intercepting is a compile / link target and not
-      --  a preprocessing / -### action.
+      --  Expand the command line using gcc's -### option. TODO??? check if the
+      --  command we are intercepting is a compile / link target and not a
+      --  preprocessing / -### action.
 
       Run_Command
         (+Context.Orig_Compiler_Driver,
@@ -272,18 +271,19 @@ is
 
       --  Then, parse the files containing the list of launched commands, using
       --  the following heuristics:
+      --
       --    * If the command is a cc1 invocation (first argument end with cc1),
       --      assume compilation command.
       --    * If the command is an as invocation, assume assembly command.
-      --    * If the command is a collect2 invocation, assume link command
+      --    * If the command is a collect2 invocation, assume link command.
 
       declare
          Commands_File : File_Type;
       begin
          Open (Commands_File, In_File, Commands_Filename);
          while not End_Of_File (Commands_File) loop
             declare
-               Line : constant String := Get_Line (Commands_File);
+               Line    : constant String := Get_Line (Commands_File);
                Command : constant String_Vectors.Vector := Split_Args (Line);
             begin
                if Line = "" then
@@ -353,8 +353,8 @@ is
             Arg : constant Unbounded_String :=
               String_Vectors.Element (Cur);
          begin
-            --  Skip switches arguments that look like filenames. Ideally,
-            --  we would find the positional argument but it is not
+            --  Skip switches arguments that look like filenames. Ideally, we
+            --  would find the positional argument but it is not
             --  straightforward.
 
             if Arg = +"-dumpbase" or else Arg = +"-dumpbase-ext" then
@@ -523,7 +523,7 @@ is
          Args.Append (+Symbol_File);
 
          --  The command can fail with e.g. "file format not recognized" for
-         --  system libraries. TODO???: investigate why. We should also avoid
+         --  system libraries. TODO??? investigate why. We should also avoid
          --  invoking nm on system libraries altogether.
 
          Ignore_Success :=
@@ -542,7 +542,7 @@ is
          while not End_Of_File (Output_File) loop
             declare
                Line_Str : constant String := Get_Line (Output_File);
-               Line : constant Unbounded_String := +Line_Str;
+               Line     : constant Unbounded_String := +Line_Str;
             begin
                if Starts_With (Line, "gnatcov_rts_buffers")
 
@@ -639,7 +639,7 @@ is
 
    Instr_Config_File : constant String :=
      Compiler_Wrapper_Dir / Instrumentation_Config_Filename;
-   Instr_Config : Instrumentation_Config :=
+   Instr_Config      : Instrumentation_Config :=
      Load_Config (Instr_Config_File);
    --  Instrumentation configuration previously generated by the setup step
 
@@ -664,6 +664,8 @@ is
    Instrumented_Files : String_Sets.Set;
    --  List of instrumented files (files of interest / main files / both)
 
+--  Start of processing for Compiler_Wrappers.GCC
+
 begin
    Create_Temporary_Directory
      (Instr_Dir, "gnatcov_instr", Auto_Delete => not Switches.Save_Temps);
@@ -724,12 +726,12 @@ begin
            Comp_DB.Compilation_Commands.Reference (Cur);
          Instrumenter     : Language_Instrumenter'Class :=
            (case Comp_Command.Language is
-               when C_Language => Create_C_Instrumenter (Instr_Config.Tag),
-               when CPP_Language => Create_CPP_Instrumenter (Instr_Config.Tag),
-               when others =>
-                  raise Program_Error
-                    with "Unsupported language for integrated"
-                         & " instrumentation");
+            when C_Language   => Create_C_Instrumenter (Instr_Config.Tag),
+            when CPP_Language => Create_CPP_Instrumenter (Instr_Config.Tag),
+            when others       =>
+               raise Program_Error
+                 with "Unsupported language for integrated"
+                      & " instrumentation");
 
          Fullname    : constant String :=
            Ada.Directories.Full_Name (+Comp_Command.Filename);
@@ -752,7 +754,7 @@ begin
                Unit_Name         => Fullname,
 
                --  Generate all the SID files under the same directory as the
-               --  compiler wrapper as they must persist. TODO???: deal with
+               --  compiler wrapper as they must persist. TODO??? deal with
                --  homonym files in SID names.
 
                SID_Name => Compiler_Wrapper_Dir / (Simple_Name & ".sid"));
@@ -809,9 +811,7 @@ begin
               Config          => Instr_Config);
       begin
          Buffers_List_Unit :=
-           Instrumenter.Emit_Buffers_List_Unit
-             (Buffer_Symbols,
-              Prj);
+           Instrumenter.Emit_Buffers_List_Unit (Buffer_Symbols, Prj);
       end;
    end if;
 
@@ -845,8 +845,8 @@ begin
          begin
             if Ada.Directories.Exists (+Arg) then
                declare
-                  Base      : constant String := Simple_Name (+Arg);
-                  Fullname  : constant String := Full_Name (+Arg);
+                  Base     : constant String := Simple_Name (+Arg);
+                  Fullname : constant String := Full_Name (+Arg);
                begin
                   if Instrumented_Files.Contains (+Fullname) then
                      New_Args.Replace_Element (I, +(Output_Dir / Base));
@@ -923,7 +923,7 @@ begin
                   Packaged_Name : constant String :=
                     New_File
                       (Prj, "instr_" & Filename_Slug (+Orig_Source) & ".a");
-                  Success : Boolean;
+                  Success       : Boolean;
                begin
                   if not Instr_Objects.Is_Empty then
                      declare
@@ -941,9 +941,9 @@ begin
                            Arguments           => Args_Ld,
                            Origin_Command_Name => "compiler wrapper");
 
-                        --  Finally, replace the original object file with
-                        --  the newly created library file, packaging both
-                        --  the instrumented source and its coverage buffer.
+                        --  Finally, replace the original object file with the
+                        --  newly created library file, packaging both the
+                        --  instrumented source and its coverage buffer.
 
                         GNAT.OS_Lib.Copy_File
                           (Packaged_Name,

tools/gnatcov/subprocesses.adb

@@ -485,7 +485,7 @@ package body Subprocesses is
          Environment,
          +Pool.Process_Infos (Id).Output_File,
 
-         --  TODO???: there will be mangling on the stderr if stdout was
+         --  TODO??? there will be mangling on the stderr if stdout was
          --  redirected to an output file.
 
          Err_To_Out   => Output_File = "",