Merge branch 'mr/pmderodat/unbounded_strings' into 'master'

Unify references to unbounded strings

See merge request eng/das/cov/gnatcoverage!356

For https://gitlab.adacore-it.com/eng/das/cov/gnatcoverage/-/issues/176

Author: pmderodat

tools/gnatcov/ali_files.adb

@@ -17,7 +17,6 @@
 ------------------------------------------------------------------------------
 
 with Ada.Characters.Handling; use Ada.Characters.Handling;
-with Ada.Strings.Unbounded;
 with Ada.Text_IO;             use Ada.Text_IO;
 
 with GNAT.Regpat; use GNAT.Regpat;
@@ -29,9 +28,12 @@ with Files_Table; use Files_Table;
 with Get_SCOs;
 with Inputs;      use Inputs;
 with Outputs;     use Outputs;
+with Strings;     use Strings;
 
 package body ALI_Files is
 
+   use all type Unbounded_String;
+
    procedure Read
      (CLS : in out Checkpoint_Load_State; Value : out ALI_Annotation);
    --  Read a ALI_Annotation from CLS
@@ -72,8 +74,6 @@ package body ALI_Files is
    -------------
 
    function Unquote (Filename : String) return String is
-      use Ada.Strings.Unbounded;
-
       Result   : Unbounded_String;
       In_Quote : Boolean := False;
       --  True when we just met a double quote inside a quoted filename. False
@@ -96,7 +96,7 @@ package body ALI_Files is
                Append (Result, C);
             end if;
          end loop;
-         return To_String (Result);
+         return +Result;
       end if;
    end Unquote;
 
@@ -366,17 +366,13 @@ package body ALI_Files is
       --  Check that the first line is a valid ALI V line.
 
       declare
-         use Ada.Strings.Unbounded;
-
          V_Line    : constant String := Get_Stripped_Line (ALI_File);
-
          Error_Msg : Unbounded_String;
       begin
          Match (V_Matcher, V_Line, Matches);
          if Matches (0) = No_Match then
             Error_Msg :=
