From patchwork Wed Sep 18 08:39:44 2019 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: 1163831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509169-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="lMCFKgS4"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46YD2D2Bdnz9s4Y for ; Wed, 18 Sep 2019 18:40:20 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=kQjUGr0caF+k6PgI+ZzbSB1RRZBUp5MJgLJ/D6exTbnF6uloSN Y+9IRM5BbxGJuaNi2YAk0DfhZL6n/has/3PjMO4ts7VTjXJrACRrDg8O9E6CT/Ok TwdZLWgyI4JXYTHxA1NBZ47BsayDnvxILqjU9rQQBz1Z8QxT4zMBEeTHQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=uqyeqYmmNuLYWwozLkQh7coihBc=; b=lMCFKgS40BAOHYNZA+Ik iypAloDxNoYAyI8UPeA83aBcoQB9BucgNV38zuvfqXvpEg3wBH74KLWL7yCVQSug HE/XfXiU/9vQR5pEP36p1q0q5EOdxGzQ4eMS/6Xq+QEx0gPY2lMl7N/g9ETKRd5C MrsIMAbF5TK9foUPg3tQnUw= Received: (qmail 100270 invoked by alias); 18 Sep 2019 08:39:48 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 100208 invoked by uid 89); 18 Sep 2019 08:39:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:3184 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 18 Sep 2019 08:39:46 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id AEF98117C5F; Wed, 18 Sep 2019 04:39:44 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Xy9c+Ia3iS+j; Wed, 18 Sep 2019 04:39:44 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 9C068117BD9; Wed, 18 Sep 2019 04:39:44 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 981AC702; Wed, 18 Sep 2019 04:39:44 -0400 (EDT) Date: Wed, 18 Sep 2019 04:39:44 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Claire Dross Subject: [Ada] Fix style issues in functional maps Message-ID: <20190918083944.GA145003@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes Rename global constants from I to J. No functional changes. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-09-18 Claire Dross gcc/ada/ * libgnat/a-cofuma.adb (Remove, Elements_Equal_Except, Keys_Included, Keys_Included_Except): Rename loop indexes and global constants from I to J. --- gcc/ada/libgnat/a-cofuma.adb +++ gcc/ada/libgnat/a-cofuma.adb @@ -88,15 +88,15 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is New_Key : Key_Type) return Boolean is begin - for I in 1 .. Length (Left.Keys) loop + for J in 1 .. Length (Left.Keys) loop declare - K : constant Key_Type := Get (Left.Keys, I); + K : constant Key_Type := Get (Left.Keys, J); begin if not Equivalent_Keys (K, New_Key) and then (Find (Right.Keys, K) = 0 or else Get (Right.Elements, Find (Right.Keys, K)) /= - Get (Left.Elements, I)) + Get (Left.Elements, J)) then return False; end if; @@ -112,16 +112,16 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is Y : Key_Type) return Boolean is begin - for I in 1 .. Length (Left.Keys) loop + for J in 1 .. Length (Left.Keys) loop declare - K : constant Key_Type := Get (Left.Keys, I); + K : constant Key_Type := Get (Left.Keys, J); begin if not Equivalent_Keys (K, X) and then not Equivalent_Keys (K, Y) and then (Find (Right.Keys, K) = 0 or else Get (Right.Elements, Find (Right.Keys, K)) /= - Get (Left.Elements, I)) + Get (Left.Elements, J)) then return False; end if; @@ -173,9 +173,9 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is function Keys_Included (Left : Map; Right : Map) return Boolean is begin - for I in 1 .. Length (Left.Keys) loop + for J in 1 .. Length (Left.Keys) loop declare - K : constant Key_Type := Get (Left.Keys, I); + K : constant Key_Type := Get (Left.Keys, J); begin if Find (Right.Keys, K) = 0 then return False; @@ -196,9 +196,9 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is New_Key : Key_Type) return Boolean is begin - for I in 1 .. Length (Left.Keys) loop + for J in 1 .. Length (Left.Keys) loop declare - K : constant Key_Type := Get (Left.Keys, I); + K : constant Key_Type := Get (Left.Keys, J); begin if not Equivalent_Keys (K, New_Key) and then Find (Right.Keys, K) = 0 @@ -218,9 +218,9 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is Y : Key_Type) return Boolean is begin - for I in 1 .. Length (Left.Keys) loop + for J in 1 .. Length (Left.Keys) loop declare - K : constant Key_Type := Get (Left.Keys, I); + K : constant Key_Type := Get (Left.Keys, J); begin if not Equivalent_Keys (K, X) and then not Equivalent_Keys (K, Y) @@ -248,11 +248,11 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is ------------ function Remove (Container : Map; Key : Key_Type) return Map is - I : constant Extended_Index := Find (Container.Keys, Key); + J : constant Extended_Index := Find (Container.Keys, Key); begin return - (Keys => Remove (Container.Keys, I), - Elements => Remove (Container.Elements, I)); + (Keys => Remove (Container.Keys, J), + Elements => Remove (Container.Elements, J)); end Remove; ---------------