sem_ch6.adb (Process_Formals): Mark suspicious reference to SPARK RM in comment.

2016-04-19  Arnaud Charlet  <charlet@adacore.com>

	* sem_ch6.adb (Process_Formals): Mark suspicious reference to
	SPARK RM in comment.
	* sem_prag.adb (Analyze_Global_Item): Fix reference to SPARK RM
	in comment.
	* sem_res.adb (Property_Error, Resolve_Actuals): Fix reference
	to SPARK RM in both comment and error message.

From-SVN: r235196

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ca023c2..5f3e5c9 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-19  Arnaud Charlet  <charlet@adacore.com>
+
+       * sem_ch6.adb (Process_Formals): Mark suspicious reference to
+       SPARK RM in comment.
+       * sem_prag.adb (Analyze_Global_Item): Fix reference to SPARK RM
+       in comment.
+       * sem_res.adb (Property_Error, Resolve_Actuals): Fix reference
+       to SPARK RM in both comment and error message.
+
 2016-04-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * sem_ch6.adb (Possible_Freeze): If the type is an incomplete

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 2fec97c..a0d5b8e 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -10483,7 +10483,7 @@ package body Sem_Ch6 is
 
             --  A procedure cannot have an effectively volatile formal
             --  parameter of mode IN because it behaves as a constant
-            --  (SPARK RM 7.1.3(6)).
+            --  (SPARK RM 7.1.3(6)). -- ??? maybe 7.1.3(4)
 
             elsif Ekind (Scope (Formal)) = E_Procedure
               and then Ekind (Formal) = E_In_Parameter

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 644cfaa..74c6915 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -2311,7 +2311,7 @@ package body Sem_Prag is
 
                   --  An effectively volatile object with external property
                   --  Effective_Reads set to True must have mode Output or
-                  --  In_Out (SPARK RM 7.1.3(11)).
+                  --  In_Out (SPARK RM 7.1.3(10)).
 
                   elsif Effective_Reads_Enabled (Item_Id)
                     and then Global_Mode = Name_Input

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index d6b9069..3fa5051 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -3520,7 +3520,7 @@ package body Sem_Res is
          Error_Msg_Name_1 := Prop_Nam;
          Error_Msg_NE
            ("external variable & with enabled property % cannot appear as "
-            & "actual in procedure call (SPARK RM 7.1.3(11))", Var, Var_Id);
+            & "actual in procedure call (SPARK RM 7.1.3(10))", Var, Var_Id);
          Error_Msg_N ("\\corresponding formal parameter has mode In", Var);
       end Property_Error;
 
@@ -4467,7 +4467,7 @@ package body Sem_Res is
             then
                --  An effectively volatile object may act as an actual when the
                --  corresponding formal is of a non-scalar effectively volatile
-               --  type (SPARK RM 7.1.3(12)).
+               --  type (SPARK RM 7.1.3(11)).
 
                if not Is_Scalar_Type (Etype (F))
                  and then Is_Effectively_Volatile (Etype (F))
@@ -4476,7 +4476,7 @@ package body Sem_Res is
 
                --  An effectively volatile object may act as an actual in a
                --  call to an instance of Unchecked_Conversion.
-               --  (SPARK RM 7.1.3(12)).
+               --  (SPARK RM 7.1.3(11)).
 
                elsif Is_Unchecked_Conversion_Instance (Nam) then
                   null;
@@ -4484,7 +4484,7 @@ package body Sem_Res is
                else
                   Error_Msg_N
                     ("volatile object cannot act as actual in a call (SPARK "
-                     & "RM 7.1.3(12))", A);
+                     & "RM 7.1.3(11))", A);
                end if;
 
                --  Detect an external variable with an enabled property that