-              To_Unbounded_String
-                ("malformed ALI file """ & ALI_Filename & """");
+              +("malformed ALI file """ & ALI_Filename & """");
 
             if V_Line'Length > 3
                  and then
@@ -388,7 +384,7 @@ package body ALI_Files is
                   & "to load ALIs from list use ""--scos=@"
                   & ALI_Filename & """");
             end if;
-            Fatal_Error (To_String (Error_Msg));
+            Fatal_Error (+Error_Msg);
          end if;
       end;
 

tools/gnatcov/annotations-cobertura.adb

@@ -22,7 +22,6 @@ with Ada.Containers.Ordered_Maps;
 with Ada.Directories;
 with Ada.Text_IO;              use Ada.Text_IO;
 with Ada.Strings.Fixed;
-with Ada.Strings.Unbounded;    use Ada.Strings.Unbounded;
 with Ada.Unchecked_Deallocation;
 
 with GNAT.OS_Lib;
@@ -424,7 +423,7 @@ package body Annotations.Cobertura is
       Branches_Valid, Branches_Covered : Natural;
       Branch_Rate                      : Rate_Type;
 
-      Filename : Unbounded_String := To_Unbounded_String (Info.Full_Name.all);
+      Filename : Unbounded_String := +Info.Full_Name.all;
       --  Filename to mention in the coverage report. Use the full name, unless
       --  we can remove the prefix according to the --source-root option.
    begin
@@ -459,15 +458,14 @@ package body Annotations.Cobertura is
             Matches             : GNAT.Regpat.Match_Array (0 .. 0);
             First, Last         : Natural;
             Normalized_Filename : constant String :=
-              Paths.Normalize_For_Regexp (To_String (Filename));
+              Paths.Normalize_For_Regexp (+Filename);
          begin
             GNAT.Regpat.Match
               (Pp.Source_Prefix_Pattern.all, Normalized_Filename, Matches);
             if Matches (0) /= GNAT.Regpat.No_Match then
                First := Matches (0).Last + 1;
                Last := Normalized_Filename'Last;
-               Filename :=
-                 To_Unbounded_String (Normalized_Filename (First .. Last));
+               Filename := +Normalized_Filename (First .. Last);
             end if;
          end;
       end if;
@@ -480,7 +478,7 @@ package body Annotations.Cobertura is
       Pp.ST ("classes");
       Pp.ST ("class",
              A ("name", Simple_Source_Filename)
-             & A ("filename", To_String (Filename))
+             & A ("filename", +Filename)
              & A ("line-rate", Img (Line_Rate))
              & A ("branch-rate", Img (Branch_Rate))
              & A ("complexity", "-1"));

tools/gnatcov/annotations-dynamic_html.adb

@@ -19,7 +19,6 @@
 with Ada.Characters.Handling;
 with Ada.Directories;         use Ada.Directories;
 with Ada.Exceptions;          use Ada.Exceptions;
-with Ada.Strings.Unbounded;   use Ada.Strings.Unbounded;
 with Ada.Text_IO;
 
 pragma Warnings (Off, "* is an internal GNAT unit");
@@ -125,7 +124,7 @@ package body Annotations.Dynamic_Html is
       Source_List         : JSON_Array;
       --  The sources array in the index, containing all source mappings
 
-      Title_Prefix        : Ada.Strings.Unbounded.Unbounded_String;
+      Title_Prefix        : Unbounded_String;
       --  Prefix to use for titles in generated HTML documents
 
       Scope_Metrics       : JSON_Value;
@@ -226,7 +225,7 @@ package body Annotations.Dynamic_Html is
    --  Write Item (String) into Output
 
    procedure W
-     (Item     : Ada.Strings.Unbounded.Unbounded_String;
+     (Item     : Unbounded_String;
       Output   : Ada.Text_IO.File_Type;
       New_Line : Boolean := True)
    with Pre => Ada.Text_IO.Is_Open (Output);
@@ -812,7 +811,7 @@ package body Annotations.Dynamic_Html is
          Message.Set_Field ("sco", Image (M.SCO, With_Sloc => False));
       end if;
 
-      Message.Set_Field ("message", To_String (M.Msg));
+      Message.Set_Field ("message", +M.Msg);
       Pp.Current_Mapping.Get ("messages").Append (Message);
    end Pretty_Print_Message;
 
@@ -835,18 +834,18 @@ package body Annotations.Dynamic_Html is
    end W;
 
    procedure W
-     (Item     : Ada.Strings.Unbounded.Unbounded_String;
+     (Item     : Unbounded_String;
       Output   : Ada.Text_IO.File_Type;
       New_Line : Boolean := True)
    is
       use Ada.Text_IO;
 
-      Buffer : Aux.Big_String_Access;
+      Buffer : US.Aux.Big_String_Access;
       Last   : Natural;
-      First  : constant Natural := Aux.Big_String'First;
+      First  : constant Natural := US.Aux.Big_String'First;
 
    begin
-      Aux.Get_String (Item, Buffer, Last);
+      US.Aux.Get_String (Item, Buffer, Last);
       Put (File => Output, Item => Buffer (First .. Last));
 
       if New_Line then
@@ -1119,7 +1118,7 @@ package body Annotations.Dynamic_Html is
                     (In_Filename  => Source_Name,
                      Out_Filename => Target_Name,
                      Pattern      => "<title>.*</title>",
-                     Replacement  => "  <title>" & To_String (Pp.Title_Prefix)
+                     Replacement  => "  <title>" & (+Pp.Title_Prefix)
                                      & "GNATcoverage Report</title>");
                else
                   Copy_File (Source_Name, Target_Name);

tools/gnatcov/annotations-html.adb

@@ -458,7 +458,7 @@ package body Annotations.Html is
 
       Pi ("<html lang=""en"">");
       Pi ("<head>");
-      Pi ("  <title>" & To_String (Pp.Title_Prefix)
+      Pi ("  <title>" & (+Pp.Title_Prefix)
           & "Coverage results</title>");
       Pi ("  <link rel=""stylesheet"" type=""text/css"" href=""xcov.css"">");
       Pi ("</head>");
@@ -484,11 +484,11 @@ package body Annotations.Html is
 
       for El of Sorted_Traces_Files loop
          Pi ("    <tr>");
-         Pi ("      <td>" & To_String (El.Filename) & "</td>");
+         Pi ("      <td>" & (+El.Filename) & "</td>");
          Pi ("      <td>" & Image (El.Kind) & "</td>");
-         Pi ("      <td>" & To_String (El.Program_Name) & "</td>");
-         Pi ("      <td>" & To_String (El.Time) & "</td>");
-         Pi ("      <td>" & To_String (El.User_Data) & "</td>");
+         Pi ("      <td>" & (+El.Program_Name) & "</td>");
+         Pi ("      <td>" & (+El.Time) & "</td>");
+         Pi ("      <td>" & (+El.User_Data) & "</td>");
          Pi ("    </tr>");
       end loop;
 
@@ -598,7 +598,7 @@ package body Annotations.Html is
 
       Plh (Pp, "<html lang=""en"">");
       Plh (Pp, "<head>");
-      Plh (Pp, "  <title>" & To_String (Pp.Title_Prefix) & "Coverage of "
+      Plh (Pp, "  <title>" & (+Pp.Title_Prefix) & "Coverage of "
                 & To_Xml_String (Simple_Source_Filename) & "</title>");
       Plh (Pp, "  <link rel=""stylesheet"" type=""text/css"" "
              & "href=""xcov.css"">");

tools/gnatcov/annotations-html.ads

@@ -16,8 +16,6 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
-
 with Annotations.Xml; use Annotations.Xml;
 with Command_Line;
 with Coverage;
@@ -37,8 +35,7 @@ package Annotations.Html is
      (Report_Title : Command_Line.Parser.String_Option)
       return Unbounded_String
    is ((if Report_Title.Present and then Length (Report_Title.Value) > 0
-        then To_Unbounded_String
-          (To_Xml_String (To_String (Report_Title.Value & " - ")))
+        then +(To_Xml_String (+Report_Title.Value & " - "))
         else Null_Unbounded_String));
    --  If Report_Title is present and non-empty, return the corresponding
    --  report title prefix (for instance: "foo" -> "foo - "). Return an empty

tools/gnatcov/annotations-report.adb

@@ -19,7 +19,6 @@
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 with Ada.Containers.Vectors;
 with Ada.Containers.Indefinite_Ordered_Maps;
-with Ada.Strings.Unbounded;
 with Ada.Text_IO;             use Ada.Text_IO;
 
 with ALI_Files;
@@ -104,10 +103,7 @@ package body Annotations.Report is
         "="          => Message_Vectors."=");
 
    package String_Vectors is
-     new Ada.Containers.Vectors
-       (Natural,
-        Ada.Strings.Unbounded.Unbounded_String,
-        Ada.Strings.Unbounded."=");
+     new Ada.Containers.Vectors (Natural, Unbounded_String, "=");
 
    type Report_Pretty_Printer is new Pretty_Printer with record
       Current_File_Index : Source_File_Index;
@@ -302,7 +298,6 @@ package body Annotations.Report is
 
    procedure Pretty_Print_End (Pp : in out Report_Pretty_Printer) is
       use ALI_Files, ALI_Files.ALI_Annotation_Maps;
-      use Ada.Strings.Unbounded;
 
       Output : constant File_Access := Get_Output;
 
@@ -397,7 +392,7 @@ package body Annotations.Report is
 
       procedure Output_Message (C : Message_Vectors.Cursor) is
          M     : Message renames Message_Vectors.Element (C);
-         Msg   : constant String := To_String (M.Msg);
+         Msg   : constant String := +M.Msg;
          First : Natural := Msg'First;
       begin
 
@@ -551,7 +546,7 @@ package body Annotations.Report is
 
          procedure Output_Message (C : Message_Vectors.Cursor) is
             M            : Message renames Message_Vectors.Element (C);
-            Msg          : constant String := To_String (M.Msg);
+            Msg          : constant String := +M.Msg;
             First        : Natural := Msg'First;
             Show_Vectors : constant Boolean :=
               (Switches.Show_MCDC_Vectors
@@ -625,19 +620,18 @@ package body Annotations.Report is
          --  Append summary line for general summary chapter
 
          Pp.Summary.Append
-           (To_Unbounded_String
-              (Pluralize
-                 (Item_Count,
-                    (case MC is
-                       when Coverage_Violations =>
-                        Non_Exempted
-                          & Coverage_Level'Val (MC)'Img & " " & Item,
-                       when Other_Errors        =>
-                         "other message",
-                       when Coverage_Exclusions  =>
-                         "coverage exclusion",
-                       when Undetermined_Coverage =>
-                         "undetermined coverage item")) & "."));
+           (+(Pluralize
+                (Item_Count,
+                   (case MC is
+                      when Coverage_Violations =>
+                       Non_Exempted
+                         & Coverage_Level'Val (MC)'Img & " " & Item,
+                      when Other_Errors        =>
+                        "other message",
+                      when Coverage_Exclusions  =>
+                        "coverage exclusion",
+                      when Undetermined_Coverage =>
+                        "undetermined coverage item")) & "."));
 
          --  Count of total (coverable) and covered SCOs is displayed only
          --  if --all-messages is specified.
@@ -725,7 +719,7 @@ package body Annotations.Report is
       New_Line (Output.all);
 
       for L of Pp.Summary loop
-         Put_Line (Output.all, To_String (L));
+         Put_Line (Output.all, +L);
       end loop;
 
       if Has_Exempted_Region then
@@ -835,8 +829,6 @@ package body Annotations.Report is
    ------------------------
 
    procedure Pretty_Print_Start (Pp : in out Report_Pretty_Printer) is
-      use Ada.Strings.Unbounded;
-
       Output : constant File_Access := Get_Output;
 
       procedure Process_One_Trace (TF : Trace_File_Element);
@@ -850,11 +842,11 @@ package body Annotations.Report is
          Orig_Context : constant String := Original_Processing_Context (TF);
       begin
          New_Line (Output.all);
-         Put_Line (Output.all, To_String (TF.Filename));
+         Put_Line (Output.all, +TF.Filename);
          Put_Line (Output.all, "  kind     : " & Image (TF.Kind));
-         Put_Line (Output.all, "  program  : " & To_String (TF.Program_Name));
-         Put_Line (Output.all, "  date     : " & To_String (TF.Time));
-         Put_Line (Output.all, "  tag      : " & To_String (TF.User_Data));
+         Put_Line (Output.all, "  program  : " & (+TF.Program_Name));
+         Put_Line (Output.all, "  date     : " & (+TF.Time));
+         Put_Line (Output.all, "  tag      : " & (+TF.User_Data));
 
          --  For a trace that has been processed in an earlier run, provide
          --  information on original coverage assessment context.
@@ -875,15 +867,14 @@ package body Annotations.Report is
       Put_Line (Output.all, "Date and time of execution: "
                 & Image (Pp.Context.Timestamp));
       Put_Line (Output.all, "Tool version: XCOV "
-                & To_String (Pp.Context.Version));
+                & (+Pp.Context.Version));
       New_Line (Output.all);
 
       Put_Line (Output.all, "Command line:");
-      Put_Line (Output.all, To_String (Pp.Context.Command));
+      Put_Line (Output.all, +Pp.Context.Command);
       New_Line (Output.all);
 
-      Put_Line (Output.all, "Coverage level: "
-                & To_String (Pp.Context.Levels));
+      Put_Line (Output.all, "Coverage level: " & (+Pp.Context.Levels));
       New_Line (Output.all);
 
       Put_Line (Output.all, "Trace files:");