Commit 0ae9f22f by Robert Dewar Committed by Arnaud Charlet

s-gloloc-mingw.adb, [...]: Minor reformatting.

2006-02-13  Robert Dewar  <dewar@adacore.com>

	* s-gloloc-mingw.adb, a-cgaaso.ads, a-stzmap.adb, a-stzmap.adb,
	a-stzmap.ads, a-ztcoio.adb, a-ztedit.adb, a-ztedit.ads, a-ztenau.adb,
	a-ztenau.ads, a-colien.adb, a-colien.ads, a-colire.adb, a-colire.ads,
	a-comlin.adb, a-decima.adb, a-decima.ads, a-direio.adb, a-direio.adb,
	a-direio.adb, a-direio.ads, a-ngcoty.adb, a-ngcoty.ads, a-nuflra.adb,
	a-nuflra.ads, a-sequio.adb, a-sequio.ads, a-sequio.ads, a-storio.ads,
	a-stream.ads, a-ststio.adb, a-ststio.adb, a-ststio.ads, a-ststio.ads,
	a-stwima.adb, a-stwima.adb, a-stwima.ads, a-stwise.adb, a-teioed.adb,
	a-teioed.ads, a-ticoau.adb, a-ticoau.ads, a-ticoio.adb, a-tasatt.ads,
	a-tideau.adb, a-tideau.ads, a-tideio.adb, a-tideio.ads, a-tienau.adb,
	a-tienau.ads, a-tienio.adb, a-tienio.ads, a-tifiio.ads, a-tiflau.adb,
	a-tiflau.ads, a-tiflio.adb, a-tiflio.adb, a-tiflio.ads, a-tigeau.ads,
	a-tiinau.adb, a-tiinau.ads, a-tiinio.adb, a-tiinio.ads, a-timoio.adb,
	a-timoio.ads, a-titest.adb, a-titest.ads, a-wtcoio.adb, a-wtdeau.adb,
	a-wtdeau.ads, a-wtdeio.adb, a-wtdeio.ads, a-wtedit.adb, a-wtedit.adb,
	a-wtedit.ads, a-wtenau.adb, a-wtenau.ads, a-wtenau.ads, a-wtenio.adb,
	a-wtenio.ads, a-wtfiio.adb, a-wtfiio.ads, a-wtflau.adb, a-wtflau.ads,
	a-wtflio.adb, a-wtflio.adb, a-wtflio.ads, a-wtgeau.ads, a-wtinau.adb,
	a-wtinau.ads, a-wtinio.adb, a-wtinio.ads, a-wtmoau.adb, a-wtmoau.ads,
	a-wtmoio.adb, a-wtmoio.ads, xref_lib.adb, xref_lib.ads, xr_tabls.adb,
	g-boubuf.adb, g-boubuf.ads, g-cgideb.adb, g-io.adb, gnatdll.adb,
	g-pehage.adb, i-c.ads, g-spitbo.adb, g-spitbo.ads, mdll.adb,
	mlib-fil.adb, mlib-utl.adb, mlib-utl.ads, prj-env.adb, prj-tree.adb,
	prj-tree.ads, prj-util.adb, s-arit64.adb, s-asthan.ads, s-auxdec.adb,
	s-auxdec.ads, s-chepoo.ads, s-direio.adb, s-direio.ads, s-errrep.adb,
	s-errrep.ads, s-fileio.adb, s-fileio.ads, s-finroo.adb, s-finroo.ads,
	s-gloloc.adb, s-gloloc.ads, s-io.adb, s-io.ads, s-rpc.adb,
	s-rpc.ads, s-shasto.ads, s-sequio.adb, s-stopoo.ads, s-stratt.adb,
	s-stratt.ads, s-taasde.adb, s-taasde.ads, s-tadert.adb, s-sequio.ads,
	s-taskin.adb, s-tasque.adb, s-tasque.ads, s-wchjis.ads, makegpr.adb,
	a-coinve.adb, a-cidlli.adb, eval_fat.adb, exp_dist.ads, exp_smem.adb,
	fmap.adb, g-dyntab.ads, g-expect.adb, lib-xref.ads, osint.adb,
	par-load.adb, restrict.adb, sinput-c.ads, a-cdlili.adb,
	system-vms.ads, system-vms-zcx.ads, system-vms_64.ads: Minor
	reformatting.

