Skip to content

R
riscv-gcc-1
Commit 4e45e7a9 by Robert Dewar Committed by Arnaud Charlet
Options

a-strunb.ads, [...]: Add missing pragma Ada_05 statements Fix name of Set routine 

2005-02-09  Robert Dewar  <dewar@adacore.com>

        * a-strunb.ads, a-strunb.adb: Add missing pragma Ada_05 statements
        Fix name of Set routine

	* a-strfix.ads, a-strfix.adb: Add new index functions from AI-301 to
	fixed packages.

	* a-stwise.ads, a-stwise.adb, a-stwifi.ads, a-stwifi.adb,
	a-strsea.ads, a-strsea.adb: Add new index functions from AI-301 to
	fixed packages

	* a-witeio.ads, a-witeio.adb, a-textio.ads, a-textio.adb: New function
	forms of Get_Line subprograms for AI-301.

	* a-wtcoau.adb, a-wtcoau.ads, a-wtcoio.adb, a-wtcoio.ads,
	a-wtedit.adb, a-wtedit.adb, a-wtedit.ads, a-wttest.adb,
	a-wttest.ads, a-strmap.ads, a-strmap.adb, a-stwima.adb,
	a-stwima.ads: Minor reformatting.

From-SVN: r94810
parent 82c80734
Showing with 625 additions and 424 deletions
gcc/ada/a-strmap.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......
gcc/ada/a-strmap.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
......
gcc/ada/a-strsea.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -76,9 +76,9 @@ package body Ada.Strings.Search is
-----------
function Count
(Source : String;
Pattern : String;
Mapping : Maps.Character_Mapping := Maps.Identity) return Natural
(Source : String;
Pattern : String;
Mapping : Maps.Character_Mapping := Maps.Identity) return Natural
is
N : Natural;
J : Natural;
......@@ -110,9 +110,9 @@ package body Ada.Strings.Search is
end Count;
function Count
(Source : String;
Pattern : String;
Mapping : Maps.Character_Mapping_Function) return Natural
(Source : String;
Pattern : String;
Mapping : Maps.Character_Mapping_Function) return Natural
is
Mapped_Source : String (Source'Range);
N : Natural;
......@@ -280,7 +280,6 @@ package body Ada.Strings.Search is
declare
pragma Unsuppress (Access_Check);
begin
for J in Source'Range loop
Mapped_Source (J) := Mapping.all (Source (J));
......@@ -348,6 +347,84 @@ package body Ada.Strings.Search is
return 0;
end Index;
function Index
(Source : String;
Pattern : String;
From : Positive;
Going : Direction := Forward;
Mapping : Maps.Character_Mapping := Maps.Identity) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index (Source (From .. Source'Last), Pattern, Forward, Mapping);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index (Source (Source'First .. From), Pattern, Backward, Mapping);
end if;
end Index;
function Index
(Source : String;
Pattern : String;
From : Positive;
Going : Direction := Forward;
Mapping : Maps.Character_Mapping_Function) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return Index
(Source (From .. Source'Last), Pattern, Forward, Mapping);
else
if From > Source'Last then
raise Index_Error;
end if;
return Index
(Source (Source'First .. From), Pattern, Backward, Mapping);
end if;
end Index;
function Index
(Source : String;
Set : Maps.Character_Set;
From : Positive;
Test : Membership := Inside;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index (Source (From .. Source'Last), Set, Test, Forward);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index (Source (Source'First .. From), Set, Test, Backward);
end if;
end Index;
---------------------
-- Index_Non_Blank --
---------------------
......@@ -375,7 +452,30 @@ package body Ada.Strings.Search is
-- Fall through if no match
return 0;
end Index_Non_Blank;
function Index_Non_Blank
(Source : String;
From : Positive;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index_Non_Blank (Source (From .. Source'Last), Forward);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index_Non_Blank (Source (Source'First .. From), Backward);
end if;
end Index_Non_Blank;
end Ada.Strings.Search;
gcc/ada/a-strsea.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -61,8 +61,34 @@ pragma Preelaborate (Search);
Test : Membership := Inside;
Going : Direction := Forward) return Natural;
function Index
(Source : String;
Pattern : String;
From : Positive;
Going : Direction := Forward;
Mapping : Maps.Character_Mapping := Maps.Identity) return Natural;
function Index
(Source : String;
Pattern : String;
From : Positive;
Going : Direction := Forward;
Mapping : Maps.Character_Mapping_Function) return Natural;
function Index
(Source : String;
Set : Maps.Character_Set;
From : Positive;
Test : Membership := Inside;
Going : Direction := Forward) return Natural;
function Index_Non_Blank
(Source : String;
Going : Direction := Forward) return Natural;
function Index_Non_Blank
(Source : String;
From : Positive;
Going : Direction := Forward) return Natural;
function Count
......
gcc/ada/a-stwima.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2002 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -40,8 +40,7 @@ package body Ada.Strings.Wide_Maps is
---------
function "-"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set
(Left, Right : Wide_Character_Set) return Wide_Character_Set
is
LS : constant Wide_Character_Ranges_Access := Left.Set;
RS : constant Wide_Character_Ranges_Access := Right.Set;
......@@ -159,8 +158,7 @@ package body Ada.Strings.Wide_Maps is
-----------
function "and"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set
(Left, Right : Wide_Character_Set) return Wide_Character_Set
is
LS : constant Wide_Character_Ranges_Access := Left.Set;
RS : constant Wide_Character_Ranges_Access := Right.Set;
......@@ -210,8 +208,7 @@ package body Ada.Strings.Wide_Maps is
-----------
function "not"
(Right : in Wide_Character_Set)
return Wide_Character_Set
(Right : Wide_Character_Set) return Wide_Character_Set
is
RS : constant Wide_Character_Ranges_Access := Right.Set;
......@@ -253,8 +250,7 @@ package body Ada.Strings.Wide_Maps is
----------
function "or"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set
(Left, Right : Wide_Character_Set) return Wide_Character_Set
is
LS : constant Wide_Character_Ranges_Access := Left.Set;
RS : constant Wide_Character_Ranges_Access := Right.Set;
......@@ -341,8 +337,7 @@ package body Ada.Strings.Wide_Maps is
-----------
function "xor"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set
(Left, Right : Wide_Character_Set) return Wide_Character_Set
is
begin
return (Left or Right) - (Left and Right);
......@@ -409,9 +404,8 @@ package body Ada.Strings.Wide_Maps is
-----------
function Is_In
(Element : in Wide_Character;
Set : in Wide_Character_Set)
return Boolean
(Element : Wide_Character;
Set : Wide_Character_Set) return Boolean
is
L, R, M : Natural;
SS : constant Wide_Character_Ranges_Access := Set.Set;
......@@ -446,9 +440,8 @@ package body Ada.Strings.Wide_Maps is
---------------
function Is_Subset
(Elements : in Wide_Character_Set;
Set : in Wide_Character_Set)
return Boolean
(Elements : Wide_Character_Set;
Set : Wide_Character_Set) return Boolean
is
ES : constant Wide_Character_Ranges_Access := Elements.Set;
SS : constant Wide_Character_Ranges_Access := Set.Set;
......@@ -493,8 +486,7 @@ package body Ada.Strings.Wide_Maps is
---------------
function To_Domain
(Map : in Wide_Character_Mapping)
return Wide_Character_Sequence
(Map : Wide_Character_Mapping) return Wide_Character_Sequence
is
begin
return Map.Map.Domain;
......@@ -505,8 +497,7 @@ package body Ada.Strings.Wide_Maps is
----------------
function To_Mapping
(From, To : in Wide_Character_Sequence)
return Wide_Character_Mapping
(From, To : Wide_Character_Sequence) return Wide_Character_Mapping
is
Domain : Wide_Character_Sequence (1 .. From'Length);
Rangev : Wide_Character_Sequence (1 .. To'Length);
......@@ -554,8 +545,7 @@ package body Ada.Strings.Wide_Maps is
--------------
function To_Range
(Map : in Wide_Character_Mapping)
return Wide_Character_Sequence
(Map : Wide_Character_Mapping) return Wide_Character_Sequence
is
begin
return Map.Map.Rangev;
......@@ -566,8 +556,7 @@ package body Ada.Strings.Wide_Maps is
---------------
function To_Ranges
(Set : in Wide_Character_Set)
return Wide_Character_Ranges
(Set : in Wide_Character_Set) return Wide_Character_Ranges
is
begin
return Set.Set.all;
......@@ -578,8 +567,7 @@ package body Ada.Strings.Wide_Maps is
-----------------
function To_Sequence
(Set : in Wide_Character_Set)
return Wide_Character_Sequence
(Set : Wide_Character_Set) return Wide_Character_Sequence
is
SS : constant Wide_Character_Ranges_Access := Set.Set;
......@@ -604,8 +592,7 @@ package body Ada.Strings.Wide_Maps is
-- Case of multiple range input
function To_Set
(Ranges : in Wide_Character_Ranges)
return Wide_Character_Set
(Ranges : Wide_Character_Ranges) return Wide_Character_Set
is
Result : Wide_Character_Ranges (Ranges'Range);
N : Natural := 0;
......@@ -667,8 +654,7 @@ package body Ada.Strings.Wide_Maps is
-- Case of single range input
function To_Set
(Span : in Wide_Character_Range)
return Wide_Character_Set
(Span : Wide_Character_Range) return Wide_Character_Set
is
begin
if Span.Low > Span.High then
......@@ -685,8 +671,7 @@ package body Ada.Strings.Wide_Maps is
-- Case of wide string input
function To_Set
(Sequence : in Wide_Character_Sequence)
return Wide_Character_Set
(Sequence : Wide_Character_Sequence) return Wide_Character_Set
is
R : Wide_Character_Ranges (1 .. Sequence'Length);
......@@ -701,8 +686,7 @@ package body Ada.Strings.Wide_Maps is
-- Case of single wide character input
function To_Set
(Singleton : in Wide_Character)
return Wide_Character_Set
(Singleton : Wide_Character) return Wide_Character_Set
is
begin
return
......@@ -715,9 +699,8 @@ package body Ada.Strings.Wide_Maps is
-----------
function Value
(Map : in Wide_Character_Mapping;
Element : in Wide_Character)
return Wide_Character
(Map : Wide_Character_Mapping;
Element : Wide_Character) return Wide_Character
is
L, R, M : Natural;
......
gcc/ada/a-stwima.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-1998 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
......@@ -63,16 +63,13 @@ package Ada.Strings.Wide_Maps is
array (Positive range <>) of Wide_Character_Range;
function To_Set
(Ranges : in Wide_Character_Ranges)
return Wide_Character_Set;
(Ranges : Wide_Character_Ranges) return Wide_Character_Set;
function To_Set
(Span : in Wide_Character_Range)
return Wide_Character_Set;
(Span : Wide_Character_Range) return Wide_Character_Set;
function To_Ranges
(Set : in Wide_Character_Set)
return Wide_Character_Ranges;
(Set : in Wide_Character_Set) return Wide_Character_Ranges;
---------------------------------------
-- Operations on Wide Character Sets --
......@@ -81,55 +78,44 @@ package Ada.Strings.Wide_Maps is
function "=" (Left, Right : in Wide_Character_Set) return Boolean;
function "not"
(Right : in Wide_Character_Set)
return Wide_Character_Set;
(Right : Wide_Character_Set) return Wide_Character_Set;
function "and"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set;
(Left, Right : Wide_Character_Set) return Wide_Character_Set;
function "or"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set;
(Left, Right : Wide_Character_Set) return Wide_Character_Set;
function "xor"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set;
(Left, Right : Wide_Character_Set) return Wide_Character_Set;
function "-"
(Left, Right : in Wide_Character_Set)
return Wide_Character_Set;
(Left, Right : Wide_Character_Set) return Wide_Character_Set;
function Is_In
(Element : in Wide_Character;
Set : in Wide_Character_Set)
return Boolean;
(Element : Wide_Character;
Set : Wide_Character_Set) return Boolean;
function Is_Subset
(Elements : in Wide_Character_Set;
Set : in Wide_Character_Set)
return Boolean;
(Elements : Wide_Character_Set;
Set : Wide_Character_Set) return Boolean;
function "<="
(Left : in Wide_Character_Set;
Right : in Wide_Character_Set)
return Boolean
(Left : Wide_Character_Set;
Right : Wide_Character_Set) return Boolean
renames Is_Subset;
subtype Wide_Character_Sequence is Wide_String;
-- Alternative representation for a set of character values
function To_Set
(Sequence : in Wide_Character_Sequence)
return Wide_Character_Set;
(Sequence : Wide_Character_Sequence) return Wide_Character_Set;
function To_Set
(Singleton : in Wide_Character)
return Wide_Character_Set;
(Singleton : Wide_Character) return Wide_Character_Set;
function To_Sequence
(Set : in Wide_Character_Set)
return Wide_Character_Sequence;
(Set : Wide_Character_Set) return Wide_Character_Sequence;
-----------------------------------------
-- Wide Character Mapping Declarations --
......@@ -139,9 +125,8 @@ package Ada.Strings.Wide_Maps is
-- Representation for a wide character to wide character mapping:
function Value
(Map : in Wide_Character_Mapping;
Element : in Wide_Character)
return Wide_Character;
(Map : Wide_Character_Mapping;
Element : Wide_Character) return Wide_Character;
Identity : constant Wide_Character_Mapping;
......@@ -150,19 +135,16 @@ package Ada.Strings.Wide_Maps is
---------------------------------
function To_Mapping
(From, To : in Wide_Character_Sequence)
return Wide_Character_Mapping;
(From, To : Wide_Character_Sequence) return Wide_Character_Mapping;
function To_Domain
(Map : in Wide_Character_Mapping)
return Wide_Character_Sequence;
(Map : Wide_Character_Mapping) return Wide_Character_Sequence;
function To_Range
(Map : in Wide_Character_Mapping)
return Wide_Character_Sequence;
(Map : Wide_Character_Mapping) return Wide_Character_Sequence;
type Wide_Character_Mapping_Function is
access function (From : in Wide_Character) return Wide_Character;
access function (From : Wide_Character) return Wide_Character;
private
package AF renames Ada.Finalization;
......
gcc/ada/a-stwise.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992,1993,1994 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -42,8 +42,7 @@ package body Ada.Strings.Wide_Search is
function Belongs
(Element : Wide_Character;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership)
return Boolean;
Test : Membership) return Boolean;
pragma Inline (Belongs);
-- Determines if the given element is in (Test = Inside) or not in
-- (Test = Outside) the given character set.
......@@ -55,9 +54,8 @@ package body Ada.Strings.Wide_Search is
function Belongs
(Element : Wide_Character;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership)
return Boolean is
Test : Membership) return Boolean
is
begin
if Test = Inside then
return Is_In (Element, Set);
......@@ -71,10 +69,10 @@ package body Ada.Strings.Wide_Search is
-----------
function Count
(Source : in Wide_String;
Pattern : in Wide_String;
Mapping : in Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural
(Source : Wide_String;
Pattern : Wide_String;
Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural
is
N : Natural;
J : Natural;
......@@ -117,10 +115,9 @@ package body Ada.Strings.Wide_Search is
end Count;
function Count
(Source : in Wide_String;
Pattern : in Wide_String;
Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
return Natural
(Source : Wide_String;
Pattern : Wide_String;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural
is
Mapped_Source : Wide_String (Source'Range);
......@@ -132,9 +129,9 @@ package body Ada.Strings.Wide_Search is
return Count (Mapped_Source, Pattern);
end Count;
function Count (Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set)
return Natural
function Count
(Source : in Wide_String;
Set : Wide_Maps.Wide_Character_Set) return Natural
is
N : Natural := 0;
......@@ -153,9 +150,9 @@ package body Ada.Strings.Wide_Search is
----------------
procedure Find_Token
(Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set;
Test : in Membership;
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership;
First : out Positive;
Last : out Natural)
is
......@@ -190,11 +187,11 @@ package body Ada.Strings.Wide_Search is
-----------
function Index
(Source : in Wide_String;
Pattern : in Wide_String;
Going : in Direction := Forward;
Mapping : in Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural
(Source : Wide_String;
Pattern : Wide_String;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural
is
begin
if Pattern = "" then
......@@ -239,16 +236,11 @@ package body Ada.Strings.Wide_Search is
return 0;
end Index;
-----------
-- Index --
-----------
function Index
(Source : in Wide_String;
Pattern : in Wide_String;
Going : in Direction := Forward;
Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
return Natural
(Source : Wide_String;
Pattern : Wide_String;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural
is
Mapped_Source : Wide_String (Source'Range);
......@@ -261,11 +253,10 @@ package body Ada.Strings.Wide_Search is
end Index;
function Index
(Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set;
Test : in Membership := Inside;
Going : in Direction := Forward)
return Natural
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership := Inside;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
......@@ -288,14 +279,92 @@ package body Ada.Strings.Wide_Search is
return 0;
end Index;
function Index
(Source : Wide_String;
Pattern : Wide_String;
From : Positive;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index (Source (From .. Source'Last), Pattern, Forward, Mapping);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index (Source (Source'First .. From), Pattern, Backward, Mapping);
end if;
end Index;
function Index
(Source : Wide_String;
Pattern : Wide_String;
From : Positive;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return Index
(Source (From .. Source'Last), Pattern, Forward, Mapping);
else
if From > Source'Last then
raise Index_Error;
end if;
return Index
(Source (Source'First .. From), Pattern, Backward, Mapping);
end if;
end Index;
function Index
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
From : Positive;
Test : Membership := Inside;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index (Source (From .. Source'Last), Set, Test, Forward);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index (Source (Source'First .. From), Set, Test, Backward);
end if;
end Index;
---------------------
-- Index_Non_Blank --
---------------------
function Index_Non_Blank
(Source : in Wide_String;
Going : in Direction := Forward)
return Natural
(Source : Wide_String;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
......@@ -316,7 +385,30 @@ package body Ada.Strings.Wide_Search is
-- Fall through if no match
return 0;
end Index_Non_Blank;
function Index_Non_Blank
(Source : Wide_String;
From : Positive;
Going : Direction := Forward) return Natural
is
begin
if Going = Forward then
if From < Source'First then
raise Index_Error;
end if;
return
Index_Non_Blank (Source (From .. Source'Last), Forward);
else
if From > Source'Last then
raise Index_Error;
end if;
return
Index_Non_Blank (Source (Source'First .. From), Backward);
end if;
end Index_Non_Blank;
end Ada.Strings.Wide_Search;
gcc/ada/a-stwise.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -43,49 +43,76 @@ with Ada.Strings.Wide_Maps;
private package Ada.Strings.Wide_Search is
pragma Preelaborate (Wide_Search);
function Index (Source : in Wide_String;
Pattern : in Wide_String;
Going : in Direction := Forward;
Mapping : in Wide_Maps.Wide_Character_Mapping :=
Wide_Maps.Identity)
return Natural;
function Index
(Source : Wide_String;
Pattern : Wide_String;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping :=
Wide_Maps.Identity) return Natural;
function Index (Source : in Wide_String;
Pattern : in Wide_String;
Going : in Direction := Forward;
Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
return Natural;
function Index
(Source : Wide_String;
Pattern : Wide_String;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
function Index (Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set;
Test : in Membership := Inside;
Going : in Direction := Forward)
return Natural;
function Index
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership := Inside;
Going : Direction := Forward) return Natural;
function Index_Non_Blank (Source : in Wide_String;
Going : in Direction := Forward)
function Index
(Source : Wide_String;
Pattern : Wide_String;
From : Positive;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural;
function Count (Source : in Wide_String;
Pattern : in Wide_String;
Mapping : in Wide_Maps.Wide_Character_Mapping :=
Wide_Maps.Identity)
return Natural;
function Index
(Source : Wide_String;
Pattern : Wide_String;
From : Positive;
Going : Direction := Forward;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
function Count (Source : in Wide_String;
Pattern : in Wide_String;
Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
return Natural;
function Index
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
From : Positive;
Test : Membership := Inside;
Going : Direction := Forward) return Natural;
function Index_Non_Blank
(Source : Wide_String;
Going : Direction := Forward) return Natural;
function Count (Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set)
function Index_Non_Blank
(Source : Wide_String;
From : Positive;
Going : Direction := Forward) return Natural;
function Count
(Source : Wide_String;
Pattern : Wide_String;
Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
return Natural;
function Count
(Source : Wide_String;
Pattern : Wide_String;
Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
function Count
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set) return Natural;
procedure Find_Token (Source : in Wide_String;
Set : in Wide_Maps.Wide_Character_Set;
Test : in Membership;
First : out Positive;
Last : out Natural);
procedure Find_Token
(Source : Wide_String;
Set : Wide_Maps.Wide_Character_Set;
Test : Membership;
First : out Positive;
Last : out Natural);
end Ada.Strings.Wide_Search;
gcc/ada/a-textio.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2002 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
......@@ -86,34 +86,34 @@ pragma Elaborate_Body (Text_IO);
procedure Create
(File : in out File_Type;
Mode : in File_Mode := Out_File;
Name : in String := "";
Form : in String := "");
Mode : File_Mode := Out_File;
Name : String := "";
Form : String := "");
procedure Open
(File : in out File_Type;
Mode : in File_Mode;
Name : in String;
Form : in String := "");
Mode : File_Mode;
Name : String;
Form : String := "");
procedure Close (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);
function Mode (File : in File_Type) return File_Mode;
function Name (File : in File_Type) return String;
function Form (File : in File_Type) return String;
function Mode (File : File_Type) return File_Mode;
function Name (File : 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;
------------------------------------------------------
-- Control of default input, output and error files --
------------------------------------------------------
procedure Set_Input (File : in File_Type);
procedure Set_Output (File : in File_Type);
procedure Set_Error (File : in File_Type);
procedure Set_Input (File : File_Type);
procedure Set_Output (File : File_Type);
procedure Set_Error (File : File_Type);
function Standard_Input return File_Type;
function Standard_Output return File_Type;
......@@ -140,76 +140,76 @@ pragma Elaborate_Body (Text_IO);
-- 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.
procedure Flush (File : in File_Type);
procedure Flush (File : File_Type);
procedure Flush;
--------------------------------------------
-- Specification of line and page lengths --
--------------------------------------------
procedure Set_Line_Length (File : in File_Type; To : in Count);
procedure Set_Line_Length (To : in Count);
procedure Set_Line_Length (File : File_Type; To : Count);
procedure Set_Line_Length (To : Count);
procedure Set_Page_Length (File : in File_Type; To : in Count);
procedure Set_Page_Length (To : in Count);
procedure Set_Page_Length (File : File_Type; To : Count);
procedure Set_Page_Length (To : Count);
function Line_Length (File : in File_Type) return Count;
function Line_Length (File : File_Type) return Count;
function Line_Length return Count;
function Page_Length (File : in File_Type) return Count;
function Page_Length (File : File_Type) return Count;
function Page_Length return Count;
------------------------------------
-- Column, Line, and Page Control --
------------------------------------
procedure New_Line (File : in File_Type; Spacing : in Positive_Count := 1);
procedure New_Line (Spacing : in Positive_Count := 1);
procedure New_Line (File : File_Type; Spacing : Positive_Count := 1);
procedure New_Line (Spacing : Positive_Count := 1);
procedure Skip_Line (File : in File_Type; Spacing : in Positive_Count := 1);
procedure Skip_Line (Spacing : in Positive_Count := 1);
procedure Skip_Line (File : File_Type; Spacing : Positive_Count := 1);
procedure Skip_Line (Spacing : Positive_Count := 1);
function End_Of_Line (File : in File_Type) return Boolean;
function End_Of_Line (File : File_Type) return Boolean;
function End_Of_Line return Boolean;
procedure New_Page (File : in File_Type);
procedure New_Page (File : File_Type);
procedure New_Page;
procedure Skip_Page (File : in File_Type);
procedure Skip_Page (File : File_Type);
procedure Skip_Page;
function End_Of_Page (File : in File_Type) return Boolean;
function End_Of_Page (File : File_Type) return Boolean;
function End_Of_Page return Boolean;
function End_Of_File (File : in File_Type) return Boolean;
function End_Of_File (File : File_Type) return Boolean;
function End_Of_File return Boolean;
procedure Set_Col (File : in File_Type; To : in Positive_Count);
procedure Set_Col (To : in Positive_Count);
procedure Set_Col (File : File_Type; To : Positive_Count);
procedure Set_Col (To : Positive_Count);
procedure Set_Line (File : in File_Type; To : in Positive_Count);
procedure Set_Line (To : in Positive_Count);
procedure Set_Line (File : File_Type; To : Positive_Count);
procedure Set_Line (To : Positive_Count);
function Col (File : in File_Type) return Positive_Count;
function Col (File : File_Type) return Positive_Count;
function Col return Positive_Count;
function Line (File : in File_Type) return Positive_Count;
function Line (File : File_Type) return Positive_Count;
function Line return Positive_Count;
function Page (File : in File_Type) return Positive_Count;
function Page (File : File_Type) return Positive_Count;
function Page return Positive_Count;
----------------------------
-- Character Input-Output --
----------------------------
procedure Get (File : in File_Type; Item : out Character);
procedure Get (File : File_Type; Item : out Character);
procedure Get (Item : out Character);
procedure Put (File : in File_Type; Item : in Character);
procedure Put (Item : in Character);
procedure Put (File : File_Type; Item : Character);
procedure Put (Item : Character);
procedure Look_Ahead
(File : in File_Type;
(File : File_Type;
Item : out Character;
End_Of_Line : out Boolean);
......@@ -218,14 +218,14 @@ pragma Elaborate_Body (Text_IO);
End_Of_Line : out Boolean);
procedure Get_Immediate
(File : in File_Type;
(File : File_Type;
Item : out Character);
procedure Get_Immediate
(Item : out Character);
procedure Get_Immediate
(File : in File_Type;
(File : File_Type;
Item : out Character;
Available : out Boolean);
......@@ -237,13 +237,13 @@ pragma Elaborate_Body (Text_IO);
-- String Input-Output --
-------------------------
procedure Get (File : in File_Type; Item : out String);
procedure Get (File : File_Type; Item : out String);
procedure Get (Item : out String);
procedure Put (File : in File_Type; Item : in String);
procedure Put (Item : in String);
procedure Put (File : File_Type; Item : String);
procedure Put (Item : String);
procedure Get_Line
(File : in File_Type;
(File : File_Type;
Item : out String;
Last : out Natural);
......@@ -251,12 +251,18 @@ pragma Elaborate_Body (Text_IO);
(Item : out String;
Last : out Natural);
function Get_Line (File : File_Type) return String;
pragma Ada_05 (Get_Line);
function Get_Line return String;
pragma Ada_05 (Get_Line);
procedure Put_Line
(File : in File_Type;
Item : in String);
(File : File_Type;
Item : String);
procedure Put_Line
(Item : in String);
(Item : String);
---------------------------------------
-- Generic packages for Input-Output --
......@@ -375,7 +381,7 @@ private
procedure Write
(File : in out Text_AFCB;
Item : in Ada.Streams.Stream_Element_Array);
Item : Ada.Streams.Stream_Element_Array);
-- Write operation used when Text_IO file is treated directly as Stream
------------------------
......
gcc/ada/a-witeio.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2000 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
......@@ -89,34 +89,34 @@ package Ada.Wide_Text_IO is
procedure Create
(File : in out File_Type;
Mode : in File_Mode := Out_File;
Name : in String := "";
Form : in String := "");
Mode : File_Mode := Out_File;
Name : String := "";
Form : String := "");
procedure Open
(File : in out File_Type;
Mode : in File_Mode;
Name : in String;
Form : in String := "");
Mode : File_Mode;
Name : String;
Form : String := "");
procedure Close (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);
function Mode (File : in File_Type) return File_Mode;
function Name (File : in File_Type) return String;
function Form (File : in File_Type) return String;
function Mode (File : File_Type) return File_Mode;
function Name (File : 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;
------------------------------------------------------
-- Control of default input, output and error files --
------------------------------------------------------
procedure Set_Input (File : in File_Type);
procedure Set_Output (File : in File_Type);
procedure Set_Error (File : in File_Type);
procedure Set_Input (File : File_Type);
procedure Set_Output (File : File_Type);
procedure Set_Error (File : File_Type);
function Standard_Input return File_Type;
function Standard_Output return File_Type;
......@@ -143,76 +143,76 @@ package Ada.Wide_Text_IO is
-- Note: The paramter file is in out in the RM, but as pointed out
-- in <<95-5166.a Tucker Taft 95-6-23>> this is clearly an oversight.
procedure Flush (File : in File_Type);
procedure Flush (File : File_Type);
procedure Flush;
--------------------------------------------
-- Specification of line and page lengths --
--------------------------------------------
procedure Set_Line_Length (File : in File_Type; To : in Count);
procedure Set_Line_Length (To : in Count);
procedure Set_Line_Length (File : File_Type; To : Count);
procedure Set_Line_Length (To : Count);
procedure Set_Page_Length (File : in File_Type; To : in Count);
procedure Set_Page_Length (To : in Count);
procedure Set_Page_Length (File : File_Type; To : Count);
procedure Set_Page_Length (To : Count);
function Line_Length (File : in File_Type) return Count;
function Line_Length (File : File_Type) return Count;
function Line_Length return Count;
function Page_Length (File : in File_Type) return Count;
function Page_Length (File : File_Type) return Count;
function Page_Length return Count;
------------------------------------
-- Column, Line, and Page Control --
------------------------------------
procedure New_Line (File : in File_Type; Spacing : in Positive_Count := 1);
procedure New_Line (Spacing : in Positive_Count := 1);
procedure New_Line (File : File_Type; Spacing : Positive_Count := 1);
procedure New_Line (Spacing : Positive_Count := 1);
procedure Skip_Line (File : in File_Type; Spacing : in Positive_Count := 1);
procedure Skip_Line (Spacing : in Positive_Count := 1);
procedure Skip_Line (File : File_Type; Spacing : Positive_Count := 1);
procedure Skip_Line (Spacing : Positive_Count := 1);
function End_Of_Line (File : in File_Type) return Boolean;
function End_Of_Line (File : File_Type) return Boolean;
function End_Of_Line return Boolean;
procedure New_Page (File : in File_Type);
procedure New_Page (File : File_Type);
procedure New_Page;
procedure Skip_Page (File : in File_Type);
procedure Skip_Page (File : File_Type);
procedure Skip_Page;
function End_Of_Page (File : in File_Type) return Boolean;
function End_Of_Page (File : File_Type) return Boolean;
function End_Of_Page return Boolean;
function End_Of_File (File : in File_Type) return Boolean;
function End_Of_File (File : File_Type) return Boolean;
function End_Of_File return Boolean;
procedure Set_Col (File : in File_Type; To : in Positive_Count);
procedure Set_Col (To : in Positive_Count);
procedure Set_Col (File : File_Type; To : Positive_Count);
procedure Set_Col (To : Positive_Count);
procedure Set_Line (File : in File_Type; To : in Positive_Count);
procedure Set_Line (To : in Positive_Count);
procedure Set_Line (File : File_Type; To : Positive_Count);
procedure Set_Line (To : Positive_Count);
function Col (File : in File_Type) return Positive_Count;
function Col (File : File_Type) return Positive_Count;
function Col return Positive_Count;
function Line (File : in File_Type) return Positive_Count;
function Line (File : File_Type) return Positive_Count;
function Line return Positive_Count;
function Page (File : in File_Type) return Positive_Count;
function Page (File : File_Type) return Positive_Count;
function Page return Positive_Count;
----------------------------
-- Character Input-Output --
----------------------------
procedure Get (File : in File_Type; Item : out Wide_Character);
procedure Get (File : File_Type; Item : out Wide_Character);
procedure Get (Item : out Wide_Character);
procedure Put (File : in File_Type; Item : in Wide_Character);
procedure Put (Item : in Wide_Character);
procedure Put (File : File_Type; Item : Wide_Character);
procedure Put (Item : Wide_Character);
procedure Look_Ahead
(File : in File_Type;
(File : File_Type;
Item : out Wide_Character;
End_Of_Line : out Boolean);
......@@ -221,14 +221,14 @@ package Ada.Wide_Text_IO is
End_Of_Line : out Boolean);
procedure Get_Immediate
(File : in File_Type;
(File : File_Type;
Item : out Wide_Character);
procedure Get_Immediate
(Item : out Wide_Character);
procedure Get_Immediate
(File : in File_Type;
(File : File_Type;
Item : out Wide_Character;
Available : out Boolean);
......@@ -240,13 +240,13 @@ package Ada.Wide_Text_IO is
-- String Input-Output --
-------------------------
procedure Get (File : in File_Type; Item : out Wide_String);
procedure Get (File : File_Type; Item : out Wide_String);
procedure Get (Item : out Wide_String);
procedure Put (File : in File_Type; Item : in Wide_String);
procedure Put (Item : in Wide_String);
procedure Put (File : File_Type; Item : Wide_String);
procedure Put (Item : Wide_String);
procedure Get_Line
(File : in File_Type;
(File : File_Type;
Item : out Wide_String;
Last : out Natural);
......@@ -254,12 +254,18 @@ package Ada.Wide_Text_IO is
(Item : out Wide_String;
Last : out Natural);
function Get_Line (File : File_Type) return Wide_String;
pragma Ada_05 (Get_Line);
function Get_Line return Wide_String;
pragma Ada_05 (Get_Line);
procedure Put_Line
(File : in File_Type;
Item : in Wide_String);
(File : File_Type;
Item : Wide_String);
procedure Put_Line
(Item : in Wide_String);
(Item : Wide_String);
---------------------------------------
-- Generic packages for Input-Output --
......@@ -398,7 +404,7 @@ private
procedure Write
(File : in out Wide_Text_AFCB;
Item : in Ada.Streams.Stream_Element_Array);
Item : Ada.Streams.Stream_Element_Array);
-- Write operation used when Wide_Text_IO file is treated as a Stream
------------------------
......@@ -440,7 +446,7 @@ private
-- occurs. The result is EOF if the end of file was read.
procedure Get_Character
(File : in File_Type;
(File : File_Type;
Item : out Character);
-- This is essentially a copy of the normal Get routine from Text_IO. It
-- obtains a single character from the input file File, and places it in
......@@ -449,8 +455,7 @@ private
function Get_Wide_Char
(C : Character;
File : File_Type)
return Wide_Character;
File : File_Type) return Wide_Character;
-- This function is shared by Get and Get_Immediate to extract a wide
-- character value from the given File. The first byte has already been
-- read and is passed in C. The wide character value is returned as the
......
gcc/ada/a-wtcoau.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -45,7 +45,7 @@ package body Ada.Wide_Text_IO.Complex_Aux is
---------
procedure Get
(File : in File_Type;
(File : File_Type;
ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float;
Width : Field)
......@@ -96,7 +96,7 @@ package body Ada.Wide_Text_IO.Complex_Aux is
----------
procedure Gets
(From : in String;
(From : String;
ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float;
Last : out Positive)
......@@ -163,8 +163,8 @@ package body Ada.Wide_Text_IO.Complex_Aux is
(To : out String;
ItemR : Long_Long_Float;
ItemI : Long_Long_Float;
Aft : in Field;
Exp : in Field)
Aft : Field;
Exp : Field)
is
I_String : String (1 .. 3 * Field'Last);
R_String : String (1 .. 3 * Field'Last);
......
gcc/ada/a-wtcoau.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -42,7 +42,7 @@
package Ada.Wide_Text_IO.Complex_Aux is
procedure Get
(File : in File_Type;
(File : File_Type;
ItemR : out Long_Long_Float;
ItemI : out Long_Long_Float;
Width : Field);
......
gcc/ada/a-wtcoio.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -32,6 +32,7 @@
------------------------------------------------------------------------------
with Ada.Wide_Text_IO.Complex_Aux;
with System.WCh_Con; use System.WCh_Con;
with System.WCh_WtS; use System.WCh_WtS;
......@@ -44,9 +45,6 @@ package body Ada.Wide_Text_IO.Complex_IO is
subtype LLF is Long_Long_Float;
-- Type used for calls to routines in Aux
-- subtype TFT is Ada.Wide_Text_IO.File_Type;
-- File type required for calls to routines in Aux
function TFT is new
Ada.Unchecked_Conversion (File_Type, Ada.Wide_Text_IO.File_Type);
-- This unchecked conversion is to get around a visibility bug in
......@@ -58,12 +56,12 @@ package body Ada.Wide_Text_IO.Complex_IO is
---------
procedure Get
(File : in File_Type;
(File : File_Type;
Item : out Complex;
Width : in Field := 0)
Width : Field := 0)
is
Real_Item : Real'Base;
Imag_Item : Real'Base;
Real_Item : Real'Base;
Imag_Item : Real'Base;
begin
Aux.Get (TFT (File), LLF (Real_Item), LLF (Imag_Item), Width);
......@@ -79,7 +77,7 @@ package body Ada.Wide_Text_IO.Complex_IO is
procedure Get
(Item : out Complex;
Width : in Field := 0)
Width : Field := 0)
is
begin
Get (Current_Input, Item, Width);
......@@ -90,7 +88,7 @@ package body Ada.Wide_Text_IO.Complex_IO is
---------
procedure Get
(From : in Wide_String;
(From : Wide_String;
Item : out Complex;
Last : out Positive)
is
......@@ -116,11 +114,11 @@ package body Ada.Wide_Text_IO.Complex_IO is
---------
procedure Put
(File : in File_Type;
Item : in Complex;
Fore : in Field := Default_Fore;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp)
(File : File_Type;
Item : Complex;
Fore : Field := Default_Fore;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp)
is
begin
Aux.Put (TFT (File), LLF (Re (Item)), LLF (Im (Item)), Fore, Aft, Exp);
......@@ -131,10 +129,10 @@ package body Ada.Wide_Text_IO.Complex_IO is
---------
procedure Put
(Item : in Complex;
Fore : in Field := Default_Fore;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp)
(Item : Complex;
Fore : Field := Default_Fore;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp)
is
begin
Put (Current_Output, Item, Fore, Aft, Exp);
......@@ -146,9 +144,9 @@ package body Ada.Wide_Text_IO.Complex_IO is
procedure Put
(To : out Wide_String;
Item : in Complex;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp)
Item : Complex;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp)
is
S : String (To'First .. To'Last);
......
gcc/ada/a-wtcoio.ads
......@@ -27,36 +27,36 @@ package Ada.Wide_Text_IO.Complex_IO is
Default_Exp : Field := 3;
procedure Get
(File : in File_Type;
(File : File_Type;
Item : out Complex;
Width : in Field := 0);
Width : Field := 0);
procedure Get
(Item : out Complex;
Width : in Field := 0);
Width : Field := 0);
procedure Put
(File : in File_Type;
Item : in Complex;
Fore : in Field := Default_Fore;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp);
(File : File_Type;
Item : Complex;
Fore : Field := Default_Fore;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp);
procedure Put
(Item : in Complex;
Fore : in Field := Default_Fore;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp);
(Item : Complex;
Fore : Field := Default_Fore;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp);
procedure Get
(From : in Wide_String;
(From : Wide_String;
Item : out Complex;
Last : out Positive);
procedure Put
(To : out Wide_String;
Item : in Complex;
Aft : in Field := Default_Aft;
Exp : in Field := Default_Exp);
Item : Complex;
Aft : Field := Default_Aft;
Exp : Field := Default_Exp);
end Ada.Wide_Text_IO.Complex_IO;
gcc/ada/a-wtedit.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-1997 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
......@@ -40,14 +40,12 @@ package Ada.Wide_Text_IO.Editing is
type Picture is private;
function Valid
(Pic_String : in String;
Blank_When_Zero : in Boolean := False)
return Boolean;
(Pic_String : String;
Blank_When_Zero : Boolean := False) return Boolean;
function To_Picture
(Pic_String : in String;
Blank_When_Zero : in Boolean := False)
return Picture;
(Pic_String : String;
Blank_When_Zero : Boolean := False) return Picture;
function Pic_String (Pic : in Picture) return String;
function Blank_When_Zero (Pic : in Picture) return Boolean;
......@@ -63,62 +61,59 @@ package Ada.Wide_Text_IO.Editing is
generic
type Num is delta <> digits <>;
Default_Currency : in Wide_String :=
Default_Currency : Wide_String :=
Wide_Text_IO.Editing.Default_Currency;
Default_Fill : in Wide_Character :=
Default_Fill : Wide_Character :=
Wide_Text_IO.Editing.Default_Fill;
Default_Separator : in Wide_Character :=
Default_Separator : Wide_Character :=
Wide_Text_IO.Editing.Default_Separator;
Default_Radix_Mark : in Wide_Character :=
Default_Radix_Mark : Wide_Character :=
Wide_Text_IO.Editing.Default_Radix_Mark;
package Decimal_Output is
function Length
(Pic : in Picture;
Currency : in Wide_String := Default_Currency)
return Natural;
(Pic : Picture;
Currency : Wide_String := Default_Currency) return Natural;
function Valid
(Item : Num;
Pic : in Picture;
Currency : in Wide_String := Default_Currency)
return Boolean;
Pic : Picture;
Currency : Wide_String := Default_Currency) return Boolean;
function Image
(Item : Num;
Pic : in Picture;
Currency : in Wide_String := Default_Currency;
Fill : in Wide_Character := Default_Fill;
Separator : in Wide_Character := Default_Separator;
Radix_Mark : in Wide_Character := Default_Radix_Mark)
return Wide_String;
Pic : Picture;
Currency : Wide_String := Default_Currency;
Fill : Wide_Character := Default_Fill;
Separator : Wide_Character := Default_Separator;
Radix_Mark : Wide_Character := Default_Radix_Mark) return Wide_String;
procedure Put
(File : in File_Type;
(File : File_Type;
Item : Num;
Pic : in Picture;
Currency : in Wide_String := Default_Currency;
Fill : in Wide_Character := Default_Fill;
Separator : in Wide_Character := Default_Separator;
Radix_Mark : in Wide_Character := Default_Radix_Mark);
Pic : Picture;
Currency : Wide_String := Default_Currency;
Fill : Wide_Character := Default_Fill;
Separator : Wide_Character := Default_Separator;
Radix_Mark : Wide_Character := Default_Radix_Mark);
procedure Put
(Item : Num;
Pic : in Picture;
Currency : in Wide_String := Default_Currency;
Fill : in Wide_Character := Default_Fill;
Separator : in Wide_Character := Default_Separator;
Radix_Mark : in Wide_Character := Default_Radix_Mark);
Pic : Picture;
Currency : Wide_String := Default_Currency;
Fill : Wide_Character := Default_Fill;
Separator : Wide_Character := Default_Separator;
Radix_Mark : Wide_Character := Default_Radix_Mark);
procedure Put
(To : out Wide_String;
Item : Num;
Pic : in Picture;
Currency : in Wide_String := Default_Currency;
Fill : in Wide_Character := Default_Fill;
Separator : in Wide_Character := Default_Separator;
Radix_Mark : in Wide_Character := Default_Radix_Mark);
Pic : Picture;
Currency : Wide_String := Default_Currency;
Fill : Wide_Character := Default_Fill;
Separator : Wide_Character := Default_Separator;
Radix_Mark : Wide_Character := Default_Radix_Mark);
end Decimal_Output;
......@@ -196,8 +191,7 @@ private
Currency_Symbol : Wide_String;
Fill_Character : Wide_Character;
Separator_Character : Wide_Character;
Radix_Point : Wide_Character)
return Wide_String;
Radix_Point : Wide_Character) return Wide_String;
-- Formats number according to Pic
function Expand (Picture : in String) return String;
......
gcc/ada/a-wttest.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -39,7 +39,7 @@ package body Ada.Wide_Text_IO.Text_Streams is
-- Stream --
------------
function Stream (File : in File_Type) return Stream_Access is
function Stream (File : File_Type) return Stream_Access is
begin
System.File_IO.Check_File_Open (FCB.AFCB_Ptr (File));
return Stream_Access (File);
......
gcc/ada/a-wttest.ads
......@@ -19,6 +19,6 @@ package Ada.Wide_Text_IO.Text_Streams is
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.Wide_Text_IO.Text_Streams;
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