procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a-crbtgk.adb, [...]: Minor code reorganization (use conditional expressions)

Browse source 
2009-08-17  Robert Dewar  <dewar@adacore.com>

	* a-crbtgk.adb, a-crdlli.adb, a-direct.adb:
	Minor code reorganization (use conditional expressions)

From-SVN: r150837
This commit is contained in:
Robert Dewar 2009-08-17 10:30:39 +00:00 • committed by Arnaud Charlet
parent 1257ae4a47
commit 5f2d216d27
4 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ada/ChangeLog
View file

@ -1,8 +1,9 @@
2009-08-17 Robert Dewar <dewar@adacore.com>
* a-caldel-vms.adb, a-calend-vms.adb, a-calfor.adb, a-cdlili.adb,
a-chahan.adb, a-cidlli.adb, a-coinve.adb, a-comlin.adb: Minor code
reorganization (use conditional expressions).
* a-crbtgk.adb, a-crdlli.adb, a-direct.adb, a-caldel-vms.adb,
a-calend-vms.adb, a-calfor.adb, a-cdlili.adb, a-chahan.adb,
a-cidlli.adb, a-coinve.adb, a-comlin.adb: Minor code reorganization
(use conditional expressions).
2009-08-17 Robert Dewar <dewar@adacore.com>

14
gcc/ada/a-crbtgk.adb
View file

@ -125,12 +125,7 @@ package body Ada.Containers.Red_Black_Trees.Generic_Keys is
while X /= null loop
Y := X;
Inserted := Is_Less_Key_Node (Key, X);
if Inserted then
X := Ops.Left (X);
else
X := Ops.Right (X);
end if;
X := (if Inserted then Ops.Left (X) else Ops.Right (X));
end loop;
-- If Inserted is True, then this means either that Tree is
@ -440,12 +435,7 @@ package body Ada.Containers.Red_Black_Trees.Generic_Keys is
while X /= null loop
Y := X;
Before := Is_Less_Key_Node (Key, X);
if Before then
X := Ops.Left (X);
else
X := Ops.Right (X);
end if;
X := (if Before then Ops.Left (X) else Ops.Right (X));
end loop;
Insert_Post (Tree, Y, Before, Node);

10
gcc/ada/a-crdlli.adb
View file

@ -561,15 +561,9 @@ package body Ada.Containers.Restricted_Doubly_Linked_Lists is
----------
procedure Sort (Front, Back : Count_Type) is
Pivot : Count_Type;
Pivot : constant Count_Type :=
(if Front = 0 then Container.First else N (Front).Next);
begin
if Front = 0 then
Pivot := Container.First;
else
Pivot := N (Front).Next;
end if;
if Pivot /= Back then
Partition (Pivot, Back);
Sort (Front, Pivot);

9
gcc/ada/a-direct.adb
View file

@ -1065,14 +1065,9 @@ package body Ada.Directories is
Cut_End : Natural;
begin
-- Cut_Start point to the first simple name character
-- Cut_Start pointS to the first simple name character
if Cut_Start = 0 then
Cut_Start := Path'First;
else
Cut_Start := Cut_Start + 1;
end if;
Cut_Start := (if Cut_Start = 0 then Path'First else Cut_Start + 1);
-- Cut_End point to the last simple name character