Minor refactorings/reformattings/typo fixes

Author: pmderodat

testsuite/tests/subp_of_interest/test.py

@@ -47,8 +47,8 @@
 if thistest.options.trace_mode == "bin":
     thistest.fail_if_no_match(
         "gnatcov coverage output",
-        "warning: Ignoring --subprograms switches as this is not supported with"
-        " binary traces.",
+        "warning: Ignoring --subprograms switches as this is not supported"
+        " with binary traces.",
         contents_of("coverage.log"),
     )
 else:
@@ -61,9 +61,9 @@
         "xcov_subp",
     )
 
-    # Then check that the checkpoint contains only coverage data for the specific
-    # subprogram. To do this, produce a new coverage report from the checkpoint
-    # without using the --subprograms switch.
+    # Then check that the checkpoint contains only coverage data for the
+    # specific subprogram. To do this, produce a new coverage report from the
+    # checkpoint without using the --subprograms switch.
     xcov(
         cov_args[:-1]
         + ["--checkpoint", "trace.ckpt", "--output-dir=xcov_no_subp"]
@@ -90,10 +90,12 @@
         regexp=r".*Wrong argument passed to --subprograms: .*",
         actual=contents_of("xcov-wrong1.txt"),
     )
-    
+
     # Case 2: line number is not a number
     xcov(
-        cov_args + ["--subprograms", f"{os.path.join('..', 'src', 'pkg.ads')}:b",],
+        cov_args + [
+            "--subprograms", f"{os.path.join('..', 'src', 'pkg.ads')}:b",
+        ],
         out="xcov-wrong2.txt",
         register_failure=False,
     )
@@ -102,7 +104,7 @@
         regexp=r".*Wrong argument passed to --subprograms: .*",
         actual=contents_of("xcov-wrong2.txt"),
     )
-    
+
     # Case 3: file does not exist
     xcov(
         cov_args + ["--subprograms", "dumb-file-name:4"],
@@ -111,11 +113,12 @@
     )
     thistest.fail_if_no_match(
         what="unexpected coverage output",
-        regexp=r".*Error when parsing --subprograms argument dumb-file-name:4:"
-        r".*dumb-file-name does not exist",
+        regexp=(
+            r".*Error when parsing --subprograms argument dumb-file-name:4:"
+            r".*dumb-file-name does not exist"
+        ),
         actual=contents_of("xcov-wrong3.txt"),
     )
 
 
-
 thistest.result()

testsuite/tests/subp_of_interest_c/test.py

@@ -10,8 +10,8 @@
 
 from SCOV.minicheck import build_run_and_coverage, check_xcov_reports
 from SUITE.context import thistest
-from SUITE.cutils import contents_of, Wdir
-from SUITE.tutils import gprfor, xcov
+from SUITE.cutils import Wdir
+from SUITE.tutils import gprfor
 from SUITE.gprutils import GPRswitches
 
 tmp = Wdir("tmp_")

tools/gnatcov/coverage-source.adb

@@ -1948,6 +1948,7 @@ package body Coverage.Source is
    is
       CU : CU_Id;
       BM : CU_Bit_Maps;
+      ST : Scope_Traversal_Type;
 
       procedure Set_Executed (SCI : in out Source_Coverage_Info);
       --  Mark SCI as executed
@@ -1962,6 +1963,12 @@ package body Coverage.Source is
             when File_Based_Language => +CU_Name.Filename);
       --  Helper to refer to the instrumented unit in an error message
 
+      procedure Update_SCI_Wrapper
+        (SCO     : SCO_Id;
+         Tag     : SC_Tag;
+         Process : access procedure (SCI : in out Source_Coverage_Info));
+      --  Execute Process on the SCI for the given SCO and tag
+
       ------------------
       -- Set_Executed --
       ------------------
@@ -1985,13 +1992,9 @@ package body Coverage.Source is
                  when Unit_Separate => "separate");
       end Part_Image;
 
