[Ada] Semantics of Delete for fixed strings

This patch corrects a bug in the implementation of Delete in an unusual
boundary case: the RM describes the semantics of Delete as equivalent to
that of Replace_String with a null argument. As a result, deleting a
null string that starts past the end of its argument is a noop and must
not raise Index_Error.

2019-07-08  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* libgnat/a-strfix.adb (Delete): The RM describes the semantics
	of Delete as equivalent to that of Replace_String with a null
	argument. As a result, deleting a null string that starts past
	the end of its argument is a noop and must not raise
	Index_Error.

gcc/testsuite/

	* gnat.dg/fixed_delete.adb: New testcase.

From-SVN: r273205

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 969e9335e0fd6b1ed1e997232401fceb5d1ae092..2f97ab9ea4eae4c9af3882b0f5fef527d5e8333c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+       * libgnat/a-strfix.adb (Delete): The RM describes the semantics
+       of Delete as equivalent to that of Replace_String with a null
+       argument. As a result, deleting a null string that starts past
+       the end of its argument is a noop and must not raise
+       Index_Error.
+
 2019-07-08  Javier Miranda  <miranda@adacore.com>
 
        * exp_disp.adb (Register_Primitive): When registering a

diff --git a/gcc/ada/libgnat/a-strfix.adb b/gcc/ada/libgnat/a-strfix.adb
index 6bf825b28f6b565fe26f369ce21d8e02df8ec1e4..b8b5f42dcb13f12dfe138f929ac48411a615109a 100644 (file)
--- a/gcc/ada/libgnat/a-strfix.adb
+++ b/gcc/ada/libgnat/a-strfix.adb
@@ -192,7 +192,15 @@ package body Ada.Strings.Fixed is
       elsif From not in Source'Range
         or else Through > Source'Last
       then
-         raise Index_Error;
+         --  In most cases this raises an exception, but the case of deleting
+         --  a null string at the end of the current one is a special-case, and
+         --  reflects the equivalence with Replace_String (RM A.4.3 (86/3)).
+
+         if From = Source'Last + 1 and then From = Through then
+            return Source;
+         else
+            raise Index_Error;
+         end if;
 
       else
          declare

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14d127fc607d3490d93e8f9c12c050cd7515c3d0..a0b6bb4d71f65e2ebb950095fff2b8bf1f73621b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+       * gnat.dg/fixed_delete.adb: New testcase.
+
 2019-07-08  Javier Miranda  <miranda@adacore.com>
 
        * gnat.dg/interface9.adb, gnat.dg/interface9_root-child.ads,

diff --git a/gcc/testsuite/gnat.dg/fixed_delete.adb b/gcc/testsuite/gnat.dg/fixed_delete.adb
new file mode 100644 (file)
index 0000000..c13c71c
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/fixed_delete.adb
@@ -0,0 +1,17 @@
+--  { dg-do run }
+
+with Ada.Text_IO; use Ada.Text_IO;
+with Ada.Strings.Fixed; use Ada.Strings.Fixed;
+
+procedure Fixed_Delete is
+   Str  : String := "a";
+   Str1 : String := Replace_Slice (Str, 2, 2, "");
+   Str2 : String := Delete (Str, 2, 2);
+begin
+   if Str1 /= "a" then
+      raise Program_Error;
+   end if;
+   if Str2 /= "a" then
+      raise Program_Error;
+   end if;
+end Fixed_Delete;