diff options
author | Piotr Trojanek <trojanek@adacore.com> | 2020-10-14 23:30:49 +0200 |
---|---|---|
committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-11-25 08:22:36 -0500 |
commit | ad26cae122e1ffd7f1c34fd531d4329b8f4048da (patch) | |
tree | 89666d9c1b4a5362eb518907db82b506310c4be6 /gcc/ada/einfo.adb | |
parent | 49c4dd7a229ce424379402deb295bf25d4c544e2 (diff) | |
download | gcc-ad26cae122e1ffd7f1c34fd531d4329b8f4048da.zip gcc-ad26cae122e1ffd7f1c34fd531d4329b8f4048da.tar.gz gcc-ad26cae122e1ffd7f1c34fd531d4329b8f4048da.tar.bz2 |
[Ada] Simplify Ekind tests with wrappers and membership tests
gcc/ada/
* einfo.adb: Use composite wrappers (e.g.
Is_Subprogram_Or_Entry) and membership tests where it appears to
improve clarity.
Diffstat (limited to 'gcc/ada/einfo.adb')
-rw-r--r-- | gcc/ada/einfo.adb | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb index c9b69b9..9e5b0ee 100644 --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -3040,7 +3040,7 @@ package body Einfo is function Overridden_Operation (Id : E) return E is begin - pragma Assert (Is_Subprogram (Id) or else Is_Generic_Subprogram (Id)); + pragma Assert (Is_Subprogram_Or_Generic_Subprogram (Id)); return Node26 (Id); end Overridden_Operation; @@ -3133,7 +3133,7 @@ package body Einfo is function Protected_Body_Subprogram (Id : E) return E is begin - pragma Assert (Is_Subprogram (Id) or else Is_Entry (Id)); + pragma Assert (Is_Subprogram_Or_Entry (Id)); return Node11 (Id); end Protected_Body_Subprogram; @@ -4915,7 +4915,7 @@ package body Einfo is procedure Set_Has_Out_Or_In_Out_Parameter (Id : E; V : B := True) is begin pragma Assert - (Ekind (Id) in E_Entry | E_Entry_Family + (Is_Entry (Id) or else Is_Subprogram_Or_Generic_Subprogram (Id)); Set_Flag110 (Id, V); end Set_Has_Out_Or_In_Out_Parameter; @@ -6202,7 +6202,7 @@ package body Einfo is procedure Set_No_Return (Id : E; V : B := True) is begin - pragma Assert (Is_Subprogram (Id) or else Is_Generic_Subprogram (Id)); + pragma Assert (Is_Subprogram_Or_Generic_Subprogram (Id)); Set_Flag113 (Id, V); end Set_No_Return; @@ -6309,7 +6309,7 @@ package body Einfo is procedure Set_Overridden_Operation (Id : E; V : E) is begin - pragma Assert (Is_Subprogram (Id) or else Is_Generic_Subprogram (Id)); + pragma Assert (Is_Subprogram_Or_Generic_Subprogram (Id)); Set_Node26 (Id, V); end Set_Overridden_Operation; @@ -6407,7 +6407,7 @@ package body Einfo is procedure Set_Protected_Body_Subprogram (Id : E; V : E) is begin - pragma Assert (Is_Subprogram (Id) or else Is_Entry (Id)); + pragma Assert (Is_Subprogram_Or_Entry (Id)); Set_Node11 (Id, V); end Set_Protected_Body_Subprogram; @@ -8154,9 +8154,7 @@ package body Einfo is begin -- Identifiers, operator symbols, expanded names are entity names - return Kind = N_Identifier - or else Kind = N_Operator_Symbol - or else Kind = N_Expanded_Name + return Kind in N_Identifier | N_Operator_Symbol | N_Expanded_Name -- Attribute references are entity names if they refer to an entity. -- Note that we don't do this by testing for the presence of the @@ -8175,10 +8173,9 @@ package body Einfo is begin return Ekind (Id) in E_Constant | E_Package | E_Variable - or else Is_Entry (Id) - or else Is_Generic_Unit (Id) - or else Is_Subprogram (Id) - or else Is_Task_Type (Id); + or else Is_Generic_Unit (Id) + or else Is_Subprogram_Or_Entry (Id) + or else Is_Task_Type (Id); end Is_Elaboration_Target; ----------------------- |