From patchwork Thu Dec 2 16:28:47 2021 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: 48409 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 E4913385AC1F for ; Thu, 2 Dec 2021 16:45:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4913385AC1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638463519; bh=0NM/jLImTX1hBuf/i1sVdxoVkOpYtTgwtQWJkLSgqBk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Elmpy5FhPFOdxXpx5dl39Vp+A+O/KeHoo6QOnH5Dmd9ho7bUibwG6j1DIuyHO81yu AqpzmKTHtqRJU8BUBk9jyiHLzs9YnUbHrOxqXd7dyRJvQYchRpM88SE1azft0Ou9iw BPUaY1ID02m/SlnX5MPcTByJYQyWTc8QEShbf6tY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 9CCDE3857C7C for ; Thu, 2 Dec 2021 16:28:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9CCDE3857C7C Received: by mail-wr1-x42e.google.com with SMTP id o13so60674509wrs.12 for ; Thu, 02 Dec 2021 08:28:54 -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=0NM/jLImTX1hBuf/i1sVdxoVkOpYtTgwtQWJkLSgqBk=; b=kiyyl+zwks7aHRntTsuIXAytObk6dnid9Au5EcVkIeNnvMNSEDJybgwwMorzKfXGke yVLSCJJCRw1brz7U3aNtdNSLSfRrCySc8hWvs41ozAWDg3HWCBcrjgpNAS3KP9QDrzVh 1Q0s7MJTmtUYIQi9hgeO9RbLSj0clCTKhH7lReWLP3YnqGWp3O/gbEBJ3xChcKdeJsCp OKJtpRcMDDHW51WXklzxcoLEd3hwXGUr3fYqdsNDg0iJG3yLOeTYUTuF40OxbUOUoqVD 8bwaMWuQBsL5IYuocGvN6XaXoO+we+Scr7FglvPVNJH2CD/f0GGmOAxERaDa+yUeRcbz DP4w== X-Gm-Message-State: AOAM532YXpr/jS2su5x/x4GFqTGt0R9sIAtc1mf0OudhZVoGYDQit/+k 4mf0Rb39ynbs3cZJn4sbgg9A+gz9VYFnQA== X-Google-Smtp-Source: ABdhPJyJbcFDgZbndVd77ICc1UEq2Cv56OxGlVhSgcedaB/ejdJdpaYa5Z3gixsfKzgFtBs2nu93YQ== X-Received: by 2002:adf:fa81:: with SMTP id h1mr15248242wrr.27.1638462529033; Thu, 02 Dec 2021 08:28:49 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id g13sm115925wmk.37.2021.12.02.08.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 08:28:48 -0800 (PST) Date: Thu, 2 Dec 2021 16:28:47 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Remove extra space after assignment symbol Message-ID: <20211202162847.GA2158389@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.1 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 Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Fix style issues in GNAT after spotting a similar problem in one of the tests for GNATprove. These are easy to find with grep, but still require a manual inspection, because we want to preserve layout in declaration lists like: A := 1; B := 10; C := 100; Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_aggr.adb, exp_ch6.adb, par-ch4.adb, sem_ch13.adb: Remove extra space after ":=" symbol. * gen_il-gen.adb: Likewise; add missing headerbox. diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -7546,11 +7546,11 @@ package body Exp_Aggr is Parameter_Associations => Params)); end if; - Loop_Stat := Make_Implicit_Loop_Statement - (Node => N, - Identifier => Empty, - Iteration_Scheme => L_Iteration_Scheme, - Statements => Stats); + Loop_Stat := Make_Implicit_Loop_Statement + (Node => N, + Identifier => Empty, + Iteration_Scheme => L_Iteration_Scheme, + Statements => Stats); Append (Loop_Stat, Aggr_Code); end Expand_Iterated_Component; @@ -7825,7 +7825,7 @@ package body Exp_Aggr is -- required size for the aggregwte : call the provided -- constructor rather than the Empty aggregate. - Index := Make_Op_Add (Loc, + Index := Make_Op_Add (Loc, Left_Opnd => New_Copy_Tree (Type_Low_Bound (Index_Type)), Right_Opnd => Make_Integer_Literal (Loc, Siz - 1)); diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -10206,7 +10206,7 @@ package body Exp_Ch6 is -- If function is inherited, a conversion may be necessary. if Nkind (Par) = N_Assignment_Statement then - Last_Actual := Name (Par); + Last_Actual := Name (Par); if not Comes_From_Source (Orig_Func) and then Etype (Orig_Func) /= Etype (Func_Id) diff --git a/gcc/ada/gen_il-gen.adb b/gcc/ada/gen_il-gen.adb --- a/gcc/ada/gen_il-gen.adb +++ b/gcc/ada/gen_il-gen.adb @@ -2135,9 +2135,13 @@ package body Gen_IL.Gen is procedure One_Comp (F : Field_Enum); + -------------- + -- One_Comp -- + -------------- + procedure One_Comp (F : Field_Enum) is pragma Annotate (Codepeer, Modified, Field_Table); - Offset : constant Field_Offset := Field_Table (F).Offset; + Offset : constant Field_Offset := Field_Table (F).Offset; begin if First_Time then First_Time := False; diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb --- a/gcc/ada/par-ch4.adb +++ b/gcc/ada/par-ch4.adb @@ -3482,7 +3482,7 @@ package body Ch4 is New_Node (N_Loop_Parameter_Specification, Prev_Token_Ptr); Set_Defining_Identifier (Loop_Spec, Id); - Choice := First (Discrete_Choices (Assoc_Node)); + Choice := First (Discrete_Choices (Assoc_Node)); Assoc_Node := New_Node (N_Iterated_Element_Association, Prev_Token_Ptr); Set_Loop_Parameter_Specification (Assoc_Node, Loop_Spec); 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 @@ -15550,7 +15550,7 @@ package body Sem_Ch13 is Add_Unnamed_Subp := Subp; elsif Op_Name = Name_New_Indexed then - New_Indexed_Subp := Subp; + New_Indexed_Subp := Subp; elsif Op_Name = Name_Assign_Indexed then Assign_Indexed_Subp := Subp;