aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2020-10-15 00:55:16 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2020-11-25 08:22:39 -0500
commit6d97121d2fa61d4de1e230e586dcb4812317f284 (patch)
tree7120a07394399fb9ac141be30c8dc4dd8af7f6fa
parent28488f5ff5abe8edec60d45599dcb85c735989d0 (diff)
downloadgcc-6d97121d2fa61d4de1e230e586dcb4812317f284.zip
gcc-6d97121d2fa61d4de1e230e586dcb4812317f284.tar.gz
gcc-6d97121d2fa61d4de1e230e586dcb4812317f284.tar.bz2
[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.
-rw-r--r--gcc/ada/sem_ch13.adb4
-rw-r--r--gcc/ada/sem_prag.adb2
2 files changed, 2 insertions, 4 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 45e9d75..b605b4d 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 eda8898..87497e5 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!",