From: Pierre-Marie de Rodat <derodat@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Piotr Trojanek <trojanek@adacore.com>
Subject: [Ada] Refactor duplicated resolution of Count and Index attributes
Date: Mon, 4 Jul 2022 07:50:25 +0000 [thread overview]
Message-ID: <20220704075025.GA99329@adacore.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
Attribute Index, which was added to Ada 2022 by AI12-0143, is resolved
just like attribute Count. However, code duplication rightly triggered a
CodePeer warning.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* sem_attr.adb (Resolve_Attribute): Refactor duplicated code for
Count and Index attributes.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1257 bytes --]
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -12300,7 +12300,9 @@ package body Sem_Attr is
-- if it is an element of an entry family, the index itself may
-- have to be resolved because it can be a general expression.
- when Attribute_Count =>
+ when Attribute_Count
+ | Attribute_Index
+ =>
if Nkind (P) = N_Indexed_Component
and then Is_Entity_Name (Prefix (P))
then
@@ -12338,19 +12340,7 @@ package body Sem_Attr is
-- Index --
-----------
- when Attribute_Index =>
- if Nkind (P) = N_Indexed_Component
- and then Is_Entity_Name (Prefix (P))
- then
- declare
- Indx : constant Node_Id := First (Expressions (P));
- Fam : constant Entity_Id := Entity (Prefix (P));
-
- begin
- Resolve (Indx, Entry_Index_Type (Fam));
- Apply_Scalar_Range_Check (Indx, Entry_Index_Type (Fam));
- end;
- end if;
+ -- Processing is shared with Count
----------------
-- Loop_Entry --
reply other threads:[~2022-07-04 7:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220704075025.GA99329@adacore.com \
--to=derodat@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=trojanek@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).