diff options
author | Etienne Servais <servais@adacore.com> | 2021-09-30 14:27:34 +0200 |
---|---|---|
committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-10-11 13:38:11 +0000 |
commit | 939b3a2ac672ec5792601ef096049302432d4689 (patch) | |
tree | ba8ac61a82353f76b9daf1623b2c6bbd04fc89b1 | |
parent | e0926f7901431a1f145c83db284b94d75b926fe0 (diff) | |
download | gcc-939b3a2ac672ec5792601ef096049302432d4689.zip gcc-939b3a2ac672ec5792601ef096049302432d4689.tar.gz gcc-939b3a2ac672ec5792601ef096049302432d4689.tar.bz2 |
[Ada] Reorder subprogram spec and bodies in alphabetical order
gcc/ada/
* sem_ch4.adb (Analyze_Membership_Op): Reorder subprogram spec
and bodies in alphabetical order.
-rw-r--r-- | gcc/ada/sem_ch4.adb | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 543ba12..bf13fb2 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -2956,47 +2956,16 @@ package body Sem_Ch4 is I_F : Interp_Index; T_F : Entity_Id; + procedure Analyze_Set_Membership; + -- If a set of alternatives is present, analyze each and find the + -- common type to which they must all resolve. + procedure Try_One_Interp (T1 : Entity_Id); -- Routine to try one proposed interpretation. Note that the context -- of the operation plays no role in resolving the arguments, so that -- if there is more than one interpretation of the operands that is -- compatible with a membership test, the operation is ambiguous. - -------------------- - -- Try_One_Interp -- - -------------------- - - procedure Try_One_Interp (T1 : Entity_Id) is - begin - if Has_Compatible_Type (R, T1) then - if Found - and then Base_Type (T1) /= Base_Type (T_F) - then - It := Disambiguate (L, I_F, Index, Any_Type); - - if It = No_Interp then - Ambiguous_Operands (N); - Set_Etype (L, Any_Type); - return; - - else - T_F := It.Typ; - end if; - - else - Found := True; - T_F := T1; - I_F := Index; - end if; - - Set_Etype (L, T_F); - end if; - end Try_One_Interp; - - procedure Analyze_Set_Membership; - -- If a set of alternatives is present, analyze each and find the - -- common type to which they must all resolve. - ---------------------------- -- Analyze_Set_Membership -- ---------------------------- @@ -3095,6 +3064,37 @@ package body Sem_Ch4 is end if; end Analyze_Set_Membership; + -------------------- + -- Try_One_Interp -- + -------------------- + + procedure Try_One_Interp (T1 : Entity_Id) is + begin + if Has_Compatible_Type (R, T1) then + if Found + and then Base_Type (T1) /= Base_Type (T_F) + then + It := Disambiguate (L, I_F, Index, Any_Type); + + if It = No_Interp then + Ambiguous_Operands (N); + Set_Etype (L, Any_Type); + return; + + else + T_F := It.Typ; + end if; + + else + Found := True; + T_F := T1; + I_F := Index; + end if; + + Set_Etype (L, T_F); + end if; + end Try_One_Interp; + Op : Node_Id; -- Start of processing for Analyze_Membership_Op |