diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2022-05-31 12:22:21 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-07-04 07:45:59 +0000 |
| commit | e0cd23986ed4fcfbb71ab44959ca18299412e706 (patch) | |
| tree | f0fcd54b9b2b0f7e0d6f274f280743067f307bf6 /gcc | |
| parent | a521dc37999bed5ec1f529b4c6ba7ded09dca464 (diff) | |
| download | gcc-e0cd23986ed4fcfbb71ab44959ca18299412e706.zip gcc-e0cd23986ed4fcfbb71ab44959ca18299412e706.tar.gz gcc-e0cd23986ed4fcfbb71ab44959ca18299412e706.tar.bz2 | |
[Ada] Refactor duplicated resolution of Count and Index attributes
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/sem_attr.adb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index c0998a5..20849bf 100644 --- 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 -- |