[multiple changes]

2011-08-03  Emmanuel Briot  <briot@adacore.com>

	* prj-tree.ads: Remove unused variable.

2011-08-03  Yannick Moy  <moy@adacore.com>

	* restrict.adb (Restriction_Msg): set "SPARK" all in upper case for
	issuing messages related to SPARK restriction violation.

From-SVN: r177246

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9fb4ce894da24c6d689b1f4b0b78c0f52a702bc5..111f819be81fde42def245c5fc172f2be03f19e1 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-03  Emmanuel Briot  <briot@adacore.com>
+
+       * prj-tree.ads: Remove unused variable.
+
+2011-08-03  Yannick Moy  <moy@adacore.com>
+
+       * restrict.adb (Restriction_Msg): set "SPARK" all in upper case for
+       issuing messages related to SPARK restriction violation.
+
 2011-08-03  Ed Schonberg  <schonberg@adacore.com>
 
        * sem_ch6.adb: guard against error nodes in return statements.

diff --git a/gcc/ada/prj-tree.ads b/gcc/ada/prj-tree.ads
index f24c4060cfac219989dab7b4e79546031e24b491..5bb123f7c56ad764dc1b8862a4f5291271012df0 100644 (file)
--- a/gcc/ada/prj-tree.ads
+++ b/gcc/ada/prj-tree.ads
@@ -1464,10 +1464,6 @@ package Prj.Tree is
       --  project-tree specific so that one can load the same tree twice but
       --  have two views of it, for instance.
 
-      Target_Name : String_Access := null;
-      --  The target name, if any, specified with the gprbuild or gprclean
-      --  switch --target=.
-
       Project_Path : aliased Prj.Env.Project_Search_Path;
       --  The project path is tree specific, since we might want to load
       --  simultaneously multiple projects, each with its own search path, in

diff --git a/gcc/ada/restrict.adb b/gcc/ada/restrict.adb
index fdc243cdd6ae0a2ae504212549ace67426417555..44e3b5fda62b3991c13b6c9fceda12599b1626fb 100644 (file)
--- a/gcc/ada/restrict.adb
+++ b/gcc/ada/restrict.adb
@@ -715,9 +715,10 @@ package body Restrict is
 
       procedure Id_Case (S : String; Quotes : Boolean := True);
       --  Given a string S, case it according to current identifier casing,
-      --  and store in Error_Msg_String. Then append `~` to the message buffer
-      --  to output the string unchanged surrounded in quotes. The quotes are
-      --  suppressed if Quotes = False.
+      --  except for SPARK (an acronym) which is set all upper case, and store
+      --  in Error_Msg_String. Then append `~` to the message buffer to output
+      --  the string unchanged surrounded in quotes. The quotes are suppressed
+      --  if Quotes = False.
 
       --------------
       -- Add_Char --
@@ -747,7 +748,13 @@ package body Restrict is
       begin
          Name_Buffer (1 .. S'Last) := S;
          Name_Len := S'Length;
-         Set_Casing (Identifier_Casing (Get_Source_File_Index (Sloc (N))));
+
+         if R = SPARK then
+            Set_All_Upper_Case;
+         else
+            Set_Casing (Identifier_Casing (Get_Source_File_Index (Sloc (N))));
+         end if;
+
          Error_Msg_Strlen := Name_Len;
          Error_Msg_String (1 .. Name_Len) := Name_Buffer (1 .. Name_Len);