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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135615 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ali.adb b/gcc/ada/ali.adb
index 31695a3..e00bc46 100644 (file)
--- 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 (file)
--- 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