From e51537ff6cdf7a85ed58883511d00ee309c21bd9 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Tue, 2 Aug 2011 09:50:34 +0000 Subject: [PATCH] a-cfdlli.ads, [...]: Remove unneeded with of Ada.Containers Remove commented out pragma Inline's... 2011-08-02 Robert Dewar * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, a-cforse.ads: Remove unneeded with of Ada.Containers Remove commented out pragma Inline's Move specifications of new subprograms to the actual specs From-SVN: r177114 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/a-cfdlli.ads | 23 +++++++++++------------ gcc/ada/a-cfhama.ads | 29 ++++++++++++----------------- gcc/ada/a-cfhase.ads | 26 +++++++++++--------------- gcc/ada/a-cforma.ads | 27 ++++++++++++--------------- gcc/ada/a-cforse.ads | 25 +++++++++++-------------- 6 files changed, 64 insertions(+), 73 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 35103c9d3b4..888b7a10979 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-08-02 Robert Dewar + + * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, + a-cforse.ads: Remove unneeded with of Ada.Containers + Remove commented out pragma Inline's + Move specifications of new subprograms to the actual specs + 2011-08-02 Yannick Moy * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, diff --git a/gcc/ada/a-cfdlli.ads b/gcc/ada/a-cfdlli.ads index 3be6ea6dc78..d961cb9535c 100644 --- a/gcc/ada/a-cfdlli.ads +++ b/gcc/ada/a-cfdlli.ads @@ -49,16 +49,7 @@ -- function Left (Container : List; Position : Cursor) return List; -- function Right (Container : List; Position : Cursor) return List; --- Strict_Equal returns True if the containers are physically equal, --- meaning that they are structurally equal (function "=" returns True) --- and that they have the same set of cursors. - --- Left returns a container containing all elements preceding Position --- (excluded) in Container. Right returns a container containing all --- elements following Position (included) in Container. These two new --- functions are useful to express invariant properties in loops which --- iterate over containers. Left returns the part of the container already --- scanned and Right the part not scanned yet. +-- See detailed specifications for these subprograms private with Ada.Streams; with Ada.Containers; @@ -235,10 +226,18 @@ package Ada.Containers.Formal_Doubly_Linked_Lists is end Generic_Sorting; function Strict_Equal (Left, Right : List) return Boolean; + -- Strict_Equal returns True if the containers are physically equal, i.e. + -- they are structurally equal (function "=" returns True) and that they + -- have the same set of cursors. - function Left (Container : List; Position : Cursor) return List; - + function Left (Container : List; Position : Cursor) return List; function Right (Container : List; Position : Cursor) return List; + -- Left returns a container containing all elements preceding Position + -- (excluded) in Container. Right returns a container containing all + -- elements following Position (included) in Container. These two new + -- functions can be used to express invariant properties in loops which + -- iterate over containers. Left returns the part of the container already + -- scanned and Right the part not scanned yet. private diff --git a/gcc/ada/a-cfhama.ads b/gcc/ada/a-cfhama.ads index 56a0a62ce1b..31e3b7350e9 100644 --- a/gcc/ada/a-cfhama.ads +++ b/gcc/ada/a-cfhama.ads @@ -49,21 +49,10 @@ -- function Left (Container : Map; Position : Cursor) return Map; -- function Right (Container : Map; Position : Cursor) return Map; --- Strict_Equal returns True if the containers are physically equal, --- meaning that they are structurally equal (function "=" returns True) --- and that they have the same set of cursors. Overlap returns True if --- the containers have common keys. - --- Left returns a container containing all elements preceding Position --- (excluded) in Container. Right returns a container containing all --- elements following Position (included) in Container. These two new --- functions are useful to express invariant properties in loops which --- iterate over containers. Left returns the part of the container already --- scanned and Right the part not scanned yet. +-- See detailed specifications for these subprograms private with Ada.Containers.Hash_Tables; private with Ada.Streams; -with Ada.Containers; use Ada.Containers; generic type Key_Type is private; @@ -206,24 +195,30 @@ package Ada.Containers.Formal_Hashed_Maps is function Default_Modulus (Capacity : Count_Type) return Hash_Type; function Strict_Equal (Left, Right : Map) return Boolean; + -- Strict_Equal returns True if the containers are physically equal, i.e. + -- they are structurally equal (function "=" returns True) and that they + -- have the same set of cursors. - function Left (Container : Map; Position : Cursor) return Map; - + function Left (Container : Map; Position : Cursor) return Map; function Right (Container : Map; Position : Cursor) return Map; + -- Left returns a container containing all elements preceding Position + -- (excluded) in Container. Right returns a container containing all + -- elements following Position (included) in Container. These two new + -- functions can be used to express invariant properties in loops which + -- iterate over containers. Left returns the part of the container already + -- scanned and Right the part not scanned yet. function Overlap (Left, Right : Map) return Boolean; + -- Overlap returns True if the containers have common keys private - -- pragma Inline ("="); pragma Inline (Length); pragma Inline (Is_Empty); pragma Inline (Clear); pragma Inline (Key); pragma Inline (Element); - -- pragma Inline (Move); ??? pragma Inline (Contains); pragma Inline (Capacity); - -- pragma Inline (Reserve_Capacity); ??? pragma Inline (Has_Element); pragma Inline (Equivalent_Keys); pragma Inline (Next); diff --git a/gcc/ada/a-cfhase.ads b/gcc/ada/a-cfhase.ads index b9da734e32a..ecc70e4e5d2 100644 --- a/gcc/ada/a-cfhase.ads +++ b/gcc/ada/a-cfhase.ads @@ -49,23 +49,11 @@ -- function Left (Container : Set; Position : Cursor) return Set; -- function Right (Container : Set; Position : Cursor) return Set; --- Strict_Equal returns True if the containers are physically equal, --- meaning that they are structurally equal (function "=" returns True) --- and that they have the same set of cursors. - --- Left returns a container containing all elements preceding Position --- (excluded) in Container. Right returns a container containing all --- elements following Position (included) in Container. These two new --- functions are useful to express invariant properties in loops which --- iterate over containers. Left returns the part of the container already --- scanned and Right the part not scanned yet. +-- See detailed specifications for these subprograms private with Ada.Containers.Hash_Tables; private with Ada.Streams; -with Ada.Containers; -use Ada.Containers; - generic type Element_Type is private; @@ -242,10 +230,18 @@ package Ada.Containers.Formal_Hashed_Sets is end Generic_Keys; function Strict_Equal (Left, Right : Set) return Boolean; + -- Strict_Equal returns True if the containers are physically equal, i.e. + -- they are structurally equal (function "=" returns True) and that they + -- have the same set of cursors. - function Left (Container : Set; Position : Cursor) return Set; - + function Left (Container : Set; Position : Cursor) return Set; function Right (Container : Set; Position : Cursor) return Set; + -- Left returns a container containing all elements preceding Position + -- (excluded) in Container. Right returns a container containing all + -- elements following Position (included) in Container. These two new + -- functions can be used to express invariant properties in loops which + -- iterate over containers. Left returns the part of the container already + -- scanned and Right the part not scanned yet. private diff --git a/gcc/ada/a-cforma.ads b/gcc/ada/a-cforma.ads index 261a29e68b3..088cf69917f 100644 --- a/gcc/ada/a-cforma.ads +++ b/gcc/ada/a-cforma.ads @@ -51,21 +51,10 @@ -- function Left (Container : Map; Position : Cursor) return Map; -- function Right (Container : Map; Position : Cursor) return Map; --- Strict_Equal returns True if the containers are physically equal, --- meaning that they are structurally equal (function "=" returns True) --- and that they have the same set of cursors. Overlap returns True if --- the containers have common keys. - --- Left returns a container containing all elements preceding Position --- (excluded) in Container. Right returns a container containing all --- elements following Position (included) in Container. These two new --- functions are useful to express invariant properties in loops which --- iterate over containers. Left returns the part of the container already --- scanned and Right the part not scanned yet. +-- See detailed specifications for these subprograms private with Ada.Containers.Red_Black_Trees; private with Ada.Streams; -with Ada.Containers; generic type Key_Type is private; @@ -205,13 +194,21 @@ package Ada.Containers.Formal_Ordered_Maps is procedure (Container : Map; Position : Cursor)); function Strict_Equal (Left, Right : Map) return Boolean; + -- Strict_Equal returns True if the containers are physically equal, i.e. + -- they are structurally equal (function "=" returns True) and that they + -- have the same set of cursors. - function Left (Container : Map; Position : Cursor) return Map; - + function Left (Container : Map; Position : Cursor) return Map; function Right (Container : Map; Position : Cursor) return Map; + -- Left returns a container containing all elements preceding Position + -- (excluded) in Container. Right returns a container containing all + -- elements following Position (included) in Container. These two new + -- functions can be used to express invariant properties in loops which + -- iterate over containers. Left returns the part of the container already + -- scanned and Right the part not scanned yet. function Overlap (Left, Right : Map) return Boolean; - + -- Overlap returns True if the containers have common keys private pragma Inline (Next); diff --git a/gcc/ada/a-cforse.ads b/gcc/ada/a-cforse.ads index c15f9c64333..b942ba49e92 100644 --- a/gcc/ada/a-cforse.ads +++ b/gcc/ada/a-cforse.ads @@ -50,22 +50,11 @@ -- function Left (Container : Set; Position : Cursor) return Set; -- function Right (Container : Set; Position : Cursor) return Set; --- Strict_Equal returns True if the containers are physically equal, --- meaning that they are structurally equal (function "=" returns True) --- and that they have the same set of cursors. - --- Left returns a container containing all elements preceding Position --- (excluded) in Container. Right returns a container containing all --- elements following Position (included) in Container. These two new --- functions are useful to express invariant properties in loops which --- iterate over containers. Left returns the part of the container already --- scanned and Right the part not scanned yet. +-- See detailed specifications for these subprograms private with Ada.Containers.Red_Black_Trees; private with Ada.Streams; -with Ada.Containers; - generic type Element_Type is private; @@ -256,10 +245,18 @@ package Ada.Containers.Formal_Ordered_Sets is end Generic_Keys; function Strict_Equal (Left, Right : Set) return Boolean; + -- Strict_Equal returns True if the containers are physically equal, i.e. + -- they are structurally equal (function "=" returns True) and that they + -- have the same set of cursors. - function Left (Container : Set; Position : Cursor) return Set; - + function Left (Container : Set; Position : Cursor) return Set; function Right (Container : Set; Position : Cursor) return Set; + -- Left returns a container containing all elements preceding Position + -- (excluded) in Container. Right returns a container containing all + -- elements following Position (included) in Container. These two new + -- functions can be used to express invariant properties in loops which + -- iterate over containers. Left returns the part of the container already + -- scanned and Right the part not scanned yet. private -- 2.30.2