diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/a-crbtgk.adb | 14 | ||||
| -rw-r--r-- | gcc/ada/a-crdlli.adb | 10 | ||||
| -rw-r--r-- | gcc/ada/a-direct.adb | 9 |
4 files changed, 10 insertions, 30 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2107917f803..d77bb1afbf4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -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> diff --git a/gcc/ada/a-crbtgk.adb b/gcc/ada/a-crbtgk.adb index c06f31e1d07..59d25be4557 100644 --- a/gcc/ada/a-crbtgk.adb +++ b/gcc/ada/a-crbtgk.adb @@ -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); diff --git a/gcc/ada/a-crdlli.adb b/gcc/ada/a-crdlli.adb index acdc57d1a08..137290b11e0 100644 --- a/gcc/ada/a-crdlli.adb +++ b/gcc/ada/a-crdlli.adb @@ -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); diff --git a/gcc/ada/a-direct.adb b/gcc/ada/a-direct.adb index d38745fbd8b..f0182c68e7a 100644 --- a/gcc/ada/a-direct.adb +++ b/gcc/ada/a-direct.adb @@ -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 |