[Ada] Rename package instead of each routine

Message ID 20210503092945.GA77587@adacore.com
State New
Headers show
  • [Ada] Rename package instead of each routine
Related show

Commit Message

Pierre-Marie de Rodat May 3, 2021, 9:29 a.m.
Package GNAT.Case_Util contained routines renamed from System.Case_Util.
Few routines were missed. Renames entire package instead of renaming
each routine separately.

Tested on x86_64-pc-linux-gnu, committed on trunk


	* libgnat/g-casuti.adb: Replace with "pragma No_Body".
	* libgnat/g-casuti.ads: Replace with a package renaming.


diff --git a/gcc/ada/libgnat/g-casuti.adb b/gcc/ada/libgnat/g-casuti.adb
--- a/gcc/ada/libgnat/g-casuti.adb
+++ b/gcc/ada/libgnat/g-casuti.adb
@@ -29,10 +29,8 @@ 
 --                                                                          --
---  This is a dummy body, required because if we remove the body we have
---  bootstrap path problems (this unit used to have a body, and if we do not
---  supply a dummy body, the old incorrect body is picked up during the
---  bootstrap process.
+--  This package does not require a body, since it is a package renaming. We
+--  provide a dummy file containing a No_Body pragma so that previous versions
+--  of the body (which did exist) will not interfere.
-package body GNAT.Case_Util is
-end GNAT.Case_Util;
+pragma No_Body;

diff --git a/gcc/ada/libgnat/g-casuti.ads b/gcc/ada/libgnat/g-casuti.ads
--- a/gcc/ada/libgnat/g-casuti.ads
+++ b/gcc/ada/libgnat/g-casuti.ads
@@ -40,38 +40,4 @@ 
 with System.Case_Util;
-package GNAT.Case_Util is
-   pragma Pure;
-   pragma Elaborate_Body;
-   --  The elaborate body is because we have a dummy body to deal with
-   --  bootstrap path problems (we used to have a real body, and now we don't
-   --  need it any more, but the bootstrap requires that we have a dummy body,
-   --  since otherwise the old body gets picked up.
-   --  Note: all the following functions handle the full Latin-1 set
-   function To_Upper (A : Character) return Character
-     renames System.Case_Util.To_Upper;
-   --  Converts A to upper case if it is a lower case letter, otherwise
-   --  returns the input argument unchanged.
-   procedure To_Upper (A : in out String)
-     renames System.Case_Util.To_Upper;
-   --  Folds all characters of string A to upper case
-   function To_Lower (A : Character) return Character
-     renames System.Case_Util.To_Lower;
-   --  Converts A to lower case if it is an upper case letter, otherwise
-   --  returns the input argument unchanged.
-   procedure To_Lower (A : in out String)
-     renames System.Case_Util.To_Lower;
-   --  Folds all characters of string A to lower case
-   procedure To_Mixed (A : in out String)
-     renames System.Case_Util.To_Mixed;
-   --  Converts A to mixed case (i.e. lower case, except for initial
-   --  character and any character after an underscore, which are
-   --  converted to upper case.
-end GNAT.Case_Util;
+package GNAT.Case_Util renames System.Case_Util;