diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2022-01-03 10:12:57 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-01-11 13:24:45 +0000 |
| commit | f9cdce4a71a4ea04d9669631cfd951fbd70d5b7c (patch) | |
| tree | c37072615fe42c66dc559660dc6337f3376cbc2e /gcc | |
| parent | e306ed45b58e7210021a8a74d453ee1b2a75ed30 (diff) | |
| download | gcc-f9cdce4a71a4ea04d9669631cfd951fbd70d5b7c.zip gcc-f9cdce4a71a4ea04d9669631cfd951fbd70d5b7c.tar.gz gcc-f9cdce4a71a4ea04d9669631cfd951fbd70d5b7c.tar.bz2 | |
[Ada] Code cleanups
gcc/ada/
* exp_ch9.adb, gen_il-types.ads, make.adb, par-ch12.adb,
sem_ch13.adb: Use membership tests.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch9.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/gen_il-types.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/make.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/par-ch12.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 5 |
5 files changed, 6 insertions, 8 deletions
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index 63f8b7c..81f4d7c 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -4394,7 +4394,7 @@ package body Exp_Ch9 is -- It would be better to encapsulate this as a routine in Exp_Dbug ??? if Append_Char /= ' ' then - if Append_Char = 'P' or Append_Char = 'N' then + if Append_Char in 'P' | 'N' then Add_Char_To_Name_Buffer (Append_Char); return Name_Find; else diff --git a/gcc/ada/gen_il-types.ads b/gcc/ada/gen_il-types.ads index 6347137..ca85ecf 100644 --- a/gcc/ada/gen_il-types.ads +++ b/gcc/ada/gen_il-types.ads @@ -577,8 +577,7 @@ package Gen_IL.Types is | N_Defining_Operator_Symbol; subtype Opt_Abstract_Type is Opt_Type_Enum with - Predicate => Opt_Abstract_Type = No_Type or - Opt_Abstract_Type in Abstract_Type; + Predicate => Opt_Abstract_Type in No_Type | Abstract_Type; subtype Type_Boundaries is Type_Enum with Predicate => Type_Boundaries in diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 2d4e051..bbabd76 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -3765,7 +3765,7 @@ package body Make is declare Arg : constant String := Argument (J); begin - if Arg = "-cargs" or Arg = "-bargs" or Arg = "-largs" then + if Arg in "-cargs" | "-bargs" | "-largs" then In_Gnatmake_Switches := False; elsif Arg = "-margs" then diff --git a/gcc/ada/par-ch12.adb b/gcc/ada/par-ch12.adb index dc34aa0..991e93f 100644 --- a/gcc/ada/par-ch12.adb +++ b/gcc/ada/par-ch12.adb @@ -184,7 +184,7 @@ package body Ch12 is if Token = Tok_Package then Append (P_Formal_Package_Declaration, Decls); - elsif Token = Tok_Procedure or Token = Tok_Function then + elsif Token in Tok_Procedure | Tok_Function then Append (P_Formal_Subprogram_Declaration, Decls); else diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 02dd87c..1577b9b 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -17125,9 +17125,8 @@ package body Sem_Ch13 is procedure Validate_Literal_Aspect (Typ : Entity_Id; ASN : Node_Id) is A_Id : constant Aspect_Id := Get_Aspect_Id (ASN); - pragma Assert ((A_Id = Aspect_Integer_Literal) or - (A_Id = Aspect_Real_Literal) or - (A_Id = Aspect_String_Literal)); + pragma Assert (A_Id in Aspect_Integer_Literal | + Aspect_Real_Literal | Aspect_String_Literal); Func_Name : constant Node_Id := Expression (ASN); Overloaded : Boolean := Is_Overloaded (Func_Name); |