From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 070FF385842D for ; Mon, 10 Jun 2024 09:08:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 070FF385842D Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 070FF385842D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::433 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718010500; cv=none; b=CB6uJbc2FHqjWBNPMxB/OheXpzBOxMCS41l+MpN0sPPLcHMMLS98GBu17YtSeEivD5m9vuj9CRorIseNA2uTULA5vdCLbIUGSkzY50iS5Rgvy9fNB55C41QuXx/bPJtpTgo17RHHMGw2QL+V+4MN5GkXlpQNDTla9n0zWpa/qbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718010500; c=relaxed/simple; bh=BGR3JKorjumkWZPQfiX50UWFsu4DaOB1FFC2Cmv/f4I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AxHye74xzmg2dnFmiAc+C7q8DKTnt/TkkDcUuM10UNyaSX1/iTB6kwd8N1m5xASxXSt3pvfjgDPLKckGuo3HXQf62kytluNel0t+APp/nFI2WehwiIoATEqOSFsRMpJxUXhIo+gTYctw5ziQFQvPoHtbSFO2qLhVuvPuYq1npIE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-35f1c209893so1450606f8f.2 for ; Mon, 10 Jun 2024 02:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1718010497; x=1718615297; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vHl5RsDvY44jrEUr48kVRyd4ixazKG9Oql/Z6oQOWEc=; b=Ut7UcNjTvQ1jH5rVLQpyxzU/DWXHbMX6W/Rhg2pAppduITktiLxbRMK/veheotOtxK P0ie0e0zuwWIJDVeXFO9uAp9OzsHi2Jijqkmo+kWvLnQ6GW21D0BsMYSFyCCMS9TDsZE KLvsE/FUj1N92hqgX7L5RtZpQlSqG7jA7JLoQot8aFVcxt6Zc7KFCsZ/ivNGbgoPEaX0 0htlDsmnfnQO5EbNsJR37U4nkHsLMqK1DEfuOodsiIX38Zve26Z85l6eM2G9F+tUXjZJ UCZ5zJqZbz9CIT+P4w6RMZmpKWU2UDGPQSgRHq87rUagLKf5Uo+DajypasbH8lsodovk gJXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718010497; x=1718615297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vHl5RsDvY44jrEUr48kVRyd4ixazKG9Oql/Z6oQOWEc=; b=ZlenLSA9a5rsxvaCI6xpMu3LziUhyuc9F+aMIKWdRSZ6ckYuOalYhpJ0FIecHeTa39 2yNQKHcMBBROvF8j7daTfcrcvHoYcybIK/xsdEk+I8rJIgY+JVLBZnjbFAa6Y7VgLPaC 7T+3D7TJXXjHcHumD9rZSVqmt47DF4T1qhmn2u3pguGcKFjAN/f4G0jGfcSQ3IveLyuW 3QTk11aGQEDeb4d6BXgfdcj1UCfX23wzJCHQvY+4kODjK3QvyuJj00C2CbDaqr77Q6ZT BOyLo7I3h2SO1jaMK5vu+KcC2R+1ned2WnYnXKn0A45+SXVMqIRVdZubxACd8AfKsUu2 6+FA== X-Gm-Message-State: AOJu0YycTqrx5UvaVNFIF9soDZSr/qxld1tAWKMuco2PLnjMhoiRA35Y 5tlcMwTtl1DFK7GApTWoOywYHLZQa/+4x5gd2KHvJ2gOSMvKn+N48WR56FtwelEs9Us0vj5YMHA = X-Google-Smtp-Source: AGHT+IF7GzLaWZkHi+2N9eEgEcIpWsPBsnc5BO2Td+MFkxIDF12nrabTqAYMRA+7WZQm9RrJ/M1Nog== X-Received: by 2002:a05:6000:b43:b0:35f:900:4e6 with SMTP id ffacd0b85a97d-35f090005famr6800912f8f.60.1718010496737; Mon, 10 Jun 2024 02:08:16 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f0f551c20sm6454970f8f.69.2024.06.10.02.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 02:08:16 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED 19/30] ada: Fix references to Ada RM in comments Date: Mon, 10 Jun 2024 11:07:35 +0200 Message-ID: <20240610090747.1557638-19-poulhies@adacore.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240610090747.1557638-1-poulhies@adacore.com> References: <20240610090747.1557638-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Piotr Trojanek We seem to have a convention of using "RM" in the GNAT comments, not "Ada RM". Also, the paragraph references by convention should appear in parentheses, e.g. "8.3(12.3/2)", not "8.3 12.3/2". gcc/ada/ * einfo.ads, exp_attr.adb, exp_ch4.adb, exp_ch7.adb, lib-writ.adb, libgnat/a-stbuut.ads, sem_ch13.adb, sem_ch3.adb, sem_ch7.adb: Use "RM" in comments. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/einfo.ads | 2 +- gcc/ada/exp_attr.adb | 4 ++-- gcc/ada/exp_ch4.adb | 2 +- gcc/ada/exp_ch7.adb | 2 +- gcc/ada/lib-writ.adb | 3 +-- gcc/ada/libgnat/a-stbuut.ads | 2 +- gcc/ada/sem_ch13.adb | 4 ++-- gcc/ada/sem_ch3.adb | 2 +- gcc/ada/sem_ch7.adb | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index e5110f51670..0b0529a39cf 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -2728,7 +2728,7 @@ package Einfo is -- Defined in all entities. Set for implicitly declared subprograms -- that require overriding or are null procedures, and are hidden by -- a non-fully conformant homograph with the same characteristics --- (Ada RM 8.3 12.3/2). +-- (RM 8.3(12.3/2)). -- Is_Hidden_Open_Scope -- Defined in all entities. Set for a scope that contains the diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index 0349db28a1a..1396007a2d1 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -2173,8 +2173,8 @@ package body Exp_Attr is -- for the arguments of a 'Read attribute reference (since the -- scalar argument is an OUT scalar) and for the arguments of a -- 'Has_Same_Storage or 'Overlaps_Storage attribute reference (which not - -- considered to be reads of their prefixes and expressions, see Ada RM - -- 13.3(73.10/3)). + -- considered to be reads of their prefixes and expressions, see + -- RM 13.3(73.10/3)). if Validity_Checks_On and then Validity_Check_Operands and then Id /= Attribute_Asm_Output diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 6ceffdf8302..95b7765b173 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -8512,7 +8512,7 @@ package body Exp_Ch4 is -- For small negative exponents, we return the reciprocal of -- the folding of the exponentiation for the opposite (positive) - -- exponent, as required by Ada RM 4.5.6(11/3). + -- exponent, as required by RM 4.5.6(11/3). if abs Expv <= 4 then diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 993c13c7318..fd1d9db0654 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -7419,7 +7419,7 @@ package body Exp_Ch7 is -- non-POC components are finalized before the -- non-POC extension components. This violates the -- usual "finalize in reverse declaration order" - -- principle, but that's ok (see Ada RM 7.6.1(9)). + -- principle, but that's ok (see RM 7.6.1(9)). -- -- Last_POC_Call should be non-empty if the extension -- has at least one POC. Interactions with variant diff --git a/gcc/ada/lib-writ.adb b/gcc/ada/lib-writ.adb index 697b2f2b797..0755b92e4db 100644 --- a/gcc/ada/lib-writ.adb +++ b/gcc/ada/lib-writ.adb @@ -298,8 +298,7 @@ package body Lib.Writ is function Is_Implicit_With_Clause (Clause : Node_Id) return Boolean is begin -- With clauses created for ancestor units are marked as internal, - -- however, they emulate the semantics in Ada RM 10.1.2 (6/2), - -- where + -- however, they emulate the semantics in RM 10.1.2 (6/2), where -- -- with A.B; -- diff --git a/gcc/ada/libgnat/a-stbuut.ads b/gcc/ada/libgnat/a-stbuut.ads index dadfe5f0010..2a8b08bca57 100644 --- a/gcc/ada/libgnat/a-stbuut.ads +++ b/gcc/ada/libgnat/a-stbuut.ads @@ -33,7 +33,7 @@ with Ada.Strings.UTF_Encoding.Wide_Wide_Strings; package Ada.Strings.Text_Buffers.Utils with Pure is - -- Ada.Strings.Text_Buffers is a predefined unit (see Ada RM A.4.12). + -- Ada.Strings.Text_Buffers is a predefined unit (see RM A.4.12). -- This is a GNAT-defined child unit of that parent. subtype Character_7 is diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index c0a5b6c2c37..f84ca2c75d7 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -12860,7 +12860,7 @@ package body Sem_Ch13 is procedure Hide_Non_Overridden_Subprograms (Typ : Entity_Id); -- Inspect the primitive operations of type Typ and hide all pairs of -- implicitly declared non-overridden non-fully conformant homographs - -- (Ada RM 8.3 12.3/2). + -- (RM 8.3(12.3/2)). ------------------------------------- -- Hide_Non_Overridden_Subprograms -- @@ -13028,7 +13028,7 @@ package body Sem_Ch13 is -- overriding. If this set contains fully conformant homographs, then -- one is chosen arbitrarily (already done during resolution), otherwise -- all remaining non-fully conformant homographs are hidden from - -- visibility (Ada RM 8.3 12.3/2). + -- visibility (RM 8.3(12.3/2)). if Is_Tagged_Type (E) then Hide_Non_Overridden_Subprograms (E); diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 263be607ec1..0403babff13 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -16553,7 +16553,7 @@ package body Sem_Ch3 is New_Overloaded_Entity (New_Subp, Derived_Type); - -- Ada RM 6.1.1 (15): If a subprogram inherits nonconforming class-wide + -- RM 6.1.1(15): If a subprogram inherits nonconforming class-wide -- preconditions and the derived type is abstract, the derived operation -- is abstract as well if parent subprogram is not abstract or null. diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index a70d72c94c1..09d85bea335 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -2400,7 +2400,7 @@ package body Sem_Ch7 is -- Do not enter implicitly inherited non-overridden subprograms of -- a tagged type back into visibility if they have non-conformant - -- homographs (Ada RM 8.3 12.3/2). + -- homographs (RM 8.3(12.3/2)). elsif Is_Hidden_Non_Overridden_Subpgm (Id) then null; -- 2.45.1