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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94810 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 62 insertions, 35 deletions

diff --git a/gcc/ada/a-stwise.ads b/gcc/ada/a-stwise.ads
index 01f21660695..26ba39a0bae 100644
--- a/gcc/ada/a-stwise.ads
+++ b/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;