From-SVN: r111023
parent 85a40c43
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2004-2005, Free Software Foundation, Inc. -- -- Copyright (C) 2004-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -499,9 +499,7 @@ package body Ada.Containers.Doubly_Linked_Lists is ...@@ -499,9 +499,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
procedure Sort (Container : in out List) is procedure Sort (Container : in out List) is
procedure Partition procedure Partition (Pivot : Node_Access; Back : Node_Access);
(Pivot : in Node_Access;
Back : in Node_Access);
procedure Sort (Front, Back : Node_Access); procedure Sort (Front, Back : Node_Access);
...@@ -509,10 +507,7 @@ package body Ada.Containers.Doubly_Linked_Lists is ...@@ -509,10 +507,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
-- Partition -- -- Partition --
--------------- ---------------
procedure Partition procedure Partition (Pivot : Node_Access; Back : Node_Access) is
(Pivot : Node_Access;
Back : Node_Access)
is
Node : Node_Access := Pivot.Next; Node : Node_Access := Pivot.Next;
begin begin
...@@ -948,7 +943,7 @@ package body Ada.Containers.Doubly_Linked_Lists is ...@@ -948,7 +943,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
procedure Query_Element procedure Query_Element
(Position : Cursor; (Position : Cursor;
Process : not null access procedure (Element : in Element_Type)) Process : not null access procedure (Element : Element_Type))
is is
begin begin
if Position.Node = null then if Position.Node = null then
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2004-2005, Free Software Foundation, Inc. -- -- Copyright (C) 2004-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -40,6 +40,6 @@ generic ...@@ -40,6 +40,6 @@ generic
with procedure Swap (Left, Right : Index_Type) is <>; with procedure Swap (Left, Right : Index_Type) is <>;
procedure Ada.Containers.Generic_Anonymous_Array_Sort procedure Ada.Containers.Generic_Anonymous_Array_Sort
(First, Last : in Index_Type'Base); (First, Last : Index_Type'Base);
pragma Pure (Ada.Containers.Generic_Anonymous_Array_Sort); pragma Pure (Ada.Containers.Generic_Anonymous_Array_Sort);
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2004-2005, Free Software Foundation, Inc. -- -- Copyright (C) 2004-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -789,7 +789,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is ...@@ -789,7 +789,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
procedure Iterate procedure Iterate
(Container : List; (Container : List;
Process : not null access procedure (Position : in Cursor)) Process : not null access procedure (Position : Cursor))
is is
C : List renames Container'Unrestricted_Access.all; C : List renames Container'Unrestricted_Access.all;
B : Natural renames C.Busy; B : Natural renames C.Busy;
...@@ -969,7 +969,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is ...@@ -969,7 +969,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
procedure Query_Element procedure Query_Element
(Position : Cursor; (Position : Cursor;
Process : not null access procedure (Element : in Element_Type)) Process : not null access procedure (Element : Element_Type))
is is
begin begin
if Position.Node = null then if Position.Node = null then
...@@ -1233,7 +1233,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is ...@@ -1233,7 +1233,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
procedure Reverse_Iterate procedure Reverse_Iterate
(Container : List; (Container : List;
Process : not null access procedure (Position : in Cursor)) Process : not null access procedure (Position : Cursor))
is is
C : List renames Container'Unrestricted_Access.all; C : List renames Container'Unrestricted_Access.all;
B : Natural renames C.Busy; B : Natural renames C.Busy;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2004-2005, Free Software Foundation, Inc. -- -- Copyright (C) 2004-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -1620,7 +1620,7 @@ package body Ada.Containers.Indefinite_Vectors is ...@@ -1620,7 +1620,7 @@ package body Ada.Containers.Indefinite_Vectors is
procedure Iterate procedure Iterate
(Container : Vector; (Container : Vector;
Process : not null access procedure (Position : in Cursor)) Process : not null access procedure (Position : Cursor))
is is
V : Vector renames Container'Unrestricted_Access.all; V : Vector renames Container'Unrestricted_Access.all;
B : Natural renames V.Busy; B : Natural renames V.Busy;
...@@ -1811,7 +1811,7 @@ package body Ada.Containers.Indefinite_Vectors is ...@@ -1811,7 +1811,7 @@ package body Ada.Containers.Indefinite_Vectors is
procedure Query_Element procedure Query_Element
(Container : Vector; (Container : Vector;
Index : Index_Type; Index : Index_Type;
Process : not null access procedure (Element : in Element_Type)) Process : not null access procedure (Element : Element_Type))
is is
V : Vector renames Container'Unrestricted_Access.all; V : Vector renames Container'Unrestricted_Access.all;
B : Natural renames V.Busy; B : Natural renames V.Busy;
...@@ -1844,7 +1844,7 @@ package body Ada.Containers.Indefinite_Vectors is ...@@ -1844,7 +1844,7 @@ package body Ada.Containers.Indefinite_Vectors is
procedure Query_Element procedure Query_Element
(Position : Cursor; (Position : Cursor;
Process : not null access procedure (Element : in Element_Type)) Process : not null access procedure (Element : Element_Type))
is is
begin begin
if Position.Container = null then if Position.Container = null then
...@@ -2189,7 +2189,7 @@ package body Ada.Containers.Indefinite_Vectors is ...@@ -2189,7 +2189,7 @@ package body Ada.Containers.Indefinite_Vectors is
procedure Reverse_Iterate procedure Reverse_Iterate
(Container : Vector; (Container : Vector;
Process : not null access procedure (Position : in Cursor)) Process : not null access procedure (Position : Cursor))
is is
V : Vector renames Container'Unrestricted_Access.all; V : Vector renames Container'Unrestricted_Access.all;
B : Natural renames V.Busy; B : Natural renames V.Busy;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1996-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1996-2006, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -51,7 +51,7 @@ package body Ada.Command_Line.Environment is ...@@ -51,7 +51,7 @@ package body Ada.Command_Line.Environment is
-- Environment_Value -- -- Environment_Value --
----------------------- -----------------------
function Environment_Value (Number : in Positive) return String is function Environment_Value (Number : Positive) return String is
procedure Fill_Env (E : System.Address; Env_Num : Integer); procedure Fill_Env (E : System.Address; Env_Num : Integer);
pragma Import (C, Fill_Env, "__gnat_fill_env"); pragma Import (C, Fill_Env, "__gnat_fill_env");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1996-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1996-2006, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -45,7 +45,7 @@ package Ada.Command_Line.Environment is ...@@ -45,7 +45,7 @@ package Ada.Command_Line.Environment is
-- variables in the environment of the program invoking the function. -- variables in the environment of the program invoking the function.
-- Otherwise it returns 0. And that's a lot of environment. -- Otherwise it returns 0. And that's a lot of environment.
function Environment_Value (Number : in Positive) return String; function Environment_Value (Number : Positive) return String;
-- If the external execution environment supports passing the environment -- If the external execution environment supports passing the environment
-- to a program, then Environment_Value returns an implementation-defined -- to a program, then Environment_Value returns an implementation-defined
-- value corresponding to the value at relative position Number. If Number -- value corresponding to the value at relative position Number. If Number
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1999-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1999-2006, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -60,7 +60,7 @@ package body Ada.Command_Line.Remove is ...@@ -60,7 +60,7 @@ package body Ada.Command_Line.Remove is
-- Remove_Argument -- -- Remove_Argument --
--------------------- ---------------------
procedure Remove_Argument (Number : in Positive) is procedure Remove_Argument (Number : Positive) is
begin begin
Initialize; Initialize;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1999-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1999-2006, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
package Ada.Command_Line.Remove is package Ada.Command_Line.Remove is
pragma Preelaborate; pragma Preelaborate;
procedure Remove_Argument (Number : in Positive); procedure Remove_Argument (Number : Positive);
-- Removes the argument identified by Number, which must be in the -- Removes the argument identified by Number, which must be in the
-- range 1 .. Argument_Count (i.e. an in range argument number which -- range 1 .. Argument_Count (i.e. an in range argument number which
-- reflects removals). If Number is out of range Constraint_Error -- reflects removals). If Number is out of range Constraint_Error
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -57,7 +57,7 @@ package body Ada.Command_Line is ...@@ -57,7 +57,7 @@ package body Ada.Command_Line is
-- Argument -- -- Argument --
-------------- --------------
function Argument (Number : in Positive) return String is function Argument (Number : Positive) return String is
Num : Positive; Num : Positive;
begin begin
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -38,8 +38,8 @@ package body Ada.Decimal is ...@@ -38,8 +38,8 @@ package body Ada.Decimal is
------------ ------------
procedure Divide procedure Divide
(Dividend : in Dividend_Type; (Dividend : Dividend_Type;
Divisor : in Divisor_Type; Divisor : Divisor_Type;
Quotient : out Quotient_Type; Quotient : out Quotient_Type;
Remainder : out Remainder_Type) Remainder : out Remainder_Type)
is is
...@@ -48,8 +48,8 @@ package body Ada.Decimal is ...@@ -48,8 +48,8 @@ package body Ada.Decimal is
-- not have convention Intrinsic. -- not have convention Intrinsic.
procedure Divide procedure Divide
(Dividend : in Dividend_Type; (Dividend : Dividend_Type;
Divisor : in Divisor_Type; Divisor : Divisor_Type;
Quotient : out Quotient_Type; Quotient : out Quotient_Type;
Remainder : out Remainder_Type); Remainder : out Remainder_Type);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -58,8 +58,8 @@ package Ada.Decimal is ...@@ -58,8 +58,8 @@ package Ada.Decimal is
type Remainder_Type is delta <> digits <>; type Remainder_Type is delta <> digits <>;
procedure Divide procedure Divide
(Dividend : in Dividend_Type; (Dividend : Dividend_Type;
Divisor : in Divisor_Type; Divisor : Divisor_Type;
Quotient : out Quotient_Type; Quotient : out Quotient_Type;
Remainder : out Remainder_Type); Remainder : out Remainder_Type);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -83,9 +83,9 @@ package body Ada.Direct_IO is ...@@ -83,9 +83,9 @@ package body Ada.Direct_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Inout_File; Mode : File_Mode := Inout_File;
Name : in String := ""; Name : String := "";
Form : in String := "") Form : String := "")
is is
begin begin
DIO.Create (FP (File), To_FCB (Mode), Name, Form); DIO.Create (FP (File), To_FCB (Mode), Name, Form);
...@@ -105,7 +105,7 @@ package body Ada.Direct_IO is ...@@ -105,7 +105,7 @@ package body Ada.Direct_IO is
-- End_Of_File -- -- End_Of_File --
----------------- -----------------
function End_Of_File (File : in File_Type) return Boolean is function End_Of_File (File : File_Type) return Boolean is
begin begin
return DIO.End_Of_File (FP (File)); return DIO.End_Of_File (FP (File));
end End_Of_File; end End_Of_File;
...@@ -114,7 +114,7 @@ package body Ada.Direct_IO is ...@@ -114,7 +114,7 @@ package body Ada.Direct_IO is
-- Form -- -- Form --
---------- ----------
function Form (File : in File_Type) return String is function Form (File : File_Type) return String is
begin begin
return FIO.Form (AP (File)); return FIO.Form (AP (File));
end Form; end Form;
...@@ -123,7 +123,7 @@ package body Ada.Direct_IO is ...@@ -123,7 +123,7 @@ package body Ada.Direct_IO is
-- Index -- -- Index --
----------- -----------
function Index (File : in File_Type) return Positive_Count is function Index (File : File_Type) return Positive_Count is
begin begin
return Positive_Count (DIO.Index (FP (File))); return Positive_Count (DIO.Index (FP (File)));
end Index; end Index;
...@@ -132,7 +132,7 @@ package body Ada.Direct_IO is ...@@ -132,7 +132,7 @@ package body Ada.Direct_IO is
-- Is_Open -- -- Is_Open --
------------- -------------
function Is_Open (File : in File_Type) return Boolean is function Is_Open (File : File_Type) return Boolean is
begin begin
return FIO.Is_Open (AP (File)); return FIO.Is_Open (AP (File));
end Is_Open; end Is_Open;
...@@ -141,7 +141,7 @@ package body Ada.Direct_IO is ...@@ -141,7 +141,7 @@ package body Ada.Direct_IO is
-- Mode -- -- Mode --
---------- ----------
function Mode (File : in File_Type) return File_Mode is function Mode (File : File_Type) return File_Mode is
begin begin
return To_DIO (FIO.Mode (AP (File))); return To_DIO (FIO.Mode (AP (File)));
end Mode; end Mode;
...@@ -150,7 +150,7 @@ package body Ada.Direct_IO is ...@@ -150,7 +150,7 @@ package body Ada.Direct_IO is
-- Name -- -- Name --
---------- ----------
function Name (File : in File_Type) return String is function Name (File : File_Type) return String is
begin begin
return FIO.Name (AP (File)); return FIO.Name (AP (File));
end Name; end Name;
...@@ -161,9 +161,9 @@ package body Ada.Direct_IO is ...@@ -161,9 +161,9 @@ package body Ada.Direct_IO is
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := "") Form : String := "")
is is
begin begin
DIO.Open (FP (File), To_FCB (Mode), Name, Form); DIO.Open (FP (File), To_FCB (Mode), Name, Form);
...@@ -175,9 +175,9 @@ package body Ada.Direct_IO is ...@@ -175,9 +175,9 @@ package body Ada.Direct_IO is
---------- ----------
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Element_Type; Item : out Element_Type;
From : in Positive_Count) From : Positive_Count)
is is
begin begin
-- For a non-constrained variant record type, we read into an -- For a non-constrained variant record type, we read into an
...@@ -207,7 +207,7 @@ package body Ada.Direct_IO is ...@@ -207,7 +207,7 @@ package body Ada.Direct_IO is
end if; end if;
end Read; end Read;
procedure Read (File : in File_Type; Item : out Element_Type) is procedure Read (File : File_Type; Item : out Element_Type) is
begin begin
-- Same processing for unconstrained case as above -- Same processing for unconstrained case as above
...@@ -235,7 +235,7 @@ package body Ada.Direct_IO is ...@@ -235,7 +235,7 @@ package body Ada.Direct_IO is
-- Reset -- -- Reset --
----------- -----------
procedure Reset (File : in out File_Type; Mode : in File_Mode) is procedure Reset (File : in out File_Type; Mode : File_Mode) is
begin begin
DIO.Reset (FP (File), To_FCB (Mode)); DIO.Reset (FP (File), To_FCB (Mode));
end Reset; end Reset;
...@@ -249,7 +249,7 @@ package body Ada.Direct_IO is ...@@ -249,7 +249,7 @@ package body Ada.Direct_IO is
-- Set_Index -- -- Set_Index --
--------------- ---------------
procedure Set_Index (File : in File_Type; To : in Positive_Count) is procedure Set_Index (File : File_Type; To : Positive_Count) is
begin begin
DIO.Set_Index (FP (File), DPCount (To)); DIO.Set_Index (FP (File), DPCount (To));
end Set_Index; end Set_Index;
...@@ -258,7 +258,7 @@ package body Ada.Direct_IO is ...@@ -258,7 +258,7 @@ package body Ada.Direct_IO is
-- Size -- -- Size --
---------- ----------
function Size (File : in File_Type) return Count is function Size (File : File_Type) return Count is
begin begin
return Count (DIO.Size (FP (File))); return Count (DIO.Size (FP (File)));
end Size; end Size;
...@@ -268,16 +268,16 @@ package body Ada.Direct_IO is ...@@ -268,16 +268,16 @@ package body Ada.Direct_IO is
----------- -----------
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Element_Type; Item : Element_Type;
To : in Positive_Count) To : Positive_Count)
is is
begin begin
DIO.Set_Index (FP (File), DPCount (To)); DIO.Set_Index (FP (File), DPCount (To));
DIO.Write (FP (File), Item'Address, Item'Size / SU, Zeroes); DIO.Write (FP (File), Item'Address, Item'Size / SU, Zeroes);
end Write; end Write;
procedure Write (File : in File_Type; Item : in Element_Type) is procedure Write (File : File_Type; Item : Element_Type) is
begin begin
DIO.Write (FP (File), Item'Address, Item'Size / SU, Zeroes); DIO.Write (FP (File), Item'Address, Item'Size / SU, Zeroes);
end Write; end Write;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -71,55 +71,55 @@ package Ada.Direct_IO is ...@@ -71,55 +71,55 @@ package Ada.Direct_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Inout_File; Mode : File_Mode := Inout_File;
Name : in String := ""; Name : String := "";
Form : in String := ""); Form : String := "");
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := ""); Form : String := "");
procedure Close (File : in out File_Type); procedure Close (File : in out File_Type);
procedure Delete (File : in out File_Type); procedure Delete (File : in out File_Type);
procedure Reset (File : in out File_Type; Mode : in File_Mode); procedure Reset (File : in out File_Type; Mode : File_Mode);
procedure Reset (File : in out File_Type); procedure Reset (File : in out File_Type);
function Mode (File : in File_Type) return File_Mode; function Mode (File : File_Type) return File_Mode;
function Name (File : in File_Type) return String; function Name (File : File_Type) return String;
function Form (File : in File_Type) return String; function Form (File : File_Type) return String;
function Is_Open (File : in File_Type) return Boolean; function Is_Open (File : File_Type) return Boolean;
--------------------------------- ---------------------------------
-- Input and Output Operations -- -- Input and Output Operations --
--------------------------------- ---------------------------------
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Element_Type; Item : out Element_Type;
From : in Positive_Count); From : Positive_Count);
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Element_Type); Item : out Element_Type);
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Element_Type; Item : Element_Type;
To : in Positive_Count); To : Positive_Count);
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Element_Type); Item : Element_Type);
procedure Set_Index (File : in File_Type; To : in Positive_Count); procedure Set_Index (File : File_Type; To : Positive_Count);
function Index (File : in File_Type) return Positive_Count; function Index (File : File_Type) return Positive_Count;
function Size (File : in File_Type) return Count; function Size (File : File_Type) return Count;
function End_Of_File (File : in File_Type) return Boolean; function End_Of_File (File : File_Type) return Boolean;
---------------- ----------------
-- Exceptions -- -- Exceptions --
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -647,12 +647,12 @@ package body Ada.Numerics.Generic_Complex_Types is ...@@ -647,12 +647,12 @@ package body Ada.Numerics.Generic_Complex_Types is
-- Set_Im -- -- Set_Im --
------------ ------------
procedure Set_Im (X : in out Complex; Im : in Real'Base) is procedure Set_Im (X : in out Complex; Im : Real'Base) is
begin begin
X.Im := Im; X.Im := Im;
end Set_Im; end Set_Im;
procedure Set_Im (X : out Imaginary; Im : in Real'Base) is procedure Set_Im (X : out Imaginary; Im : Real'Base) is
begin begin
X := Imaginary (Im); X := Imaginary (Im);
end Set_Im; end Set_Im;
...@@ -661,7 +661,7 @@ package body Ada.Numerics.Generic_Complex_Types is ...@@ -661,7 +661,7 @@ package body Ada.Numerics.Generic_Complex_Types is
-- Set_Re -- -- Set_Re --
------------ ------------
procedure Set_Re (X : in out Complex; Re : in Real'Base) is procedure Set_Re (X : in out Complex; Re : Real'Base) is
begin begin
X.Re := Re; X.Re := Re;
end Set_Re; end Set_Re;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -56,9 +56,9 @@ package Ada.Numerics.Generic_Complex_Types is ...@@ -56,9 +56,9 @@ package Ada.Numerics.Generic_Complex_Types is
function Im (X : Complex) return Real'Base; function Im (X : Complex) return Real'Base;
function Im (X : Imaginary) return Real'Base; function Im (X : Imaginary) return Real'Base;
procedure Set_Re (X : in out Complex; Re : in Real'Base); procedure Set_Re (X : in out Complex; Re : Real'Base);
procedure Set_Im (X : in out Complex; Im : in Real'Base); procedure Set_Im (X : in out Complex; Im : Real'Base);
procedure Set_Im (X : out Imaginary; Im : in Real'Base); procedure Set_Im (X : out Imaginary; Im : Real'Base);
function Compose_From_Cartesian (Re, Im : Real'Base) return Complex; function Compose_From_Cartesian (Re, Im : Real'Base) return Complex;
function Compose_From_Cartesian (Re : Real'Base) return Complex; function Compose_From_Cartesian (Re : Real'Base) return Complex;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -55,7 +55,7 @@ package body Ada.Numerics.Float_Random is ...@@ -55,7 +55,7 @@ package body Ada.Numerics.Float_Random is
-- Local Subprograms -- -- Local Subprograms --
----------------------- -----------------------
procedure Euclid (P, Q : in Int; X, Y : out Int; GCD : out Int); procedure Euclid (P, Q : Int; X, Y : out Int; GCD : out Int);
function Euclid (P, Q : Int) return Int; function Euclid (P, Q : Int) return Int;
...@@ -65,24 +65,24 @@ package body Ada.Numerics.Float_Random is ...@@ -65,24 +65,24 @@ package body Ada.Numerics.Float_Random is
-- Euclid -- -- Euclid --
------------ ------------
procedure Euclid (P, Q : in Int; X, Y : out Int; GCD : out Int) is procedure Euclid (P, Q : Int; X, Y : out Int; GCD : out Int) is
XT : Int := 1; XT : Int := 1;
YT : Int := 0; YT : Int := 0;
procedure Recur procedure Recur
(P, Q : in Int; -- a (i-1), a (i) (P, Q : Int; -- a (i-1), a (i)
X, Y : in Int; -- x (i), y (i) X, Y : Int; -- x (i), y (i)
XP, YP : in out Int; -- x (i-1), y (i-1) XP, YP : in out Int; -- x (i-1), y (i-1)
GCD : out Int); GCD : out Int);
procedure Recur procedure Recur
(P, Q : in Int; (P, Q : Int;
X, Y : in Int; X, Y : Int;
XP, YP : in out Int; XP, YP : in out Int;
GCD : out Int) GCD : out Int)
is is
Quo : Int := P / Q; -- q <-- |_ a (i-1) / a (i) _| Quo : Int := P / Q; -- q <-- |_ a (i-1) / a (i) _|
XT : Int := X; -- x (i) XT : Int := X; -- x (i)
YT : Int := Y; -- y (i) YT : Int := Y; -- y (i)
...@@ -156,7 +156,7 @@ package body Ada.Numerics.Float_Random is ...@@ -156,7 +156,7 @@ package body Ada.Numerics.Float_Random is
-- Version that works from given initiator value -- Version that works from given initiator value
procedure Reset (Gen : in Generator; Initiator : in Integer) is procedure Reset (Gen : Generator; Initiator : Integer) is
Genp : constant Pointer := Gen.Gen_State'Unrestricted_Access; Genp : constant Pointer := Gen.Gen_State'Unrestricted_Access;
X1, X2 : Int; X1, X2 : Int;
...@@ -227,7 +227,7 @@ package body Ada.Numerics.Float_Random is ...@@ -227,7 +227,7 @@ package body Ada.Numerics.Float_Random is
-- Save -- -- Save --
---------- ----------
procedure Save (Gen : in Generator; To_State : out State) is procedure Save (Gen : Generator; To_State : out State) is
begin begin
To_State := Gen.Gen_State; To_State := Gen.Gen_State;
end Save; end Save;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2002 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -69,7 +69,7 @@ package Ada.Numerics.Float_Random is ...@@ -69,7 +69,7 @@ package Ada.Numerics.Float_Random is
Max_Image_Width : constant := 80; Max_Image_Width : constant := 80;
function Image (Of_State : State) return String; function Image (Of_State : State) return String;
function Value (Coded_State : String) return State; function Value (Coded_State : String) return State;
private private
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -76,9 +76,9 @@ package body Ada.Sequential_IO is ...@@ -76,9 +76,9 @@ package body Ada.Sequential_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Out_File; Mode : File_Mode := Out_File;
Name : in String := ""; Name : String := "";
Form : in String := "") Form : String := "")
is is
begin begin
SIO.Create (FP (File), To_FCB (Mode), Name, Form); SIO.Create (FP (File), To_FCB (Mode), Name, Form);
...@@ -97,7 +97,7 @@ package body Ada.Sequential_IO is ...@@ -97,7 +97,7 @@ package body Ada.Sequential_IO is
-- End_Of_File -- -- End_Of_File --
----------------- -----------------
function End_Of_File (File : in File_Type) return Boolean is function End_Of_File (File : File_Type) return Boolean is
begin begin
return FIO.End_Of_File (AP (File)); return FIO.End_Of_File (AP (File));
end End_Of_File; end End_Of_File;
...@@ -106,7 +106,7 @@ package body Ada.Sequential_IO is ...@@ -106,7 +106,7 @@ package body Ada.Sequential_IO is
-- Form -- -- Form --
---------- ----------
function Form (File : in File_Type) return String is function Form (File : File_Type) return String is
begin begin
return FIO.Form (AP (File)); return FIO.Form (AP (File));
end Form; end Form;
...@@ -115,7 +115,7 @@ package body Ada.Sequential_IO is ...@@ -115,7 +115,7 @@ package body Ada.Sequential_IO is
-- Is_Open -- -- Is_Open --
------------- -------------
function Is_Open (File : in File_Type) return Boolean is function Is_Open (File : File_Type) return Boolean is
begin begin
return FIO.Is_Open (AP (File)); return FIO.Is_Open (AP (File));
end Is_Open; end Is_Open;
...@@ -124,7 +124,7 @@ package body Ada.Sequential_IO is ...@@ -124,7 +124,7 @@ package body Ada.Sequential_IO is
-- Mode -- -- Mode --
---------- ----------
function Mode (File : in File_Type) return File_Mode is function Mode (File : File_Type) return File_Mode is
begin begin
return To_SIO (FIO.Mode (AP (File))); return To_SIO (FIO.Mode (AP (File)));
end Mode; end Mode;
...@@ -133,7 +133,7 @@ package body Ada.Sequential_IO is ...@@ -133,7 +133,7 @@ package body Ada.Sequential_IO is
-- Name -- -- Name --
---------- ----------
function Name (File : in File_Type) return String is function Name (File : File_Type) return String is
begin begin
return FIO.Name (AP (File)); return FIO.Name (AP (File));
end Name; end Name;
...@@ -144,9 +144,9 @@ package body Ada.Sequential_IO is ...@@ -144,9 +144,9 @@ package body Ada.Sequential_IO is
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := "") Form : String := "")
is is
begin begin
SIO.Open (FP (File), To_FCB (Mode), Name, Form); SIO.Open (FP (File), To_FCB (Mode), Name, Form);
...@@ -156,7 +156,7 @@ package body Ada.Sequential_IO is ...@@ -156,7 +156,7 @@ package body Ada.Sequential_IO is
-- Read -- -- Read --
---------- ----------
procedure Read (File : in File_Type; Item : out Element_Type) is procedure Read (File : File_Type; Item : out Element_Type) is
Siz : constant size_t := (Item'Size + SU - 1) / SU; Siz : constant size_t := (Item'Size + SU - 1) / SU;
Rsiz : size_t; Rsiz : size_t;
...@@ -238,7 +238,7 @@ package body Ada.Sequential_IO is ...@@ -238,7 +238,7 @@ package body Ada.Sequential_IO is
-- Reset -- -- Reset --
----------- -----------
procedure Reset (File : in out File_Type; Mode : in File_Mode) is procedure Reset (File : in out File_Type; Mode : File_Mode) is
begin begin
FIO.Reset (AP (File), To_FCB (Mode)); FIO.Reset (AP (File), To_FCB (Mode));
end Reset; end Reset;
...@@ -252,7 +252,7 @@ package body Ada.Sequential_IO is ...@@ -252,7 +252,7 @@ package body Ada.Sequential_IO is
-- Write -- -- Write --
----------- -----------
procedure Write (File : in File_Type; Item : in Element_Type) is procedure Write (File : File_Type; Item : Element_Type) is
Siz : constant size_t := (Item'Size + SU - 1) / SU; Siz : constant size_t := (Item'Size + SU - 1) / SU;
begin begin
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -67,35 +67,35 @@ package Ada.Sequential_IO is ...@@ -67,35 +67,35 @@ package Ada.Sequential_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Out_File; Mode : File_Mode := Out_File;
Name : in String := ""; Name : String := "";
Form : in String := ""); Form : String := "");
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := ""); Form : String := "");
procedure Close (File : in out File_Type); procedure Close (File : in out File_Type);
procedure Delete (File : in out File_Type); procedure Delete (File : in out File_Type);
procedure Reset (File : in out File_Type; Mode : in File_Mode); procedure Reset (File : in out File_Type; Mode : File_Mode);
procedure Reset (File : in out File_Type); procedure Reset (File : in out File_Type);
function Mode (File : in File_Type) return File_Mode; function Mode (File : File_Type) return File_Mode;
function Name (File : in File_Type) return String; function Name (File : File_Type) return String;
function Form (File : in File_Type) return String; function Form (File : File_Type) return String;
function Is_Open (File : in File_Type) return Boolean; function Is_Open (File : File_Type) return Boolean;
--------------------------------- ---------------------------------
-- Input and output operations -- -- Input and output operations --
--------------------------------- ---------------------------------
procedure Read (File : in File_Type; Item : out Element_Type); procedure Read (File : File_Type; Item : out Element_Type);
procedure Write (File : in File_Type; Item : in Element_Type); procedure Write (File : File_Type; Item : Element_Type);
function End_Of_File (File : in File_Type) return Boolean; function End_Of_File (File : File_Type) return Boolean;
---------------- ----------------
-- Exceptions -- -- Exceptions --
......
...@@ -34,9 +34,9 @@ package Ada.Storage_IO is ...@@ -34,9 +34,9 @@ package Ada.Storage_IO is
-- Input and Output Operations -- -- Input and Output Operations --
--------------------------------- ---------------------------------
procedure Read (Buffer : in Buffer_Type; Item : out Element_Type); procedure Read (Buffer : Buffer_Type; Item : out Element_Type);
procedure Write (Buffer : out Buffer_Type; Item : in Element_Type); procedure Write (Buffer : out Buffer_Type; Item : Element_Type);
---------------- ----------------
-- Exceptions -- -- Exceptions --
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -60,7 +60,7 @@ package Ada.Streams is ...@@ -60,7 +60,7 @@ package Ada.Streams is
procedure Write procedure Write
(Stream : in out Root_Stream_Type; (Stream : in out Root_Stream_Type;
Item : in Stream_Element_Array) Item : Stream_Element_Array)
is abstract; is abstract;
private private
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -31,11 +31,13 @@ ...@@ -31,11 +31,13 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Interfaces.C_Streams; use Interfaces.C_Streams; with Interfaces.C_Streams; use Interfaces.C_Streams;
with System; use System;
with System; use System;
with System.File_IO; with System.File_IO;
with System.Soft_Links; with System.Soft_Links;
with System.CRTL; with System.CRTL;
with Unchecked_Conversion; with Unchecked_Conversion;
with Unchecked_Deallocation; with Unchecked_Deallocation;
...@@ -55,7 +57,7 @@ package body Ada.Streams.Stream_IO is ...@@ -55,7 +57,7 @@ package body Ada.Streams.Stream_IO is
-- Local Subprograms -- -- Local Subprograms --
----------------------- -----------------------
procedure Set_Position (File : in File_Type); procedure Set_Position (File : File_Type);
-- Sets file position pointer according to value of current index -- Sets file position pointer according to value of current index
------------------- -------------------
...@@ -64,7 +66,6 @@ package body Ada.Streams.Stream_IO is ...@@ -64,7 +66,6 @@ package body Ada.Streams.Stream_IO is
function AFCB_Allocate (Control_Block : Stream_AFCB) return FCB.AFCB_Ptr is function AFCB_Allocate (Control_Block : Stream_AFCB) return FCB.AFCB_Ptr is
pragma Warnings (Off, Control_Block); pragma Warnings (Off, Control_Block);
begin begin
return new Stream_AFCB; return new Stream_AFCB;
end AFCB_Allocate; end AFCB_Allocate;
...@@ -77,7 +78,6 @@ package body Ada.Streams.Stream_IO is ...@@ -77,7 +78,6 @@ package body Ada.Streams.Stream_IO is
procedure AFCB_Close (File : access Stream_AFCB) is procedure AFCB_Close (File : access Stream_AFCB) is
pragma Warnings (Off, File); pragma Warnings (Off, File);
begin begin
null; null;
end AFCB_Close; end AFCB_Close;
...@@ -111,9 +111,9 @@ package body Ada.Streams.Stream_IO is ...@@ -111,9 +111,9 @@ package body Ada.Streams.Stream_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Out_File; Mode : File_Mode := Out_File;
Name : in String := ""; Name : String := "";
Form : in String := "") Form : String := "")
is is
Dummy_File_Control_Block : Stream_AFCB; Dummy_File_Control_Block : Stream_AFCB;
pragma Warnings (Off, Dummy_File_Control_Block); pragma Warnings (Off, Dummy_File_Control_Block);
...@@ -145,7 +145,7 @@ package body Ada.Streams.Stream_IO is ...@@ -145,7 +145,7 @@ package body Ada.Streams.Stream_IO is
-- End_Of_File -- -- End_Of_File --
----------------- -----------------
function End_Of_File (File : in File_Type) return Boolean is function End_Of_File (File : File_Type) return Boolean is
begin begin
FIO.Check_Read_Status (AP (File)); FIO.Check_Read_Status (AP (File));
return Count (File.Index) > Size (File); return Count (File.Index) > Size (File);
...@@ -164,7 +164,7 @@ package body Ada.Streams.Stream_IO is ...@@ -164,7 +164,7 @@ package body Ada.Streams.Stream_IO is
-- Form -- -- Form --
---------- ----------
function Form (File : in File_Type) return String is function Form (File : File_Type) return String is
begin begin
return FIO.Form (AP (File)); return FIO.Form (AP (File));
end Form; end Form;
...@@ -173,7 +173,7 @@ package body Ada.Streams.Stream_IO is ...@@ -173,7 +173,7 @@ package body Ada.Streams.Stream_IO is
-- Index -- -- Index --
----------- -----------
function Index (File : in File_Type) return Positive_Count is function Index (File : File_Type) return Positive_Count is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
return Count (File.Index); return Count (File.Index);
...@@ -183,7 +183,7 @@ package body Ada.Streams.Stream_IO is ...@@ -183,7 +183,7 @@ package body Ada.Streams.Stream_IO is
-- Is_Open -- -- Is_Open --
------------- -------------
function Is_Open (File : in File_Type) return Boolean is function Is_Open (File : File_Type) return Boolean is
begin begin
return FIO.Is_Open (AP (File)); return FIO.Is_Open (AP (File));
end Is_Open; end Is_Open;
...@@ -192,7 +192,7 @@ package body Ada.Streams.Stream_IO is ...@@ -192,7 +192,7 @@ package body Ada.Streams.Stream_IO is
-- Mode -- -- Mode --
---------- ----------
function Mode (File : in File_Type) return File_Mode is function Mode (File : File_Type) return File_Mode is
begin begin
return To_SIO (FIO.Mode (AP (File))); return To_SIO (FIO.Mode (AP (File)));
end Mode; end Mode;
...@@ -201,7 +201,7 @@ package body Ada.Streams.Stream_IO is ...@@ -201,7 +201,7 @@ package body Ada.Streams.Stream_IO is
-- Name -- -- Name --
---------- ----------
function Name (File : in File_Type) return String is function Name (File : File_Type) return String is
begin begin
return FIO.Name (AP (File)); return FIO.Name (AP (File));
end Name; end Name;
...@@ -212,9 +212,9 @@ package body Ada.Streams.Stream_IO is ...@@ -212,9 +212,9 @@ package body Ada.Streams.Stream_IO is
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := "") Form : String := "")
is is
Dummy_File_Control_Block : Stream_AFCB; Dummy_File_Control_Block : Stream_AFCB;
pragma Warnings (Off, Dummy_File_Control_Block); pragma Warnings (Off, Dummy_File_Control_Block);
...@@ -255,10 +255,10 @@ package body Ada.Streams.Stream_IO is ...@@ -255,10 +255,10 @@ package body Ada.Streams.Stream_IO is
---------- ----------
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Stream_Element_Array; Item : out Stream_Element_Array;
Last : out Stream_Element_Offset; Last : out Stream_Element_Offset;
From : in Positive_Count) From : Positive_Count)
is is
begin begin
Set_Index (File, From); Set_Index (File, From);
...@@ -266,7 +266,7 @@ package body Ada.Streams.Stream_IO is ...@@ -266,7 +266,7 @@ package body Ada.Streams.Stream_IO is
end Read; end Read;
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Stream_Element_Array; Item : out Stream_Element_Array;
Last : out Stream_Element_Offset) Last : out Stream_Element_Offset)
is is
...@@ -319,7 +319,7 @@ package body Ada.Streams.Stream_IO is ...@@ -319,7 +319,7 @@ package body Ada.Streams.Stream_IO is
-- Reset -- -- Reset --
----------- -----------
procedure Reset (File : in out File_Type; Mode : in File_Mode) is procedure Reset (File : in out File_Type; Mode : File_Mode) is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
...@@ -339,7 +339,7 @@ package body Ada.Streams.Stream_IO is ...@@ -339,7 +339,7 @@ package body Ada.Streams.Stream_IO is
-- Set_Index -- -- Set_Index --
--------------- ---------------
procedure Set_Index (File : in File_Type; To : in Positive_Count) is procedure Set_Index (File : File_Type; To : Positive_Count) is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
File.Index := Count (To); File.Index := Count (To);
...@@ -350,7 +350,7 @@ package body Ada.Streams.Stream_IO is ...@@ -350,7 +350,7 @@ package body Ada.Streams.Stream_IO is
-- Set_Mode -- -- Set_Mode --
-------------- --------------
procedure Set_Mode (File : in out File_Type; Mode : in File_Mode) is procedure Set_Mode (File : in out File_Type; Mode : File_Mode) is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
...@@ -382,7 +382,7 @@ package body Ada.Streams.Stream_IO is ...@@ -382,7 +382,7 @@ package body Ada.Streams.Stream_IO is
-- Set_Position -- -- Set_Position --
------------------ ------------------
procedure Set_Position (File : in File_Type) is procedure Set_Position (File : File_Type) is
use type System.CRTL.long; use type System.CRTL.long;
begin begin
if fseek (File.Stream, if fseek (File.Stream,
...@@ -396,7 +396,7 @@ package body Ada.Streams.Stream_IO is ...@@ -396,7 +396,7 @@ package body Ada.Streams.Stream_IO is
-- Size -- -- Size --
---------- ----------
function Size (File : in File_Type) return Count is function Size (File : File_Type) return Count is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
...@@ -417,7 +417,7 @@ package body Ada.Streams.Stream_IO is ...@@ -417,7 +417,7 @@ package body Ada.Streams.Stream_IO is
-- Stream -- -- Stream --
------------ ------------
function Stream (File : in File_Type) return Stream_Access is function Stream (File : File_Type) return Stream_Access is
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
return Stream_Access (File); return Stream_Access (File);
...@@ -428,16 +428,19 @@ package body Ada.Streams.Stream_IO is ...@@ -428,16 +428,19 @@ package body Ada.Streams.Stream_IO is
----------- -----------
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Stream_Element_Array; Item : Stream_Element_Array;
To : in Positive_Count) To : Positive_Count)
is is
begin begin
Set_Index (File, To); Set_Index (File, To);
Write (File, Item); Write (File, Item);
end Write; end Write;
procedure Write (File : in File_Type; Item : in Stream_Element_Array) is procedure Write
(File : File_Type;
Item : Stream_Element_Array)
is
begin begin
FIO.Check_Write_Status (AP (File)); FIO.Check_Write_Status (AP (File));
...@@ -474,7 +477,7 @@ package body Ada.Streams.Stream_IO is ...@@ -474,7 +477,7 @@ package body Ada.Streams.Stream_IO is
procedure Write procedure Write
(File : in out Stream_AFCB; (File : in out Stream_AFCB;
Item : in Ada.Streams.Stream_Element_Array) Item : Ada.Streams.Stream_Element_Array)
is is
begin begin
Write (File'Unchecked_Access, Item); Write (File'Unchecked_Access, Item);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -67,64 +67,64 @@ package Ada.Streams.Stream_IO is ...@@ -67,64 +67,64 @@ package Ada.Streams.Stream_IO is
procedure Create procedure Create
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode := Out_File; Mode : File_Mode := Out_File;
Name : in String := ""; Name : String := "";
Form : in String := ""); Form : String := "");
procedure Open procedure Open
(File : in out File_Type; (File : in out File_Type;
Mode : in File_Mode; Mode : File_Mode;
Name : in String; Name : String;
Form : in String := ""); Form : String := "");
procedure Close (File : in out File_Type); procedure Close (File : in out File_Type);
procedure Delete (File : in out File_Type); procedure Delete (File : in out File_Type);
procedure Reset (File : in out File_Type; Mode : in File_Mode); procedure Reset (File : in out File_Type; Mode : File_Mode);
procedure Reset (File : in out File_Type); procedure Reset (File : in out File_Type);
function Mode (File : in File_Type) return File_Mode; function Mode (File : File_Type) return File_Mode;
function Name (File : in File_Type) return String; function Name (File : File_Type) return String;
function Form (File : in File_Type) return String; function Form (File : File_Type) return String;
function Is_Open (File : in File_Type) return Boolean; function Is_Open (File : File_Type) return Boolean;
function End_Of_File (File : in File_Type) return Boolean; function End_Of_File (File : File_Type) return Boolean;
function Stream (File : in File_Type) return Stream_Access; function Stream (File : File_Type) return Stream_Access;
----------------------------- -----------------------------
-- Input-Output Operations -- -- Input-Output Operations --
----------------------------- -----------------------------
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Stream_Element_Array; Item : out Stream_Element_Array;
Last : out Stream_Element_Offset; Last : out Stream_Element_Offset;
From : in Positive_Count); From : Positive_Count);
procedure Read procedure Read
(File : in File_Type; (File : File_Type;
Item : out Stream_Element_Array; Item : out Stream_Element_Array;
Last : out Stream_Element_Offset); Last : out Stream_Element_Offset);
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Stream_Element_Array; Item : Stream_Element_Array;
To : in Positive_Count); To : Positive_Count);
procedure Write procedure Write
(File : in File_Type; (File : File_Type;
Item : in Stream_Element_Array); Item : Stream_Element_Array);
---------------------------------------- ----------------------------------------
-- Operations on Position within File -- -- Operations on Position within File --
---------------------------------------- ----------------------------------------
procedure Set_Index (File : in File_Type; To : in Positive_Count); procedure Set_Index (File : File_Type; To : Positive_Count);
function Index (File : in File_Type) return Positive_Count; function Index (File : File_Type) return Positive_Count;
function Size (File : in File_Type) return Count; function Size (File : File_Type) return Count;
procedure Set_Mode (File : in out File_Type; Mode : in File_Mode); procedure Set_Mode (File : in out File_Type; Mode : File_Mode);
-- Note: The parameter file is IN OUT in the RM, but this is clearly -- Note: The parameter file is IN OUT in the RM, but this is clearly
-- an oversight, and was intended to be IN, see AI95-00057. -- an oversight, and was intended to be IN, see AI95-00057.
...@@ -187,7 +187,7 @@ private ...@@ -187,7 +187,7 @@ private
procedure Write procedure Write
(File : in out Stream_AFCB; (File : in out Stream_AFCB;
Item : in Ada.Streams.Stream_Element_Array); Item : Ada.Streams.Stream_Element_Array);
-- Write operation used when Stream_IO file is treated directly as Stream -- Write operation used when Stream_IO file is treated directly as Stream
end Ada.Streams.Stream_IO; end Ada.Streams.Stream_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -148,7 +148,7 @@ package body Ada.Strings.Wide_Maps is ...@@ -148,7 +148,7 @@ package body Ada.Strings.Wide_Maps is
-- The sorted, discontiguous form is canonical, so equality can be used -- The sorted, discontiguous form is canonical, so equality can be used
function "=" (Left, Right : in Wide_Character_Set) return Boolean is function "=" (Left, Right : Wide_Character_Set) return Boolean is
begin begin
return Left.Set.all = Right.Set.all; return Left.Set.all = Right.Set.all;
end "="; end "=";
...@@ -556,7 +556,7 @@ package body Ada.Strings.Wide_Maps is ...@@ -556,7 +556,7 @@ package body Ada.Strings.Wide_Maps is
--------------- ---------------
function To_Ranges function To_Ranges
(Set : in Wide_Character_Set) return Wide_Character_Ranges (Set : Wide_Character_Set) return Wide_Character_Ranges
is is
begin begin
return Set.Set.all; return Set.Set.all;
...@@ -643,7 +643,7 @@ package body Ada.Strings.Wide_Maps is ...@@ -643,7 +643,7 @@ package body Ada.Strings.Wide_Maps is
end if; end if;
end loop; end loop;
if Result (N).High < Result (N).Low then if N > 0 and then Result (N).High < Result (N).Low then
N := N - 1; N := N - 1;
end if; end if;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -69,13 +69,13 @@ package Ada.Strings.Wide_Maps is ...@@ -69,13 +69,13 @@ package Ada.Strings.Wide_Maps is
(Span : Wide_Character_Range) return Wide_Character_Set; (Span : Wide_Character_Range) return Wide_Character_Set;
function To_Ranges function To_Ranges
(Set : in Wide_Character_Set) return Wide_Character_Ranges; (Set : Wide_Character_Set) return Wide_Character_Ranges;
--------------------------------------- ---------------------------------------
-- Operations on Wide Character Sets -- -- Operations on Wide Character Sets --
--------------------------------------- ---------------------------------------
function "=" (Left, Right : in Wide_Character_Set) return Boolean; function "=" (Left, Right : Wide_Character_Set) return Boolean;
function "not" function "not"
(Right : Wide_Character_Set) return Wide_Character_Set; (Right : Wide_Character_Set) return Wide_Character_Set;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -130,8 +130,8 @@ package body Ada.Strings.Wide_Search is ...@@ -130,8 +130,8 @@ package body Ada.Strings.Wide_Search is
end Count; end Count;
function Count function Count
(Source : in Wide_String; (Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set) return Natural Set : Wide_Maps.Wide_Character_Set) return Natural
is is
N : Natural := 0; N : Natural := 0;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -148,7 +148,7 @@ package body Ada.Strings.Wide_Wide_Maps is ...@@ -148,7 +148,7 @@ package body Ada.Strings.Wide_Wide_Maps is
-- The sorted, discontiguous form is canonical, so equality can be used -- The sorted, discontiguous form is canonical, so equality can be used
function "=" (Left, Right : in Wide_Wide_Character_Set) return Boolean is function "=" (Left, Right : Wide_Wide_Character_Set) return Boolean is
begin begin
return Left.Set.all = Right.Set.all; return Left.Set.all = Right.Set.all;
end "="; end "=";
...@@ -559,7 +559,7 @@ package body Ada.Strings.Wide_Wide_Maps is ...@@ -559,7 +559,7 @@ package body Ada.Strings.Wide_Wide_Maps is
--------------- ---------------
function To_Ranges function To_Ranges
(Set : in Wide_Wide_Character_Set) return Wide_Wide_Character_Ranges (Set : Wide_Wide_Character_Set) return Wide_Wide_Character_Ranges
is is
begin begin
return Set.Set.all; return Set.Set.all;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -75,7 +75,7 @@ package Ada.Strings.Wide_Wide_Maps is ...@@ -75,7 +75,7 @@ package Ada.Strings.Wide_Wide_Maps is
-- Operations on Wide Character Sets -- -- Operations on Wide Character Sets --
--------------------------------------- ---------------------------------------
function "=" (Left, Right : in Wide_Wide_Character_Set) return Boolean; function "=" (Left, Right : Wide_Wide_Character_Set) return Boolean;
function "not" function "not"
(Right : Wide_Wide_Character_Set) return Wide_Wide_Character_Set; (Right : Wide_Wide_Character_Set) return Wide_Wide_Character_Set;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -39,7 +39,7 @@ with Ada.Task_Identification; ...@@ -39,7 +39,7 @@ with Ada.Task_Identification;
generic generic
type Attribute is private; type Attribute is private;
Initial_Value : in Attribute; Initial_Value : Attribute;
package Ada.Task_Attributes is package Ada.Task_Attributes is
...@@ -47,13 +47,11 @@ package Ada.Task_Attributes is ...@@ -47,13 +47,11 @@ package Ada.Task_Attributes is
function Value function Value
(T : Ada.Task_Identification.Task_Id := (T : Ada.Task_Identification.Task_Id :=
Ada.Task_Identification.Current_Task) Ada.Task_Identification.Current_Task) return Attribute;
return Attribute;
function Reference function Reference
(T : Ada.Task_Identification.Task_Id := (T : Ada.Task_Identification.Task_Id :=
Ada.Task_Identification.Current_Task) Ada.Task_Identification.Current_Task) return Attribute_Handle;
return Attribute_Handle;
procedure Set_Value procedure Set_Value
(Val : Attribute; (Val : Attribute;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,7 +42,7 @@ package body Ada.Text_IO.Editing is ...@@ -42,7 +42,7 @@ package body Ada.Text_IO.Editing is
-- Blank_When_Zero -- -- Blank_When_Zero --
--------------------- ---------------------
function Blank_When_Zero (Pic : in Picture) return Boolean is function Blank_When_Zero (Pic : Picture) return Boolean is
begin begin
return Pic.Contents.Original_BWZ; return Pic.Contents.Original_BWZ;
end Blank_When_Zero; end Blank_When_Zero;
...@@ -51,7 +51,7 @@ package body Ada.Text_IO.Editing is ...@@ -51,7 +51,7 @@ package body Ada.Text_IO.Editing is
-- Expand -- -- Expand --
------------ ------------
function Expand (Picture : in String) return String is function Expand (Picture : String) return String is
Result : String (1 .. MAX_PICSIZE); Result : String (1 .. MAX_PICSIZE);
Picture_Index : Integer := Picture'First; Picture_Index : Integer := Picture'First;
Result_Index : Integer := Result'First; Result_Index : Integer := Result'First;
...@@ -124,8 +124,7 @@ package body Ada.Text_IO.Editing is ...@@ -124,8 +124,7 @@ package body Ada.Text_IO.Editing is
Currency_Symbol : String; Currency_Symbol : String;
Fill_Character : Character; Fill_Character : Character;
Separator_Character : Character; Separator_Character : Character;
Radix_Point : Character) Radix_Point : Character) return String
return String
is is
Attrs : Number_Attributes := Parse_Number_String (Number); Attrs : Number_Attributes := Parse_Number_String (Number);
Position : Integer; Position : Integer;
...@@ -929,7 +928,7 @@ package body Ada.Text_IO.Editing is ...@@ -929,7 +928,7 @@ package body Ada.Text_IO.Editing is
-- The following ensures that we return B and not b being careful not -- The following ensures that we return B and not b being careful not
-- to break things which expect lower case b for blank. See CXF3A02. -- to break things which expect lower case b for blank. See CXF3A02.
function Pic_String (Pic : in Picture) return String is function Pic_String (Pic : Picture) return String is
Temp : String (1 .. Pic.Contents.Picture.Length) := Temp : String (1 .. Pic.Contents.Picture.Length) :=
Pic.Contents.Picture.Expanded; Pic.Contents.Picture.Expanded;
begin begin
...@@ -975,7 +974,7 @@ package body Ada.Text_IO.Editing is ...@@ -975,7 +974,7 @@ package body Ada.Text_IO.Editing is
procedure Debug_Start (Name : String); procedure Debug_Start (Name : String);
pragma Inline (Debug_Start); pragma Inline (Debug_Start);
procedure Debug_Integer (Value : in Integer; S : String); procedure Debug_Integer (Value : Integer; S : String);
pragma Inline (Debug_Integer); pragma Inline (Debug_Integer);
procedure Trailing_Currency; procedure Trailing_Currency;
...@@ -1032,7 +1031,7 @@ package body Ada.Text_IO.Editing is ...@@ -1032,7 +1031,7 @@ package body Ada.Text_IO.Editing is
-- Debug_Integer -- -- Debug_Integer --
------------------- -------------------
procedure Debug_Integer (Value : in Integer; S : String) is procedure Debug_Integer (Value : Integer; S : String) is
use Ada.Text_IO; -- needed for > use Ada.Text_IO; -- needed for >
begin begin
...@@ -2717,9 +2716,8 @@ package body Ada.Text_IO.Editing is ...@@ -2717,9 +2716,8 @@ package body Ada.Text_IO.Editing is
---------------- ----------------
function To_Picture function To_Picture
(Pic_String : in String; (Pic_String : String;
Blank_When_Zero : in Boolean := False) Blank_When_Zero : Boolean := False) return Picture
return Picture
is is
Result : Picture; Result : Picture;
...@@ -2745,9 +2743,8 @@ package body Ada.Text_IO.Editing is ...@@ -2745,9 +2743,8 @@ package body Ada.Text_IO.Editing is
----------- -----------
function Valid function Valid
(Pic_String : in String; (Pic_String : String;
Blank_When_Zero : in Boolean := False) Blank_When_Zero : Boolean := False) return Boolean
return Boolean
is is
begin begin
declare declare
...@@ -2764,8 +2761,8 @@ package body Ada.Text_IO.Editing is ...@@ -2764,8 +2761,8 @@ package body Ada.Text_IO.Editing is
-- False only if Blank_When_Zero is True but the pic string has a '*' -- False only if Blank_When_Zero is True but the pic string has a '*'
return not Blank_When_Zero or return not Blank_When_Zero
Strings_Fixed.Index (Expanded_Pic, "*") = 0; or else Strings_Fixed.Index (Expanded_Pic, "*") = 0;
end; end;
exception exception
...@@ -2783,13 +2780,12 @@ package body Ada.Text_IO.Editing is ...@@ -2783,13 +2780,12 @@ package body Ada.Text_IO.Editing is
----------- -----------
function Image function Image
(Item : in Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark) Radix_Mark : Character := Default_Radix_Mark) return String
return String
is is
begin begin
return Format_Number return Format_Number
...@@ -2802,9 +2798,8 @@ package body Ada.Text_IO.Editing is ...@@ -2802,9 +2798,8 @@ package body Ada.Text_IO.Editing is
------------ ------------
function Length function Length
(Pic : in Picture; (Pic : Picture;
Currency : in String := Default_Currency) Currency : String := Default_Currency) return Natural
return Natural
is is
Picstr : constant String := Pic_String (Pic); Picstr : constant String := Pic_String (Pic);
V_Adjust : Integer := 0; V_Adjust : Integer := 0;
...@@ -2836,13 +2831,13 @@ package body Ada.Text_IO.Editing is ...@@ -2836,13 +2831,13 @@ package body Ada.Text_IO.Editing is
--------- ---------
procedure Put procedure Put
(File : in Text_IO.File_Type; (File : Text_IO.File_Type;
Item : in Num; Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark) Radix_Mark : Character := Default_Radix_Mark)
is is
begin begin
Text_IO.Put (File, Image (Item, Pic, Text_IO.Put (File, Image (Item, Pic,
...@@ -2850,12 +2845,12 @@ package body Ada.Text_IO.Editing is ...@@ -2850,12 +2845,12 @@ package body Ada.Text_IO.Editing is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark) Radix_Mark : Character := Default_Radix_Mark)
is is
begin begin
Text_IO.Put (Image (Item, Pic, Text_IO.Put (Image (Item, Pic,
...@@ -2864,12 +2859,12 @@ package body Ada.Text_IO.Editing is ...@@ -2864,12 +2859,12 @@ package body Ada.Text_IO.Editing is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark) Radix_Mark : Character := Default_Radix_Mark)
is is
Result : constant String := Result : constant String :=
Image (Item, Pic, Currency, Fill, Separator, Radix_Mark); Image (Item, Pic, Currency, Fill, Separator, Radix_Mark);
...@@ -2889,9 +2884,8 @@ package body Ada.Text_IO.Editing is ...@@ -2889,9 +2884,8 @@ package body Ada.Text_IO.Editing is
function Valid function Valid
(Item : Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency) Currency : String := Default_Currency) return Boolean
return Boolean
is is
begin begin
declare declare
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -40,17 +40,15 @@ package Ada.Text_IO.Editing is ...@@ -40,17 +40,15 @@ package Ada.Text_IO.Editing is
type Picture is private; type Picture is private;
function Valid function Valid
(Pic_String : in String; (Pic_String : String;
Blank_When_Zero : in Boolean := False) Blank_When_Zero : Boolean := False) return Boolean;
return Boolean;
function To_Picture function To_Picture
(Pic_String : in String; (Pic_String : String;
Blank_When_Zero : in Boolean := False) Blank_When_Zero : Boolean := False) return Picture;
return Picture;
function Pic_String (Pic : in Picture) return String; function Pic_String (Pic : Picture) return String;
function Blank_When_Zero (Pic : in Picture) return Boolean; function Blank_When_Zero (Pic : Picture) return Boolean;
Max_Picture_Length : constant := 64; Max_Picture_Length : constant := 64;
...@@ -63,58 +61,55 @@ package Ada.Text_IO.Editing is ...@@ -63,58 +61,55 @@ package Ada.Text_IO.Editing is
generic generic
type Num is delta <> digits <>; type Num is delta <> digits <>;
Default_Currency : in String := Editing.Default_Currency; Default_Currency : String := Editing.Default_Currency;
Default_Fill : in Character := Editing.Default_Fill; Default_Fill : Character := Editing.Default_Fill;
Default_Separator : in Character := Editing.Default_Separator; Default_Separator : Character := Editing.Default_Separator;
Default_Radix_Mark : in Character := Editing.Default_Radix_Mark; Default_Radix_Mark : Character := Editing.Default_Radix_Mark;
package Decimal_Output is package Decimal_Output is
function Length function Length
(Pic : in Picture; (Pic : Picture;
Currency : in String := Default_Currency) Currency : String := Default_Currency) return Natural;
return Natural;
function Valid function Valid
(Item : Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency) Currency : String := Default_Currency) return Boolean;
return Boolean;
function Image function Image
(Item : Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark) Radix_Mark : Character := Default_Radix_Mark) return String;
return String;
procedure Put procedure Put
(File : in Ada.Text_IO.File_Type; (File : Ada.Text_IO.File_Type;
Item : Num; Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark); Radix_Mark : Character := Default_Radix_Mark);
procedure Put procedure Put
(Item : Num; (Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark); Radix_Mark : Character := Default_Radix_Mark);
procedure Put procedure Put
(To : out String; (To : out String;
Item : Num; Item : Num;
Pic : in Picture; Pic : Picture;
Currency : in String := Default_Currency; Currency : String := Default_Currency;
Fill : in Character := Default_Fill; Fill : Character := Default_Fill;
Separator : in Character := Default_Separator; Separator : Character := Default_Separator;
Radix_Mark : in Character := Default_Radix_Mark); Radix_Mark : Character := Default_Radix_Mark);
end Decimal_Output; end Decimal_Output;
...@@ -193,10 +188,9 @@ private ...@@ -193,10 +188,9 @@ private
Currency_Symbol : String; Currency_Symbol : String;
Fill_Character : Character; Fill_Character : Character;
Separator_Character : Character; Separator_Character : Character;
Radix_Point : Character) Radix_Point : Character) return String;
return String;
-- Formats number according to Pic -- Formats number according to Pic
function Expand (Picture : in String) return String; function Expand (Picture : String) return String;
end Ada.Text_IO.Editing; end Ada.Text_IO.Editing;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -45,7 +45,7 @@ package body Ada.Text_IO.Complex_Aux is ...@@ -45,7 +45,7 @@ package body Ada.Text_IO.Complex_Aux is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
ItemR : out Long_Long_Float; ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float; ItemI : out Long_Long_Float;
Width : Field) Width : Field)
...@@ -96,7 +96,7 @@ package body Ada.Text_IO.Complex_Aux is ...@@ -96,7 +96,7 @@ package body Ada.Text_IO.Complex_Aux is
---------- ----------
procedure Gets procedure Gets
(From : in String; (From : String;
ItemR : out Long_Long_Float; ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float; ItemI : out Long_Long_Float;
Last : out Positive) Last : out Positive)
...@@ -163,8 +163,8 @@ package body Ada.Text_IO.Complex_Aux is ...@@ -163,8 +163,8 @@ package body Ada.Text_IO.Complex_Aux is
(To : out String; (To : out String;
ItemR : Long_Long_Float; ItemR : Long_Long_Float;
ItemI : Long_Long_Float; ItemI : Long_Long_Float;
Aft : in Field; Aft : Field;
Exp : in Field) Exp : Field)
is is
I_String : String (1 .. 3 * Field'Last); I_String : String (1 .. 3 * Field'Last);
R_String : String (1 .. 3 * Field'Last); R_String : String (1 .. 3 * Field'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
package Ada.Text_IO.Complex_Aux is package Ada.Text_IO.Complex_Aux is
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
ItemR : out Long_Long_Float; ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float; ItemI : out Long_Long_Float;
Width : Field); Width : Field);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -37,6 +37,8 @@ with Ada.Text_IO.Complex_Aux; ...@@ -37,6 +37,8 @@ with Ada.Text_IO.Complex_Aux;
package body Ada.Text_IO.Complex_IO is package body Ada.Text_IO.Complex_IO is
use Complex_Types;
package Aux renames Ada.Text_IO.Complex_Aux; package Aux renames Ada.Text_IO.Complex_Aux;
subtype LLF is Long_Long_Float; subtype LLF is Long_Long_Float;
...@@ -47,12 +49,12 @@ package body Ada.Text_IO.Complex_IO is ...@@ -47,12 +49,12 @@ package body Ada.Text_IO.Complex_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Complex_Types.Complex; Item : out Complex_Types.Complex;
Width : in Field := 0) Width : Field := 0)
is is
Real_Item : Real'Base; Real_Item : Real'Base;
Imag_Item : Real'Base; Imag_Item : Real'Base;
begin begin
Aux.Get (File, LLF (Real_Item), LLF (Imag_Item), Width); Aux.Get (File, LLF (Real_Item), LLF (Imag_Item), Width);
...@@ -68,7 +70,7 @@ package body Ada.Text_IO.Complex_IO is ...@@ -68,7 +70,7 @@ package body Ada.Text_IO.Complex_IO is
procedure Get procedure Get
(Item : out Complex_Types.Complex; (Item : out Complex_Types.Complex;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_In, Item, Width); Get (Current_In, Item, Width);
...@@ -79,7 +81,7 @@ package body Ada.Text_IO.Complex_IO is ...@@ -79,7 +81,7 @@ package body Ada.Text_IO.Complex_IO is
--------- ---------
procedure Get procedure Get
(From : in String; (From : String;
Item : out Complex_Types.Complex; Item : out Complex_Types.Complex;
Last : out Positive) Last : out Positive)
is is
...@@ -99,11 +101,11 @@ package body Ada.Text_IO.Complex_IO is ...@@ -99,11 +101,11 @@ package body Ada.Text_IO.Complex_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Complex_Types.Complex; Item : Complex_Types.Complex;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Put (File, LLF (Re (Item)), LLF (Im (Item)), Fore, Aft, Exp); Aux.Put (File, LLF (Re (Item)), LLF (Im (Item)), Fore, Aft, Exp);
...@@ -114,10 +116,10 @@ package body Ada.Text_IO.Complex_IO is ...@@ -114,10 +116,10 @@ package body Ada.Text_IO.Complex_IO is
--------- ---------
procedure Put procedure Put
(Item : in Complex_Types.Complex; (Item : Complex_Types.Complex;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Put (Current_Out, Item, Fore, Aft, Exp); Put (Current_Out, Item, Fore, Aft, Exp);
...@@ -129,9 +131,9 @@ package body Ada.Text_IO.Complex_IO is ...@@ -129,9 +131,9 @@ package body Ada.Text_IO.Complex_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Complex_Types.Complex; Item : Complex_Types.Complex;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Puts (To, LLF (Re (Item)), LLF (Im (Item)), Aft, Exp); Aux.Puts (To, LLF (Re (Item)), LLF (Im (Item)), Aft, Exp);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -46,10 +46,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -46,10 +46,9 @@ package body Ada.Text_IO.Decimal_Aux is
------------- -------------
function Get_Dec function Get_Dec
(File : in File_Type; (File : File_Type;
Width : in Field; Width : Field;
Scale : Integer) Scale : Integer) return Integer
return Integer
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer; Ptr : aliased Integer;
...@@ -75,10 +74,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -75,10 +74,9 @@ package body Ada.Text_IO.Decimal_Aux is
------------- -------------
function Get_LLD function Get_LLD
(File : in File_Type; (File : File_Type;
Width : in Field; Width : Field;
Scale : Integer) Scale : Integer) return Long_Long_Integer
return Long_Long_Integer
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer; Ptr : aliased Integer;
...@@ -104,10 +102,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -104,10 +102,9 @@ package body Ada.Text_IO.Decimal_Aux is
-------------- --------------
function Gets_Dec function Gets_Dec
(From : in String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Integer
return Integer
is is
Pos : aliased Integer; Pos : aliased Integer;
Item : Integer; Item : Integer;
...@@ -129,10 +126,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -129,10 +126,9 @@ package body Ada.Text_IO.Decimal_Aux is
-------------- --------------
function Gets_LLD function Gets_LLD
(From : in String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Long_Long_Integer
return Long_Long_Integer
is is
Pos : aliased Integer; Pos : aliased Integer;
Item : Long_Long_Integer; Item : Long_Long_Integer;
...@@ -154,11 +150,11 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -154,11 +150,11 @@ package body Ada.Text_IO.Decimal_Aux is
------------- -------------
procedure Put_Dec procedure Put_Dec
(File : in File_Type; (File : File_Type;
Item : in Integer; Item : Integer;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer) Scale : Integer)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
...@@ -174,11 +170,11 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -174,11 +170,11 @@ package body Ada.Text_IO.Decimal_Aux is
------------- -------------
procedure Put_LLD procedure Put_LLD
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer) Scale : Integer)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
...@@ -195,9 +191,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -195,9 +191,9 @@ package body Ada.Text_IO.Decimal_Aux is
procedure Puts_Dec procedure Puts_Dec
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer) Scale : Integer)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
...@@ -230,9 +226,9 @@ package body Ada.Text_IO.Decimal_Aux is ...@@ -230,9 +226,9 @@ package body Ada.Text_IO.Decimal_Aux is
procedure Puts_LLD procedure Puts_LLD
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer) Scale : Integer)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,57 +42,53 @@ ...@@ -42,57 +42,53 @@
private package Ada.Text_IO.Decimal_Aux is private package Ada.Text_IO.Decimal_Aux is
function Get_Dec function Get_Dec
(File : in File_Type; (File : File_Type;
Width : in Field; Width : Field;
Scale : Integer) Scale : Integer) return Integer;
return Integer;
function Get_LLD function Get_LLD
(File : in File_Type; (File : File_Type;
Width : in Field; Width : Field;
Scale : Integer) Scale : Integer) return Long_Long_Integer;
return Long_Long_Integer;
procedure Put_Dec procedure Put_Dec
(File : File_Type; (File : File_Type;
Item : Integer; Item : Integer;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer); Scale : Integer);
procedure Put_LLD procedure Put_LLD
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer); Scale : Integer);
function Gets_Dec function Gets_Dec
(From : in String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Integer;
return Integer;
function Gets_LLD function Gets_LLD
(From : in String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Long_Long_Integer;
return Long_Long_Integer;
procedure Puts_Dec procedure Puts_Dec
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer); Scale : Integer);
procedure Puts_LLD procedure Puts_LLD
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Aft : in Field; Aft : Field;
Exp : in Field; Exp : Field;
Scale : Integer); Scale : Integer);
end Ada.Text_IO.Decimal_Aux; end Ada.Text_IO.Decimal_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -44,9 +44,9 @@ package body Ada.Text_IO.Decimal_IO is ...@@ -44,9 +44,9 @@ package body Ada.Text_IO.Decimal_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
pragma Unsuppress (Range_Check); pragma Unsuppress (Range_Check);
...@@ -64,14 +64,14 @@ package body Ada.Text_IO.Decimal_IO is ...@@ -64,14 +64,14 @@ package body Ada.Text_IO.Decimal_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_In, Item, Width); Get (Current_In, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -95,11 +95,11 @@ package body Ada.Text_IO.Decimal_IO is ...@@ -95,11 +95,11 @@ package body Ada.Text_IO.Decimal_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
if Num'Size > Integer'Size then if Num'Size > Integer'Size then
...@@ -113,10 +113,10 @@ package body Ada.Text_IO.Decimal_IO is ...@@ -113,10 +113,10 @@ package body Ada.Text_IO.Decimal_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Put (Current_Out, Item, Fore, Aft, Exp); Put (Current_Out, Item, Fore, Aft, Exp);
...@@ -124,9 +124,9 @@ package body Ada.Text_IO.Decimal_IO is ...@@ -124,9 +124,9 @@ package body Ada.Text_IO.Decimal_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
if Num'Size > Integer'Size then if Num'Size > Integer'Size then
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,37 +51,37 @@ package Ada.Text_IO.Decimal_IO is ...@@ -51,37 +51,37 @@ package Ada.Text_IO.Decimal_IO is
Default_Exp : Field := 0; Default_Exp : Field := 0;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
private private
pragma Inline (Get); pragma Inline (Get);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -154,9 +154,9 @@ package body Ada.Text_IO.Enumeration_Aux is ...@@ -154,9 +154,9 @@ package body Ada.Text_IO.Enumeration_Aux is
---------- ----------
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in String; Item : String;
Set : Type_Set) Set : Type_Set)
is is
Ptr : Natural; Ptr : Natural;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -62,9 +62,9 @@ private package Ada.Text_IO.Enumeration_Aux is ...@@ -62,9 +62,9 @@ private package Ada.Text_IO.Enumeration_Aux is
-- using the given Width and Set parameters (Item is always in upper case). -- using the given Width and Set parameters (Item is always in upper case).
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in String; Item : String;
Set : Type_Set); Set : Type_Set);
-- Stores the enumeration literal image stored in Item to the string To, -- Stores the enumeration literal image stored in Item to the string To,
-- padding with trailing spaces if necessary to fill To. Set is used to -- padding with trailing spaces if necessary to fill To. Set is used to
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -41,7 +41,7 @@ package body Ada.Text_IO.Enumeration_IO is ...@@ -41,7 +41,7 @@ package body Ada.Text_IO.Enumeration_IO is
-- Get -- -- Get --
--------- ---------
procedure Get (File : in File_Type; Item : out Enum) is procedure Get (File : File_Type; Item : out Enum) is
Buf : String (1 .. Enum'Width); Buf : String (1 .. Enum'Width);
Buflen : Natural; Buflen : Natural;
...@@ -67,7 +67,7 @@ package body Ada.Text_IO.Enumeration_IO is ...@@ -67,7 +67,7 @@ package body Ada.Text_IO.Enumeration_IO is
end Get; end Get;
procedure Get procedure Get
(From : in String; (From : String;
Item : out Enum; Item : out Enum;
Last : out Positive) Last : out Positive)
is is
...@@ -92,10 +92,10 @@ package body Ada.Text_IO.Enumeration_IO is ...@@ -92,10 +92,10 @@ package body Ada.Text_IO.Enumeration_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Enum; Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
Image : constant String := Enum'Image (Item); Image : constant String := Enum'Image (Item);
...@@ -104,9 +104,9 @@ package body Ada.Text_IO.Enumeration_IO is ...@@ -104,9 +104,9 @@ package body Ada.Text_IO.Enumeration_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Enum; (Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
begin begin
Put (Current_Out, Item, Width, Set); Put (Current_Out, Item, Width, Set);
...@@ -114,8 +114,8 @@ package body Ada.Text_IO.Enumeration_IO is ...@@ -114,8 +114,8 @@ package body Ada.Text_IO.Enumeration_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Enum; Item : Enum;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
Image : constant String := Enum'Image (Item); Image : constant String := Enum'Image (Item);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2000 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -50,28 +50,28 @@ package Ada.Text_IO.Enumeration_IO is ...@@ -50,28 +50,28 @@ package Ada.Text_IO.Enumeration_IO is
Default_Width : Field := 0; Default_Width : Field := 0;
Default_Setting : Type_Set := Upper_Case; Default_Setting : Type_Set := Upper_Case;
procedure Get (File : in File_Type; Item : out Enum); procedure Get (File : File_Type; Item : out Enum);
procedure Get (Item : out Enum); procedure Get (Item : out Enum);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Enum; Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
procedure Put procedure Put
(Item : in Enum; (Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Enum; Item : out Enum;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Enum; Item : Enum;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
end Ada.Text_IO.Enumeration_IO; end Ada.Text_IO.Enumeration_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,37 +51,37 @@ package Ada.Text_IO.Fixed_IO is ...@@ -51,37 +51,37 @@ package Ada.Text_IO.Fixed_IO is
Default_Exp : Field := 0; Default_Exp : Field := 0;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
private private
pragma Inline (Get); pragma Inline (Get);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2003 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
with Ada.Text_IO.Generic_Aux; use Ada.Text_IO.Generic_Aux; with Ada.Text_IO.Generic_Aux; use Ada.Text_IO.Generic_Aux;
with System.Img_Real; use System.Img_Real; with System.Img_Real; use System.Img_Real;
with System.Val_Real; use System.Val_Real; with System.Val_Real; use System.Val_Real;
package body Ada.Text_IO.Float_Aux is package body Ada.Text_IO.Float_Aux is
...@@ -43,9 +43,9 @@ package body Ada.Text_IO.Float_Aux is ...@@ -43,9 +43,9 @@ package body Ada.Text_IO.Float_Aux is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Stop : Integer := 0; Stop : Integer := 0;
...@@ -69,7 +69,7 @@ package body Ada.Text_IO.Float_Aux is ...@@ -69,7 +69,7 @@ package body Ada.Text_IO.Float_Aux is
---------- ----------
procedure Gets procedure Gets
(From : in String; (From : String;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Last : out Positive) Last : out Positive)
is is
...@@ -90,7 +90,7 @@ package body Ada.Text_IO.Float_Aux is ...@@ -90,7 +90,7 @@ package body Ada.Text_IO.Float_Aux is
--------------- ---------------
procedure Load_Real procedure Load_Real
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural) Ptr : in out Natural)
is is
...@@ -181,11 +181,11 @@ package body Ada.Text_IO.Float_Aux is ...@@ -181,11 +181,11 @@ package body Ada.Text_IO.Float_Aux is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Float; Item : Long_Long_Float;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field) Exp : Field)
is is
Buf : String (1 .. 3 * Field'Last + 2); Buf : String (1 .. 3 * Field'Last + 2);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -201,9 +201,9 @@ package body Ada.Text_IO.Float_Aux is ...@@ -201,9 +201,9 @@ package body Ada.Text_IO.Float_Aux is
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in Long_Long_Float; Item : Long_Long_Float;
Aft : in Field; Aft : Field;
Exp : in Field) Exp : Field)
is is
Buf : String (1 .. 3 * Field'Last + 2); Buf : String (1 .. 3 * Field'Last + 2);
Ptr : Natural := 0; Ptr : Natural := 0;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,33 +42,33 @@ ...@@ -42,33 +42,33 @@
private package Ada.Text_IO.Float_Aux is private package Ada.Text_IO.Float_Aux is
procedure Load_Real procedure Load_Real
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural); Ptr : in out Natural);
-- This is an auxiliary routine that is used to load a possibly signed -- This is an auxiliary routine that is used to load a possibly signed
-- real literal value from the input file into Buf, starting at Ptr + 1. -- real literal value from the input file into Buf, starting at Ptr + 1.
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Width : in Field); Width : Field);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Float; Item : Long_Long_Float;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field); Exp : Field);
procedure Gets procedure Gets
(From : in String; (From : String;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Last : out Positive); Last : out Positive);
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in Long_Long_Float; Item : Long_Long_Float;
Aft : in Field; Aft : Field;
Exp : in Field); Exp : Field);
end Ada.Text_IO.Float_Aux; end Ada.Text_IO.Float_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,9 +42,9 @@ package body Ada.Text_IO.Float_IO is ...@@ -42,9 +42,9 @@ package body Ada.Text_IO.Float_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
pragma Unsuppress (Range_Check); pragma Unsuppress (Range_Check);
...@@ -66,7 +66,7 @@ package body Ada.Text_IO.Float_IO is ...@@ -66,7 +66,7 @@ package body Ada.Text_IO.Float_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
pragma Unsuppress (Range_Check); pragma Unsuppress (Range_Check);
...@@ -87,7 +87,7 @@ package body Ada.Text_IO.Float_IO is ...@@ -87,7 +87,7 @@ package body Ada.Text_IO.Float_IO is
end Get; end Get;
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -114,21 +114,21 @@ package body Ada.Text_IO.Float_IO is ...@@ -114,21 +114,21 @@ package body Ada.Text_IO.Float_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp); Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp);
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Put (Current_Out, Long_Long_Float (Item), Fore, Aft, Exp); Aux.Put (Current_Out, Long_Long_Float (Item), Fore, Aft, Exp);
...@@ -136,9 +136,9 @@ package body Ada.Text_IO.Float_IO is ...@@ -136,9 +136,9 @@ package body Ada.Text_IO.Float_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Puts (To, Long_Long_Float (Item), Aft, Exp); Aux.Puts (To, Long_Long_Float (Item), Aft, Exp);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,37 +51,37 @@ package Ada.Text_IO.Float_IO is ...@@ -51,37 +51,37 @@ package Ada.Text_IO.Float_IO is
Default_Exp : Field := 3; Default_Exp : Field := 3;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
private private
pragma Inline (Get); pragma Inline (Get);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -80,7 +80,7 @@ private package Ada.Text_IO.Generic_Aux is ...@@ -80,7 +80,7 @@ private package Ada.Text_IO.Generic_Aux is
procedure Load_Width procedure Load_Width
(File : File_Type; (File : File_Type;
Width : in Field; Width : Field;
Buf : out String; Buf : out String;
Ptr : in out Integer); Ptr : in out Integer);
-- Loads exactly Width characters, unless a line mark is encountered first -- Loads exactly Width characters, unless a line mark is encountered first
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -49,7 +49,7 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -49,7 +49,7 @@ package body Ada.Text_IO.Integer_Aux is
----------------------- -----------------------
procedure Load_Integer procedure Load_Integer
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural); Ptr : in out Natural);
-- This is an auxiliary routine that is used to load a possibly signed -- This is an auxiliary routine that is used to load a possibly signed
...@@ -61,9 +61,9 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -61,9 +61,9 @@ package body Ada.Text_IO.Integer_Aux is
------------- -------------
procedure Get_Int procedure Get_Int
(File : in File_Type; (File : File_Type;
Item : out Integer; Item : out Integer;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer := 1; Ptr : aliased Integer := 1;
...@@ -86,9 +86,9 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -86,9 +86,9 @@ package body Ada.Text_IO.Integer_Aux is
------------- -------------
procedure Get_LLI procedure Get_LLI
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer := 1; Ptr : aliased Integer := 1;
...@@ -111,7 +111,7 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -111,7 +111,7 @@ package body Ada.Text_IO.Integer_Aux is
-------------- --------------
procedure Gets_Int procedure Gets_Int
(From : in String; (From : String;
Item : out Integer; Item : out Integer;
Last : out Positive) Last : out Positive)
is is
...@@ -132,7 +132,7 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -132,7 +132,7 @@ package body Ada.Text_IO.Integer_Aux is
-------------- --------------
procedure Gets_LLI procedure Gets_LLI
(From : in String; (From : String;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Last : out Positive) Last : out Positive)
is is
...@@ -153,7 +153,7 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -153,7 +153,7 @@ package body Ada.Text_IO.Integer_Aux is
------------------ ------------------
procedure Load_Integer procedure Load_Integer
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural) Ptr : in out Natural)
is is
...@@ -198,10 +198,10 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -198,10 +198,10 @@ package body Ada.Text_IO.Integer_Aux is
------------- -------------
procedure Put_Int procedure Put_Int
(File : in File_Type; (File : File_Type;
Item : in Integer; Item : Integer;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Integer'Max (Field'Last, Width)); Buf : String (1 .. Integer'Max (Field'Last, Width));
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -223,10 +223,10 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -223,10 +223,10 @@ package body Ada.Text_IO.Integer_Aux is
------------- -------------
procedure Put_LLI procedure Put_LLI
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Integer'Max (Field'Last, Width)); Buf : String (1 .. Integer'Max (Field'Last, Width));
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -249,8 +249,8 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -249,8 +249,8 @@ package body Ada.Text_IO.Integer_Aux is
procedure Puts_Int procedure Puts_Int
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Integer'Max (Field'Last, To'Length)); Buf : String (1 .. Integer'Max (Field'Last, To'Length));
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -275,8 +275,8 @@ package body Ada.Text_IO.Integer_Aux is ...@@ -275,8 +275,8 @@ package body Ada.Text_IO.Integer_Aux is
procedure Puts_LLI procedure Puts_LLI
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Integer'Max (Field'Last, To'Length)); Buf : String (1 .. Integer'Max (Field'Last, To'Length));
Ptr : Natural := 0; Ptr : Natural := 0;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -41,45 +41,45 @@ ...@@ -41,45 +41,45 @@
private package Ada.Text_IO.Integer_Aux is private package Ada.Text_IO.Integer_Aux is
procedure Get_Int procedure Get_Int
(File : in File_Type; (File : File_Type;
Item : out Integer; Item : out Integer;
Width : in Field); Width : Field);
procedure Get_LLI procedure Get_LLI
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Width : in Field); Width : Field);
procedure Put_Int procedure Put_Int
(File : in File_Type; (File : File_Type;
Item : in Integer; Item : Integer;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Put_LLI procedure Put_LLI
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Gets_Int procedure Gets_Int
(From : in String; (From : String;
Item : out Integer; Item : out Integer;
Last : out Positive); Last : out Positive);
procedure Gets_LLI procedure Gets_LLI
(From : in String; (From : String;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Last : out Positive); Last : out Positive);
procedure Puts_Int procedure Puts_Int
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Base : in Number_Base); Base : Number_Base);
procedure Puts_LLI procedure Puts_LLI
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Base : in Number_Base); Base : Number_Base);
end Ada.Text_IO.Integer_Aux; end Ada.Text_IO.Integer_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -49,9 +49,9 @@ package body Ada.Text_IO.Integer_IO is ...@@ -49,9 +49,9 @@ package body Ada.Text_IO.Integer_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
-- We depend on a range check to get Data_Error -- We depend on a range check to get Data_Error
...@@ -71,7 +71,7 @@ package body Ada.Text_IO.Integer_IO is ...@@ -71,7 +71,7 @@ package body Ada.Text_IO.Integer_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
-- We depend on a range check to get Data_Error -- We depend on a range check to get Data_Error
...@@ -90,7 +90,7 @@ package body Ada.Text_IO.Integer_IO is ...@@ -90,7 +90,7 @@ package body Ada.Text_IO.Integer_IO is
end Get; end Get;
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -115,10 +115,10 @@ package body Ada.Text_IO.Integer_IO is ...@@ -115,10 +115,10 @@ package body Ada.Text_IO.Integer_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Need_LLI then if Need_LLI then
...@@ -129,9 +129,9 @@ package body Ada.Text_IO.Integer_IO is ...@@ -129,9 +129,9 @@ package body Ada.Text_IO.Integer_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Need_LLI then if Need_LLI then
...@@ -143,8 +143,8 @@ package body Ada.Text_IO.Integer_IO is ...@@ -143,8 +143,8 @@ package body Ada.Text_IO.Integer_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Need_LLI then if Need_LLI then
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -50,34 +50,34 @@ package Ada.Text_IO.Integer_IO is ...@@ -50,34 +50,34 @@ package Ada.Text_IO.Integer_IO is
Default_Base : Number_Base := 10; Default_Base : Number_Base := 10;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
private private
pragma Inline (Get); pragma Inline (Get);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -44,9 +44,9 @@ package body Ada.Text_IO.Modular_IO is ...@@ -44,9 +44,9 @@ package body Ada.Text_IO.Modular_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
pragma Unsuppress (Range_Check); pragma Unsuppress (Range_Check);
...@@ -63,7 +63,7 @@ package body Ada.Text_IO.Modular_IO is ...@@ -63,7 +63,7 @@ package body Ada.Text_IO.Modular_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
pragma Unsuppress (Range_Check); pragma Unsuppress (Range_Check);
...@@ -79,7 +79,7 @@ package body Ada.Text_IO.Modular_IO is ...@@ -79,7 +79,7 @@ package body Ada.Text_IO.Modular_IO is
end Get; end Get;
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -101,10 +101,10 @@ package body Ada.Text_IO.Modular_IO is ...@@ -101,10 +101,10 @@ package body Ada.Text_IO.Modular_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Num'Size > Unsigned'Size then if Num'Size > Unsigned'Size then
...@@ -115,9 +115,9 @@ package body Ada.Text_IO.Modular_IO is ...@@ -115,9 +115,9 @@ package body Ada.Text_IO.Modular_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Num'Size > Unsigned'Size then if Num'Size > Unsigned'Size then
...@@ -129,8 +129,8 @@ package body Ada.Text_IO.Modular_IO is ...@@ -129,8 +129,8 @@ package body Ada.Text_IO.Modular_IO is
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Num'Size > Unsigned'Size then if Num'Size > Unsigned'Size then
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1993-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1993-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -50,34 +50,34 @@ package Ada.Text_IO.Modular_IO is ...@@ -50,34 +50,34 @@ package Ada.Text_IO.Modular_IO is
Default_Base : Number_Base := 10; Default_Base : Number_Base := 10;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Get procedure Get
(From : in String; (From : String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out String; (To : out String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
private private
pragma Inline (Get); pragma Inline (Get);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -39,7 +39,7 @@ package body Ada.Text_IO.Text_Streams is ...@@ -39,7 +39,7 @@ package body Ada.Text_IO.Text_Streams is
-- Stream -- -- Stream --
------------ ------------
function Stream (File : in File_Type) return Stream_Access is function Stream (File : File_Type) return Stream_Access is
begin begin
System.File_IO.Check_File_Open (FCB.AFCB_Ptr (File)); System.File_IO.Check_File_Open (FCB.AFCB_Ptr (File));
return Stream_Access (File); return Stream_Access (File);
......
...@@ -18,6 +18,6 @@ package Ada.Text_IO.Text_Streams is ...@@ -18,6 +18,6 @@ package Ada.Text_IO.Text_Streams is
type Stream_Access is access all Streams.Root_Stream_Type'Class; type Stream_Access is access all Streams.Root_Stream_Type'Class;
function Stream (File : in File_Type) return Stream_Access; function Stream (File : File_Type) return Stream_Access;
end Ada.Text_IO.Text_Streams; end Ada.Text_IO.Text_Streams;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -56,9 +56,9 @@ package body Ada.Wide_Text_IO.Complex_IO is ...@@ -56,9 +56,9 @@ package body Ada.Wide_Text_IO.Complex_IO is
--------- ---------
procedure Get procedure Get
(File : File_Type; (File : File_Type;
Item : out Complex; Item : out Complex;
Width : Field := 0) Width : Field := 0)
is is
Real_Item : Real'Base; Real_Item : Real'Base;
Imag_Item : Real'Base; Imag_Item : Real'Base;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -46,10 +46,9 @@ package body Ada.Wide_Text_IO.Decimal_Aux is ...@@ -46,10 +46,9 @@ package body Ada.Wide_Text_IO.Decimal_Aux is
------------- -------------
function Get_Dec function Get_Dec
(File : File_Type; (File : File_Type;
Width : Field; Width : Field;
Scale : Integer) Scale : Integer) return Integer
return Integer
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer; Ptr : aliased Integer;
...@@ -75,10 +74,9 @@ package body Ada.Wide_Text_IO.Decimal_Aux is ...@@ -75,10 +74,9 @@ package body Ada.Wide_Text_IO.Decimal_Aux is
------------- -------------
function Get_LLD function Get_LLD
(File : File_Type; (File : File_Type;
Width : Field; Width : Field;
Scale : Integer) Scale : Integer) return Long_Long_Integer
return Long_Long_Integer
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer; Ptr : aliased Integer;
...@@ -106,8 +104,7 @@ package body Ada.Wide_Text_IO.Decimal_Aux is ...@@ -106,8 +104,7 @@ package body Ada.Wide_Text_IO.Decimal_Aux is
function Gets_Dec function Gets_Dec
(From : String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Integer
return Integer
is is
Pos : aliased Integer; Pos : aliased Integer;
Item : Integer; Item : Integer;
...@@ -132,8 +129,7 @@ package body Ada.Wide_Text_IO.Decimal_Aux is ...@@ -132,8 +129,7 @@ package body Ada.Wide_Text_IO.Decimal_Aux is
function Gets_LLD function Gets_LLD
(From : String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Long_Long_Integer
return Long_Long_Integer
is is
Pos : aliased Integer; Pos : aliased Integer;
Item : Long_Long_Integer; Item : Long_Long_Integer;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2001 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -45,26 +45,22 @@ private package Ada.Wide_Text_IO.Decimal_Aux is ...@@ -45,26 +45,22 @@ private package Ada.Wide_Text_IO.Decimal_Aux is
function Get_Dec function Get_Dec
(File : File_Type; (File : File_Type;
Width : Field; Width : Field;
Scale : Integer) Scale : Integer) return Integer;
return Integer;
function Get_LLD function Get_LLD
(File : File_Type; (File : File_Type;
Width : Field; Width : Field;
Scale : Integer) Scale : Integer) return Long_Long_Integer;
return Long_Long_Integer;
function Gets_Dec function Gets_Dec
(From : String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Integer;
return Integer;
function Gets_LLD function Gets_LLD
(From : String; (From : String;
Last : access Positive; Last : access Positive;
Scale : Integer) Scale : Integer) return Long_Long_Integer;
return Long_Long_Integer;
procedure Put_Dec procedure Put_Dec
(File : File_Type; (File : File_Type;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Ada.Wide_Text_IO.Decimal_Aux; with Ada.Wide_Text_IO.Decimal_Aux;
with System.WCh_Con; use System.WCh_Con; with System.WCh_Con; use System.WCh_Con;
with System.WCh_WtS; use System.WCh_WtS; with System.WCh_WtS; use System.WCh_WtS;
...@@ -49,9 +50,9 @@ package body Ada.Wide_Text_IO.Decimal_IO is ...@@ -49,9 +50,9 @@ package body Ada.Wide_Text_IO.Decimal_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
if Num'Size > Integer'Size then if Num'Size > Integer'Size then
...@@ -71,14 +72,14 @@ package body Ada.Wide_Text_IO.Decimal_IO is ...@@ -71,14 +72,14 @@ package body Ada.Wide_Text_IO.Decimal_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_Input, Item, Width); Get (Current_Input, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -110,11 +111,11 @@ package body Ada.Wide_Text_IO.Decimal_IO is ...@@ -110,11 +111,11 @@ package body Ada.Wide_Text_IO.Decimal_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
if Num'Size > Integer'Size then if Num'Size > Integer'Size then
...@@ -133,10 +134,10 @@ package body Ada.Wide_Text_IO.Decimal_IO is ...@@ -133,10 +134,10 @@ package body Ada.Wide_Text_IO.Decimal_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
pragma Unreferenced (Fore); pragma Unreferenced (Fore);
-- ??? how come this is unreferenced, sounds wrong ??? -- ??? how come this is unreferenced, sounds wrong ???
...@@ -146,9 +147,9 @@ package body Ada.Wide_Text_IO.Decimal_IO is ...@@ -146,9 +147,9 @@ package body Ada.Wide_Text_IO.Decimal_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
S : String (To'First .. To'Last); S : String (To'First .. To'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Decimal_IO is ...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Decimal_IO is
Default_Exp : Field := 3; Default_Exp : Field := 3;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
end Ada.Wide_Text_IO.Decimal_IO; end Ada.Wide_Text_IO.Decimal_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -53,7 +53,7 @@ package body Ada.Wide_Text_IO.Editing is ...@@ -53,7 +53,7 @@ package body Ada.Wide_Text_IO.Editing is
-- Blank_When_Zero -- -- Blank_When_Zero --
--------------------- ---------------------
function Blank_When_Zero (Pic : in Picture) return Boolean is function Blank_When_Zero (Pic : Picture) return Boolean is
begin begin
return Pic.Contents.Original_BWZ; return Pic.Contents.Original_BWZ;
end Blank_When_Zero; end Blank_When_Zero;
...@@ -194,7 +194,7 @@ package body Ada.Wide_Text_IO.Editing is ...@@ -194,7 +194,7 @@ package body Ada.Wide_Text_IO.Editing is
-- Expand -- -- Expand --
------------ ------------
function Expand (Picture : in String) return String is function Expand (Picture : String) return String is
Result : String (1 .. MAX_PICSIZE); Result : String (1 .. MAX_PICSIZE);
Picture_Index : Integer := Picture'First; Picture_Index : Integer := Picture'First;
Result_Index : Integer := Result'First; Result_Index : Integer := Result'First;
...@@ -308,9 +308,9 @@ package body Ada.Wide_Text_IO.Editing is ...@@ -308,9 +308,9 @@ package body Ada.Wide_Text_IO.Editing is
Sign_Position : Integer := Pic.Sign_Position; -- may float. Sign_Position : Integer := Pic.Sign_Position; -- may float.
Answer : Wide_String (1 .. Pic.Picture.Length); Answer : Wide_String (1 .. Pic.Picture.Length);
Last : Integer; Last : Integer;
Currency_Pos : Integer := Pic.Start_Currency; Currency_Pos : Integer := Pic.Start_Currency;
Dollar : Boolean := False; Dollar : Boolean := False;
-- Overridden immediately if necessary -- Overridden immediately if necessary
...@@ -1095,7 +1095,7 @@ package body Ada.Wide_Text_IO.Editing is ...@@ -1095,7 +1095,7 @@ package body Ada.Wide_Text_IO.Editing is
-- The following ensures that we return B and not b being careful not -- The following ensures that we return B and not b being careful not
-- to break things which expect lower case b for blank. See CXF3A02. -- to break things which expect lower case b for blank. See CXF3A02.
function Pic_String (Pic : in Picture) return String is function Pic_String (Pic : Picture) return String is
Temp : String (1 .. Pic.Contents.Picture.Length) := Temp : String (1 .. Pic.Contents.Picture.Length) :=
Pic.Contents.Picture.Expanded; Pic.Contents.Picture.Expanded;
begin begin
...@@ -2757,11 +2757,10 @@ package body Ada.Wide_Text_IO.Editing is ...@@ -2757,11 +2757,10 @@ package body Ada.Wide_Text_IO.Editing is
Format_Rec.Original_BWZ := Blank_When_Zero; Format_Rec.Original_BWZ := Blank_When_Zero;
Precalculate (Format_Rec); Precalculate (Format_Rec);
-- False only if Blank_When_0 is True but the pic string -- False only if Blank_When_0 is True but the pic string has a '*'
-- has a '*'
return not Blank_When_Zero or return not Blank_When_Zero
Strings_Fixed.Index (Expanded_Pic, "*") = 0; or else Strings_Fixed.Index (Expanded_Pic, "*") = 0;
end; end;
exception exception
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -47,8 +47,8 @@ package Ada.Wide_Text_IO.Editing is ...@@ -47,8 +47,8 @@ package Ada.Wide_Text_IO.Editing is
(Pic_String : String; (Pic_String : String;
Blank_When_Zero : Boolean := False) return Picture; Blank_When_Zero : Boolean := False) return Picture;
function Pic_String (Pic : in Picture) return String; function Pic_String (Pic : Picture) return String;
function Blank_When_Zero (Pic : in Picture) return Boolean; function Blank_When_Zero (Pic : Picture) return Boolean;
Max_Picture_Length : constant := 64; Max_Picture_Length : constant := 64;
...@@ -194,6 +194,6 @@ private ...@@ -194,6 +194,6 @@ private
Radix_Point : Wide_Character) return Wide_String; Radix_Point : Wide_Character) return Wide_String;
-- Formats number according to Pic -- Formats number according to Pic
function Expand (Picture : in String) return String; function Expand (Picture : String) return String;
end Ada.Wide_Text_IO.Editing; end Ada.Wide_Text_IO.Editing;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -190,9 +190,9 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is ...@@ -190,9 +190,9 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
---------- ----------
procedure Puts procedure Puts
(To : out Wide_String; (To : out Wide_String;
Item : in Wide_String; Item : Wide_String;
Set : Type_Set) Set : Type_Set)
is is
Ptr : Natural; Ptr : Natural;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -62,9 +62,9 @@ private package Ada.Wide_Text_IO.Enumeration_Aux is ...@@ -62,9 +62,9 @@ private package Ada.Wide_Text_IO.Enumeration_Aux is
-- using the given Width and Set parameters (Item is always in upper case). -- using the given Width and Set parameters (Item is always in upper case).
procedure Puts procedure Puts
(To : out Wide_String; (To : out Wide_String;
Item : in Wide_String; Item : Wide_String;
Set : Type_Set); Set : Type_Set);
-- Stores the enumeration literal image stored in Item to the string To, -- Stores the enumeration literal image stored in Item to the string To,
-- padding with trailing spaces if necessary to fill To. Set is used to -- padding with trailing spaces if necessary to fill To. Set is used to
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -41,7 +41,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is ...@@ -41,7 +41,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is
-- Get -- -- 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); Buf : Wide_String (1 .. Enum'Width);
Buflen : Natural; Buflen : Natural;
...@@ -59,7 +59,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is ...@@ -59,7 +59,7 @@ package body Ada.Wide_Text_IO.Enumeration_IO is
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Enum; Item : out Enum;
Last : out Positive) Last : out Positive)
is is
...@@ -78,10 +78,10 @@ package body Ada.Wide_Text_IO.Enumeration_IO is ...@@ -78,10 +78,10 @@ package body Ada.Wide_Text_IO.Enumeration_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Enum; Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
Image : constant Wide_String := Enum'Wide_Image (Item); Image : constant Wide_String := Enum'Wide_Image (Item);
...@@ -90,9 +90,9 @@ package body Ada.Wide_Text_IO.Enumeration_IO is ...@@ -90,9 +90,9 @@ package body Ada.Wide_Text_IO.Enumeration_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Enum; (Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
begin begin
Put (Current_Output, Item, Width, Set); Put (Current_Output, Item, Width, Set);
...@@ -100,8 +100,8 @@ package body Ada.Wide_Text_IO.Enumeration_IO is ...@@ -100,8 +100,8 @@ package body Ada.Wide_Text_IO.Enumeration_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Enum; Item : Enum;
Set : in Type_Set := Default_Setting) Set : Type_Set := Default_Setting)
is is
Image : constant Wide_String := Enum'Wide_Image (Item); Image : constant Wide_String := Enum'Wide_Image (Item);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2000 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -49,28 +49,28 @@ package Ada.Wide_Text_IO.Enumeration_IO is ...@@ -49,28 +49,28 @@ package Ada.Wide_Text_IO.Enumeration_IO is
Default_Width : Field := 0; Default_Width : Field := 0;
Default_Setting : Type_Set := Upper_Case; Default_Setting : Type_Set := Upper_Case;
procedure Get (File : in File_Type; Item : out Enum); procedure Get (File : File_Type; Item : out Enum);
procedure Get (Item : out Enum); procedure Get (Item : out Enum);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Enum; Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
procedure Put procedure Put
(Item : in Enum; (Item : Enum;
Width : in Field := Default_Width; Width : Field := Default_Width;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Enum; Item : out Enum;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Enum; Item : Enum;
Set : in Type_Set := Default_Setting); Set : Type_Set := Default_Setting);
end Ada.Wide_Text_IO.Enumeration_IO; end Ada.Wide_Text_IO.Enumeration_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -47,9 +47,9 @@ package body Ada.Wide_Text_IO.Fixed_IO is ...@@ -47,9 +47,9 @@ package body Ada.Wide_Text_IO.Fixed_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Aux.Get (TFT (File), Long_Long_Float (Item), Width); Aux.Get (TFT (File), Long_Long_Float (Item), Width);
...@@ -60,14 +60,14 @@ package body Ada.Wide_Text_IO.Fixed_IO is ...@@ -60,14 +60,14 @@ package body Ada.Wide_Text_IO.Fixed_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_Input, Item, Width); Get (Current_Input, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -89,21 +89,21 @@ package body Ada.Wide_Text_IO.Fixed_IO is ...@@ -89,21 +89,21 @@ package body Ada.Wide_Text_IO.Fixed_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp); Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Put (Current_Output, Item, Fore, Aft, Exp); Put (Current_Output, Item, Fore, Aft, Exp);
...@@ -111,9 +111,9 @@ package body Ada.Wide_Text_IO.Fixed_IO is ...@@ -111,9 +111,9 @@ package body Ada.Wide_Text_IO.Fixed_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
S : String (To'First .. To'Last); S : String (To'First .. To'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Fixed_IO is ...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Fixed_IO is
Default_Exp : Field := 0; Default_Exp : Field := 0;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
end Ada.Wide_Text_IO.Fixed_IO; end Ada.Wide_Text_IO.Fixed_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2003 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -43,9 +43,9 @@ package body Ada.Wide_Text_IO.Float_Aux is ...@@ -43,9 +43,9 @@ package body Ada.Wide_Text_IO.Float_Aux is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Stop : Integer := 0; Stop : Integer := 0;
...@@ -69,7 +69,7 @@ package body Ada.Wide_Text_IO.Float_Aux is ...@@ -69,7 +69,7 @@ package body Ada.Wide_Text_IO.Float_Aux is
---------- ----------
procedure Gets procedure Gets
(From : in String; (From : String;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Last : out Positive) Last : out Positive)
is is
...@@ -90,7 +90,7 @@ package body Ada.Wide_Text_IO.Float_Aux is ...@@ -90,7 +90,7 @@ package body Ada.Wide_Text_IO.Float_Aux is
--------------- ---------------
procedure Load_Real procedure Load_Real
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural) Ptr : in out Natural)
is is
...@@ -181,11 +181,11 @@ package body Ada.Wide_Text_IO.Float_Aux is ...@@ -181,11 +181,11 @@ package body Ada.Wide_Text_IO.Float_Aux is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Float; Item : Long_Long_Float;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field) Exp : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -201,12 +201,12 @@ package body Ada.Wide_Text_IO.Float_Aux is ...@@ -201,12 +201,12 @@ package body Ada.Wide_Text_IO.Float_Aux is
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in Long_Long_Float; Item : Long_Long_Float;
Aft : in Field; Aft : Field;
Exp : in Field) Exp : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
begin begin
Set_Image_Real (Item, Buf, Ptr, Fore => 1, Aft => Aft, Exp => Exp); Set_Image_Real (Item, Buf, Ptr, Fore => 1, Aft => Aft, Exp => Exp);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -42,33 +42,33 @@ ...@@ -42,33 +42,33 @@
private package Ada.Wide_Text_IO.Float_Aux is private package Ada.Wide_Text_IO.Float_Aux is
procedure Load_Real procedure Load_Real
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural); Ptr : in out Natural);
-- This is an auxiliary routine that is used to load a possibly signed -- This is an auxiliary routine that is used to load a possibly signed
-- real literal value from the input file into Buf, starting at Ptr + 1. -- real literal value from the input file into Buf, starting at Ptr + 1.
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Width : in Field); Width : Field);
procedure Gets procedure Gets
(From : in String; (From : String;
Item : out Long_Long_Float; Item : out Long_Long_Float;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Float; Item : Long_Long_Float;
Fore : in Field; Fore : Field;
Aft : in Field; Aft : Field;
Exp : in Field); Exp : Field);
procedure Puts procedure Puts
(To : out String; (To : out String;
Item : in Long_Long_Float; Item : Long_Long_Float;
Aft : in Field; Aft : Field;
Exp : in Field); Exp : Field);
end Ada.Wide_Text_IO.Float_Aux; end Ada.Wide_Text_IO.Float_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Ada.Wide_Text_IO.Float_Aux; with Ada.Wide_Text_IO.Float_Aux;
with System.WCh_Con; use System.WCh_Con; with System.WCh_Con; use System.WCh_Con;
with System.WCh_WtS; use System.WCh_WtS; with System.WCh_WtS; use System.WCh_WtS;
...@@ -47,9 +48,9 @@ package body Ada.Wide_Text_IO.Float_IO is ...@@ -47,9 +48,9 @@ package body Ada.Wide_Text_IO.Float_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Aux.Get (TFT (File), Long_Long_Float (Item), Width); Aux.Get (TFT (File), Long_Long_Float (Item), Width);
...@@ -60,14 +61,14 @@ package body Ada.Wide_Text_IO.Float_IO is ...@@ -60,14 +61,14 @@ package body Ada.Wide_Text_IO.Float_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_Input, Item, Width); Get (Current_Input, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -89,21 +90,21 @@ package body Ada.Wide_Text_IO.Float_IO is ...@@ -89,21 +90,21 @@ package body Ada.Wide_Text_IO.Float_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp); Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
begin begin
Put (Current_Output, Item, Fore, Aft, Exp); Put (Current_Output, Item, Fore, Aft, Exp);
...@@ -111,9 +112,9 @@ package body Ada.Wide_Text_IO.Float_IO is ...@@ -111,9 +112,9 @@ package body Ada.Wide_Text_IO.Float_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp) Exp : Field := Default_Exp)
is is
S : String (To'First .. To'Last); S : String (To'First .. To'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Float_IO is ...@@ -51,36 +51,36 @@ package Ada.Wide_Text_IO.Float_IO is
Default_Exp : Field := 3; Default_Exp : Field := 3;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Fore : in Field := Default_Fore; Fore : Field := Default_Fore;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Aft : in Field := Default_Aft; Aft : Field := Default_Aft;
Exp : in Field := Default_Exp); Exp : Field := Default_Exp);
end Ada.Wide_Text_IO.Float_IO; end Ada.Wide_Text_IO.Float_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2001 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -79,7 +79,7 @@ package Ada.Wide_Text_IO.Generic_Aux is ...@@ -79,7 +79,7 @@ package Ada.Wide_Text_IO.Generic_Aux is
procedure Load_Width procedure Load_Width
(File : File_Type; (File : File_Type;
Width : in Field; Width : Field;
Buf : out String; Buf : out String;
Ptr : in out Integer); Ptr : in out Integer);
-- Loads exactly Width characters, unless a line mark is encountered first -- Loads exactly Width characters, unless a line mark is encountered first
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
with Ada.Wide_Text_IO.Generic_Aux; use Ada.Wide_Text_IO.Generic_Aux; with Ada.Wide_Text_IO.Generic_Aux; use Ada.Wide_Text_IO.Generic_Aux;
with System.Img_BIU; use System.Img_BIU; with System.Img_BIU; use System.Img_BIU;
with System.Img_Int; use System.Img_Int; with System.Img_Int; use System.Img_Int;
with System.Img_LLB; use System.Img_LLB; with System.Img_LLB; use System.Img_LLB;
with System.Img_LLI; use System.Img_LLI; with System.Img_LLI; use System.Img_LLI;
with System.Img_LLW; use System.Img_LLW; with System.Img_LLW; use System.Img_LLW;
with System.Img_WIU; use System.Img_WIU; with System.Img_WIU; use System.Img_WIU;
with System.Val_Int; use System.Val_Int; with System.Val_Int; use System.Val_Int;
with System.Val_LLI; use System.Val_LLI; with System.Val_LLI; use System.Val_LLI;
package body Ada.Wide_Text_IO.Integer_Aux is package body Ada.Wide_Text_IO.Integer_Aux is
...@@ -49,7 +49,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -49,7 +49,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is
----------------------- -----------------------
procedure Load_Integer procedure Load_Integer
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural); Ptr : in out Natural);
-- This is an auxiliary routine that is used to load an possibly signed -- This is an auxiliary routine that is used to load an possibly signed
...@@ -61,9 +61,9 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -61,9 +61,9 @@ package body Ada.Wide_Text_IO.Integer_Aux is
------------- -------------
procedure Get_Int procedure Get_Int
(File : in File_Type; (File : File_Type;
Item : out Integer; Item : out Integer;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer := 1; Ptr : aliased Integer := 1;
...@@ -86,9 +86,9 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -86,9 +86,9 @@ package body Ada.Wide_Text_IO.Integer_Aux is
------------- -------------
procedure Get_LLI procedure Get_LLI
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : aliased Integer := 1; Ptr : aliased Integer := 1;
...@@ -111,7 +111,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -111,7 +111,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is
-------------- --------------
procedure Gets_Int procedure Gets_Int
(From : in String; (From : String;
Item : out Integer; Item : out Integer;
Last : out Positive) Last : out Positive)
is is
...@@ -132,7 +132,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -132,7 +132,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is
-------------- --------------
procedure Gets_LLI procedure Gets_LLI
(From : in String; (From : String;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Last : out Positive) Last : out Positive)
is is
...@@ -153,7 +153,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -153,7 +153,7 @@ package body Ada.Wide_Text_IO.Integer_Aux is
------------------ ------------------
procedure Load_Integer procedure Load_Integer
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural) Ptr : in out Natural)
is is
...@@ -193,10 +193,10 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -193,10 +193,10 @@ package body Ada.Wide_Text_IO.Integer_Aux is
------------- -------------
procedure Put_Int procedure Put_Int
(File : in File_Type; (File : File_Type;
Item : in Integer; Item : Integer;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -218,10 +218,10 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -218,10 +218,10 @@ package body Ada.Wide_Text_IO.Integer_Aux is
------------- -------------
procedure Put_LLI procedure Put_LLI
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -244,8 +244,8 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -244,8 +244,8 @@ package body Ada.Wide_Text_IO.Integer_Aux is
procedure Puts_Int procedure Puts_Int
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -270,8 +270,8 @@ package body Ada.Wide_Text_IO.Integer_Aux is ...@@ -270,8 +270,8 @@ package body Ada.Wide_Text_IO.Integer_Aux is
procedure Puts_LLI procedure Puts_LLI
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -41,45 +41,45 @@ ...@@ -41,45 +41,45 @@
private package Ada.Wide_Text_IO.Integer_Aux is private package Ada.Wide_Text_IO.Integer_Aux is
procedure Get_Int procedure Get_Int
(File : in File_Type; (File : File_Type;
Item : out Integer; Item : out Integer;
Width : in Field); Width : Field);
procedure Get_LLI procedure Get_LLI
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Width : in Field); Width : Field);
procedure Gets_Int procedure Gets_Int
(From : in String; (From : String;
Item : out Integer; Item : out Integer;
Last : out Positive); Last : out Positive);
procedure Gets_LLI procedure Gets_LLI
(From : in String; (From : String;
Item : out Long_Long_Integer; Item : out Long_Long_Integer;
Last : out Positive); Last : out Positive);
procedure Put_Int procedure Put_Int
(File : in File_Type; (File : File_Type;
Item : in Integer; Item : Integer;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Put_LLI procedure Put_LLI
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Puts_Int procedure Puts_Int
(To : out String; (To : out String;
Item : in Integer; Item : Integer;
Base : in Number_Base); Base : Number_Base);
procedure Puts_LLI procedure Puts_LLI
(To : out String; (To : out String;
Item : in Long_Long_Integer; Item : Long_Long_Integer;
Base : in Number_Base); Base : Number_Base);
end Ada.Wide_Text_IO.Integer_Aux; end Ada.Wide_Text_IO.Integer_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -54,9 +54,9 @@ package body Ada.Wide_Text_IO.Integer_IO is ...@@ -54,9 +54,9 @@ package body Ada.Wide_Text_IO.Integer_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
if Need_LLI then if Need_LLI then
...@@ -71,14 +71,14 @@ package body Ada.Wide_Text_IO.Integer_IO is ...@@ -71,14 +71,14 @@ package body Ada.Wide_Text_IO.Integer_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_Input, Item, Width); Get (Current_Input, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -104,10 +104,10 @@ package body Ada.Wide_Text_IO.Integer_IO is ...@@ -104,10 +104,10 @@ package body Ada.Wide_Text_IO.Integer_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Need_LLI then if Need_LLI then
...@@ -118,9 +118,9 @@ package body Ada.Wide_Text_IO.Integer_IO is ...@@ -118,9 +118,9 @@ package body Ada.Wide_Text_IO.Integer_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
Put (Current_Output, Item, Width, Base); Put (Current_Output, Item, Width, Base);
...@@ -128,8 +128,8 @@ package body Ada.Wide_Text_IO.Integer_IO is ...@@ -128,8 +128,8 @@ package body Ada.Wide_Text_IO.Integer_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
S : String (To'First .. To'Last); S : String (To'First .. To'Last);
......
...@@ -28,33 +28,33 @@ package Ada.Wide_Text_IO.Integer_IO is ...@@ -28,33 +28,33 @@ package Ada.Wide_Text_IO.Integer_IO is
Default_Base : Number_Base := 10; Default_Base : Number_Base := 10;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
end Ada.Wide_Text_IO.Integer_IO; end Ada.Wide_Text_IO.Integer_IO;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
with Ada.Wide_Text_IO.Generic_Aux; use Ada.Wide_Text_IO.Generic_Aux; with Ada.Wide_Text_IO.Generic_Aux; use Ada.Wide_Text_IO.Generic_Aux;
with System.Img_BIU; use System.Img_BIU; with System.Img_BIU; use System.Img_BIU;
with System.Img_Uns; use System.Img_Uns; with System.Img_Uns; use System.Img_Uns;
with System.Img_LLB; use System.Img_LLB; with System.Img_LLB; use System.Img_LLB;
with System.Img_LLU; use System.Img_LLU; with System.Img_LLU; use System.Img_LLU;
with System.Img_LLW; use System.Img_LLW; with System.Img_LLW; use System.Img_LLW;
with System.Img_WIU; use System.Img_WIU; with System.Img_WIU; use System.Img_WIU;
with System.Val_Uns; use System.Val_Uns; with System.Val_Uns; use System.Val_Uns;
with System.Val_LLU; use System.Val_LLU; with System.Val_LLU; use System.Val_LLU;
package body Ada.Wide_Text_IO.Modular_Aux is package body Ada.Wide_Text_IO.Modular_Aux is
...@@ -51,7 +51,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -51,7 +51,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is
----------------------- -----------------------
procedure Load_Modular procedure Load_Modular
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural); Ptr : in out Natural);
-- This is an auxiliary routine that is used to load an possibly signed -- This is an auxiliary routine that is used to load an possibly signed
...@@ -63,9 +63,9 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -63,9 +63,9 @@ package body Ada.Wide_Text_IO.Modular_Aux is
------------- -------------
procedure Get_LLU procedure Get_LLU
(File : in File_Type; (File : File_Type;
Item : out Long_Long_Unsigned; Item : out Long_Long_Unsigned;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Stop : Integer := 0; Stop : Integer := 0;
...@@ -88,9 +88,9 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -88,9 +88,9 @@ package body Ada.Wide_Text_IO.Modular_Aux is
------------- -------------
procedure Get_Uns procedure Get_Uns
(File : in File_Type; (File : File_Type;
Item : out Unsigned; Item : out Unsigned;
Width : in Field) Width : Field)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Stop : Integer := 0; Stop : Integer := 0;
...@@ -113,7 +113,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -113,7 +113,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is
-------------- --------------
procedure Gets_LLU procedure Gets_LLU
(From : in String; (From : String;
Item : out Long_Long_Unsigned; Item : out Long_Long_Unsigned;
Last : out Positive) Last : out Positive)
is is
...@@ -134,7 +134,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -134,7 +134,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is
-------------- --------------
procedure Gets_Uns procedure Gets_Uns
(From : in String; (From : String;
Item : out Unsigned; Item : out Unsigned;
Last : out Positive) Last : out Positive)
is is
...@@ -155,7 +155,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -155,7 +155,7 @@ package body Ada.Wide_Text_IO.Modular_Aux is
------------------ ------------------
procedure Load_Modular procedure Load_Modular
(File : in File_Type; (File : File_Type;
Buf : out String; Buf : out String;
Ptr : in out Natural) Ptr : in out Natural)
is is
...@@ -203,10 +203,10 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -203,10 +203,10 @@ package body Ada.Wide_Text_IO.Modular_Aux is
------------- -------------
procedure Put_LLU procedure Put_LLU
(File : in File_Type; (File : File_Type;
Item : in Long_Long_Unsigned; Item : Long_Long_Unsigned;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -228,10 +228,10 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -228,10 +228,10 @@ package body Ada.Wide_Text_IO.Modular_Aux is
------------- -------------
procedure Put_Uns procedure Put_Uns
(File : in File_Type; (File : File_Type;
Item : in Unsigned; Item : Unsigned;
Width : in Field; Width : Field;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -254,8 +254,8 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -254,8 +254,8 @@ package body Ada.Wide_Text_IO.Modular_Aux is
procedure Puts_LLU procedure Puts_LLU
(To : out String; (To : out String;
Item : in Long_Long_Unsigned; Item : Long_Long_Unsigned;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
...@@ -280,8 +280,8 @@ package body Ada.Wide_Text_IO.Modular_Aux is ...@@ -280,8 +280,8 @@ package body Ada.Wide_Text_IO.Modular_Aux is
procedure Puts_Uns procedure Puts_Uns
(To : out String; (To : out String;
Item : in Unsigned; Item : Unsigned;
Base : in Number_Base) Base : Number_Base)
is is
Buf : String (1 .. Field'Last); Buf : String (1 .. Field'Last);
Ptr : Natural := 0; Ptr : Natural := 0;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-1997 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -45,45 +45,45 @@ private package Ada.Wide_Text_IO.Modular_Aux is ...@@ -45,45 +45,45 @@ private package Ada.Wide_Text_IO.Modular_Aux is
package U renames System.Unsigned_Types; package U renames System.Unsigned_Types;
procedure Get_Uns procedure Get_Uns
(File : in File_Type; (File : File_Type;
Item : out U.Unsigned; Item : out U.Unsigned;
Width : in Field); Width : Field);
procedure Get_LLU procedure Get_LLU
(File : in File_Type; (File : File_Type;
Item : out U.Long_Long_Unsigned; Item : out U.Long_Long_Unsigned;
Width : in Field); Width : Field);
procedure Gets_Uns procedure Gets_Uns
(From : in String; (From : String;
Item : out U.Unsigned; Item : out U.Unsigned;
Last : out Positive); Last : out Positive);
procedure Gets_LLU procedure Gets_LLU
(From : in String; (From : String;
Item : out U.Long_Long_Unsigned; Item : out U.Long_Long_Unsigned;
Last : out Positive); Last : out Positive);
procedure Put_Uns procedure Put_Uns
(File : in File_Type; (File : File_Type;
Item : in U.Unsigned; Item : U.Unsigned;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Put_LLU procedure Put_LLU
(File : in File_Type; (File : File_Type;
Item : in U.Long_Long_Unsigned; Item : U.Long_Long_Unsigned;
Width : in Field; Width : Field;
Base : in Number_Base); Base : Number_Base);
procedure Puts_Uns procedure Puts_Uns
(To : out String; (To : out String;
Item : in U.Unsigned; Item : U.Unsigned;
Base : in Number_Base); Base : Number_Base);
procedure Puts_LLU procedure Puts_LLU
(To : out String; (To : out String;
Item : in U.Long_Long_Unsigned; Item : U.Long_Long_Unsigned;
Base : in Number_Base); Base : Number_Base);
end Ada.Wide_Text_IO.Modular_Aux; end Ada.Wide_Text_IO.Modular_Aux;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -49,9 +49,9 @@ package body Ada.Wide_Text_IO.Modular_IO is ...@@ -49,9 +49,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
--------- ---------
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
if Num'Size > Unsigned'Size then if Num'Size > Unsigned'Size then
...@@ -66,14 +66,14 @@ package body Ada.Wide_Text_IO.Modular_IO is ...@@ -66,14 +66,14 @@ package body Ada.Wide_Text_IO.Modular_IO is
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0) Width : Field := 0)
is is
begin begin
Get (Current_Input, Item, Width); Get (Current_Input, Item, Width);
end Get; end Get;
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive) Last : out Positive)
is is
...@@ -99,10 +99,10 @@ package body Ada.Wide_Text_IO.Modular_IO is ...@@ -99,10 +99,10 @@ package body Ada.Wide_Text_IO.Modular_IO is
--------- ---------
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
if Num'Size > Unsigned'Size then if Num'Size > Unsigned'Size then
...@@ -113,9 +113,9 @@ package body Ada.Wide_Text_IO.Modular_IO is ...@@ -113,9 +113,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
end Put; end Put;
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
begin begin
Put (Current_Output, Item, Width, Base); Put (Current_Output, Item, Width, Base);
...@@ -123,8 +123,8 @@ package body Ada.Wide_Text_IO.Modular_IO is ...@@ -123,8 +123,8 @@ package body Ada.Wide_Text_IO.Modular_IO is
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base) Base : Number_Base := Default_Base)
is is
S : String (To'First .. To'Last); S : String (To'First .. To'Last);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- -- -- --
-- This specification is derived from the Ada Reference Manual for use with -- -- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow -- -- GNAT. The copyright notice above, and the license provisions that follow --
...@@ -50,33 +50,33 @@ package Ada.Wide_Text_IO.Modular_IO is ...@@ -50,33 +50,33 @@ package Ada.Wide_Text_IO.Modular_IO is
Default_Base : Number_Base := 10; Default_Base : Number_Base := 10;
procedure Get procedure Get
(File : in File_Type; (File : File_Type;
Item : out Num; Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Get procedure Get
(Item : out Num; (Item : out Num;
Width : in Field := 0); Width : Field := 0);
procedure Put procedure Put
(File : in File_Type; (File : File_Type;
Item : in Num; Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Put procedure Put
(Item : in Num; (Item : Num;
Width : in Field := Default_Width; Width : Field := Default_Width;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
procedure Get procedure Get
(From : in Wide_String; (From : Wide_String;
Item : out Num; Item : out Num;
Last : out Positive); Last : out Positive);
procedure Put procedure Put
(To : out Wide_String; (To : out Wide_String;
Item : in Num; Item : Num;
Base : in Number_Base := Default_Base); Base : Number_Base := Default_Base);
end Ada.Wide_Text_IO.Modular_IO; end Ada.Wide_Text_IO.Modular_IO;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment