From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 4844138515C9 for ; Mon, 12 Sep 2022 08:19:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4844138515C9 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x429.google.com with SMTP id e16so14067405wrx.7 for ; Mon, 12 Sep 2022 01:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date; bh=JvndTRszBc+uOfyXxHfwrOOgAVmGG/pn3gxbKPGKQTs=; b=X0E2E2sftDEdG0O6a+3qPTQVN3hpsB6DHYPJEXY4w/mUF2nVncAPNkyug4rqnIKLrf w1cAYtAIEdOmvrQipaSTXF430inRSmpm3qexSDHuBH7Ie9b54Da7mYzm4G50Fsfh1zr1 aSiNCyatiIzcypVxDVb1TSkZVeUONzntNAmNEi3xuVRGjG8nlyOpXR/Sp+WT9cvBlZc6 6bwYEUpBQMYAymXdY/Ly7qal1KUvdMtCwDZsJydlYPvteyWtINVhbw3zRItc7a25AeEC ousJvBNDx2m47MKxSPowCTCQsBQYSLfVLk+MgqspUpmxEU+AAy/IQwpySKVRQLt9eijI jAkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date; bh=JvndTRszBc+uOfyXxHfwrOOgAVmGG/pn3gxbKPGKQTs=; b=qHBpI5SwGjjM45OoW1oV+DVB5Iyi0qZiKVrYwSqBquiNa1eaWmaZrt2MpO1RNhtmzi Jst43CIBgWoxlihgiC1HktwsdrQ8Cj4CX9UKf0EewD9b295LL5sdyWMSINYRfOE69W6u U2layr3ZraQ1vEzq3S48dE1j9BYkepaKftl3yjM6z6/WdzHWB1L0GogGT4qW5Eg30e50 FdbL/PpjQIk6ObiQ3gRZ4LG7cTF7MRt8Wqahni79C5Ef1/8UkP4D0CISD7gbGyPmJeag 0NgFZtX1mhzWuylm0yeLmGdOUkTW3g9Vib6DF8uJqZCHgOfgpHgs56mWB6ntjkMtrf39 //AA== X-Gm-Message-State: ACgBeo2zXQQQBAozSa8UNwcV81Cpuq7AluYeKAKqEgJ/RzvXrorazycQ e0c6ET7xBNFeisipP90i86pNAlCz89yiGw== X-Google-Smtp-Source: AA6agR5d175LTEho9ERn7fmr9dZ/fya1/fblFKO58cfq4WCi5ZVgQgsJwQ8i69AwKFy4mtGoCTa4rw== X-Received: by 2002:a05:6000:10ca:b0:22a:3318:861f with SMTP id b10-20020a05600010ca00b0022a3318861fmr10015979wrx.284.1662970777209; Mon, 12 Sep 2022 01:19:37 -0700 (PDT) Received: from poulhies-Precision-5550 (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id x5-20020a05600c21c500b003b4727d199asm6714957wmj.15.2022.09.12.01.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 01:19:36 -0700 (PDT) Date: Mon, 12 Sep 2022 10:19:36 +0200 From: Marc =?iso-8859-1?Q?Poulhi=E8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Cleanup routine for handling SPARK_Mode kinds Message-ID: <20220912081936.GA1513041@poulhies-Precision-5550> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="KsGdsel6WgEHnImy" Content-Disposition: inline X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Code cleanup; semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_prag.adb (Get_SPARK_Mode_Type): Fix header box; replace chained IF with a CASE statement. --KsGdsel6WgEHnImy Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -31172,25 +31172,26 @@ package body Sem_Prag is end if; end Get_Base_Subprogram; - ----------------------- + ------------------------- -- Get_SPARK_Mode_Type -- - ----------------------- + ------------------------- function Get_SPARK_Mode_Type (N : Name_Id) return SPARK_Mode_Type is begin - if N = Name_Auto then - return None; - elsif N = Name_On then - return On; - elsif N = Name_Off then - return Off; + case N is + when Name_Auto => + return None; + when Name_On => + return On; + when Name_Off => + return Off; - -- Any other argument is illegal. Assume that no SPARK mode applies to - -- avoid potential cascaded errors. + -- Any other argument is illegal. Assume that no SPARK mode applies + -- to avoid potential cascaded errors. - else - return None; - end if; + when others => + return None; + end case; end Get_SPARK_Mode_Type; ------------------------------------ --KsGdsel6WgEHnImy--