From 6d97121d2fa61d4de1e230e586dcb4812317f284 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Thu, 15 Oct 2020 00:55:16 +0200 Subject: [PATCH] [Ada] Reuse Is_Named_Number where possible gcc/ada/ * sem_ch13.adb (Check_Expr_Constants): Simplify with Is_Named_Number. * sem_prag.adb (Process_Convention): Likewise. --- gcc/ada/sem_ch13.adb | 4 +--- gcc/ada/sem_prag.adb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 45e9d751795..b605b4d9a45 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -11120,9 +11120,7 @@ package body Sem_Ch13 is -- Otherwise look at the identifier and see if it is OK - if Ekind (Ent) in E_Named_Integer | E_Named_Real - or else Is_Type (Ent) - then + if Is_Named_Number (Ent) or else Is_Type (Ent) then return; elsif Ekind (Ent) in E_Constant | E_In_Parameter then diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index eda8898bdb3..87497e599d8 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -8119,7 +8119,7 @@ package body Sem_Prag is -- Check that we are not applying this to a named constant - if Ekind (E) in E_Named_Integer | E_Named_Real then + if Is_Named_Number (E) then Error_Msg_Name_1 := Pname; Error_Msg_N ("cannot apply pragma% to named constant!", -- 2.30.2