From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Mon, 2 May 2016 09:12:46 +0000 (+0200)
Subject: Minor reformatting.
X-Git-Tag: basepoints/gcc-8~7239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3702225c48a2db3cce92b96ca1648b16806c6abb;p=thirdparty%2Fgcc.git

Minor reformatting.

From-SVN: r235711
---

diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index 5238efcb5b85..5377b95086b7 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -2251,14 +2251,14 @@ package body Exp_Ch5 is
                                Prefix =>
                                  Unchecked_Convert_To (RTE (RE_Tag_Ptr),
                                    Make_Attribute_Reference (Loc,
-                                     Prefix => Duplicate_Subexpr (Lhs),
+                                     Prefix         => Duplicate_Subexpr (Lhs),
                                      Attribute_Name => Name_Address)));
                            Rhs_Tag :=
                              Make_Explicit_Dereference (Loc,
                                Prefix =>
                                  Unchecked_Convert_To (RTE (RE_Tag_Ptr),
                                    Make_Attribute_Reference (Loc,
-                                     Prefix => Duplicate_Subexpr (Rhs),
+                                     Prefix         => Duplicate_Subexpr (Rhs),
                                      Attribute_Name => Name_Address)));
                         end if;
 
@@ -2266,9 +2266,9 @@ package body Exp_Ch5 is
                           Make_Raise_Constraint_Error (Loc,
                             Condition =>
                               Make_Op_Ne (Loc,
-                                Left_Opnd => Lhs_Tag,
+                                Left_Opnd  => Lhs_Tag,
                                 Right_Opnd => Rhs_Tag),
-                            Reason => CE_Tag_Check_Failed));
+                            Reason    => CE_Tag_Check_Failed));
                      end;
                   end if;
 
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index d071f02e737b..6d8f8fcb3a10 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -4980,7 +4980,6 @@ package body Sem_Attr is
             --  type may lead to spurious errors if context is a case.
 
             if not GNATprove_Mode then
-
                if not Is_Discrete_Type (Pref_Typ) then
                   Pref_Typ := Base_Type (Pref_Typ);
                end if;
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index c6d0dba7a4a2..875c16667008 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -4322,8 +4322,8 @@ package body Sem_Ch13 is
          ----------------------------
 
          function Valid_Default_Iterator (Subp : Entity_Id) return Boolean is
-            Formal : Entity_Id;
             Root_T : constant Entity_Id := Root_Type (Etype (Etype (Subp)));
+            Formal : Entity_Id;
 
          begin
             if not Check_Primitive_Function (Subp) then
@@ -4422,7 +4422,7 @@ package body Sem_Ch13 is
                   Set_Is_Overloaded (Expr, False);
                else
                   Error_Msg_N
-                    ("No interpretation is a valid default iterator!", Expr);
+                    ("no interpretation is a valid default iterator!", Expr);
                end if;
             end;
          end if;
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 99827081d0bb..fdefb004a7e4 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -597,13 +597,15 @@ package body Sem_Ch4 is
                if Is_Tagged_Type (Type_Id)
                  and then Has_Discriminants (Type_Id)
                  and then not Is_Constrained (Type_Id)
-                 and then Present
-                   (Discriminant_Default_Value (First_Discriminant (Type_Id)))
+                 and then
+                   Present
+                     (Discriminant_Default_Value
+                       (First_Discriminant (Type_Id)))
                then
                   declare
+                     Constr : constant List_Id    := New_List;
                      Loc    : constant Source_Ptr := Sloc (E);
                      Discr  : Entity_Id := First_Discriminant (Type_Id);
-                     Constr : constant List_Id := New_List;
 
                   begin
                      if Present (Discriminant_Default_Value (Discr)) then
@@ -612,11 +614,12 @@ package body Sem_Ch4 is
                            Next_Discriminant (Discr);
                         end loop;
 
-                        Rewrite (E, Make_Subtype_Indication (Loc,
-                          Subtype_Mark => New_Occurrence_Of (Type_Id, Loc),
-                          Constraint   =>
-                            Make_Index_Or_Discriminant_Constraint (Loc,
-                              Constr)));
+                        Rewrite (E,
+                          Make_Subtype_Indication (Loc,
+                            Subtype_Mark => New_Occurrence_Of (Type_Id, Loc),
+                            Constraint   =>
+                              Make_Index_Or_Discriminant_Constraint (Loc,
+                                Constraints => Constr)));
                      end if;
                   end;
                end if;
@@ -638,7 +641,7 @@ package body Sem_Ch4 is
                      Error_Msg_N ("constraint not allowed here", E);
 
                      if Nkind (Constraint (E)) =
-                       N_Index_Or_Discriminant_Constraint
+                          N_Index_Or_Discriminant_Constraint
                      then
                         Error_Msg_N -- CODEFIX
                           ("\if qualified expression was meant, " &