diff options
Diffstat (limited to 'gcc/ada/a-cohase.ads')
| -rw-r--r-- | gcc/ada/a-cohase.ads | 123 |
1 files changed, 66 insertions, 57 deletions
diff --git a/gcc/ada/a-cohase.ads b/gcc/ada/a-cohase.ads index 9f0cdc38747..16aaf5dc360 100644 --- a/gcc/ada/a-cohase.ads +++ b/gcc/ada/a-cohase.ads @@ -2,11 +2,11 @@ -- -- -- GNAT LIBRARY COMPONENTS -- -- -- --- ADA.CONTAINERS.HASHED_SETS -- +-- A D A . C O N T A I N E R S . H A S H E D _ S E T S -- -- -- -- S p e c -- -- -- --- Copyright (C) 2004 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 -- @@ -35,16 +35,15 @@ with Ada.Containers.Hash_Tables; with Ada.Streams; +with Ada.Finalization; generic type Element_Type is private; with function Hash (Element : Element_Type) return Hash_Type; - -- TODO: get a ruling from ARG in Atlanta re the name and - -- order of these declarations. ??? - -- - with function Equivalent_Keys (Left, Right : Element_Type) return Boolean; + with function Equivalent_Elements (Left, Right : Element_Type) + return Boolean; with function "=" (Left, Right : Element_Type) return Boolean is <>; @@ -61,6 +60,8 @@ pragma Preelaborate (Hashed_Sets); function "=" (Left, Right : Set) return Boolean; + function Equivalent_Sets (Left, Right : Set) return Boolean; + function Length (Container : Set) return Count_Type; function Is_Empty (Container : Set) return Boolean; @@ -73,11 +74,10 @@ pragma Preelaborate (Hashed_Sets); (Position : Cursor; Process : not null access procedure (Element : Element_Type)); - -- TODO: resolve in atlanta - -- procedure Replace_Element - -- (Container : in out Set; - -- Position : Cursor; - -- By : Element_Type); + procedure Replace_Element + (Container : Set; + Position : Cursor; + By : Element_Type); procedure Move (Target : in out Set; Source : in out Set); @@ -95,9 +95,37 @@ pragma Preelaborate (Hashed_Sets); procedure Delete (Container : in out Set; Item : Element_Type); + procedure Delete (Container : in out Set; Position : in out Cursor); + procedure Exclude (Container : in out Set; Item : Element_Type); - procedure Delete (Container : in out Set; Position : in out Cursor); + function Contains (Container : Set; Item : Element_Type) return Boolean; + + function Find + (Container : Set; + Item : Element_Type) return Cursor; + + function First (Container : Set) return Cursor; + + function Next (Position : Cursor) return Cursor; + + procedure Next (Position : in out Cursor); + + function Has_Element (Position : Cursor) return Boolean; + + function Equivalent_Elements (Left, Right : Cursor) return Boolean; + + function Equivalent_Elements + (Left : Cursor; + Right : Element_Type) return Boolean; + + function Equivalent_Elements + (Left : Element_Type; + Right : Cursor) return Boolean; + + procedure Iterate + (Container : Set; + Process : not null access procedure (Position : Cursor)); procedure Union (Target : in out Set; Source : Set); @@ -128,40 +156,12 @@ pragma Preelaborate (Hashed_Sets); function Is_Subset (Subset : Set; Of_Set : Set) return Boolean; - function Contains (Container : Set; Item : Element_Type) return Boolean; - - function Find - (Container : Set; - Item : Element_Type) return Cursor; - function Capacity (Container : Set) return Count_Type; procedure Reserve_Capacity (Container : in out Set; Capacity : Count_Type); - function First (Container : Set) return Cursor; - - function Next (Position : Cursor) return Cursor; - - procedure Next (Position : in out Cursor); - - function Has_Element (Position : Cursor) return Boolean; - - function Equivalent_Keys (Left, Right : Cursor) return Boolean; - - function Equivalent_Keys - (Left : Cursor; - Right : Element_Type) return Boolean; - - function Equivalent_Keys - (Left : Element_Type; - Right : Cursor) return Boolean; - - procedure Iterate - (Container : Set; - Process : not null access procedure (Position : Cursor)); - generic type Key_Type (<>) is limited private; @@ -183,18 +183,16 @@ pragma Preelaborate (Hashed_Sets); function Element (Container : Set; Key : Key_Type) return Element_Type; - -- TODO: resolve in atlanta - -- procedure Replace - -- (Container : in out Set; - -- Key : Key_Type; - -- New_Item : Element_Type); + procedure Replace + (Container : in out Set; + Key : Key_Type; + New_Item : Element_Type); procedure Delete (Container : in out Set; Key : Key_Type); procedure Exclude (Container : in out Set; Key : Key_Type); - -- TODO: resolve name in atlanta: ??? - procedure Checked_Update_Element + procedure Update_Element_Preserving_Key (Container : in out Set; Position : Cursor; Process : not null access @@ -215,24 +213,35 @@ private type Node_Type; type Node_Access is access Node_Type; - package HT_Types is - new Hash_Tables.Generic_Hash_Table_Types (Node_Access); + type Node_Type is + limited record + Element : Element_Type; + Next : Node_Access; + end record; - use HT_Types; + package HT_Types is new Hash_Tables.Generic_Hash_Table_Types + (Node_Type, + Node_Access); - type Set is new Hash_Table_Type with null record; + type Set is new Ada.Finalization.Controlled with record + HT : HT_Types.Hash_Table_Type; + end record; procedure Adjust (Container : in out Set); procedure Finalize (Container : in out Set); - type Set_Access is access constant Set; + use HT_Types; + use Ada.Finalization; + + type Set_Access is access all Set; for Set_Access'Storage_Size use 0; - type Cursor is record - Container : Set_Access; - Node : Node_Access; - end record; + type Cursor is + record + Container : Set_Access; + Node : Node_Access; + end record; No_Element : constant Cursor := (Container => null, Node => null); @@ -250,6 +259,6 @@ private for Set'Read use Read; - Empty_Set : constant Set := (Hash_Table_Type with null record); + Empty_Set : constant Set := (Controlled with HT => (null, 0, 0, 0)); end Ada.Containers.Hashed_Sets; |