[multiple changes]

2014-02-06  Robert Dewar  <dewar@adacore.com>

	* sem_ch3.adb, sem_prag.adb, sem_res.adb, lib-xref.adb: Minor
	reformatting.

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

	* sem_ch6.adb (Process_Formals): Error message reformatting.

From-SVN: r207555

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 26164ba1f01a45ded8199d827411ed5a46fa008c..8e96bcae11542854f1817546bb5db908fc216f6a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-06  Robert Dewar  <dewar@adacore.com>
+
+       * sem_ch3.adb, sem_prag.adb, sem_res.adb, lib-xref.adb: Minor
+       reformatting.
+
+2014-02-06  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * sem_ch6.adb (Process_Formals): Error message reformatting.
+
 2014-02-06  Hristian Kirtchev  <kirtchev@adacore.com>
 
        * sem_ch3.adb (Handle_Late_Controlled_Primitive): Add local

diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb
index fbbdc3fb0236b5568373e237166d79f0b0991ae2..28c5dbbd3939d938931a8c73fb5a33e680556411 100644 (file)
--- a/gcc/ada/lib-xref.adb
+++ b/gcc/ada/lib-xref.adb
@@ -1069,7 +1069,7 @@ package body Lib.Xref is
             end if;
 
             Add_Entry
