Minor reformatting.

From-SVN: r244700

diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index f1afe320a3d65210ef17e29145de63d8d51ab146..3b79bc32c0777059594d43cbd3fd1b43856f42dd 100644 (file)
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -3158,10 +3158,8 @@ package body Inline is
             --  unconstrained type renaming a local variable of constrained
             --  type, which is not expected by GNATprove.
 
-            elsif Etype (F) /= Etype (A)
-              and then not GNATprove_Mode
-            then
-               New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
+            elsif Etype (F) /= Etype (A) and then not GNATprove_Mode then
+               New_A    := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
                Temp_Typ := Etype (F);
 
             else

diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 8f1ce7dba1268c0f5e977e5cfe8732774477a833..5e4641e4753c418de3800ce0a8f0e3c873f1c241 100644 (file)
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -1808,17 +1808,17 @@ package body Sem_Ch13 is
                     ("aspect must name a discriminant of current type", Expr);
 
                else
-
                   --  Discriminant type be an anonymous access type or an
                   --  anonymous access to subprogram.
+
                   --  Missing synchronized types???
 
                   Disc := First_Discriminant (E);
                   while Present (Disc) loop
                      if Chars (Expr) = Chars (Disc)
                        and then Ekind_In (Etype (Disc),
-                                  E_Anonymous_Access_Type,
-                                  E_Anonymous_Access_Subprogram_Type)
+                                          E_Anonymous_Access_Subprogram_Type,
+                                          E_Anonymous_Access_Type)
                      then
                         Set_Has_Implicit_Dereference (E);
                         Set_Has_Implicit_Dereference (Disc);

diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 8ae620cd144a28c1b2e62a6e519667825d788c14..942e21e922e1a911cf62b9dceebe1307c31c0d9c 100644 (file)
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -913,8 +913,8 @@ package body Sem_Ch4 is
    --  the type-checking is similar to that of other calls.
 
    procedure Analyze_Call (N : Node_Id) is
+      Actuals : constant List_Id    := Parameter_Associations (N);
       Loc     : constant Source_Ptr := Sloc (N);
-      Actuals : constant List_Id := Parameter_Associations (N);
       Nam     : Node_Id;
       X       : Interp_Index;
       It      : Interp;
@@ -1325,10 +1325,13 @@ package body Sem_Ch4 is
                   then
                      Rewrite (Name (N),
                        Make_Explicit_Dereference (Loc,
-                         Prefix => Make_Selected_Component (Loc,
-                           Prefix        =>
-                             (New_Occurrence_Of (Entity (Nam), Loc)),
-                           Selector_Name => New_Occurrence_Of (It.Nam, Loc))));
+                         Prefix =>
+                           Make_Selected_Component (Loc,
+                             Prefix        =>
+                               New_Occurrence_Of (Entity (Nam), Loc),
+                             Selector_Name =>
+                               New_Occurrence_Of (It.Nam, Loc))));
+
                      Analyze (N);
                      return;
 
@@ -1342,8 +1345,7 @@ package body Sem_Ch4 is
                   Set_Etype (Nam, It.Typ);
                end if;
 
-            elsif Nkind_In (Name (N), N_Selected_Component,
-                                      N_Function_Call)
+            elsif Nkind_In (Name (N), N_Function_Call, N_Selected_Component)
             then
                Remove_Interp (X);
             end if;

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 062a8392f9af44abf85e2a4546637c2a7020e70a..7850a0cddd5f8ea7610305199a5039d6db97855c 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -2465,11 +2465,11 @@ package body Sem_Res is
                --  with a name that is an explicit dereference, there is
                --  nothing to be done at this point.
 
-               elsif Nkind_In (N, N_Explicit_Dereference,
-                                  N_Attribute_Reference,
+               elsif Nkind_In (N, N_Attribute_Reference,
                                   N_And_Then,
-                                  N_Indexed_Component,
+                                  N_Explicit_Dereference,
                                   N_Identifier,
+                                  N_Indexed_Component,
                                   N_Or_Else,
                                   N_Range,
                                   N_Selected_Component,