2005-03-29 Robert Dewar <dewar@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / a-strmap.ads

diff --git a/gcc/ada/a-strmap.ads b/gcc/ada/a-strmap.ads
index 2d1595b..598b234 100644 (file)
--- a/gcc/ada/a-strmap.ads
+++ b/gcc/ada/a-strmap.ads
@@ -6,8 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---                                                                          --
---          Copyright (C) 1992-2001 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 --
@@ -41,8 +40,6 @@ with Ada.Characters.Latin_1;
 package Ada.Strings.Maps is
 pragma Preelaborate (Maps);
 
-   package L renames Ada.Characters.Latin_1;
-
    --------------------------------
    -- Character Set Declarations --
    --------------------------------
@@ -64,48 +61,44 @@ pragma Preelaborate (Maps);
 
    type Character_Ranges is array (Positive range <>) of Character_Range;
 
-   function To_Set    (Ranges : in Character_Ranges) return Character_Set;
+   function To_Set    (Ranges : Character_Ranges) return Character_Set;
 
-   function To_Set    (Span   : in Character_Range)  return Character_Set;
+   function To_Set    (Span   : Character_Range)  return Character_Set;
 
-   function To_Ranges (Set    : in Character_Set)    return Character_Ranges;
+   function To_Ranges (Set    : Character_Set)    return Character_Ranges;
 
    ----------------------------------
    -- Operations on Character Sets --
    ----------------------------------
 
-   function "="   (Left, Right : in Character_Set) return Boolean;
+   function "="   (Left, Right : Character_Set) return Boolean;
 
-   function "not" (Right       : in Character_Set) return Character_Set;
-   function "and" (Left, Right : in Character_Set) return Character_Set;
-   function "or"  (Left, Right : in Character_Set) return Character_Set;
-   function "xor" (Left, Right : in Character_Set) return Character_Set;
-   function "-"   (Left, Right : in Character_Set) return Character_Set;
+   function "not" (Right       : Character_Set) return Character_Set;
+   function "and" (Left, Right : Character_Set) return Character_Set;
+   function "or"  (Left, Right : Character_Set) return Character_Set;
+   function "xor" (Left, Right : Character_Set) return Character_Set;
+   function "-"   (Left, Right : Character_Set) return Character_Set;
 
    function Is_In
-     (Element : in Character;
-      Set     : in Character_Set)
-      return    Boolean;
+     (Element : Character;
+      Set     : Character_Set) return Boolean;
 
    function Is_Subset
-     (Elements : in Character_Set;
-      Set      : in Character_Set)
-      return     Boolean;
+     (Elements : Character_Set;
+      Set      : Character_Set) return     Boolean;
 
    function "<="
-     (Left  : in Character_Set;
-      Right : in Character_Set)
-      return  Boolean
+     (Left  : Character_Set;
+      Right : Character_Set) return  Boolean
    renames Is_Subset;
 
    subtype Character_Sequence is String;
    --  Alternative representation for a set of character values
 
-   function To_Set (Sequence  : in Character_Sequence) return Character_Set;
-
-   function To_Set (Singleton : in Character)          return Character_Set;
+   function To_Set (Sequence  : Character_Sequence) return Character_Set;
+   function To_Set (Singleton : Character)          return Character_Set;
 
-   function To_Sequence (Set : in Character_Set) return Character_Sequence;
+   function To_Sequence (Set : Character_Set) return Character_Sequence;
 
    ------------------------------------
    -- Character Mapping Declarations --
@@ -115,9 +108,8 @@ pragma Preelaborate (Maps);
    --  Representation for a character to character mapping:
 
    function Value
-     (Map     : in Character_Mapping;
-      Element : in Character)
-      return    Character;
+     (Map     : Character_Mapping;
+      Element : Character) return Character;
 
    Identity : constant Character_Mapping;
 
@@ -126,23 +118,16 @@ pragma Preelaborate (Maps);
    ----------------------------
 
    function To_Mapping
-     (From, To : in Character_Sequence)
-      return     Character_Mapping;
+     (From, To : Character_Sequence) return Character_Mapping;
 
    function To_Domain
-     (Map  : in Character_Mapping)
-      return Character_Sequence;
+     (Map : Character_Mapping) return Character_Sequence;
 
    function To_Range
-     (Map  : in Character_Mapping)
-      return Character_Sequence;
+     (Map : Character_Mapping) return Character_Sequence;
 
    type Character_Mapping_Function is
-      access function (From : in Character) return Character;
-
-   ------------------
-   -- Private Part --
-   ------------------
+      access function (From : Character) return Character;
 
 private
    pragma Inline (Is_In);
@@ -162,6 +147,8 @@ private
 
    type Character_Mapping is array (Character) of Character;
 
+   package L renames Ada.Characters.Latin_1;
+
    Identity : constant Character_Mapping :=
      (L.NUL                         &  -- NUL                             0
       L.SOH                         &  -- SOH                             1