[multiple changes]

2013-07-08  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch4.adb: minor reformatting (remove obsolete comment).
	* sem_ch9.adb: improve error message on illegal trigger.

2013-07-08  Robert Dewar  <dewar@adacore.com>

	* sem_prag.adb: Minor reformatting.

From-SVN: r200766

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ab8ce39..f11eaa6 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2013-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+       * sem_ch4.adb: minor reformatting (remove obsolete comment).
+       * sem_ch9.adb: improve error message on illegal trigger.
+
+2013-07-08  Robert Dewar  <dewar@adacore.com>
+
+       * sem_prag.adb: Minor reformatting.
+
 2013-07-08  Robert Dewar  <dewar@adacore.com>
 
        * gnatcmd.adb: Minor reformatting.

diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 333fb4b..3931957 100644 (file)
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -7212,9 +7212,6 @@ package body Sem_Ch4 is
          --  For cross-reference purposes, treat the new node as being in
          --  the source if the original one is. Set entity and type, even
          --  though they may be overwritten during resolution if overloaded.
-         --  Perform the same transformation in ASIS mode, because during
-         --  pre-analysis of a pre/post condition the node will not be
-         --  rewritten as a call. (is this ASIS comment obsolete ???)
 
          Set_Comes_From_Source (Subprog, Comes_From_Source (N));
          Set_Comes_From_Source (Call_Node, Comes_From_Source (N));

diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index 16c011c..41b4d9c 100644 (file)
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2013, 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- --
@@ -3053,8 +3053,9 @@ package body Sem_Ch9 is
            and then not Is_Controlling_Limited_Procedure
                           (Entity (Name (Trigger)))
          then
-            Error_Msg_N ("triggering statement must be delay, procedure " &
-                         "or entry call", Trigger);
+            Error_Msg_N
+              ("triggering statement must be procedure_or_entry_call " &
+               "('R'M 9.7.2) or delay statement", Trigger);
          end if;
       end if;
 

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 7c929a4..9a68720 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -4629,7 +4629,7 @@ package body Sem_Prag is
                               and then
                                 Is_Spec_Name (Unit_Name (Current_Sem_Unit))
                               and then (Ekind (Cent) /= E_Package
-                                          or else not In_Private_Part (Cent));
+                                         or else not In_Private_Part (Cent));
                   --  Set True if this is the warning case, and we are in the
                   --  visible part of a package spec, or in a subprogram spec,
                   --  in which case we want to force the client to see the