2019-07-01 Hristian Kirtchev <kirtchev@adacore.com>
+ * libgnat/g-sets.adb: Use type Membership_Set rathern than
+ Instance in various routines.
+ * libgnat/g-sets.ads: Change type Instance to Membership_Set.
+ Update various routines that mention the type.
+
+2019-07-01 Hristian Kirtchev <kirtchev@adacore.com>
+
* libgnat/g-lists.adb: Use type Doubly_Linked_List rather than
Instance in various routines.
* libgnat/g-lists.ads: Change type Instance to
package body GNAT.Sets is
- --------------------
- -- Membership_Set --
- --------------------
+ ---------------------
+ -- Membership_Sets --
+ ---------------------
- package body Membership_Set is
+ package body Membership_Sets is
--------------
-- Contains --
--------------
- function Contains (S : Instance; Elem : Element_Type) return Boolean is
+ function Contains
+ (S : Membership_Set;
+ Elem : Element_Type) return Boolean
+ is
begin
- return Hashed_Set.Get (Hashed_Set.Instance (S), Elem);
+ return Hashed_Set.Get (Hashed_Set.Dynamic_Hash_Table (S), Elem);
end Contains;
------------
-- Create --
------------
- function Create (Initial_Size : Positive) return Instance is
+ function Create (Initial_Size : Positive) return Membership_Set is
begin
- return Instance (Hashed_Set.Create (Initial_Size));
+ return Membership_Set (Hashed_Set.Create (Initial_Size));
end Create;
------------
-- Delete --
------------
- procedure Delete (S : Instance; Elem : Element_Type) is
+ procedure Delete (S : Membership_Set; Elem : Element_Type) is
begin
- Hashed_Set.Delete (Hashed_Set.Instance (S), Elem);
+ Hashed_Set.Delete (Hashed_Set.Dynamic_Hash_Table (S), Elem);
end Delete;
-------------
-- Destroy --
-------------
- procedure Destroy (S : in out Instance) is
+ procedure Destroy (S : in out Membership_Set) is
begin
- Hashed_Set.Destroy (Hashed_Set.Instance (S));
+ Hashed_Set.Destroy (Hashed_Set.Dynamic_Hash_Table (S));
end Destroy;
--------------
-- Insert --
------------
- procedure Insert (S : Instance; Elem : Element_Type) is
+ procedure Insert
+ (S : Membership_Set;
+ Elem : Element_Type)
+ is
begin
- Hashed_Set.Put (Hashed_Set.Instance (S), Elem, True);
+ Hashed_Set.Put (Hashed_Set.Dynamic_Hash_Table (S), Elem, True);
end Insert;
--------------
-- Is_Empty --
--------------
- function Is_Empty (S : Instance) return Boolean is
+ function Is_Empty (S : Membership_Set) return Boolean is
begin
- return Hashed_Set.Is_Empty (Hashed_Set.Instance (S));
+ return Hashed_Set.Is_Empty (Hashed_Set.Dynamic_Hash_Table (S));
end Is_Empty;
-------------
-- Iterate --
-------------
- function Iterate (S : Instance) return Iterator is
+ function Iterate (S : Membership_Set) return Iterator is
begin
- return Iterator (Hashed_Set.Iterate (Hashed_Set.Instance (S)));
+ return
+ Iterator (Hashed_Set.Iterate (Hashed_Set.Dynamic_Hash_Table (S)));
end Iterate;
----------
-- Next --
----------
- procedure Next (Iter : in out Iterator; Elem : out Element_Type) is
+ procedure Next
+ (Iter : in out Iterator;
+ Elem : out Element_Type)
+ is
begin
Hashed_Set.Next (Hashed_Set.Iterator (Iter), Elem);
end Next;
-- Present --
-------------
- function Present (S : Instance) return Boolean is
+ function Present (S : Membership_Set) return Boolean is
begin
- return Hashed_Set.Present (Hashed_Set.Instance (S));
+ return Hashed_Set.Present (Hashed_Set.Dynamic_Hash_Table (S));
end Present;
-----------
-- Reset --
-----------
- procedure Reset (S : Instance) is
+ procedure Reset (S : Membership_Set) is
begin
- Hashed_Set.Reset (Hashed_Set.Instance (S));
+ Hashed_Set.Reset (Hashed_Set.Dynamic_Hash_Table (S));
end Reset;
----------
-- Size --
----------
- function Size (S : Instance) return Natural is
+ function Size (S : Membership_Set) return Natural is
begin
- return Hashed_Set.Size (Hashed_Set.Instance (S));
+ return Hashed_Set.Size (Hashed_Set.Dynamic_Hash_Table (S));
end Size;
- end Membership_Set;
+ end Membership_Sets;
end GNAT.Sets;
--
-- The following use pattern must be employed with this set:
--
- -- Set : Instance := Create (<some size>);
+ -- Set : Membership_Set := Create (<some size>);
--
-- <various operations>
--
with function Hash (Key : Element_Type) return Bucket_Range_Type;
-- Map an arbitrary key into the range of buckets
- package Membership_Set is
+ package Membership_Sets is
--------------------
-- Set operations --
-- The following type denotes a membership set handle. Each instance
-- must be created using routine Create.
- type Instance is private;
- Nil : constant Instance;
+ type Membership_Set is private;
+ Nil : constant Membership_Set;
- function Contains (S : Instance; Elem : Element_Type) return Boolean;
+ function Contains
+ (S : Membership_Set;
+ Elem : Element_Type) return Boolean;
-- Determine whether membership set S contains element Elem
- function Create (Initial_Size : Positive) return Instance;
+ function Create (Initial_Size : Positive) return Membership_Set;
-- Create a new membership set with bucket capacity Initial_Size. This
-- routine must be called at the start of the membership set's lifetime.
- procedure Delete (S : Instance; Elem : Element_Type);
+ procedure Delete
+ (S : Membership_Set;
+ Elem : Element_Type);
-- Delete element Elem from membership set S. The routine has no effect
-- if the element is not present in the membership set. This action will
-- raise Iterated if the membership set has outstanding iterators.
- procedure Destroy (S : in out Instance);
+ procedure Destroy (S : in out Membership_Set);
-- Destroy the contents of membership set S, rendering it unusable. This
-- routine must be called at the end of the membership set's lifetime.
-- This action will raise Iterated if the hash table has outstanding
-- iterators.
- procedure Insert (S : Instance; Elem : Element_Type);
+ procedure Insert
+ (S : Membership_Set;
+ Elem : Element_Type);
-- Insert element Elem in membership set S. The routine has no effect
-- if the element is already present in the membership set. This action
-- will raise Iterated if the membership set has outstanding iterators.
- function Is_Empty (S : Instance) return Boolean;
+ function Is_Empty (S : Membership_Set) return Boolean;
-- Determine whether set S is empty
- function Present (S : Instance) return Boolean;
+ function Present (S : Membership_Set) return Boolean;
-- Determine whether set S exists
- procedure Reset (S : Instance);
+ procedure Reset (S : Membership_Set);
-- Destroy the contents of membership set S, and reset it to its initial
-- created state. This action will raise Iterated if the membership set
-- has outstanding iterators.
- function Size (S : Instance) return Natural;
+ function Size (S : Membership_Set) return Natural;
-- Obtain the number of elements in membership set S
-------------------------
type Iterator is private;
- function Iterate (S : Instance) return Iterator;
+ function Iterate (S : Membership_Set) return Iterator;
-- Obtain an iterator over the elements of membership set S. This action
-- locks all mutation functionality of the associated membership set.
procedure Destroy (B : in out Boolean);
-- Destroy boolean B
- package Hashed_Set is new Dynamic_HTable
+ package Hashed_Set is new Dynamic_Hash_Tables
(Key_Type => Element_Type,
Value_Type => Boolean,
No_Value => False,
Destroy_Value => Destroy,
Hash => Hash);
- type Instance is new Hashed_Set.Instance;
- Nil : constant Instance := Instance (Hashed_Set.Nil);
+ type Membership_Set is new Hashed_Set.Dynamic_Hash_Table;
+ Nil : constant Membership_Set := Membership_Set (Hashed_Set.Nil);
type Iterator is new Hashed_Set.Iterator;
- end Membership_Set;
+ end Membership_Sets;
end GNAT.Sets;
2019-07-01 Hristian Kirtchev <kirtchev@adacore.com>
+ * gnat.dg/sets1.adb: Update.
+
+2019-07-01 Hristian Kirtchev <kirtchev@adacore.com>
+
* gnat.dg/linkedlist.adb: Update.
2019-07-01 Hristian Kirtchev <kirtchev@adacore.com>
procedure Sets1 is
function Hash (Key : Integer) return Bucket_Range_Type;
- package Integer_Sets is new Membership_Set
+ package Integer_Sets is new Membership_Sets
(Element_Type => Integer,
"=" => "=",
Hash => Hash);
procedure Check_Empty
(Caller : String;
- S : Instance;
+ S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer);
-- Ensure that none of the elements in the range Low_Elem .. High_Elem are
-- present in set S, and that the set's length is 0.
- procedure Check_Locked_Mutations (Caller : String; S : in out Instance);
+ procedure Check_Locked_Mutations
+ (Caller : String;
+ S : in out Membership_Set);
-- Ensure that all mutation operations of set S are locked
procedure Check_Present
(Caller : String;
- S : Instance;
+ S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer);
-- Ensure that all elements in the range Low_Elem .. High_Elem are present
-- in set S.
- procedure Check_Unlocked_Mutations (Caller : String; S : in out Instance);
+ procedure Check_Unlocked_Mutations
+ (Caller : String;
+ S : in out Membership_Set);
-- Ensure that all mutation operations of set S are unlocked
procedure Populate
- (S : Instance;
+ (S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer);
-- Add elements in the range Low_Elem .. High_Elem in set S
procedure Check_Empty
(Caller : String;
- S : Instance;
+ S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer)
is
-- Check_Locked_Mutations --
----------------------------
- procedure Check_Locked_Mutations (Caller : String; S : in out Instance) is
+ procedure Check_Locked_Mutations
+ (Caller : String;
+ S : in out Membership_Set)
+ is
begin
begin
Delete (S, 1);
procedure Check_Present
(Caller : String;
- S : Instance;
+ S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer)
is
-- Check_Unlocked_Mutations --
------------------------------
- procedure Check_Unlocked_Mutations (Caller : String; S : in out Instance) is
+ procedure Check_Unlocked_Mutations
+ (Caller : String;
+ S : in out Membership_Set)
+ is
begin
Delete (S, 1);
Insert (S, 1);
--------------
procedure Populate
- (S : Instance;
+ (S : Membership_Set;
Low_Elem : Integer;
High_Elem : Integer)
is
Low_Bogus : constant Integer := Low_Elem - 1;
High_Bogus : constant Integer := High_Elem + 1;
- S : Instance := Create (Init_Size);
+ S : Membership_Set := Create (Init_Size);
begin
Populate (S, Low_Elem, High_Elem);
Count : Natural;
Flag : Boolean;
Iter : Iterator;
- S : Instance;
+ S : Membership_Set;
begin
-- Ensure that every routine defined in the API fails on a set which
Init_Size : Positive)
is
Iter : Iterator;
- S : Instance := Create (Init_Size);
+ S : Membership_Set := Create (Init_Size);
begin
Populate (S, Low_Elem, High_Elem);
-------------------
procedure Test_Is_Empty is
- S : Instance := Create (8);
+ S : Membership_Set := Create (8);
begin
if not Is_Empty (S) then
Elem : Integer;
Iter_1 : Iterator;
Iter_2 : Iterator;
- S : Instance := Create (5);
+ S : Membership_Set := Create (5);
begin
Populate (S, 1, 5);
procedure Test_Iterate_Empty is
Elem : Integer;
Iter : Iterator;
- S : Instance := Create (5);
+ S : Membership_Set := Create (5);
begin
-- Obtain an iterator. This action must lock all mutation operations of
is
Elem : Integer;
Iter : Iterator;
- S : Instance := Create (Init_Size);
+ S : Membership_Set := Create (Init_Size);
begin
Populate (S, Low_Elem, High_Elem);
---------------
procedure Test_Size is
- S : Instance := Create (6);
+ S : Membership_Set := Create (6);
Siz : Natural;
begin