From fd11c7e6210fb05897d21f4b71c6ac457ac7515a Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Mon, 22 Jun 2020 13:17:44 +0200 Subject: [PATCH] [Ada] Refine type from Nat to Pos in Make_Index gcc/ada/ * sem_ch3.ads, sem_ch3.adb (Make_Index): Refined type of parameter. (Constrain_Index): Likewise. (Array_Type_Declaration): Refine type of a local counter variable; remove a trivially useless initialization. --- gcc/ada/sem_ch3.adb | 10 +++++----- gcc/ada/sem_ch3.ads | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 8581938..ca982ff 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -440,7 +440,7 @@ package body Sem_Ch3 is Related_Nod : Node_Id; Related_Id : Entity_Id; Suffix : Character; - Suffix_Index : Nat); + Suffix_Index : Pos); -- Process an index constraint S in a constrained array declaration. The -- constraint can be a subtype name, or a range with or without an explicit -- subtype mark. The index is the corresponding index of the unconstrained @@ -5987,9 +5987,9 @@ package body Sem_Ch3 is Element_Type : Entity_Id; Implicit_Base : Entity_Id; Index : Node_Id; - Nb_Index : Nat; + Nb_Index : Pos; Priv : Entity_Id; - Related_Id : Entity_Id := Empty; + Related_Id : Entity_Id; begin if Nkind (Def) = N_Constrained_Array_Definition then @@ -14100,7 +14100,7 @@ package body Sem_Ch3 is Related_Nod : Node_Id; Related_Id : Entity_Id; Suffix : Character; - Suffix_Index : Nat) + Suffix_Index : Pos) is Def_Id : Entity_Id; R : Node_Id := Empty; @@ -19120,7 +19120,7 @@ package body Sem_Ch3 is (N : Node_Id; Related_Nod : Node_Id; Related_Id : Entity_Id := Empty; - Suffix_Index : Nat := 1) + Suffix_Index : Pos := 1) is R : Node_Id; T : Entity_Id; diff --git a/gcc/ada/sem_ch3.ads b/gcc/ada/sem_ch3.ads index bb29904..e94ce15 100644 --- a/gcc/ada/sem_ch3.ads +++ b/gcc/ada/sem_ch3.ads @@ -195,7 +195,7 @@ package Sem_Ch3 is (N : Node_Id; Related_Nod : Node_Id; Related_Id : Entity_Id := Empty; - Suffix_Index : Nat := 1); + Suffix_Index : Pos := 1); -- Process an index that is given in an array declaration, an entry -- family declaration or a loop iteration. The index is given by an index -- declaration (a 'box'), or by a discrete range. The later can be the name -- 2.7.4