This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Ada] Refine type of Get_Homonym_Number result
- From: Pierre-Marie de Rodat <derodat at adacore dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Piotr Trojanek <trojanek at adacore dot com>
- Date: Wed, 18 Sep 2019 04:39:45 -0400
- Subject: [Ada] Refine type of Get_Homonym_Number result
Routine Get_Homonym_Number always returns a positive number. This is
explained in its comment and is evident from its body. No test attached,
because semantics is unaffected.
Tested on x86_64-pc-linux-gnu, committed on trunk
2019-09-18 Piotr Trojanek <trojanek@adacore.com>
gcc/ada/
* exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Refine type
from Nat to Pos.
* sem_util.adb (Add_Homonym_Suffix): Refine type of a local
variable.
--- gcc/ada/exp_dbug.adb
+++ gcc/ada/exp_dbug.adb
@@ -1058,9 +1058,9 @@ package body Exp_Dbug is
-- Get_Homonym_Number --
------------------------
- function Get_Homonym_Number (E : Entity_Id) return Nat is
+ function Get_Homonym_Number (E : Entity_Id) return Pos is
H : Entity_Id := Homonym (E);
- Nr : Nat := 1;
+ Nr : Pos := 1;
begin
while Present (H) loop
--- gcc/ada/exp_dbug.ads
+++ gcc/ada/exp_dbug.ads
@@ -460,7 +460,7 @@ package Exp_Dbug is
-- Subprograms for Handling Qualification --
--------------------------------------------
- function Get_Homonym_Number (E : Entity_Id) return Nat;
+ function Get_Homonym_Number (E : Entity_Id) return Pos;
-- Return the homonym number for E, which is its position in the homonym
-- chain starting at 1. This is exported for use in GNATprove.
--- gcc/ada/sem_util.adb
+++ gcc/ada/sem_util.adb
@@ -26183,7 +26183,7 @@ package body Sem_Util is
if Has_Homonym (U) then
declare
- N : constant Nat := Get_Homonym_Number (U);
+ N : constant Pos := Get_Homonym_Number (U);
S : constant String := N'Img;
begin
if N > 1 then