exp_attr.adb, [...]: Minor reformatting.

2017-09-06  Hristian Kirtchev  <kirtchev@adacore.com>

	* exp_attr.adb, sem_util.adb, sem_attr.adb, sem_ch6.adb, sem_ch8.adb,
	sem_warn.adb: Minor reformatting.

From-SVN: r251772

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 5e6d0af..49642c3 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-06  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * exp_attr.adb, sem_util.adb, sem_attr.adb, sem_ch6.adb, sem_ch8.adb,
+       sem_warn.adb: Minor reformatting.
+
 2017-09-06  Ed Schonberg  <schonberg@adacore.com>
 
        * sem_warn.adb (Warn_On_Overlapping_Actuals): Refine previous

diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index d537cf3..aa23038 100644 (file)
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -1597,8 +1597,8 @@ package body Exp_Attr is
       procedure Rewrite_Object_Reference_Image
         (Name    : Name_Id;
          Str_Typ : Entity_Id);
-      --  Rewrite an Image attribute applied to an object reference for
-      --  AI12-00124 into an attribute applied to a type.
+      --  AI12-00124: Rewrite attribute 'Image when it is applied to an object
+      --  reference as an attribute applied to a type.
 
       procedure Rewrite_Stream_Proc_Call (Pname : Entity_Id);
       --  Rewrites a stream attribute for Read, Write or Output with the
@@ -1610,7 +1610,8 @@ package body Exp_Attr is
 
       procedure Rewrite_Object_Reference_Image
         (Name    : Name_Id;
-         Str_Typ : Entity_Id) is
+         Str_Typ : Entity_Id)
+      is
       begin
          Rewrite (N,
            Make_Attribute_Reference (Loc,

diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index 436c359..1578ade 100644 (file)
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -364,8 +364,8 @@ package body Sem_Attr is
       --  Check that P is an object reference
 
       procedure Check_Object_Reference_Image (Str_Typ : Entity_Id);
-      --  Verify that the prefix of an image attribute is an object reference
-      --  and set the Etype of the prefix to that specified by Str_Typ.
+      --  Verify that the prefix of attribute 'Image is an object reference and
+      --  set the type of the prefix to Str_Typ.
 
       procedure Check_PolyORB_Attribute;
       --  Validity checking for PolyORB/DSA attribute

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 64d87b2..83ca58a 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -6691,16 +6691,16 @@ package body Sem_Ch6 is
             if not Raise_Exception_Call then
                if GNATprove_Mode then
                   Error_Msg_N
-                    ("implied return after this statement "
-                     & "would have raised Program_Error", Last_Stm);
+                    ("implied return after this statement would have raised "
+                     & "Program_Error", Last_Stm);
 
-               --  In normal compilation mode, do not warn on a generated
-               --  call (e.g. in the body of a renaming as completion).
+               --  In normal compilation mode, do not warn on a generated call
+               --  (e.g. in the body of a renaming as completion).
 
                elsif Comes_From_Source (Last_Stm) then
                   Error_Msg_N
-                    ("implied return after this statement "
-                     & "will raise Program_Error??", Last_Stm);
+                    ("implied return after this statement will raise "
+                     & "Program_Error??", Last_Stm);
                end if;
 
                Error_Msg_Warn := SPARK_Mode /= On;

diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 82f82d7..783ff1a 100644 (file)
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -2947,7 +2947,7 @@ package body Sem_Ch8 is
          Set_Public_Status (New_S);
 
          if No_Return (Rename_Spec)
-            and then not No_Return (Entity (Nam))
+           and then not No_Return (Entity (Nam))
          then
             Error_Msg_N ("renaming completes a No_Return procedure", N);
             Error_Msg_N

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 0138648..0159a70 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -13782,9 +13782,10 @@ package body Sem_Util is
       P_Typ  : Entity_Id) return Boolean
    is
    begin
-      return Ada_Version > Ada_2005
-        and then Is_Object_Reference (Prefix)
-        and then Is_Scalar_Type (P_Typ);
+      return
+        Ada_Version > Ada_2005
+          and then Is_Object_Reference (Prefix)
+          and then Is_Scalar_Type (P_Typ);
    end Is_Image_Applied_To_Object;
 
    ----------------------------
@@ -17066,9 +17067,10 @@ package body Sem_Util is
       if Ada_Version >= Ada_2005
         and then Present (First_Formal (E))
         and then No (Default_Value (First_Formal (E)))
-        and then (Is_Controlling_Formal (First_Formal (E))
-          or else Is_Class_Wide_Type (Etype (First_Formal (E)))
-          or else Is_Anonymous_Access_Type (Etype (First_Formal (E))))
+        and then
+          (Is_Controlling_Formal (First_Formal (E))
+            or else Is_Class_Wide_Type (Etype (First_Formal (E)))
+            or else Is_Anonymous_Access_Type (Etype (First_Formal (E))))
       then
          Formal := Next_Formal (First_Formal (E));
          while Present (Formal) loop

diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index 962e919..76e1f1b 100644 (file)
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -3608,13 +3608,13 @@ package body Sem_Warn is
 
       --  Local variables
 
-      Act1       : Node_Id;
-      Act2       : Node_Id;
-      Form1      : Entity_Id;
-      Form2      : Entity_Id;
-      Warn_Only  : Boolean;
-      --  GNAT warns on overlapping in-out parameters even when there
-      --  sre no two in-out parameters of an elementary type, as stated in
+      Act1      : Node_Id;
+      Act2      : Node_Id;
+      Form1     : Entity_Id;
+      Form2     : Entity_Id;
+      Warn_Only : Boolean;
+      --  GNAT warns on overlapping in-out parameters even when there are no
+      --  two in-out parameters of an elementary type, as stated in
       --  RM 6.5.1 (17/2).
 
    --  Start of processing for Warn_On_Overlapping_Actuals
@@ -3625,8 +3625,8 @@ package body Sem_Warn is
          return;
       end if;
 
-      --  The call is illegal only if there are at least two in-out
-      --  parameters of the same elementary type.
+      --  The call is illegal only if there are at least two in-out parameters
+      --  of the same elementary type.
 
       Warn_Only := True;
       Form1 := First_Formal (Subp);
@@ -3727,11 +3727,10 @@ package body Sem_Warn is
 
                        or else not Is_Elementary_Type (Etype (Form1))
 
-                       --  debug flag -gnatd.E changes the error to a
-                       --  warning even in Ada 2012 mode.
+                       --  debug flag -gnatd.E changes the error to a warning
+                       --  even in Ada 2012 mode.
 
                        or else Error_To_Warning
-
                        or else Warn_Only;
 
                      declare