From patchwork Tue Nov 7 09:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 162337 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp112233vqo; Tue, 7 Nov 2023 01:22:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuEXDryvy2ePmh40cMt21xRGtzEMg6lrfsuk8kF/S11kSdVsr1S5ulZzp/gimFDvSxtO6O X-Received: by 2002:a05:620a:28d0:b0:772:553d:a49e with SMTP id l16-20020a05620a28d000b00772553da49emr35735401qkp.18.1699348966861; Tue, 07 Nov 2023 01:22:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699348966; cv=pass; d=google.com; s=arc-20160816; b=EzmDfKcF0aaycagNob6wcEcA8sYtWQVQd815E6CJdguTiQ4LSP19uE4qQCQ1uujFbT K+b4rPyYr/GWG9sNGe3Blpf+3calyytGEHDeSlnaszttVtwYbv0mft6LN6w8Cn/IT6ZZ V/0o1jHWOsca3n09gQNN1w/9VCBAED8hyoRQHgmqvOLA8JnjcLwO5dH3r/uPPYjU3rcH R8Be/ziB2ff/2kNZaTjV1a/VjZrQtN02+BhW+eXQHQWiX01ztlRXfgTSFA4U3qt1OkW8 E+di9MxSyYjgfTh6ztww2+4qwXW+V7YIZDSApR9OQRTMBc+56LOFN23KIdBpqoheYYmJ Y8RA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=Np5A64yNKlcofbNBUFMNNT1pIC+JFo8WrSxVSjnWtxk=; fh=QRb7QY4BZ0mIIAPiH2G4K0PcYKRtRn2i5A6VLUA8cN4=; b=accPa4NDuRU4tb8w1Jq7148NUMnJYSklCTpoTsw3N/Y3/NtLTbGnKI1dTFm53Pivw+ Bp47zBwBbQsnfpEqPqNj9VfQ0McNzMNCnxnX28g7vGmliok4UTFkk5osc+T5jYgc0m2K bWSYg0cbX8fpAMR8FyRmVg4Ea6GjWp6bYsEkxc5109yoM8ovtN96w+trUBc58sSDVO+s qewd668IsAKLUn4ZHidPoMVlnZiYN4/ojEJv5BdUmxIWdUHa26sxEFiJBCQXSTsq8OUW WZFDCZrKKoDZbS/uaq+ecnToZAuUT9StmI4bUJOpkD4sucO5XU675r809mEPWoD7Rq4l I/Yg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=aW07f1HH; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o24-20020a05620a229800b0076f2bb34fb1si382735qkh.416.2023.11.07.01.22.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 01:22:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=aW07f1HH; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 14ED33883029 for ; Tue, 7 Nov 2023 09:21:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id D5CBE3856944 for ; Tue, 7 Nov 2023 09:19:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D5CBE3856944 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D5CBE3856944 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699348794; cv=none; b=pC/Jyv5ptkYOPPF5C9GAKbJRUtR/S+hI/ifaCyqAOzSeDqQjBIel2F/JiT24von2fg6nhvmP+IghICphsrUCm2hYQxAS8CwnW5rKhFYbNfyhA2D6TQtU3LkrO2jH93GTmdgEg7337MXlIOlbFoIytL//xDhoSwKHpKxP3b3pkxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699348794; c=relaxed/simple; bh=SL2fRY1qdUXwvI126ZN/qZNMmopyrUZL8g3cgwOIbd8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=h5yxFU33jtISVrzmihnUIHZ6fRiPSePbP7vmANHLZWOpjjLoIZHWsBhFkeMrWV4PxFAx8Bdh54/rYMBc2YGadqY7R+uY8m00G+Q++WBTTC9RFH4CyLfrtriAehtCnoZRXiFQvVdBglLigEl4MKQYcsWNjCFC96kpEskb+e0B0Kg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40806e4106dso32954155e9.1 for ; Tue, 07 Nov 2023 01:19:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1699348790; x=1699953590; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Np5A64yNKlcofbNBUFMNNT1pIC+JFo8WrSxVSjnWtxk=; b=aW07f1HH63fQYwnfdgA+3ggQejwjXiT/nrGOAjJ0HiLFHqtBxiu9kz0bhDO3qDWAhi CyasAaiB0M9DBS5AAlvUYOyB73jofMgdNZAvueI1SHklVZbMAzzxeH0eYsHHnvmvY8do B50jGAlrd6XCKIpL0lm8iH1Q6BZuF3q+RIQ6srkTeFiWu4h0oHZ8gtSV7q8x+e3THGzJ oZUdQ+oTTdUqrRlp7N/Vjx5CFCRQeO78uihJeLPHrgWafJ4OCeoKpBEpMTtctvVsjcAv vQ+fmF9R5UY11UAKI3K1bPFWObwrOfucbZtEuj5Nuhr8eextZR3Svz6pzPqBE4LNpGuf IL8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699348790; x=1699953590; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Np5A64yNKlcofbNBUFMNNT1pIC+JFo8WrSxVSjnWtxk=; b=LaW0IbXj4SaCu4zMHCCMnWKOeqPam8+7y34pPZMU0PUHQApZZOQb+7Yo9ZwQMBERkZ ejbEFYA7BNdZ4xpZfeYRG2hbcAuOyDUa+61p2jfEaDvqeZQKABYSueUu1SilQ4CWiac1 fs28JcqUSKLnOIjLpxUmBPR5ibxTTdBtG8unQ4iWmNRLUoEOoZ4+qS+HIhZWa9rYBRmj Ck5U+dZZShzSYT6BVlhDmFXpBK3Ul2UHZ1LNWaoIuuKc/fOWkvVH+FZl511SAUtkSlmq cnHge4SvOTjJAavTD0fklTa7MyMsmq0prGyFfFZWqoRaj2XRSuv6QM07/hpVm2dHqAvN Blng== X-Gm-Message-State: AOJu0YztoAqwXRp1h+iRMzkarS9lnkTPJCL254ioW3c+Rin5Co4dnc6E Z94wqZZK6A/dVe90pS8wn3k3aZYzqZBG5JMcemyw8A== X-Received: by 2002:a05:600c:35d6:b0:408:411c:4f6d with SMTP id r22-20020a05600c35d600b00408411c4f6dmr2098275wmq.14.1699348790672; Tue, 07 Nov 2023 01:19:50 -0800 (PST) Received: from localhost.localdomain ([2001:861:3382:1a90:dbc1:a1d1:2e58:4040]) by smtp.gmail.com with ESMTPSA id g4-20020a05600c310400b004068e09a70bsm15025443wmo.31.2023.11.07.01.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 01:19:50 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Fix extra whitespace after END keywords Date: Tue, 7 Nov 2023 10:19:45 +0100 Message-ID: <20231107091945.3905796-1-poulhies@adacore.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781896541864186774 X-GMAIL-MSGID: 1781896541864186774 From: Piotr Trojanek Style cleanup. gcc/ada/ * exp_pakd.adb, libgnarl/s-osinte__android.ads, libgnarl/s-osinte__linux.ads, libgnarl/s-osinte__qnx.ads, libgnarl/s-osinte__rtems.ads, libgnat/s-gearop.adb, libgnat/s-poosiz.adb, sem_util.adb: Fix style. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_pakd.adb | 2 +- gcc/ada/libgnarl/s-osinte__android.ads | 2 +- gcc/ada/libgnarl/s-osinte__linux.ads | 2 +- gcc/ada/libgnarl/s-osinte__qnx.ads | 2 +- gcc/ada/libgnarl/s-osinte__rtems.ads | 2 +- gcc/ada/libgnat/s-gearop.adb | 2 +- gcc/ada/libgnat/s-poosiz.adb | 2 +- gcc/ada/sem_util.adb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb index e197211736a..68f0db3d56d 100644 --- a/gcc/ada/exp_pakd.adb +++ b/gcc/ada/exp_pakd.adb @@ -2203,7 +2203,7 @@ package body Exp_Pakd is end loop; return False; - end In_Partially_Packed_Record; + end In_Partially_Packed_Record; -- Start of processing for Known_Aligned_Enough diff --git a/gcc/ada/libgnarl/s-osinte__android.ads b/gcc/ada/libgnarl/s-osinte__android.ads index fb4310a1a43..04b22220a68 100644 --- a/gcc/ada/libgnarl/s-osinte__android.ads +++ b/gcc/ada/libgnarl/s-osinte__android.ads @@ -622,7 +622,7 @@ private type pthread_mutexattr_t is record Data : char_array (1 .. OS_Constants.PTHREAD_MUTEXATTR_SIZE); - end record; + end record; pragma Convention (C, pthread_mutexattr_t); for pthread_mutexattr_t'Alignment use Interfaces.C.int'Alignment; diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads index a5e645d334d..adf040e9fc9 100644 --- a/gcc/ada/libgnarl/s-osinte__linux.ads +++ b/gcc/ada/libgnarl/s-osinte__linux.ads @@ -652,7 +652,7 @@ private type pthread_mutexattr_t is record Data : char_array (1 .. OS_Constants.PTHREAD_MUTEXATTR_SIZE); - end record; + end record; pragma Convention (C, pthread_mutexattr_t); for pthread_mutexattr_t'Alignment use Interfaces.C.int'Alignment; diff --git a/gcc/ada/libgnarl/s-osinte__qnx.ads b/gcc/ada/libgnarl/s-osinte__qnx.ads index 3282abe8869..320a71dfece 100644 --- a/gcc/ada/libgnarl/s-osinte__qnx.ads +++ b/gcc/ada/libgnarl/s-osinte__qnx.ads @@ -597,7 +597,7 @@ private type pthread_mutexattr_t is record Data : char_array (1 .. OS_Constants.PTHREAD_MUTEXATTR_SIZE); - end record; + end record; pragma Convention (C, pthread_mutexattr_t); for pthread_mutexattr_t'Alignment use Interfaces.C.int'Alignment; diff --git a/gcc/ada/libgnarl/s-osinte__rtems.ads b/gcc/ada/libgnarl/s-osinte__rtems.ads index 6572bc4e472..43d137f2068 100644 --- a/gcc/ada/libgnarl/s-osinte__rtems.ads +++ b/gcc/ada/libgnarl/s-osinte__rtems.ads @@ -617,7 +617,7 @@ private type pthread_mutexattr_t is record Data : char_array (1 .. OS_Constants.PTHREAD_MUTEXATTR_SIZE); - end record; + end record; pragma Convention (C, pthread_mutexattr_t); for pthread_mutexattr_t'Alignment use Interfaces.C.int'Alignment; diff --git a/gcc/ada/libgnat/s-gearop.adb b/gcc/ada/libgnat/s-gearop.adb index e735bb0036a..000e59ccf69 100644 --- a/gcc/ada/libgnat/s-gearop.adb +++ b/gcc/ada/libgnat/s-gearop.adb @@ -901,7 +901,7 @@ is (for all KK in R'Range (2) => R (J, KK)'Initialized); end loop; end return; - end Matrix_Matrix_Product; + end Matrix_Matrix_Product; ---------------------------- -- Matrix_Vector_Solution -- diff --git a/gcc/ada/libgnat/s-poosiz.adb b/gcc/ada/libgnat/s-poosiz.adb index e5e6d0ff77b..0b2baec2d5a 100644 --- a/gcc/ada/libgnat/s-poosiz.adb +++ b/gcc/ada/libgnat/s-poosiz.adb @@ -408,5 +408,5 @@ package body System.Pool_Size is pragma Warnings (On); end Size; - end Variable_Size_Management; + end Variable_Size_Management; end System.Pool_Size; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index d5df05b88e1..cfd8b88a26e 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -10045,7 +10045,7 @@ package body Sem_Util is ("value of discriminant & is out of range", Discrim_Value, Discrim); Report_Errors := True; return; - end if; + end if; -- If we have found the corresponding choice, recursively add its -- components to the Into list. The nested components are part of