From patchwork Tue Jan 11 13:32:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 49844 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6DBCE38A9403 for ; Tue, 11 Jan 2022 13:45:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6DBCE38A9403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641908719; bh=HgnXh3D0cpkNZDCOsZSUNUCN7VamNfl+VA2VNmH+xb8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pAHI8oqN071hUGQIfkqHU+qWYzJz8Z/YxwuHHQ/qjVY4DNZnEjTx2du6ikh37jVJV ACa2Np4sSkEwXbOaMSYeA3Db3tt5mIM8aEISdTzZve+/hhSiffR0JDZfB6o5CbasXY mwl5VPhC7UOZsV/iiWlfe2L7B46nPQpZwQPOEKNQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 84A1B38AAC1B for ; Tue, 11 Jan 2022 13:32:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 84A1B38AAC1B Received: by mail-wr1-x42b.google.com with SMTP id s1so33008779wra.6 for ; Tue, 11 Jan 2022 05:32:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=HgnXh3D0cpkNZDCOsZSUNUCN7VamNfl+VA2VNmH+xb8=; b=Z0GdfDet84eOHp2vZuvPJvKZU+QSkskgyU+xiIoupuodU/S/dMVXiy6S79P2SFNDIV bWj88bWvyyQo1Zum12IWnaBHYplPuKyPOEuUdt7UlQjNYn+7uGehfEgPB497Ne2ewXey 2p3xBij+fW/h/rOVRoL7VtfwwvzLrN9hUYWN/0t9d/dZnFB+iMaRT1itTa/W4vaAson/ djuOoWPzEUYmmIS/HkUBNQxpxSOuG4WnPM1m0xlq2DoBUbGFTORRqB86xStINkaq4/aG 1oTAZqt1qRVcIOr/+nnGhowZJjn5IhsenyEc9Nz4dhmipVd9huKh5tYuB1X3LHvZdTbu c5wA== X-Gm-Message-State: AOAM530e8Dt4cL9pOvLSBvgRPk3iCFYtOom0dTCmBeX1zRDo/YZHYhCe b79YXy5OT6J07xiiqGc1IEu0GWxjpQaquQ== X-Google-Smtp-Source: ABdhPJwNIWZOB/Vv2xVig7p7dCsKeSdimTVnHQGwyGRTbq9eKxnxSBh4zV9VBAndwDYLXXNc7vx+gg== X-Received: by 2002:adf:f945:: with SMTP id q5mr3939218wrr.115.1641907923565; Tue, 11 Jan 2022 05:32:03 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id bh26sm2388973wmb.3.2022.01.11.05.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 05:32:02 -0800 (PST) Date: Tue, 11 Jan 2022 13:32:01 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Code cleanups Message-ID: <20220111133201.GA748544@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Use membership tests when possible Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch9.adb, gen_il-types.ads, make.adb, par-ch12.adb, sem_ch13.adb: Use membership tests. diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb --- 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 --- 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 --- 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 --- 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 --- 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);