[Ada] Minor reformatting

2018-01-11  Hristian Kirtchev  <kirtchev@adacore.com>

gcc/ada/

	* exp_aggr.adb, exp_ch9.adb, exp_util.adb, sem_aggr.adb, sem_ch3.adb,
	sem_res.adb, sem_util.adb: Minor reformatting.

From-SVN: r256496

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a938ab2fbcc5f30e9339ff9929d874888ce66d31..4d186b21b40d2306d9b4f876fbf252ca108809f3 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * exp_aggr.adb, exp_ch9.adb, exp_util.adb, sem_aggr.adb, sem_ch3.adb,
+       sem_res.adb, sem_util.adb: Minor reformatting.
+
 2018-01-11  Ed Schonberg  <schonberg@adacore.com>
 
        * sem_prag.adb (Analyze_Pragma, case Predicate): Indicate that the type

diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 6aff4dd98c77a80d389b8111a035093ec99f5471..dd135b5025e0fe9dc8de37ff1cf1798d38f110a2 100644 (file)
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -1538,11 +1538,9 @@ package body Exp_Aggr is
             --  proper context, in which the loop parameter is visible.
 
             if Present (Comp_Typ) and then not Is_Array_Type (Comp_Typ) then
-               if
-                 Nkind (Parent (Expr_Q)) = N_Iterated_Component_Association
-                or else
-                  Nkind (Parent (Parent ((Expr_Q))))
-                     = N_Iterated_Component_Association
+               if Nkind (Parent (Expr_Q)) = N_Iterated_Component_Association
+                 or else Nkind (Parent (Parent ((Expr_Q)))) =
+                           N_Iterated_Component_Association
                then
                   null;
                else
@@ -5009,7 +5007,6 @@ package body Exp_Aggr is
          --  Scalar types are OK if their size is a multiple of Storage_Unit
 
          elsif Is_Scalar_Type (Ctyp) then
-
             if Csiz mod System_Storage_Unit /= 0 then
                return False;
             end if;
@@ -5500,10 +5497,9 @@ package body Exp_Aggr is
 
                   return False;
 
-               elsif
-                  Nkind (Parent (Expr)) = N_Iterated_Component_Association
+               elsif Nkind (Parent (Expr)) =
+                       N_Iterated_Component_Association
                then
-
                   --  Ditto for iterated component associations, which in
                   --  general require an enclosing loop and involve nonstatic
                   --  expressions.

diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index d89b112bf0f9766b1aee5dcf522e0703bd7487be..bbd31d02b3e0789c3352bfdd0e15d957c871c2d2 100644 (file)
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -11971,14 +11971,14 @@ package body Exp_Ch9 is
 
       if Create_Secondary_Stack_For_Task (TaskId) then
          declare
-            Stack_Size : Node_Id;
-
             Size_Expr : constant Node_Id :=
                           Expression (First (
                             Pragma_Argument_Associations (
                               Get_Rep_Pragma (TaskId,
                                 Name_Secondary_Stack_Size))));
 
+            Stack_Size : Node_Id;
+
          begin
             --  The secondary stack is defined inside the corresponding
             --  record. Therefore if the size of the stack is set by means

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index dea89c4d1023f2d70bfbb064104d369dabaf5313..86b57dc0feb2de92ecaa6687998745a712b030e7 100644 (file)
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -1129,11 +1129,11 @@ package body Exp_Util is
             if Present (New_E) then
                Rewrite (N, New_Occurrence_Of (New_E, Sloc (N)));
 
-               --  Implement rule in AI12-0166: a precondition for a
-               --  protected operation cannot include an internal call to
-               --  a protected function of the type. In the case of an
-               --  inherited condition for an overriding operation, both the
-               --  operation and the function are given by primitive wrappers.
+               --  AI12-0166: a precondition for a protected operation
+               --  cannot include an internal call to a protected function
+               --  of the type. In the case of an inherited condition for an
+               --  overriding operation, both the operation and the function
+               --  are given by primitive wrappers.
 
                if Ekind (New_E) = E_Function
                  and then Is_Primitive_Wrapper (New_E)
@@ -1144,7 +1144,7 @@ package body Exp_Util is
                   Error_Msg_NE
                     ("internal call to& cannot appear in inherited "
                      & "precondition of protected operation&",
-                       N, Wrapped_Entity (New_E));
+                     N, Wrapped_Entity (New_E));
                end if;
 
                --  If the entity is an overridden primitive and we are not

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 2a4ab3605d9bccfa7167aada2421f538f79e3e96..b7e892cb1f2a27ef20b2d89c722bedf8faa0eef6 100644 (file)
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -1699,8 +1699,9 @@ package body Sem_Aggr is
          Set_Etype  (Ent, Standard_Void_Type);
          Set_Parent (Ent, Parent (N));
          Push_Scope (Ent);
-         Id := Make_Defining_Identifier (Loc,
-           Chars => Chars (Defining_Identifier (N)));
+         Id :=
+           Make_Defining_Identifier (Loc,
+             Chars => Chars (Defining_Identifier (N)));
 
          --  Insert and decorate the index variable in the current scope.
          --  The expression has to be analyzed once the index variable is

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 0e898223725d35ddb3165ed2c173995c26944f82..142674c98fe35c538172877687a00b93bf1ba9d8 100644 (file)
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -1749,7 +1749,7 @@ package body Sem_Ch3 is
                      then
                         null;
 
-                     --  The operation is inherited and must be overridden.
+                     --  The operation is inherited and must be overridden
 
                      elsif not Comes_From_Source (Prim) then
                         Error_Msg_NE

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 23a95a46c8e64e1185c2e1dc98e27a1ca244d042..f3bd3be72af5eedc09b3403d6e183ab0e4265c20 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -9100,7 +9100,6 @@ package body Sem_Res is
             Error_Msg_N
               ("\even if user-defined equality exists (RM 4.5.2 (28.1/3)?", N);
          end if;
-
       end Resolve_Set_Membership;
 
    --  Start of processing for Resolve_Membership_Op

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index bd0d4584ba4302f31b54a3f6538eb7fd88da53c6..ae8617649378080a73c208c61217236db850231a 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -15824,13 +15824,12 @@ package body Sem_Util is
       --  conjunct in a postcondition) with a potentially unevaluated operand.
 
       Par := Parent (Expr);
-
-      while not Nkind_In (Par, N_If_Expression,
+      while not Nkind_In (Par, N_And_Then,
                                N_Case_Expression,
-                               N_And_Then,
-                               N_Or_Else,
+                               N_If_Expression,
                                N_In,
                                N_Not_In,
+                               N_Or_Else,
                                N_Quantified_Expression)
       loop
          Expr := Par;