-      ST : Scope_Traversal_Type;
-
-      procedure Update_SCI_Wrapper
-        (SCO     : SCO_Id;
-         Tag     : SC_Tag;
-         Process : access procedure (SCI : in out Source_Coverage_Info));
-      --  Execute Process on the SCI for the given SCO and tag
+      ------------------------
+      -- Update_SCI_Wrapper --
+      ------------------------
 
       procedure Update_SCI_Wrapper
         (SCO     : SCO_Id;

tools/gnatcov/gnatcov_bits_specific.adb

@@ -367,14 +367,15 @@ procedure GNATcov_Bits_Specific is
       -- Process_Subp_Input --
       ------------------------
 
-      procedure Process_Subp_Input (Subp_Input : String)
-      is
-         Colon_Index : constant Natural :=
+      procedure Process_Subp_Input (Subp_Input : String) is
+         Column_Index : constant Natural :=
            Ada.Strings.Fixed.Index (Subp_Input, Ada.Strings.Maps.To_Set (':'));
-         Filename    : constant String :=
-           Subp_Input (Subp_Input'First .. Colon_Index - 1);
+         Filename     : String renames
+           Subp_Input (Subp_Input'First .. Column_Index - 1);
+         Column       : String renames
+           Subp_Input (Column_Index + 1 .. Subp_Input'Last);
       begin
-         if Colon_Index = 0 then
+         if Column_Index = 0 then
             raise Constraint_Error;
          end if;
          if not Exists (Filename) then
@@ -385,14 +386,10 @@ procedure GNATcov_Bits_Specific is
          Subps_Of_Interest.Include
            (Scope_Entity_Identifier'
               (Decl_SFI  =>
-                   Get_Index_From_Full_Name
-                      (Full_Name (Filename), Source_File),
-               Decl_Line =>
-                 Natural'Value
-                   (Subp_Input (Colon_Index + 1 .. Subp_Input'Last))));
-
+                 Get_Index_From_Full_Name (Full_Name (Filename), Source_File),
+               Decl_Line => Natural'Value (Column)));
       exception
-            --  Deal gracefully with parsing errors
+         --  Deal gracefully with parsing errors
 
          when Constraint_Error =>
             Outputs.Fatal_Error
@@ -1771,8 +1768,7 @@ begin
          --  Warn when the user hasn't explicitly set a coverage level and
          --  default to stmt.
 
-         if not (Source_Coverage_Enabled or else Object_Coverage_Enabled)
-         then
+         if not (Source_Coverage_Enabled or else Object_Coverage_Enabled) then
             Warn ("Coverage level not specified on the command line or in the"
                   & " project file (--level=" & Source_Level_Options
                   & "|" & Object_Level_Options ("|") & "), defaulting to"

tools/gnatcov/sc_obligations.adb

@@ -601,8 +601,7 @@ package body SC_Obligations is
    -- Scope_Traversal --
    ---------------------
 
-   function Scope_Traversal (CU : CU_Id) return Scope_Traversal_Type
-   is
+   function Scope_Traversal (CU : CU_Id) return Scope_Traversal_Type is
       Result : Scope_Traversal_Type;
    begin
       if CU = No_CU_Id then
@@ -614,19 +613,15 @@ package body SC_Obligations is
              (CU_Vector.Reference (CU).Element.Scope_Entities));
       Result.Scope_Stack := Scope_Stacks.Empty_List;
       Result.Active_Scopes := Scope_Id_Sets.Empty;
-      Result.Active_Scope_Ent := Result.It.First;
-      Result.Next_Scope_Ent := Result.It.Next (Result.Active_Scope_Ent);
+      Set_Active_Scope_Ent (Result, Result.It.First);
       return Result;
    end Scope_Traversal;
 
    ------------------
    -- Traverse_SCO --
    ------------------
 
-   procedure Traverse_SCO
-     (ST  : in out Scope_Traversal_Type;
-      SCO : SCO_Id)
-   is
+   procedure Traverse_SCO (ST : in out Scope_Traversal_Type; SCO : SCO_Id) is
       use Scope_Entities_Trees;
    begin
       --  In some cases (C metaprogramming instances), e.g.
@@ -662,18 +657,17 @@ package body SC_Obligations is
 
       while SCO > Element (ST.Active_Scope_Ent).To
         or else (ST.Next_Scope_Ent /= No_Element
-                  and then SCO >= Element (ST.Next_Scope_Ent).From)
+                 and then SCO >= Element (ST.Next_Scope_Ent).From)
       loop
-         --  We can enter the next scope only when we have reached its
-         --  parent scope. If the next scope is null, this means that we
-         --  are in the last scope of the unit.
+         --  We can enter the next scope only when we have reached its parent
+         --  scope. If the next scope is null, this means that we are in the
+         --  last scope of the unit.
 
          if ST.Next_Scope_Ent /= No_Element
            and then ST.Active_Scope_Ent = Parent (ST.Next_Scope_Ent)
            and then SCO >= Element (ST.Next_Scope_Ent).From
          then
-            ST.Active_Scope_Ent := ST.Next_Scope_Ent;
-            ST.Next_Scope_Ent := ST.It.Next (ST.Next_Scope_Ent);
+            Set_Active_Scope_Ent (ST, ST.Next_Scope_Ent);
             ST.Scope_Stack.Append (ST.Active_Scope_Ent);
             ST.Active_Scopes.Insert
               (Element (ST.Active_Scope_Ent).Identifier);
@@ -689,6 +683,18 @@ package body SC_Obligations is
       end loop;
    end Traverse_SCO;
 
+   --------------------------
+   -- Set_Active_Scope_Ent --
+   --------------------------
+
+   procedure Set_Active_Scope_Ent
+     (ST        : in out Scope_Traversal_Type;
+      Scope_Ent : Scope_Entities_Trees.Cursor) is
+   begin
+      ST.Active_Scope_Ent := Scope_Ent;
+      ST.Next_Scope_Ent := ST.It.Next (Scope_Ent);
+   end Set_Active_Scope_Ent;
+
    ---------------
    -- Is_Active --
    ---------------
@@ -1376,6 +1382,10 @@ package body SC_Obligations is
       end if;
    end Checkpoint_Load_Unit;
 
+   ----------
+   -- Free --
+   ----------
+
    procedure Free (CU : in out CU_Info) is
       procedure Free is new Ada.Unchecked_Deallocation
         (Statement_Bit_Map, Statement_Bit_Map_Access);

tools/gnatcov/sc_obligations.ads

@@ -180,7 +180,7 @@ package SC_Obligations is
    type Scope_Entity is record
       From, To : SCO_Id;
       --  SCO range for this scope. As scope entities are computed during
-      --  instrumentation, From and To designates low level SCOs that are then
+      --  instrumentation, From and To designate low level SCOs that are then
       --  converted to high level SCOs after processing the low level SCOs.
 
       Name : Unbounded_String;
@@ -232,9 +232,7 @@ package SC_Obligations is
    function Scope_Traversal (CU : CU_Id) return Scope_Traversal_Type;
    --  Return a scope traversal for the given compilation unit
 
-   procedure Traverse_SCO
-     (ST  : in out Scope_Traversal_Type;
-      SCO : SCO_Id);
+   procedure Traverse_SCO (ST : in out Scope_Traversal_Type; SCO : SCO_Id);
    --  Traverse the given SCO and update the Scope_Traversal accordingly. Note
    --  that the scope traversal must be done on increasing SCOs identifiers.
 
@@ -1366,6 +1364,12 @@ private
       --  Iterator to traverse the scope tree
    end record;
 
+   procedure Set_Active_Scope_Ent
+     (ST        : in out Scope_Traversal_Type;
+      Scope_Ent : Scope_Entities_Trees.Cursor);
+   --  Set ST.Active_Scope_Ent to Scope_Ent and set ST.Next_Scope_Ent to the
+   --  next one according to ST's iterator.
+
    No_Scope_Traversal : Scope_Traversal_Type :=
      (Scope_Entities   => Scope_Entities_Trees.Empty_Tree,
       Scope_Stack      => Scope_Stacks.Empty_List,