2005-11-14 Matthew Heaney <heaney@adacore.com>

	* a-crbtgo.ads, a-crbtgo.adb, a-coorse.ads, a-coorse.adb, a-convec.ads, 
	a-convec.adb, a-coinve.ads, a-coinve.adb, a-cohama.ads, a-cohama.adb, 
	a-ciorse.ads, a-ciorse.adb, a-cihama.ads, a-cihama.adb, a-cidlli.ads, 
	a-cidlli.adb, a-cdlili.ads, a-cdlili.adb, a-coormu.adb, a-ciormu.adb, 
	a-cihase.adb, a-cihase.ads, a-cohase.adb, a-cohase.ads, a-ciorma.ads, 
	a-coorma.ads, a-ciormu.ads, a-coormu.ads, a-ciorma.adb, a-coorma.adb: 
	Compiles against the spec for ordered maps described in sections
	A.18.6 of the most recent (August 2005) AI-302 draft.



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

1 files changed, 59 insertions, 43 deletions

diff --git a/gcc/ada/a-cdlili.ads b/gcc/ada/a-cdlili.ads
index 70c0f806f5b..3682104cba9 100644
--- a/gcc/ada/a-cdlili.ads
+++ b/gcc/ada/a-cdlili.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2004-2005 Free Software Foundation, Inc.          --
+--          Copyright (C) 2004-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,49 +63,51 @@ package Ada.Containers.Doubly_Linked_Lists is
 
    function Element (Position : Cursor) return Element_Type;
 
+   procedure Replace_Element
+     (Container : in out List;
+      Position  : Cursor;
+      New_Item  : Element_Type);
+
    procedure Query_Element
      (Position : Cursor;
       Process  : not null access procedure (Element : Element_Type));
 
    procedure Update_Element
-     (Position : Cursor;
-      Process  : not null access procedure (Element : in out Element_Type));
-
-   procedure Replace_Element
-     (Position : Cursor;
-      By       : Element_Type);
+     (Container : in out List;
+      Position  : Cursor;
+      Process   : not null access procedure (Element : in out Element_Type));
 
    procedure Move
      (Target : in out List;
       Source : in out List);
 
-   procedure Prepend
+   procedure Insert
      (Container : in out List;
+      Before    : Cursor;
       New_Item  : Element_Type;
       Count     : Count_Type := 1);
 
-   procedure Append
+   procedure Insert
      (Container : in out List;
+      Before    : Cursor;
       New_Item  : Element_Type;
+      Position  : out Cursor;
       Count     : Count_Type := 1);
 
    procedure Insert
      (Container : in out List;
       Before    : Cursor;
-      New_Item  : Element_Type;
+      Position  : out Cursor;
       Count     : Count_Type := 1);
 
-   procedure Insert
+   procedure Prepend
      (Container : in out List;
-      Before    : Cursor;
       New_Item  : Element_Type;
-      Position  : out Cursor;
       Count     : Count_Type := 1);
 
-   procedure Insert
+   procedure Append
      (Container : in out List;
-      Before    : Cursor;
-      Position  : out Cursor;
+      New_Item  : Element_Type;
       Count     : Count_Type := 1);
 
    procedure Delete
@@ -121,21 +123,11 @@ package Ada.Containers.Doubly_Linked_Lists is
      (Container : in out List;
       Count     : Count_Type := 1);
 
-   generic
-      with function "<" (Left, Right : Element_Type) return Boolean is <>;
-   package Generic_Sorting is
-
-      function Is_Sorted (Container : List) return Boolean;
-
-      procedure Sort (Container : in out List);
+   procedure Reverse_Elements (Container : in out List);
 
-      procedure Merge (Target, Source : in out List);
-
-   end Generic_Sorting;
-
-   procedure Reverse_List (Container : in out List);
-
-   procedure Swap (I, J : Cursor);
+   procedure Swap
+     (Container : in out List;
+      I, J      : Cursor);
 
    procedure Swap_Links
      (Container : in out List;
@@ -149,13 +141,13 @@ package Ada.Containers.Doubly_Linked_Lists is
    procedure Splice
      (Target   : in out List;
       Before   : Cursor;
-      Position : Cursor);
+      Source   : in out List;
+      Position : in out Cursor);
 
    procedure Splice
      (Target   : in out List;
       Before   : Cursor;
-      Source   : in out List;
-      Position : in out Cursor);
+      Position : Cursor);
 
    function First (Container : List) return Cursor;
 
@@ -165,9 +157,13 @@ package Ada.Containers.Doubly_Linked_Lists is
 
    function Last_Element (Container : List) return Element_Type;
 
-   function Contains
-     (Container : List;
-      Item      : Element_Type) return Boolean;
+   function Next (Position : Cursor) return Cursor;
+
+   procedure Next (Position : in out Cursor);
+
+   function Previous (Position : Cursor) return Cursor;
+
+   procedure Previous (Position : in out Cursor);
 
    function Find
      (Container : List;
@@ -179,13 +175,9 @@ package Ada.Containers.Doubly_Linked_Lists is
       Item      : Element_Type;
       Position  : Cursor := No_Element) return Cursor;
 
-   function Next (Position : Cursor) return Cursor;
-
-   function Previous (Position : Cursor) return Cursor;
-
-   procedure Next (Position : in out Cursor);
-
-   procedure Previous (Position : in out Cursor);
+   function Contains
+     (Container : List;
+      Item      : Element_Type) return Boolean;
 
    function Has_Element (Position : Cursor) return Boolean;
 
@@ -197,6 +189,18 @@ package Ada.Containers.Doubly_Linked_Lists is
      (Container : List;
       Process   : not null access procedure (Position : Cursor));
 
+   generic
+      with function "<" (Left, Right : Element_Type) return Boolean is <>;
+   package Generic_Sorting is
+
+      function Is_Sorted (Container : List) return Boolean;
+
+      procedure Sort (Container : in out List);
+
+      procedure Merge (Target, Source : in out List);
+
+   end Generic_Sorting;
+
 private
    type Node_Type;
    type Node_Access is access Node_Type;
@@ -248,6 +252,18 @@ private
          Node      : Node_Access;
       end record;
 
+   procedure Read
+     (Stream : access Root_Stream_Type'Class;
+      Item   : out Cursor);
+
+   for Cursor'Read use Read;
+
+   procedure Write
+     (Stream : access Root_Stream_Type'Class;
+      Item   : Cursor);
+
+   for Cursor'Write use Write;
+
    No_Element : constant Cursor := Cursor'(null, null);
 
 end Ada.Containers.Doubly_Linked_Lists;