X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fada%2Fa-wtenio.adb;h=f5725fad019af9191bd3370dc05b0eee7877ad7c;hb=068f40295c3c2ba63eb76bb3e589978da09d8842;hp=d44f394c3710cf51e7ca5143650cd6d01772305f;hpb=f27cea3abf8ded22456f5f46a812cc3915969815;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/ada/a-wtenio.adb b/gcc/ada/a-wtenio.adb index d44f394c371..f5725fad019 100644 --- a/gcc/ada/a-wtenio.adb +++ b/gcc/ada/a-wtenio.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2005 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2006, 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- -- @@ -41,14 +41,12 @@ package body Ada.Wide_Text_IO.Enumeration_IO is -- Get -- --------- - procedure Get (File : in File_Type; Item : out Enum) is + procedure Get (File : File_Type; Item : out Enum) is Buf : Wide_String (1 .. Enum'Width); Buflen : Natural; - begin Aux.Get_Enum_Lit (File, Buf, Buflen); Item := Enum'Wide_Value (Buf (1 .. Buflen)); - exception when Constraint_Error => raise Data_Error; end Get; @@ -59,16 +57,14 @@ package body Ada.Wide_Text_IO.Enumeration_IO is end Get; procedure Get - (From : in Wide_String; + (From : Wide_String; Item : out Enum; Last : out Positive) is Start : Natural; - begin Aux.Scan_Enum_Lit (From, Start, Last); Item := Enum'Wide_Value (From (Start .. Last)); - exception when Constraint_Error => raise Data_Error; end Get; @@ -78,21 +74,20 @@ package body Ada.Wide_Text_IO.Enumeration_IO is --------- procedure Put - (File : in File_Type; - Item : in Enum; - Width : in Field := Default_Width; - Set : in Type_Set := Default_Setting) + (File : File_Type; + Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting) is Image : constant Wide_String := Enum'Wide_Image (Item); - begin Aux.Put (File, Image, Width, Set); end Put; procedure Put - (Item : in Enum; - Width : in Field := Default_Width; - Set : in Type_Set := Default_Setting) + (Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting) is begin Put (Current_Output, Item, Width, Set); @@ -100,11 +95,10 @@ package body Ada.Wide_Text_IO.Enumeration_IO is procedure Put (To : out Wide_String; - Item : in Enum; - Set : in Type_Set := Default_Setting) + Item : Enum; + Set : Type_Set := Default_Setting) is Image : constant Wide_String := Enum'Wide_Image (Item); - begin Aux.Puts (To, Image, Set); end Put;