From patchwork Thu May 25 08:05:28 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: 98838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp192650vqr; Thu, 25 May 2023 01:07:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7uj7LTPIcIx5ujNYvN7ThI9zax56JrOQYwYj+FcZAFt7iA3tdy4Xq+BlqSlMTo21IeIMRk X-Received: by 2002:a17:906:db0a:b0:960:ddba:e5bb with SMTP id xj10-20020a170906db0a00b00960ddbae5bbmr742721ejb.43.1685002045158; Thu, 25 May 2023 01:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685002045; cv=none; d=google.com; s=arc-20160816; b=JcGbO1d1w5D2/QUIcm+ocgIlM+G/1lu/jnQMT5fMqUERHYvryoH0nDoh1Re/7a0bEh C+px/0b02ldHmEvNIZdayBswHVU+Co7ZFPT/Ip2BsC8DvLcvq3hgys0upifGS6C7u9gF /PR/HDZumsUWOQrprycCt2h2SWSY9U0W7oLNxDKbHOQF5BTwCLqQvl5LWT9dtn/oYj49 UAlvTa67T1s7NAvbEn6wlM9joisGUx1mUpjp656l8wgwLZKOL7L2S2aIZw7m6kONZLLH hiP8mHl/wENSp+OA3rEg3FP7iaifdRyEKfCnJpzUvT30jgbXyrykGnHutrRyWhDeQIX/ 3lWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=+PQloR5mhKvVmAshEu25w2tFc0pH9GR84lQGqv4E2Yw=; b=xJGc8R+M5ro8dLOlyMBHM4dnh3efkvDYJJ1mbL11c7DDgGLEe6oYKB9h006dloHbBn PUSWXWVopNBszjNFoMqqU6CeHjsYAfoyvlQU6v3pLjO+Bd4AcpzsEAGmiuyKUrQFm81+ Ry7t+05zW/ja1L4C6pW9LXRfzf+dOrdvB0Ns/5epUd2i6yWRxOtd8gIl3o4vaOkX2q1T wGT8+tr0TruH5HjGICccanltUFf9vmZRowK73EkyP0sRdJrt5NKqDfnTVB7Th2vxaj2Z RXK7xfv4tOo39ZTSFSLdlW6dIs1CasByXUSgLcw8yb0wAHYlg6IpAV5fgGSV2y6UKjLn QyCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vy6WscgF; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id g13-20020a170906348d00b0096b4c03e010si668305ejb.1032.2023.05.25.01.07.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:07:25 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vy6WscgF; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1D0F3882011 for ; Thu, 25 May 2023 08:06:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1D0F3882011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685001990; bh=+PQloR5mhKvVmAshEu25w2tFc0pH9GR84lQGqv4E2Yw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=vy6WscgF+5s6cYQWorz6o6Pums7mJJJ41B07BXgFVK6vTAVyd1xrwoEEecB7S+TJS 44GPpuuVZpg3kqVtXm8rOm9iUORdWzpzZFvhZpnARYEw0gYJPLt52UNUFFBzmdLk+a /rRkUEmj4QjNC5E/RMjDnTROplO8GMHzAll3SRvs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id E4BED385843E for ; Thu, 25 May 2023 08:05:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E4BED385843E Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f6094cb2ebso1917135e9.3 for ; Thu, 25 May 2023 01:05:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001929; x=1687593929; 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=+PQloR5mhKvVmAshEu25w2tFc0pH9GR84lQGqv4E2Yw=; b=DI3Mfl9ML/QGbVEDncbgPscEmNgW45Fur9hvGFMtnRa7MBRk3fRjBaskawnS8k1Zlm 5iIKJg93wx8xzhHmfqDHmsibud1dHVDYVXM7fmM4Y3LvtlGUQY3ZsWAfwD2+NZwjma0s CcAzTrd63hAOrvFRjZCdnVUjQ4MFTQ81rjKdPjqZ3HxKTllaYVOlCoyoqlBuiskqritq 1hiJQyRNHy/e1Wi11qHVflD50M0ZaBNhyqsl4hEIpM1Xu2xviXUWRnoPmzWUiBijgtqa sUxf46cCVGxKqujtinj8QQ4U/nLR6teJcGk0aTNbx5nZ7UfkOWwNQqR2ggHNo6zVuA+h 1W6Q== X-Gm-Message-State: AC+VfDxQHV9gMYlv2OzVf2SF5SPxA3jgfHbCvhzybpWs6YI6knPLpAzI hPXna/99i3FQF3k7XiWLIVYGQvpAXH039VZit6S2ww== X-Received: by 2002:a05:600c:2289:b0:3f5:39:240c with SMTP id 9-20020a05600c228900b003f50039240cmr1905954wmf.27.1685001929766; Thu, 25 May 2023 01:05:29 -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 w8-20020a1cf608000000b003f18b942338sm1227130wmc.3.2023.05.25.01.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:05:29 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Minor fixes in description of scope depth Date: Thu, 25 May 2023 10:05:28 +0200 Message-Id: <20230525080528.1955789-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766852704750021832?= X-GMAIL-MSGID: =?utf-8?q?1766852704750021832?= From: Eric Botcazou In particular, the scope depth of library units is 1 instead of 0. gcc/ada/ * einfo.ads (Scope_Depth): Fix circular definition. (Scope_Depth_Value): Fix value for library units. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/einfo.ads | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index 78a1534c749..b39cffd172c 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -4324,14 +4324,14 @@ package Einfo is -- concurrent types, private types and entries, and also to record types, -- i.e. to any entity that can appear on the scope stack. Yields the -- scope depth value, which for those entities other than records is --- simply the scope depth value, for record entities, it is the --- Scope_Depth of the record scope. +-- simply the Scope_Depth_Value, and for record entities, is the +-- Scope_Depth of the record's scope. -- Scope_Depth_Value -- Defined in program units, blocks, loops, return statements, -- concurrent types, private types and entries. -- Indicates the number of scopes that statically enclose the declaration --- of the unit or type. Library units have a depth of zero. Note that +-- of the unit or type. Library units have a depth of one. Note that -- record types can act as scopes but do NOT have this field set (see -- Scope_Depth above). Queries should normally be via Scope_Depth, -- and not call Scope_Depth_Value directly.