This patch adds the new Generic_Keys.Key function to the set children
of Ada.Containers.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* libgnat/a-cbhase.ads, libgnat/a-cborse.ads,
libgnat/a-cihase.ads, libgnat/a-ciorse.ads,
libgnat/a-cohase.ads, libgnat/a-coorse.ads (Key): New function
that takes a Container parameter, implemented as an expression
function, so it is self explanatory (doesn't need a comment).diff --git a/gcc/ada/libgnat/a-cbhase.ads b/gcc/ada/libgnat/a-cbhase.ads
--- a/gcc/ada/libgnat/a-cbhase.ads
+++ b/gcc/ada/libgnat/a-cbhase.ads
@@ -403,6 +403,9 @@ is
-- Applies generic formal operation Key to the element of the node
-- designated by Position.
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
-- Searches (as per the key-based Find) for the node containing Key, and
-- returns the associated element.
diff --git a/gcc/ada/libgnat/a-cborse.ads b/gcc/ada/libgnat/a-cborse.ads
--- a/gcc/ada/libgnat/a-cborse.ads
+++ b/gcc/ada/libgnat/a-cborse.ads
@@ -262,6 +262,9 @@ is
function Key (Position : Cursor) return Key_Type;
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
procedure Replace
diff --git a/gcc/ada/libgnat/a-cihase.ads b/gcc/ada/libgnat/a-cihase.ads
--- a/gcc/ada/libgnat/a-cihase.ads
+++ b/gcc/ada/libgnat/a-cihase.ads
@@ -389,6 +389,9 @@ is
-- Applies generic formal operation Key to the element of the node
-- designated by Position.
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
-- Searches (as per the key-based Find) for the node containing Key, and
-- returns the associated element.
diff --git a/gcc/ada/libgnat/a-ciorse.ads b/gcc/ada/libgnat/a-ciorse.ads
--- a/gcc/ada/libgnat/a-ciorse.ads
+++ b/gcc/ada/libgnat/a-ciorse.ads
@@ -270,6 +270,9 @@ is
function Key (Position : Cursor) return Key_Type;
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
procedure Replace
diff --git a/gcc/ada/libgnat/a-cohase.ads b/gcc/ada/libgnat/a-cohase.ads
--- a/gcc/ada/libgnat/a-cohase.ads
+++ b/gcc/ada/libgnat/a-cohase.ads
@@ -401,6 +401,9 @@ is
-- Applies generic formal operation Key to the element of the node
-- designated by Position.
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
-- Searches (as per the key-based Find) for the node containing Key, and
-- returns the associated element.
diff --git a/gcc/ada/libgnat/a-coorse.ads b/gcc/ada/libgnat/a-coorse.ads
--- a/gcc/ada/libgnat/a-coorse.ads
+++ b/gcc/ada/libgnat/a-coorse.ads
@@ -263,6 +263,9 @@ is
function Key (Position : Cursor) return Key_Type;
+ function Key (Container : Set; Position : Cursor) return Key_Type is
+ (Key (Element (Container, Position)));
+
function Element (Container : Set; Key : Key_Type) return Element_Type;
procedure Replace
