From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 565C83893655 for ; Mon, 14 Dec 2020 15:56:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 565C83893655 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 27C885611C; Mon, 14 Dec 2020 10:56:04 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id h6jLQk97jg9Z; Mon, 14 Dec 2020 10:56:04 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id EF9E356117; Mon, 14 Dec 2020 10:56:03 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id EE8E7AD; Mon, 14 Dec 2020 10:56:03 -0500 (EST) Date: Mon, 14 Dec 2020 10:56:03 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [Ada] Small cleanup in the Ada.Text_IO hierarchy Message-ID: <20201214155603.GA4144@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 15:56:13 -0000 --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This replaces the remaining uses of Current_Input with Current_In and those of Current_Output with Current_Out for the sake of consistency. Tested on x86_64-pc-linux-gnu, committed on trunk 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. --5mCyUwZo2JvN/JJP Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/libgnat/a-tifiio.adb b/gcc/ada/libgnat/a-tifiio.adb --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --5mCyUwZo2JvN/JJP--