X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fada%2Fa-wtdeio.adb;h=598b72a941e5e2ad99c5cc9822f7d55d119baa17;hb=3a0397df51186c36495bd8585b6277b4cb511f2b;hp=3d611ee479b15f7bab960d4979b307d7a760a681;hpb=f27cea3abf8ded22456f5f46a812cc3915969815;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/ada/a-wtdeio.adb b/gcc/ada/a-wtdeio.adb index 3d611ee479b..598b72a941e 100644 --- a/gcc/ada/a-wtdeio.adb +++ b/gcc/ada/a-wtdeio.adb @@ -6,25 +6,23 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2005 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- --- ware Foundation; either version 2, or (at your option) any later ver- -- +-- ware Foundation; either version 3, or (at your option) any later ver- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- --- for more details. You should have received a copy of the GNU General -- --- Public License distributed with GNAT; see file COPYING. If not, write -- --- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- --- Boston, MA 02110-1301, USA. -- +-- or FITNESS FOR A PARTICULAR PURPOSE. -- -- -- --- As a special exception, if other files instantiate generics from this -- --- unit, or you link this unit with other files to produce an executable, -- --- this unit does not by itself cause the resulting executable to be -- --- covered by the GNU General Public License. This exception does not -- --- however invalidate any other reasons why the executable file might be -- --- covered by the GNU Public License. -- +-- As a special exception under Section 7 of GPL version 3, you are granted -- +-- additional permissions described in the GCC Runtime Library Exception, -- +-- version 3.1, as published by the Free Software Foundation. -- +-- -- +-- You should have received a copy of the GNU General Public License and -- +-- a copy of the GCC Runtime Library Exception along with this program; -- +-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- +-- . -- -- -- -- GNAT was originally developed by the GNAT team at New York University. -- -- Extensive contributions were provided by Ada Core Technologies Inc. -- @@ -32,6 +30,7 @@ ------------------------------------------------------------------------------ with Ada.Wide_Text_IO.Decimal_Aux; + with System.WCh_Con; use System.WCh_Con; with System.WCh_WtS; use System.WCh_WtS; @@ -49,36 +48,30 @@ package body Ada.Wide_Text_IO.Decimal_IO is --------- procedure Get - (File : in File_Type; + (File : File_Type; Item : out Num; - Width : in Field := 0) + Width : Field := 0) is begin if Num'Size > Integer'Size then - Item := Num (Aux.Get_LLD (TFT (File), Width, Scale)); - -- Item := Num'Fixed_Value (Aux.Get_LLD (TFT (File), Width, Scale)); - -- above is what we should write, but gets assert error ??? - + Item := Num'Fixed_Value (Aux.Get_LLD (TFT (File), Width, Scale)); else - Item := Num (Aux.Get_Dec (TFT (File), Width, Scale)); - -- Item := Num'Fixed_Value (Aux.Get_Dec (TFT (File), Width, Scale)); - -- above is what we should write, but gets assert error ??? + Item := Num'Fixed_Value (Aux.Get_Dec (TFT (File), Width, Scale)); end if; - exception when Constraint_Error => raise Data_Error; end Get; procedure Get (Item : out Num; - Width : in Field := 0) + Width : Field := 0) is begin Get (Current_Input, Item, Width); end Get; procedure Get - (From : in Wide_String; + (From : Wide_String; Item : out Num; Last : out Positive) is @@ -110,11 +103,11 @@ package body Ada.Wide_Text_IO.Decimal_IO is --------- procedure Put - (File : in File_Type; - Item : in Num; - Fore : in Field := Default_Fore; - Aft : in Field := Default_Aft; - Exp : in Field := Default_Exp) + (File : File_Type; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) is begin if Num'Size > Integer'Size then @@ -133,22 +126,20 @@ package body Ada.Wide_Text_IO.Decimal_IO is end Put; procedure Put - (Item : in Num; - Fore : in Field := Default_Fore; - Aft : in Field := Default_Aft; - Exp : in Field := Default_Exp) + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) is - pragma Unreferenced (Fore); - -- ??? how come this is unreferenced, sounds wrong ??? begin - Put (Current_Output, Item, Aft, Exp); + Put (Current_Output, Item, Fore, Aft, Exp); end Put; procedure Put (To : out Wide_String; - Item : in Num; - Aft : in Field := Default_Aft; - Exp : in Field := Default_Exp) + Item : Num; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) is S : String (To'First .. To'Last);