diff options
Diffstat (limited to 'gcc/ada/binde.adb')
| -rw-r--r-- | gcc/ada/binde.adb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gcc/ada/binde.adb b/gcc/ada/binde.adb index bbc990dc892..3a85ae85e11 100644 --- a/gcc/ada/binde.adb +++ b/gcc/ada/binde.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2009, 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- -- @@ -325,14 +325,14 @@ package body Binde is -- Prefer a waiting body to any other case - if Is_Waiting_Body (U1) and not Is_Waiting_Body (U2) then + if Is_Waiting_Body (U1) and then not Is_Waiting_Body (U2) then if Debug_Flag_B then Write_Line (" True: u1 is waiting body, u2 is not"); end if; return True; - elsif Is_Waiting_Body (U2) and not Is_Waiting_Body (U1) then + elsif Is_Waiting_Body (U2) and then not Is_Waiting_Body (U1) then if Debug_Flag_B then Write_Line (" False: u2 is waiting body, u1 is not"); end if; @@ -341,14 +341,14 @@ package body Binde is -- Prefer a predefined unit to a non-predefined unit - elsif UT1.Predefined and not UT2.Predefined then + elsif UT1.Predefined and then not UT2.Predefined then if Debug_Flag_B then Write_Line (" True: u1 is predefined, u2 is not"); end if; return True; - elsif UT2.Predefined and not UT1.Predefined then + elsif UT2.Predefined and then not UT1.Predefined then if Debug_Flag_B then Write_Line (" False: u2 is predefined, u1 is not"); end if; @@ -357,13 +357,13 @@ package body Binde is -- Prefer an internal unit to a non-internal unit - elsif UT1.Internal and not UT2.Internal then + elsif UT1.Internal and then not UT2.Internal then if Debug_Flag_B then Write_Line (" True: u1 is internal, u2 is not"); end if; return True; - elsif UT2.Internal and not UT1.Internal then + elsif UT2.Internal and then not UT1.Internal then if Debug_Flag_B then Write_Line (" False: u2 is internal, u1 is not"); end if; @@ -372,14 +372,14 @@ package body Binde is -- Prefer a body to a spec - elsif Is_Body_Unit (U1) and not Is_Body_Unit (U2) then + elsif Is_Body_Unit (U1) and then not Is_Body_Unit (U2) then if Debug_Flag_B then Write_Line (" True: u1 is body, u2 is not"); end if; return True; - elsif Is_Body_Unit (U2) and not Is_Body_Unit (U1) then + elsif Is_Body_Unit (U2) and then not Is_Body_Unit (U1) then if Debug_Flag_B then Write_Line (" False: u2 is body, u1 is not"); end if; @@ -1379,18 +1379,18 @@ package body Binde is -- Prefer anything else to a waiting body (!) - elsif Is_Waiting_Body (U1) and not Is_Waiting_Body (U2) then + elsif Is_Waiting_Body (U1) and then not Is_Waiting_Body (U2) then return False; - elsif Is_Waiting_Body (U2) and not Is_Waiting_Body (U1) then + elsif Is_Waiting_Body (U2) and then not Is_Waiting_Body (U1) then return True; -- Prefer a spec to a body (!) - elsif Is_Body_Unit (U1) and not Is_Body_Unit (U2) then + elsif Is_Body_Unit (U1) and then not Is_Body_Unit (U2) then return False; - elsif Is_Body_Unit (U2) and not Is_Body_Unit (U1) then + elsif Is_Body_Unit (U2) and then not Is_Body_Unit (U1) then return True; -- If both are waiting bodies, then prefer the one whose spec is |