From: Eric Botcazou Date: Mon, 23 Nov 2020 07:50:10 +0000 (+0100) Subject: [Ada] Small cleanup in the Ada.Text_IO hierarchy X-Git-Tag: basepoints/gcc-12~2238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=430dd877b8692d1711d772cf5d19526d7a452bb6;p=thirdparty%2Fgcc.git [Ada] Small cleanup in the Ada.Text_IO hierarchy gcc/ada/ * libgnat/a-tifiio.adb (Get): Replace Current_Input with Current_In. * libgnat/a-tifiio__128.adb: (Get): Likewise. * libgnat/a-wtcoio.adb (Get): Likewise. (Put): Replace Current_Output with Current_Out. * libgnat/a-wtdeio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtdeio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtenio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtfiio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtfiio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtflio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtinio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtinio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtmoio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-wtmoio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztcoio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztdeio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztdeio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztenio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztfiio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztfiio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztflio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztinio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztinio__128.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztmoio.adb (Get): Likewise. (Put): Likewise. * libgnat/a-ztmoio__128.adb (Get): Likewise. (Put): Likewise. --- diff --git a/gcc/ada/libgnat/a-tifiio.adb b/gcc/ada/libgnat/a-tifiio.adb index 93862beb094b..b7d9471873b5 100644 --- a/gcc/ada/libgnat/a-tifiio.adb +++ b/gcc/ada/libgnat/a-tifiio.adb @@ -278,7 +278,7 @@ package body Ada.Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get diff --git a/gcc/ada/libgnat/a-tifiio__128.adb b/gcc/ada/libgnat/a-tifiio__128.adb index f2dffcffad33..4dea63ce83b4 100644 --- a/gcc/ada/libgnat/a-tifiio__128.adb +++ b/gcc/ada/libgnat/a-tifiio__128.adb @@ -318,7 +318,7 @@ package body Ada.Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get diff --git a/gcc/ada/libgnat/a-wtcoio.adb b/gcc/ada/libgnat/a-wtcoio.adb index c1c3b94e10e4..1dc4a2e2f2c3 100644 --- a/gcc/ada/libgnat/a-wtcoio.adb +++ b/gcc/ada/libgnat/a-wtcoio.adb @@ -78,7 +78,7 @@ package body Ada.Wide_Text_IO.Complex_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; --------- @@ -133,7 +133,7 @@ package body Ada.Wide_Text_IO.Complex_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; --------- diff --git a/gcc/ada/libgnat/a-wtdeio.adb b/gcc/ada/libgnat/a-wtdeio.adb index b432cac6ce0a..c503a20549f1 100644 --- a/gcc/ada/libgnat/a-wtdeio.adb +++ b/gcc/ada/libgnat/a-wtdeio.adb @@ -89,7 +89,7 @@ package body Ada.Wide_Text_IO.Decimal_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -144,7 +144,7 @@ package body Ada.Wide_Text_IO.Decimal_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtdeio__128.adb b/gcc/ada/libgnat/a-wtdeio__128.adb index 6e23e083ecb3..796c72499f22 100644 --- a/gcc/ada/libgnat/a-wtdeio__128.adb +++ b/gcc/ada/libgnat/a-wtdeio__128.adb @@ -102,7 +102,7 @@ package body Ada.Wide_Text_IO.Decimal_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -162,7 +162,7 @@ package body Ada.Wide_Text_IO.Decimal_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtenio.adb b/gcc/ada/libgnat/a-wtenio.adb index ee500f9e679d..f89359cecdd4 100644 --- a/gcc/ada/libgnat/a-wtenio.adb +++ b/gcc/ada/libgnat/a-wtenio.adb @@ -51,7 +51,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is procedure Get (Item : out Enum) is begin - Get (Current_Input, Item); + Get (Current_In, Item); end Get; procedure Get @@ -88,7 +88,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is Set : Type_Set := Default_Setting) is begin - Put (Current_Output, Item, Width, Set); + Put (Current_Out, Item, Width, Set); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtfiio.adb b/gcc/ada/libgnat/a-wtfiio.adb index 142a445e555d..fa9c1e08c084 100644 --- a/gcc/ada/libgnat/a-wtfiio.adb +++ b/gcc/ada/libgnat/a-wtfiio.adb @@ -169,7 +169,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -236,7 +236,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtfiio__128.adb b/gcc/ada/libgnat/a-wtfiio__128.adb index b4f1b1d90395..846c036dd03a 100644 --- a/gcc/ada/libgnat/a-wtfiio__128.adb +++ b/gcc/ada/libgnat/a-wtfiio__128.adb @@ -209,7 +209,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -285,7 +285,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtflio.adb b/gcc/ada/libgnat/a-wtflio.adb index a7df6d991dd0..07d33b1d8305 100644 --- a/gcc/ada/libgnat/a-wtflio.adb +++ b/gcc/ada/libgnat/a-wtflio.adb @@ -59,7 +59,7 @@ package body Ada.Wide_Text_IO.Float_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -102,7 +102,7 @@ package body Ada.Wide_Text_IO.Float_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtinio.adb b/gcc/ada/libgnat/a-wtinio.adb index dff0b68258c8..b32243309091 100644 --- a/gcc/ada/libgnat/a-wtinio.adb +++ b/gcc/ada/libgnat/a-wtinio.adb @@ -95,7 +95,7 @@ package body Ada.Wide_Text_IO.Integer_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -149,7 +149,7 @@ package body Ada.Wide_Text_IO.Integer_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtinio__128.adb b/gcc/ada/libgnat/a-wtinio__128.adb index 8936f499fcca..0eea7b52c816 100644 --- a/gcc/ada/libgnat/a-wtinio__128.adb +++ b/gcc/ada/libgnat/a-wtinio__128.adb @@ -111,7 +111,7 @@ package body Ada.Wide_Text_IO.Integer_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -169,7 +169,7 @@ package body Ada.Wide_Text_IO.Integer_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtmoio.adb b/gcc/ada/libgnat/a-wtmoio.adb index 4fe5beb6c9d0..efab035f6965 100644 --- a/gcc/ada/libgnat/a-wtmoio.adb +++ b/gcc/ada/libgnat/a-wtmoio.adb @@ -94,7 +94,7 @@ package body Ada.Wide_Text_IO.Modular_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -147,7 +147,7 @@ package body Ada.Wide_Text_IO.Modular_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-wtmoio__128.adb b/gcc/ada/libgnat/a-wtmoio__128.adb index 0dbf06ec0f45..a32eaf25224b 100644 --- a/gcc/ada/libgnat/a-wtmoio__128.adb +++ b/gcc/ada/libgnat/a-wtmoio__128.adb @@ -110,7 +110,7 @@ package body Ada.Wide_Text_IO.Modular_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -167,7 +167,7 @@ package body Ada.Wide_Text_IO.Modular_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztcoio.adb b/gcc/ada/libgnat/a-ztcoio.adb index ead1234bd7a4..711c7bbc733d 100644 --- a/gcc/ada/libgnat/a-ztcoio.adb +++ b/gcc/ada/libgnat/a-ztcoio.adb @@ -78,7 +78,7 @@ package body Ada.Wide_Wide_Text_IO.Complex_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; --------- @@ -133,7 +133,7 @@ package body Ada.Wide_Wide_Text_IO.Complex_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; --------- diff --git a/gcc/ada/libgnat/a-ztdeio.adb b/gcc/ada/libgnat/a-ztdeio.adb index cd269149734e..1d9f5d834370 100644 --- a/gcc/ada/libgnat/a-ztdeio.adb +++ b/gcc/ada/libgnat/a-ztdeio.adb @@ -89,7 +89,7 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -144,7 +144,7 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztdeio__128.adb b/gcc/ada/libgnat/a-ztdeio__128.adb index e160a01c85d3..156a66d752cf 100644 --- a/gcc/ada/libgnat/a-ztdeio__128.adb +++ b/gcc/ada/libgnat/a-ztdeio__128.adb @@ -102,7 +102,7 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -162,7 +162,7 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztenio.adb b/gcc/ada/libgnat/a-ztenio.adb index 5a61874552a8..6c35b9fc72f7 100644 --- a/gcc/ada/libgnat/a-ztenio.adb +++ b/gcc/ada/libgnat/a-ztenio.adb @@ -51,7 +51,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_IO is procedure Get (Item : out Enum) is begin - Get (Current_Input, Item); + Get (Current_In, Item); end Get; procedure Get @@ -88,7 +88,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_IO is Set : Type_Set := Default_Setting) is begin - Put (Current_Output, Item, Width, Set); + Put (Current_Out, Item, Width, Set); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztfiio.adb b/gcc/ada/libgnat/a-ztfiio.adb index c666c7b58b32..57b258e0af56 100644 --- a/gcc/ada/libgnat/a-ztfiio.adb +++ b/gcc/ada/libgnat/a-ztfiio.adb @@ -169,7 +169,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -236,7 +236,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztfiio__128.adb b/gcc/ada/libgnat/a-ztfiio__128.adb index 47041466a02c..fcb7077d1efe 100644 --- a/gcc/ada/libgnat/a-ztfiio__128.adb +++ b/gcc/ada/libgnat/a-ztfiio__128.adb @@ -210,7 +210,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -286,7 +286,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztflio.adb b/gcc/ada/libgnat/a-ztflio.adb index bb52f3806b94..0640dacdbbdc 100644 --- a/gcc/ada/libgnat/a-ztflio.adb +++ b/gcc/ada/libgnat/a-ztflio.adb @@ -58,7 +58,7 @@ package body Ada.Wide_Wide_Text_IO.Float_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -101,7 +101,7 @@ package body Ada.Wide_Wide_Text_IO.Float_IO is Exp : Field := Default_Exp) is begin - Put (Current_Output, Item, Fore, Aft, Exp); + Put (Current_Out, Item, Fore, Aft, Exp); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztinio.adb b/gcc/ada/libgnat/a-ztinio.adb index 4d4708ae5a1f..c19c8a6af727 100644 --- a/gcc/ada/libgnat/a-ztinio.adb +++ b/gcc/ada/libgnat/a-ztinio.adb @@ -95,7 +95,7 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -149,7 +149,7 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztinio__128.adb b/gcc/ada/libgnat/a-ztinio__128.adb index 560539a92e60..19dcc3467628 100644 --- a/gcc/ada/libgnat/a-ztinio__128.adb +++ b/gcc/ada/libgnat/a-ztinio__128.adb @@ -111,7 +111,7 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -169,7 +169,7 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztmoio.adb b/gcc/ada/libgnat/a-ztmoio.adb index 67087c60d2dd..ba854ffd0f37 100644 --- a/gcc/ada/libgnat/a-ztmoio.adb +++ b/gcc/ada/libgnat/a-ztmoio.adb @@ -94,7 +94,7 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -147,7 +147,7 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put diff --git a/gcc/ada/libgnat/a-ztmoio__128.adb b/gcc/ada/libgnat/a-ztmoio__128.adb index 71626cc27044..21015080dd98 100644 --- a/gcc/ada/libgnat/a-ztmoio__128.adb +++ b/gcc/ada/libgnat/a-ztmoio__128.adb @@ -110,7 +110,7 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is Width : Field := 0) is begin - Get (Current_Input, Item, Width); + Get (Current_In, Item, Width); end Get; procedure Get @@ -167,7 +167,7 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is Base : Number_Base := Default_Base) is begin - Put (Current_Output, Item, Width, Base); + Put (Current_Out, Item, Width, Base); end Put; procedure Put