[multiple changes]

2014-02-24  Olivier Ramonat  <ramonat@adacore.com>

	* gnat_rm.texi, gnat_ugn.texi: Replace Ada Compiler by Ada Development
	Environment.

2014-02-24  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_prag.adb (Check_Constituent_Usage): Remove leading spaces in
	error messages.
	(Inconsistent_Mode_Error): Remove leading spaces in error messages.
	Merge the expected and available mode errors.
	(Report_Unused_Constituents): Remove leading spaces in error messages.
	(Report_Unused_States): Remove leading spaces in error messages.

From-SVN: r208073

4 files changed, 26 insertions, 15 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ce741ff..2c18069 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,17 @@
+2014-02-24  Olivier Ramonat  <ramonat@adacore.com>
+
+	* gnat_rm.texi, gnat_ugn.texi: Replace Ada Compiler by Ada Development
+	Environment.
+
+2014-02-24  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_prag.adb (Check_Constituent_Usage): Remove leading spaces in
+	error messages.
+	(Inconsistent_Mode_Error): Remove leading spaces in error messages.
+	Merge the expected and available mode errors.
+	(Report_Unused_Constituents): Remove leading spaces in error messages.
+	(Report_Unused_States): Remove leading spaces in error messages.
+
 2014-02-24  Thomas Quinot  <quinot@adacore.com>
 
 	* par_sco.adb (Traverse_One): Refine categorization of statement
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 7e02d3b..2b71259 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -41,7 +41,7 @@ included in the section entitled ``GNU Free Documentation License''.
 
 @titlepage
 @title GNAT Reference Manual
-@subtitle GNAT, The GNU Ada Compiler
+@subtitle GNAT, The GNU Ada Development Environment
 @versionsubtitle
 @author AdaCore
 @page
@@ -59,7 +59,7 @@ included in the section entitled ``GNU Free Documentation License''.
 GNAT Reference Manual
 
 @noindent
-GNAT, The GNU Ada Compiler@*
+GNAT, The GNU Ada Development Environment@*
 GCC version @value{version-GCC}@*
 
 @noindent
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index d12f4c1..d12c889 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -138,7 +138,7 @@ Texts.  A copy of the license is included in the section entitled
 
 @sp 2
 
-@subtitle GNAT, The GNU Ada Compiler
+@subtitle GNAT, The GNU Ada Development Environment
 @versionsubtitle
 @author AdaCore
 
@@ -157,7 +157,7 @@ Texts.  A copy of the license is included in the section entitled
 @value{EDITION} User's Guide @value{PLATFORM}
 
 @noindent
-GNAT, The GNU Ada Compiler@*
+GNAT, The GNU Ada Development Environment@*
 GCC version @value{version-GCC}@*
 
 @noindent
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 9479cb8..f21baca 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -4637,8 +4637,7 @@ package body Sem_Prag is
             procedure Grouping_Error (Prag : Node_Id) is
             begin
                Error_Msg_Sloc := Sloc (Prag);
-               Error_Pragma
-                 ("pragma% should appear immediately after pragma#");
+               Error_Pragma ("pragma% must appear next to pragma#");
             end Grouping_Error;
 
          --  Start of processing for Check_Loop_Pragma_Grouping
@@ -22604,7 +22603,7 @@ package body Sem_Prag is
                   end if;
 
                   Error_Msg_NE
-                    ("\\  constituent & is missing in output list",
+                    ("\\constituent & is missing in output list",
                      N, Constit_Id);
                end if;
 
@@ -22764,10 +22763,8 @@ package body Sem_Prag is
                  ("global item & has inconsistent modes", Item, Item_Id);
 
                Error_Msg_Name_1 := Global_Mode;
-               Error_Msg_N ("\\  expected mode %", Item);
-
-               Error_Msg_Name_1 := Expect;
-               Error_Msg_N ("\\  found mode %", Item);
+               Error_Msg_Name_2 := Expect;
+               Error_Msg_N ("\\expected mode %, found mode %", Item);
             end Inconsistent_Mode_Error;
 
          --  Start of processing for Check_Refined_Global_Item
@@ -23472,10 +23469,10 @@ package body Sem_Prag is
 
                   if Ekind (Constit_Id) = E_Abstract_State then
                      Error_Msg_NE
-                       ("\\  abstract state & defined #", State, Constit_Id);
+                       ("\\abstract state & defined #", State, Constit_Id);
                   else
                      Error_Msg_NE
-                       ("\\  variable & defined #", State, Constit_Id);
+                       ("\\variable & defined #", State, Constit_Id);
                   end if;
 
                   Next_Elmt (Constit_Elmt);
@@ -23794,10 +23791,10 @@ package body Sem_Prag is
 
                if Ekind (State_Id) = E_Abstract_State then
                   Error_Msg_NE
-                    ("\\  abstract state & defined #", Body_Id, State_Id);
+                    ("\\abstract state & defined #", Body_Id, State_Id);
                else
                   Error_Msg_NE
-                    ("\\  variable & defined #", Body_Id, State_Id);
+                    ("\\variable & defined #", Body_Id, State_Id);
                end if;
 
                Next_Elmt (State_Elmt);