diff options
| author | Bob Duff <duff@adacore.com> | 2022-05-24 13:03:21 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-07-04 07:45:55 +0000 |
| commit | eb6e8a7acd1b8ecf36489e01cafad61add528f23 (patch) | |
| tree | bcf73c38c79882d8e5bacd7cb0a781514d60dff4 | |
| parent | cac397f3f6f29fe60d78d437c91f8a3842d567c9 (diff) | |
| download | gcc-eb6e8a7acd1b8ecf36489e01cafad61add528f23.zip gcc-eb6e8a7acd1b8ecf36489e01cafad61add528f23.tar.gz gcc-eb6e8a7acd1b8ecf36489e01cafad61add528f23.tar.bz2 | |
[Ada] Add Ada 2022 Key function to sets containers
This patch adds the new Generic_Keys.Key function to the set children
of Ada.Containers.
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).
| -rw-r--r-- | gcc/ada/libgnat/a-cbhase.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-cborse.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-cihase.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-ciorse.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-cohase.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-coorse.ads | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/gcc/ada/libgnat/a-cbhase.ads b/gcc/ada/libgnat/a-cbhase.ads index 7079c51..351014d 100644 --- 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 index be22c25..53acf35 100644 --- 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 index dcd1d6a..2bb4527 100644 --- 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 index d053ac7..51545d6 100644 --- 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 index 9f562d8..fb7dcca 100644 --- 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 index 9619599..7596ed6 100644 --- 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 |