diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:13:22 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:13:22 +0000 |
commit | d9e74e050bd1ae08f4be72f63784a42c0973a94a (patch) | |
tree | 1a5cb845f084a8360d6f2bc2dd674427a1a51b02 /gcc/ada/a-cohase.adb | |
parent | ad67c992e9102a7a00351747f46956e56b6f0c3f (diff) | |
download | gcc-d9e74e050bd1ae08f4be72f63784a42c0973a94a.tar.gz |
2006-10-31 Matt Heaney <heaney@adacore.com>
* a-crbtgo.ads: Commented each subprogram
* a-crbtgo.adb: Added reference to book from which algorithms were
adapted.
* a-crbtgk.ads, a-crbtgk.adb (Generic_Insert_Post): pass flag to
indicate which child.
(Generic_Conditional_Insert): changed parameter name from "Success" to
"Inserted".
(Generic_Unconditional_Insert_With_Hint): improved algorithm
* a-coorse.adb (Replace_Element): changed parameter name in call to
conditional insert operation.
* a-convec.adb, a-coinve.adb (Insert): removed obsolete comment
* a-cohama.adb (Iterate): manipulate busy-bit here, instead of in
Generic_Iteration
* a-ciorse.adb (Replace_Element): changed parameter name in call to
conditional insert operation.
* a-cihama.adb (Iterate): manipulate busy-bit here, instead of in
Generic_Iteration.
* a-cidlli.ads, a-cidlli.adb (Splice): Position param is now mode in
instead of mode inout.
* a-chtgop.adb (Adjust): modified comments to reflect current AI-302
draft
(Generic_Read): preserve existing buckets array if possible
(Generic_Write): don't send buckets array length anymore
* a-cdlili.ads, a-cdlili.adb (Splice): Position param is now mode in
instead of mode inout.
* a-cihase.adb (Difference): iterate over smaller of Tgt and Src sets
(Iterate): manipulate busy-bit here, instead of in Generic_Iteration
* a-cohase.adb (Difference): iterate over smaller of Tgt and Src sets
(Iterate): manipulate busy-bit here, instead of in Generic_Iteration
(Replace_Element): local operation is now an instantiation
* a-chtgke.ads, a-chtgke.adb (Generic_Conditional_Insert): manually
check current length.
(Generic_Replace_Element): new operation
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118324 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-cohase.adb')
-rw-r--r-- | gcc/ada/a-cohase.adb | 207 |
1 files changed, 62 insertions, 145 deletions
diff --git a/gcc/ada/a-cohase.adb b/gcc/ada/a-cohase.adb index a54683e36ff..0f0552a941d 100644 --- a/gcc/ada/a-cohase.adb +++ b/gcc/ada/a-cohase.adb @@ -6,11 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2004-2005, Free Software Foundation, Inc. -- --- -- --- This specification is derived from the Ada Reference Manual for use with -- --- GNAT. The copyright notice above, and the license provisions that follow -- --- apply solely to the contents of the part following the private keyword. -- +-- Copyright (C) 2004-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -51,6 +47,9 @@ package body Ada.Containers.Hashed_Sets is -- Local Subprograms -- ----------------------- + procedure Assign (Node : Node_Access; Item : Element_Type); + pragma Inline (Assign); + function Copy_Node (Source : Node_Access) return Node_Access; pragma Inline (Copy_Node); @@ -90,11 +89,6 @@ package body Ada.Containers.Hashed_Sets is return Node_Access; pragma Inline (Read_Node); - procedure Replace_Element - (HT : in out Hash_Table_Type; - Node : Node_Access; - New_Item : Element_Type); - procedure Set_Next (Node : Node_Access; Next : Node_Access); pragma Inline (Set_Next); @@ -136,6 +130,9 @@ package body Ada.Containers.Hashed_Sets is procedure Read_Nodes is new HT_Ops.Generic_Read (Read_Node); + procedure Replace_Element is + new Element_Keys.Generic_Replace_Element (Hash_Node, Assign); + procedure Write_Nodes is new HT_Ops.Generic_Write (Write_Node); @@ -157,6 +154,15 @@ package body Ada.Containers.Hashed_Sets is HT_Ops.Adjust (Container.HT); end Adjust; + ------------ + -- Assign -- + ------------ + + procedure Assign (Node : Node_Access; Item : Element_Type) is + begin + Node.Element := Item; + end Assign; + -------------- -- Capacity -- -------------- @@ -264,24 +270,41 @@ package body Ada.Containers.Hashed_Sets is "attempt to tamper with elements (set is busy)"; end if; - -- TODO: This can be written in terms of a loop instead as - -- active-iterator style, sort of like a passive iterator. + if Source.HT.Length < Target.HT.Length then + declare + Src_Node : Node_Access; - Tgt_Node := HT_Ops.First (Target.HT); - while Tgt_Node /= null loop - if Is_In (Source.HT, Tgt_Node) then - declare - X : Node_Access := Tgt_Node; - begin - Tgt_Node := HT_Ops.Next (Target.HT, Tgt_Node); - HT_Ops.Delete_Node_Sans_Free (Target.HT, X); - Free (X); - end; + begin + Src_Node := HT_Ops.First (Source.HT); + while Src_Node /= null loop + Tgt_Node := Element_Keys.Find (Target.HT, Src_Node.Element); - else - Tgt_Node := HT_Ops.Next (Target.HT, Tgt_Node); - end if; - end loop; + if Tgt_Node /= null then + HT_Ops.Delete_Node_Sans_Free (Target.HT, Tgt_Node); + Free (Tgt_Node); + end if; + + Src_Node := HT_Ops.Next (Source.HT, Src_Node); + end loop; + end; + + else + Tgt_Node := HT_Ops.First (Target.HT); + while Tgt_Node /= null loop + if Is_In (Source.HT, Tgt_Node) then + declare + X : Node_Access := Tgt_Node; + begin + Tgt_Node := HT_Ops.Next (Target.HT, Tgt_Node); + HT_Ops.Delete_Node_Sans_Free (Target.HT, X); + Free (X); + end; + + else + Tgt_Node := HT_Ops.Next (Target.HT, Tgt_Node); + end if; + end loop; + end if; end Difference; function Difference (Left, Right : Set) return Set is @@ -685,7 +708,7 @@ package body Ada.Containers.Hashed_Sets is return; end if; - if Source.Length = 0 then + if Source.HT.Length = 0 then Clear (Target); return; end if; @@ -695,15 +718,6 @@ package body Ada.Containers.Hashed_Sets is "attempt to tamper with elements (set is busy)"; end if; - -- TODO: optimize this to use an explicit - -- loop instead of an active iterator - -- (similar to how a passive iterator is - -- implemented). - -- - -- Another possibility is to test which - -- set is smaller, and iterate over the - -- smaller set. - Tgt_Node := HT_Ops.First (Target.HT); while Tgt_Node /= null loop if Is_In (Source.HT, Tgt_Node) then @@ -818,9 +832,6 @@ package body Ada.Containers.Hashed_Sets is return False; end if; - -- TODO: rewrite this to loop in the - -- style of a passive iterator. - Subset_Node := HT_Ops.First (Subset.HT); while Subset_Node /= null loop if not Is_In (Of_Set.HT, Subset_Node) then @@ -855,13 +866,22 @@ package body Ada.Containers.Hashed_Sets is Process (Cursor'(Container'Unrestricted_Access, Node)); end Process_Node; + B : Natural renames Container'Unrestricted_Access.HT.Busy; + -- Start of processing for Iterate begin - -- TODO: resolve whether HT_Ops.Generic_Iteration should - -- manipulate busy bit. + B := B + 1; + + begin + Iterate (Container.HT); + exception + when others => + B := B - 1; + raise; + end; - Iterate (Container.HT); + B := B - 1; end Iterate; ------------ @@ -1047,109 +1067,6 @@ package body Ada.Containers.Hashed_Sets is Node.Element := New_Item; end Replace; - --------------------- - -- Replace_Element -- - --------------------- - - procedure Replace_Element - (HT : in out Hash_Table_Type; - Node : Node_Access; - New_Item : Element_Type) - is - begin - if Equivalent_Elements (Node.Element, New_Item) then - pragma Assert (Hash (Node.Element) = Hash (New_Item)); - - if HT.Lock > 0 then - raise Program_Error with - "attempt to tamper with cursors (set is locked)"; - end if; - - Node.Element := New_Item; -- Note that this assignment can fail - return; - end if; - - if HT.Busy > 0 then - raise Program_Error with - "attempt to tamper with elements (set is busy)"; - end if; - - HT_Ops.Delete_Node_Sans_Free (HT, Node); - - Insert_New_Element : declare - function New_Node (Next : Node_Access) return Node_Access; - pragma Inline (New_Node); - - procedure Local_Insert is - new Element_Keys.Generic_Conditional_Insert (New_Node); - - -------------- - -- New_Node -- - -------------- - - function New_Node (Next : Node_Access) return Node_Access is - begin - Node.Element := New_Item; -- Note that this assignment can fail - Node.Next := Next; - return Node; - end New_Node; - - Result : Node_Access; - Inserted : Boolean; - - -- Start of processing for Insert_New_Element - - begin - Local_Insert - (HT => HT, - Key => New_Item, - Node => Result, - Inserted => Inserted); - - if Inserted then - return; - end if; - exception - when others => - null; -- Assignment must have failed - end Insert_New_Element; - - Reinsert_Old_Element : declare - function New_Node (Next : Node_Access) return Node_Access; - pragma Inline (New_Node); - - procedure Local_Insert is - new Element_Keys.Generic_Conditional_Insert (New_Node); - - -------------- - -- New_Node -- - -------------- - - function New_Node (Next : Node_Access) return Node_Access is - begin - Node.Next := Next; - return Node; - end New_Node; - - Result : Node_Access; - Inserted : Boolean; - - -- Start of processing for Reinsert_Old_Element - - begin - Local_Insert - (HT => HT, - Key => Node.Element, - Node => Result, - Inserted => Inserted); - exception - when others => - null; - end Reinsert_Old_Element; - - raise Program_Error with "attempt to replace existing element"; - end Replace_Element; - procedure Replace_Element (Container : in out Set; Position : Cursor; |