-              ((Ent      => Ent,
+              ((Ent       => Ent,
                 Loc       => Ref,
                 Typ       => Actual_Typ,
                 Eun       => Get_Source_Unit (Def),
@@ -1612,11 +1612,11 @@ package body Lib.Xref is
               and then Sloc (E) > No_Location
             then
                Add_Entry
-                 ((Ent => E,
-                   Loc => No_Location,
-                   Typ => Character'First,
-                   Eun => Get_Source_Unit (Original_Location (Sloc (E))),
-                   Lun => No_Unit,
+                 ((Ent       => E,
+                   Loc       => No_Location,
+                   Typ       => Character'First,
+                   Eun       => Get_Source_Unit (Original_Location (Sloc (E))),
+                   Lun       => No_Unit,
                    Ref_Scope => Empty,
                    Ent_Scope => Empty),
                   Ent_Scope_File => No_Unit);
@@ -1700,11 +1700,11 @@ package body Lib.Xref is
 
                      if Present (Prim) then
                         Add_Entry
-                          ((Ent => Prim,
-                            Loc => No_Location,
-                            Typ => Character'First,
-                            Eun => Get_Source_Unit (Sloc (Prim)),
-                            Lun => No_Unit,
+                          ((Ent       => Prim,
+                            Loc       => No_Location,
+                            Typ       => Character'First,
+                            Eun       => Get_Source_Unit (Sloc (Prim)),
+                            Lun       => No_Unit,
                             Ref_Scope => Empty,
                             Ent_Scope => Empty),
                            Ent_Scope_File => No_Unit);

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index e20f9f10ebbc49ce60cdf65285928ab0cd2c85ed..cf5f4a6eaba927f40f84b18385c33953b7e058d4 100644 (file)
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -2160,8 +2160,7 @@ package body Sem_Ch3 is
          Spec := Copy_Separate_Tree (Body_Spec);
 
          --  Ensure that the subprogram declaration does not inherit the null
-         --  indicator from the body as we now have a proper spec and body
-         --  pair.
+         --  indicator from the body as we now have a proper spec/body pair.
 
          Set_Null_Present (Spec, False);
 

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 853dfc6654d364fe4fcd344b8967ec8a135aa260..657879853e11b71efe5c22153abd567d8b3cb59a 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -1255,7 +1255,7 @@ package body Sem_Ch6 is
       Null_Body :=
         Make_Subprogram_Body (Loc,
           Specification => New_Copy_Tree (Spec),
-          Declarations => New_List,
+          Declarations  => New_List,
           Handled_Statement_Sequence =>
             Make_Handled_Sequence_Of_Statements (Loc,
               Statements => New_List (Make_Null_Statement (Loc))));
@@ -11243,8 +11243,8 @@ package body Sem_Ch6 is
 
             elsif Is_SPARK_Volatile_Object (Formal) then
                Error_Msg_N
-                 ("function cannot have a volatile formal parameter (SPARK RM "
-                  & "7.1.3(10))", Formal);
+                 ("function cannot have a volatile formal parameter "
+                  & "(SPARK RM 7.1.3(10))", Formal);
             end if;
          end if;
 

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 9549ade0a246e591b50bd794b6052143b44b0efa..5e52c62c1ad3ef847919b01365992bdfd84ceef7 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -850,8 +850,8 @@ package body Sem_Prag is
                              ("cannot mention state & in global refinement",
                               Item, Item_Id);
                            Error_Msg_N
-                              ("\use its constituents instead (SPARK RM "
-                               & "6.1.5(3))", Item);
+                              ("\use its constituents instead "
+                               & "(SPARK RM 6.1.5(3))", Item);
                            return;
 
                         --  If the reference to the abstract state appears in
@@ -958,8 +958,8 @@ package body Sem_Prag is
       begin
          if Ekind (Spec_Id) = E_Function and then not Result_Seen then
             Error_Msg_NE
-              ("result of & must appear in exactly one output list (SPARK RM "
-               & "6.1.5(10))", N, Spec_Id);
+              ("result of & must appear in exactly one output list "
+               & "(SPARK RM 6.1.5(10))", N, Spec_Id);
          end if;
       end Check_Function_Return;
 
@@ -1413,8 +1413,8 @@ package body Sem_Prag is
 
             elsif Is_Attribute_Result (Output) then
                Error_Msg_N
-                 ("function result cannot depend on itself (SPARK RM "
-                  & "6.1.5(10))", Output);
+                 ("function result cannot depend on itself "
+                  & "(SPARK RM 6.1.5(10))", Output);
                return;
             end if;
 
@@ -1810,8 +1810,8 @@ package body Sem_Prag is
          end if;
       else
          Error_Msg_N
-           ("external property % must apply to a volatile object (SPARK RM "
-            & "7.1.3(2))", N);
+           ("external property % must apply to a volatile object "
+            & "(SPARK RM 7.1.3(2))", N);
       end if;
 
       --  Ensure that the expression (if present) is static Boolean. A missing
@@ -1954,16 +1954,16 @@ package body Sem_Prag is
 
                elsif Ekind (Item_Id) = E_Constant then
                   Error_Msg_N
-                    ("global item cannot denote a constant (SPARK RM "
-                     & "6.1.4(7))", Item);
+                    ("global item cannot denote a constant "
+                     & "(SPARK RM 6.1.4(7))", Item);
 
                --  The only legal references are those to abstract states and
                --  variables.
 
                elsif not Ekind_In (Item_Id, E_Abstract_State, E_Variable) then
                   Error_Msg_N
-                    ("global item must denote variable or state (SPARK RM "
-                     & "6.1.4(4))", Item);
+                    ("global item must denote variable or state "
+                     & "(SPARK RM 6.1.4(4))", Item);
                   return;
                end if;
 
@@ -2004,8 +2004,8 @@ package body Sem_Prag is
                   then
                      Error_Msg_NE
                        ("volatile global item & with property Effective_Reads "
-                        & "must have mode In_Out or Output (SPARK RM "
-                        & "7.1.3(11))", Item, Item_Id);
+                        & "must have mode In_Out or Output "
+                        & "(SPARK RM 7.1.3(11))", Item, Item_Id);
                      return;
                   end if;
                end if;
@@ -2022,8 +2022,8 @@ package body Sem_Prag is
 
             else
                Error_Msg_N
-                 ("global item must denote variable or state (SPARK RM "
-                  & "6.1.4(4))", Item);
+                 ("global item must denote variable or state "
+                  & "(SPARK RM 6.1.4(4))", Item);
                return;
             end if;
 
@@ -2150,8 +2150,8 @@ package body Sem_Prag is
          begin
             if Ekind (Spec_Id) = E_Function then
                Error_Msg_N
-                 ("global mode & is not applicable to functions (SPARK RM "
-                  & "6.1.4(10))", Mode);
+                 ("global mode & is not applicable to functions "
+                  & "(SPARK RM 6.1.4(10))", Mode);
             end if;
          end Check_Mode_Restriction_In_Function;
 
@@ -3538,8 +3538,8 @@ package body Sem_Prag is
 
          if Placement = Not_In_Package then
             Error_Msg_N
-              ("indicator Part_Of may not appear in this context (SPARK RM "
-               & "7.2.6(5))", Indic);
+              ("indicator Part_Of may not appear in this context "
+               & "(SPARK RM 7.2.6(5))", Indic);
             Error_Msg_Name_1 := Chars (Scope (State_Id));
             Error_Msg_NE
               ("\& is not part of the hidden state of package %",
@@ -3593,8 +3593,8 @@ package body Sem_Prag is
 
          else
             Error_Msg_N
-              ("indicator Part_Of may not appear in this context (SPARK RM "
-               & "7.2.6(5))", Indic);
+              ("indicator Part_Of may not appear in this context "
+               & "(SPARK RM 7.2.6(5))", Indic);
 
             if Scope (State_Id) = Pack_Id then
                Error_Msg_Name_1 := Chars (Pack_Id);
@@ -22384,8 +22384,8 @@ package body Sem_Prag is
                      Posted := True;
                      Error_Msg_NE
                        ("output state & must be replaced by all its "
-                        & "constituents in global refinement (SPARK RM "
-                        & "7.2.5(3))", N, State_Id);
+                        & "constituents in global refinement "
+                        & "(SPARK RM 7.2.5(3))", N, State_Id);
                   end if;
 
                   Error_Msg_NE
@@ -24002,8 +24002,8 @@ package body Sem_Prag is
 
             else
                Error_Msg_N
-                 ("indicator Part_Of is required in this context (SPARK RM "
-                  & "7.2.6(3))", Item_Id);
+                 ("indicator Part_Of is required in this context "
+                  & "(SPARK RM 7.2.6(3))", Item_Id);
                Error_Msg_Name_1 := Chars (Pack_Id);
                Error_Msg_N
                  ("\& is declared in the visible part of private child unit %",
@@ -24035,8 +24035,8 @@ package body Sem_Prag is
 
          else
             Error_Msg_N
-              ("indicator Part_Of is required in this context (SPARK RM "
-               & "7.2.6(2))", Item_Id);
+              ("indicator Part_Of is required in this context "
+               & "(SPARK RM 7.2.6(2))", Item_Id);
             Error_Msg_Name_1 := Chars (Pack_Id);
             Error_Msg_N
               ("\& is declared in the private part of package %", Item_Id);

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index c7a7e08f4314c59dd2b37b9ad4d575a1971dd54c..e8c580851bf641c25d108eea9bf642de318618fa 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -4343,8 +4343,8 @@ package body Sem_Res is
                      Error_Msg_Name_1 := Name_Async_Writers;
                      Error_Msg_NE
                        ("external variable & with enabled property % cannot "
-                        & "appear as actual in procedure call (SPARK RM "
-                        & "7.1.3(11))", A, A_Id);
+                        & "appear as actual in procedure call "
+                        & "(SPARK RM 7.1.3(11))", A, A_Id);
                      Error_Msg_N
                        ("\\corresponding formal parameter has mode Out", A);
                   end if;
@@ -6637,8 +6637,8 @@ package body Sem_Res is
 
          if not Usage_OK then
             Error_Msg_N
-              ("volatile object cannot appear in this context (SPARK RM "
-               & "7.1.3(13))", N);
+              ("volatile object cannot appear in this context "
+               & "(SPARK RM 7.1.3(13))", N);
          end if;
       end if;
    end Resolve_Entity_Name;