Merge branch 'topic/vadim/concat' into 'master'

Concatenation of Virtual_String and Virtual_Character. Closes #216 See merge request eng/ide/VSS!285
AdaCore · Sep 13, 2023 · 1c49a43 · 1c49a43
2 parents 76e8614 + 5752fe1
commit 1c49a43
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 10 deletions.
diff --git a/source/text/implementation/vss-strings.adb b/source/text/implementation/vss-strings.adb
@@ -40,6 +40,52 @@ package body VSS.Strings is
       end return;
    end "&";
 
+   ---------
+   -- "&" --
+   ---------
+
+   function "&"
+     (Left  : Virtual_String;
+      Right : VSS.Characters.Virtual_Character) return Virtual_String is
+   begin
+      return Result : Virtual_String do
+         declare
+            Offset : VSS.Implementation.Strings.Cursor_Offset;
+
+         begin
+            Result.Data := Left.Data;
+            VSS.Implementation.Strings.Reference (Result.Data);
+            VSS.Implementation.Strings.Handler (Result.Data).Append
+              (Result.Data,
+               VSS.Characters.Virtual_Character'Pos (Right),
+               Offset);
+         end;
+      end return;
+   end "&";
+
+   ---------
+   -- "&" --
+   ---------
+
+   function "&"
+     (Left  : VSS.Characters.Virtual_Character;
+      Right : Virtual_String) return Virtual_String is
+   begin
+      return Result : Virtual_String do
+         declare
+            Offset : VSS.Implementation.Strings.Cursor_Offset;
+
+         begin
+            VSS.Implementation.Strings.Handler (Result.Data).Append
+              (Result.Data,
+               VSS.Characters.Virtual_Character'Pos (Left),
+               Offset);
+            VSS.Implementation.Strings.Handler (Result.Data).Append
+              (Result.Data, Right.Data, Offset);
+         end;
+      end return;
+   end "&";
+
    ---------
    -- "*" --
    ---------

diff --git a/source/text/vss-strings.ads b/source/text/vss-strings.ads
@@ -210,16 +210,13 @@ package VSS.Strings is
    function "&"
      (Left  : Virtual_String;
       Right : Virtual_String) return Virtual_String;
-   --  function "&"
-   --    (Left  : Virtual_String;
-   --     Right : VSS.Characters.Virtual_Character) return Virtual_String;
-   --  function "&"
-   --    (Left  : VSS.Characters.Virtual_Character;
-   --     Right : Virtual_String) return Virtual_String;
-   --  function "&"
-   --    (Left  : VSS.Characters.Virtual_Character;
-   --     Right : VSS.Characters.Virtual_Character) return Virtual_String;
-   --  --  Concatenation operator for virtual string and virtual characters.
+   function "&"
+     (Left  : Virtual_String;
+      Right : VSS.Characters.Virtual_Character) return Virtual_String;
+   function "&"
+     (Left  : VSS.Characters.Virtual_Character;
+      Right : Virtual_String) return Virtual_String;
+   --  Concatenation operator for virtual string and virtual characters.
 
    function "*"
      (Left  : Character_Count;

diff --git a/testsuite/text/test_string-test_ampersand_character.adb b/testsuite/text/test_string-test_ampersand_character.adb
@@ -0,0 +1,32 @@
+--
+--  Copyright (C) 2023, AdaCore
+--
+--  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+--
+
+with VSS.Characters;
+
+separate (Test_String)
+procedure Test_Ampersand_Character is
+
+   use type VSS.Strings.Virtual_String;
+
+begin
+   declare
+      L : constant VSS.Strings.Virtual_String       := "AB";
+      R : constant VSS.Characters.Virtual_Character := 'C';
+      V : constant VSS.Strings.Virtual_String       := L & R;
+
+   begin
+      Test_Support.Assert (V = "ABC");
+   end;
+
+   declare
+      R : constant VSS.Strings.Virtual_String       := "BC";
+      L : constant VSS.Characters.Virtual_Character := 'A';
+      V : constant VSS.Strings.Virtual_String       := L & R;
+
+   begin
+      Test_Support.Assert (V = "ABC");
+   end;
+end Test_Ampersand_Character;
diff --git a/testsuite/text/test_string.adb b/testsuite/text/test_string.adb
@@ -11,6 +11,7 @@ with Test_Support;
 
 procedure Test_String is
 
+   procedure Test_Ampersand_Character;
    procedure Test_Asterisk_Character;
    procedure Test_Ends_With;
    procedure Test_Prepend;
@@ -23,6 +24,8 @@ procedure Test_String is
    --
    --  This test requires valgrind.
 
+   procedure Test_Ampersand_Character is separate;
+
    procedure Test_Asterisk_Character is separate;
 
    procedure Test_Ends_With is separate;
@@ -201,6 +204,7 @@ procedure Test_String is
    end Test_V705_011;
 
 begin
+   Test_Ampersand_Character;
    Test_Asterisk_Character;
    Test_Ends_With;
    Test_Prepend;