diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-30 14:21:09 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-30 14:21:09 +0000 |
commit | 4c1c7f3fba4ab7518567bec67fab42be3ce50e92 (patch) | |
tree | 44e4c774ab702d0af7e2bcd8781d4f2883d3d6e0 /gcc/ada/a-cihase.adb | |
parent | 7ac8c2b1a35e66728bb39a826c61ca81b6367cad (diff) | |
download | gcc-4c1c7f3fba4ab7518567bec67fab42be3ce50e92.tar.gz |
2014-07-30 Robert Dewar <dewar@adacore.com>
* checks.adb, a-cihase.adb, a-cihase.ads, a-chtgop.adb, a-chtgop.ads,
a-except.adb, a-except-2005.adb, a-cborse.adb, a-cborse.ads,
a-exexda.adb, a-elchha.adb, exp_aggr.adb, a-cohase.adb: Minor
reformatting.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213280 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-cihase.adb')
-rw-r--r-- | gcc/ada/a-cihase.adb | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/gcc/ada/a-cihase.adb b/gcc/ada/a-cihase.adb index 44d3dc14516..7d503668702 100644 --- a/gcc/ada/a-cihase.adb +++ b/gcc/ada/a-cihase.adb @@ -2148,8 +2148,8 @@ package body Ada.Containers.Indefinite_Hashed_Sets is if Control.Container /= null then declare HT : Hash_Table_Type renames Control.Container.HT; - B : Natural renames HT.Busy; - L : Natural renames HT.Lock; + B : Natural renames HT.Busy; + L : Natural renames HT.Lock; begin B := B + 1; L := L + 1; @@ -2275,9 +2275,9 @@ package body Ada.Containers.Indefinite_Hashed_Sets is begin if Control.Container /= null then declare - HT : Hash_Table_Type renames Control.Container.HT; - B : Natural renames HT.Busy; - L : Natural renames HT.Lock; + HT : Hash_Table_Type renames Control.Container.HT; + B : Natural renames HT.Busy; + L : Natural renames HT.Lock; begin B := B - 1; L := L - 1; @@ -2285,7 +2285,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is if Hash (Key (Control.Old_Pos)) /= Control.Old_Hash then HT_Ops.Delete_Node_At_Index - (Control.Container.HT, Control.Index, Control.Old_Pos.Node); + (Control.Container.HT, Control.Index, Control.Old_Pos.Node); raise Program_Error; end if; @@ -2368,19 +2368,18 @@ package body Ada.Containers.Indefinite_Hashed_Sets is declare HT : Hash_Table_Type renames Container.HT; - B : Natural renames HT.Busy; - L : Natural renames HT.Lock; - + B : Natural renames HT.Busy; + L : Natural renames HT.Lock; begin return R : constant Reference_Type := - (Element => Position.Node.Element.all'Access, - Control => - (Controlled with - Container => Container'Access, - Index => HT_Ops.Index (HT, Position.Node), - Old_Pos => Position, - Old_Hash => Hash (Key (Position)))) - do + (Element => Position.Node.Element.all'Access, + Control => + (Controlled with + Container => Container'Access, + Index => HT_Ops.Index (HT, Position.Node), + Old_Pos => Position, + Old_Hash => Hash (Key (Position)))) + do B := B + 1; L := L + 1; end return; @@ -2391,8 +2390,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is (Container : aliased in out Set; Key : Key_Type) return Reference_Type is - Node : constant Node_Access := - Key_Keys.Find (Container.HT, Key); + Node : constant Node_Access := Key_Keys.Find (Container.HT, Key); begin if Node = null then @@ -2405,19 +2403,18 @@ package body Ada.Containers.Indefinite_Hashed_Sets is declare HT : Hash_Table_Type renames Container.HT; - B : Natural renames HT.Busy; - L : Natural renames HT.Lock; - P : constant Cursor := Find (Container, Key); - + B : Natural renames HT.Busy; + L : Natural renames HT.Lock; + P : constant Cursor := Find (Container, Key); begin return R : constant Reference_Type := - (Element => Node.Element.all'Access, - Control => - (Controlled with - Container => Container'Access, - Index => HT_Ops.Index (HT, P.Node), - Old_Pos => P, - Old_Hash => Hash (Key))) + (Element => Node.Element.all'Access, + Control => + (Controlled with + Container => Container'Access, + Index => HT_Ops.Index (HT, P.Node), + Old_Pos => P, + Old_Hash => Hash (Key))) do B := B + 1; L := L + 1; @@ -2434,8 +2431,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is Key : Key_Type; New_Item : Element_Type) is - Node : constant Node_Access := - Key_Keys.Find (Container.HT, Key); + Node : constant Node_Access := Key_Keys.Find (Container.HT, Key); begin if Node = null then |