aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Dewar <dewar@adacore.com>2008-05-20 14:44:12 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2008-05-20 14:44:12 +0200
commit57f56c63cb82353c64404ccf3cfe338ed3ea61be (patch)
tree7408a279fc4d93f07314d2129942a6d804edc962
parent0e5b1d0b4926ea5adeb1cb9dba0e8c5f2b232640 (diff)
downloadgcc-57f56c63cb82353c64404ccf3cfe338ed3ea61be.zip
gcc-57f56c63cb82353c64404ccf3cfe338ed3ea61be.tar.gz
gcc-57f56c63cb82353c64404ccf3cfe338ed3ea61be.tar.bz2
ali.adb: Correct casing of ASCII.NUL
2008-05-20 Robert Dewar <dewar@adacore.com> * ali.adb: Correct casing of ASCII.NUL * styleg-c.adb (Check_Identifier): Handle case of names in ASCII properly. From-SVN: r135615
-rw-r--r--gcc/ada/ali.adb2
-rw-r--r--gcc/ada/styleg-c.adb17
2 files changed, 8 insertions, 11 deletions
diff --git a/gcc/ada/ali.adb b/gcc/ada/ali.adb
index 31695a38..e00bc46 100644
--- a/gcc/ada/ali.adb
+++ b/gcc/ada/ali.adb
@@ -1838,7 +1838,7 @@ package body ALI is
end if;
end loop;
- Add_Char_To_Name_Buffer (nul);
+ Add_Char_To_Name_Buffer (NUL);
Skip_Eol;
end if;
diff --git a/gcc/ada/styleg-c.adb b/gcc/ada/styleg-c.adb
index ca33050..003a751 100644
--- a/gcc/ada/styleg-c.adb
+++ b/gcc/ada/styleg-c.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -175,8 +175,10 @@ package body Styleg.C is
-- Case of definition in package Standard
- elsif Sdef = Standard_Location then
-
+ elsif Sdef = Standard_Location
+ or else
+ Sdef = Standard_ASCII_Location
+ then
-- Check case of identifiers in Standard
if Style_Check_Standard then
@@ -190,19 +192,14 @@ package body Styleg.C is
-- Otherwise determine required casing of Standard entity
else
- -- ASCII entities are in all upper case
+ -- ASCII is all upper case
if Entity (Ref) = Standard_ASCII then
Cas := All_Upper_Case;
-- Special names in ASCII are also all upper case
- elsif Entity (Ref) in SE (S_LC_A) .. SE (S_LC_Z)
- or else
- Entity (Ref) in SE (S_NUL) .. SE (S_US)
- or else
- Entity (Ref) = SE (S_DEL)
- then
+ elsif Sdef = Standard_ASCII_Location then
Cas := All_Upper_Case;
-- All other entities are in mixed case