1 files changed, 12 insertions, 22 deletions

diff --git a/gcc/ada/par-util.adb b/gcc/ada/par-util.adb
index 3f1247a..0387418 100644
--- a/gcc/ada/par-util.adb
+++ b/gcc/ada/par-util.adb
@@ -336,7 +336,7 @@ package body Util is
             --  probably the semicolon did end the list. Indeed that is
             --  certainly the only single error correction possible here.
 
-            if Token = Tok_Semicolon or else Token = Tok_EOF then
+            if Token in Tok_Semicolon | Tok_EOF then
                Restore_Scan_State (Scan_State);
                return False;
 
@@ -521,44 +521,34 @@ package body Util is
                         raise Program_Error;
 
                      when C_Comma_Right_Paren =>
-                        OK_Next_Tok :=
-                          Token = Tok_Comma or else Token = Tok_Right_Paren;
+                        OK_Next_Tok := Token in Tok_Comma | Tok_Right_Paren;
 
                      when C_Comma_Colon =>
-                        OK_Next_Tok :=
-                          Token = Tok_Comma or else Token = Tok_Colon;
+                        OK_Next_Tok := Token in Tok_Comma | Tok_Colon;
 
                      when C_Do =>
-                        OK_Next_Tok :=
-                          Token = Tok_Do;
+                        OK_Next_Tok := Token = Tok_Do;
 
                      when C_Dot =>
-                        OK_Next_Tok :=
-                          Token = Tok_Dot;
+                        OK_Next_Tok := Token = Tok_Dot;
 
                      when C_Greater_Greater =>
-                        OK_Next_Tok :=
-                          Token = Tok_Greater_Greater;
+                        OK_Next_Tok := Token = Tok_Greater_Greater;
 
                      when C_In =>
-                        OK_Next_Tok :=
-                          Token = Tok_In;
+                        OK_Next_Tok := Token = Tok_In;
 
                      when C_Is =>
-                        OK_Next_Tok :=
-                          Token = Tok_Is;
+                        OK_Next_Tok := Token = Tok_Is;
 
                      when C_Left_Paren_Semicolon =>
-                        OK_Next_Tok :=
-                          Token = Tok_Left_Paren or else Token = Tok_Semicolon;
+                        OK_Next_Tok := Token in Tok_Left_Paren | Tok_Semicolon;
 
                      when C_Use =>
-                        OK_Next_Tok :=
-                          Token = Tok_Use;
+                        OK_Next_Tok := Token = Tok_Use;
 
                      when C_Vertical_Bar_Arrow =>
-                        OK_Next_Tok :=
-                          Token = Tok_Vertical_Bar or else Token = Tok_Arrow;
+                        OK_Next_Tok := Token in Tok_Vertical_Bar | Tok_Arrow;
                   end case;
 
                   Restore_Scan_State (Scan_State);
@@ -802,7 +792,7 @@ package body Util is
 
    function Token_Is_At_Start_Of_Line return Boolean is
    begin
-      return (Token_Ptr = First_Non_Blank_Location or else Token = Tok_EOF);
+      return Token_Ptr = First_Non_Blank_Location or else Token = Tok_EOF;
    end Token_Is_At_Start_Of_Line;
 
    -----------------------------------