gcc/ada/

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

diff --git a/gcc/ada/a-coorma.ads b/gcc/ada/a-coorma.ads
index 0efa16f..917c1c7 100644 (file)
--- a/gcc/ada/a-coorma.ads
+++ b/gcc/ada/a-coorma.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2004-2005 Free Software Foundation, Inc.          --
+--          Copyright (C) 2004-2007, 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 --
@@ -38,9 +38,7 @@ with Ada.Finalization;
 with Ada.Streams;
 
 generic
-
    type Key_Type is private;
-
    type Element_Type is private;
 
    with function "<" (Left, Right : Key_Type) return Boolean is <>;
@@ -48,10 +46,15 @@ generic
 
 package Ada.Containers.Ordered_Maps is
    pragma Preelaborate;
+   pragma Remote_Types;
+
+   function Equivalent_Keys (Left, Right : Key_Type) return Boolean;
 
    type Map is tagged private;
+   pragma Preelaborable_Initialization (Map);
 
    type Cursor is private;
+   pragma Preelaborable_Initialization (Cursor);
 
    Empty_Map : constant Map;
 
@@ -69,18 +72,22 @@ package Ada.Containers.Ordered_Maps is
 
    function Element (Position : Cursor) return Element_Type;
 
+   procedure Replace_Element
+     (Container : in out Map;
+      Position  : Cursor;
+      New_Item  : Element_Type);
+
    procedure Query_Element
      (Position : Cursor;
       Process  : not null access
                    procedure (Key : Key_Type; Element : Element_Type));
 
    procedure Update_Element
-     (Position : Cursor;
-      Process  : not null access
+     (Container : in out Map;
+      Position  : Cursor;
+      Process   : not null access
                    procedure (Key : Key_Type; Element : in out Element_Type));
 
-   procedure Replace_Element (Position : Cursor; By : in Element_Type);
-
    procedure Move (Target : in out Map; Source : in out Map);
 
    procedure Insert
@@ -111,6 +118,8 @@ package Ada.Containers.Ordered_Maps is
       Key       : Key_Type;
       New_Item  : Element_Type);
 
+   procedure Exclude (Container : in out Map; Key : Key_Type);
+
    procedure Delete (Container : in out Map; Key : Key_Type);
 
    procedure Delete (Container : in out Map; Position : in out Cursor);
@@ -119,30 +128,18 @@ package Ada.Containers.Ordered_Maps is
 
    procedure Delete_Last (Container : in out Map);
 
-   procedure Exclude (Container : in out Map; Key : Key_Type);
-
-   function Contains (Container : Map; Key : Key_Type) return Boolean;
-
-   function Find (Container : Map; Key : Key_Type) return Cursor;
-
-   function Element (Container : Map; Key : Key_Type) return Element_Type;
-
-   function Floor (Container : Map; Key : Key_Type) return Cursor;
-
-   function Ceiling (Container : Map; Key : Key_Type) return Cursor;
-
    function First (Container : Map) return Cursor;
 
-   function First_Key (Container : Map) return Key_Type;
-
    function First_Element (Container : Map) return Element_Type;
 
-   function Last (Container : Map) return Cursor;
+   function First_Key (Container : Map) return Key_Type;
 
-   function Last_Key (Container : Map) return Key_Type;
+   function Last (Container : Map) return Cursor;
 
    function Last_Element (Container : Map) return Element_Type;
 
+   function Last_Key (Container : Map) return Key_Type;
+
    function Next (Position : Cursor) return Cursor;
 
    procedure Next (Position : in out Cursor);
@@ -151,6 +148,16 @@ package Ada.Containers.Ordered_Maps is
 
    procedure Previous (Position : in out Cursor);
 
+   function Find (Container : Map; Key : Key_Type) return Cursor;
+
+   function Element (Container : Map; Key : Key_Type) return Element_Type;
+
+   function Floor (Container : Map; Key : Key_Type) return Cursor;
+
+   function Ceiling (Container : Map; Key : Key_Type) return Cursor;
+
+   function Contains (Container : Map; Key : Key_Type) return Boolean;
+
    function Has_Element (Position : Cursor) return Boolean;
 
    function "<" (Left, Right : Cursor) return Boolean;
@@ -175,6 +182,9 @@ package Ada.Containers.Ordered_Maps is
 
 private
 
+   pragma Inline (Next);
+   pragma Inline (Previous);
+
    type Node_Type;
    type Node_Access is access Node_Type;
 
@@ -202,8 +212,9 @@ private
    use Red_Black_Trees;
    use Tree_Types;
    use Ada.Finalization;
+   use Ada.Streams;
 
-   type Map_Access is access Map;
+   type Map_Access is access all Map;
    for Map_Access'Storage_Size use 0;
 
    type Cursor is record
@@ -211,18 +222,28 @@ private
       Node      : Node_Access;
    end record;
 
-   No_Element : constant Cursor := Cursor'(null, null);
+   procedure Write
+     (Stream : not null access Root_Stream_Type'Class;
+      Item   : Cursor);
 
-   use Ada.Streams;
+   for Cursor'Write use Write;
+
+   procedure Read
+     (Stream : not null access Root_Stream_Type'Class;
+      Item   : out Cursor);
+
+   for Cursor'Read use Read;
+
+   No_Element : constant Cursor := Cursor'(null, null);
 
    procedure Write
-     (Stream    : access Root_Stream_Type'Class;
+     (Stream    : not null access Root_Stream_Type'Class;
       Container : Map);
 
    for Map'Write use Write;
 
    procedure Read
-     (Stream    : access Root_Stream_Type'Class;
+     (Stream    : not null access Root_Stream_Type'Class;
       Container : out Map);
 
    for Map'Read use Read;