OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Refactor duplicated resolution of Count and Index attributes

Browse Source 
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.

gcc/ada/

	* sem_attr.adb (Resolve_Attribute): Refactor duplicated code for
	Count and Index attributes.
This commit is contained in:
Piotr Trojanek 2022-05-31 12:22:21 +02:00 committed by Pierre-Marie de Rodat
parent a521dc3799
commit e0cd23986e
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/ada/sem_attr.adb
View File

@ -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 --