diff options
Diffstat (limited to 'gcc/ada/a-coormu.adb')
-rw-r--r-- | gcc/ada/a-coormu.adb | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/gcc/ada/a-coormu.adb b/gcc/ada/a-coormu.adb index 2bfc682ef58..2cc76319747 100644 --- a/gcc/ada/a-coormu.adb +++ b/gcc/ada/a-coormu.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2004-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 2004-2012, 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- -- @@ -308,7 +308,7 @@ package body Ada.Containers.Ordered_Multisets is function Ceiling (Container : Set; Item : Element_Type) return Cursor is Node : constant Node_Access := - Element_Keys.Ceiling (Container.Tree, Item); + Element_Keys.Ceiling (Container.Tree, Item); begin if Node = null then @@ -365,11 +365,11 @@ package body Ada.Containers.Ordered_Multisets is function Copy_Node (Source : Node_Access) return Node_Access is Target : constant Node_Access := - new Node_Type'(Parent => null, - Left => null, - Right => null, - Color => Source.Color, - Element => Source.Element); + new Node_Type'(Parent => null, + Left => null, + Right => null, + Color => Source.Color, + Element => Source.Element); begin return Target; end Copy_Node; @@ -464,7 +464,7 @@ package body Ada.Containers.Ordered_Multisets is function Difference (Left, Right : Set) return Set is Tree : constant Tree_Type := - Set_Ops.Difference (Left.Tree, Right.Tree); + Set_Ops.Difference (Left.Tree, Right.Tree); begin return Set'(Controlled with Tree); end Difference; @@ -568,7 +568,7 @@ package body Ada.Containers.Ordered_Multisets is function Find (Container : Set; Item : Element_Type) return Cursor is Node : constant Node_Access := - Element_Keys.Find (Container.Tree, Item); + Element_Keys.Find (Container.Tree, Item); begin if Node = null then @@ -632,7 +632,7 @@ package body Ada.Containers.Ordered_Multisets is function Floor (Container : Set; Item : Element_Type) return Cursor is Node : constant Node_Access := - Element_Keys.Floor (Container.Tree, Item); + Element_Keys.Floor (Container.Tree, Item); begin if Node = null then @@ -697,7 +697,7 @@ package body Ada.Containers.Ordered_Multisets is function Ceiling (Container : Set; Key : Key_Type) return Cursor is Node : constant Node_Access := - Key_Keys.Ceiling (Container.Tree, Key); + Key_Keys.Ceiling (Container.Tree, Key); begin if Node = null then @@ -746,8 +746,7 @@ package body Ada.Containers.Ordered_Multisets is ------------- function Element (Container : Set; Key : Key_Type) return Element_Type is - Node : constant Node_Access := - Key_Keys.Find (Container.Tree, Key); + Node : constant Node_Access := Key_Keys.Find (Container.Tree, Key); begin if Node = null then raise Constraint_Error with "key not in set"; @@ -795,8 +794,7 @@ package body Ada.Containers.Ordered_Multisets is ---------- function Find (Container : Set; Key : Key_Type) return Cursor is - Node : constant Node_Access := - Key_Keys.Find (Container.Tree, Key); + Node : constant Node_Access := Key_Keys.Find (Container.Tree, Key); begin if Node = null then @@ -811,8 +809,7 @@ package body Ada.Containers.Ordered_Multisets is ----------- function Floor (Container : Set; Key : Key_Type) return Cursor is - Node : constant Node_Access := - Key_Keys.Floor (Container.Tree, Key); + Node : constant Node_Access := Key_Keys.Floor (Container.Tree, Key); begin if Node = null then @@ -1099,11 +1096,11 @@ package body Ada.Containers.Ordered_Multisets is function New_Node return Node_Access is Node : constant Node_Access := - new Node_Type'(Parent => null, - Left => null, - Right => null, - Color => Red_Black_Trees.Red, - Element => New_Item); + new Node_Type'(Parent => null, + Left => null, + Right => null, + Color => Red_Black_Trees.Red, + Element => New_Item); begin return Node; end New_Node; @@ -1144,11 +1141,11 @@ package body Ada.Containers.Ordered_Multisets is function New_Node return Node_Access is Node : constant Node_Access := - new Node_Type'(Parent => null, - Left => null, - Right => null, - Color => Red, - Element => Src_Node.Element); + new Node_Type'(Parent => null, + Left => null, + Right => null, + Color => Red, + Element => Src_Node.Element); begin return Node; end New_Node; @@ -1174,7 +1171,7 @@ package body Ada.Containers.Ordered_Multisets is function Intersection (Left, Right : Set) return Set is Tree : constant Tree_Type := - Set_Ops.Intersection (Left.Tree, Right.Tree); + Set_Ops.Intersection (Left.Tree, Right.Tree); begin return Set'(Controlled with Tree); end Intersection; @@ -1385,7 +1382,7 @@ package body Ada.Containers.Ordered_Multisets is -- a forward or reverse iteration. return It : constant Iterator := - (Limited_Controlled with S, Start.Node) + (Limited_Controlled with S, Start.Node) do B := B + 1; end return; @@ -1489,8 +1486,7 @@ package body Ada.Containers.Ordered_Multisets is "bad cursor in Next"); declare - Node : constant Node_Access := - Tree_Operations.Next (Position.Node); + Node : constant Node_Access := Tree_Operations.Next (Position.Node); begin if Node = null then return No_Element; @@ -1553,7 +1549,7 @@ package body Ada.Containers.Ordered_Multisets is declare Node : constant Node_Access := - Tree_Operations.Previous (Position.Node); + Tree_Operations.Previous (Position.Node); begin return (if Node = null then No_Element else Cursor'(Position.Container, Node)); @@ -1884,7 +1880,7 @@ package body Ada.Containers.Ordered_Multisets is function Symmetric_Difference (Left, Right : Set) return Set is Tree : constant Tree_Type := - Set_Ops.Symmetric_Difference (Left.Tree, Right.Tree); + Set_Ops.Symmetric_Difference (Left.Tree, Right.Tree); begin return Set'(Controlled with Tree); end Symmetric_Difference; @@ -1912,8 +1908,7 @@ package body Ada.Containers.Ordered_Multisets is end Union; function Union (Left, Right : Set) return Set is - Tree : constant Tree_Type := - Set_Ops.Union (Left.Tree, Right.Tree); + Tree : constant Tree_Type := Set_Ops.Union (Left.Tree, Right.Tree); begin return Set'(Controlled with Tree); end Union; |