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

2017-01-20  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch10.adb, sem_cat.adb: Minor reformatting.

From-SVN: r244703

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 03f1e983d6306084f9160bf8952ac2d34743405a..07c08e95761099b462e721dc7c7034da9830fcc0 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-20  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * sem_ch10.adb, sem_cat.adb: Minor reformatting.
+
 2017-01-20  Javier Miranda  <miranda@adacore.com>
 
        * sem_ch3.adb (Access_Type_Declaration): Protect access to the

diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index fbe5382c1b3aeb831396390b96042402de95e955..878cab0119e089a5cb31bf66679653b86982d403 100644 (file)
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -1015,20 +1015,23 @@ package body Sem_Cat is
          Item := First (Context_Items (P));
          while Present (Item) loop
             if Nkind (Item) = N_With_Clause
-              and then not (Implicit_With (Item)
-                             or else Limited_Present (Item)
-
-                             --  Skip if error already posted on the WITH
-                             --  clause (in which case the Name attribute
-                             --  may be invalid). In particular, this fixes
-                             --  the problem of hanging in the presence of a
-                             --  WITH clause on a child that is an illegal
-                             --  generic instantiation.
-
-                             or else Error_Posted (Item))
-               and then not (Try_Semantics
-                             --  Skip processing malformed trees
-                             and then Nkind (Name (Item)) not in N_Has_Entity)
+              and then
+                not (Implicit_With (Item)
+                      or else Limited_Present (Item)
+
+                      --  Skip if error already posted on the WITH clause (in
+                      --  which case the Name attribute may be invalid). In
+                      --  particular, this fixes the problem of hanging in the
+                      --  presence of a WITH clause on a child that is an
+                      --  illegal generic instantiation.
+
+                      or else Error_Posted (Item))
+              and then
+                not (Try_Semantics
+
+                      --  Skip processing malformed trees
+
+                      and then Nkind (Name (Item)) not in N_Has_Entity)
             then
                Entity_Of_Withed := Entity (Name (Item));
                Check_Categorization_Dependencies

diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index 180c025dfdbd234f5a496886b6392138ec2cb113..5ea2baf9126b114195f7c94979885075127318ce 100644 (file)
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -4202,16 +4202,18 @@ package body Sem_Ch10 is
 
          --  Do not install private_with_clauses declaration, unless unit
          --  is itself a private child unit, or is a body. Note that for a
-         --  subprogram body the private_with_clause does not take effect until
-         --  after the specification.
+         --  subprogram body the private_with_clause does not take effect
+         --  until after the specification.
 
          if Nkind (Item) /= N_With_Clause
            or else Implicit_With (Item)
            or else Limited_Present (Item)
            or else Error_Posted (Item)
+
             --  Skip processing malformed trees
+
            or else (Try_Semantics
-                      and then Nkind (Name (Item)) not in N_Has_Entity)
+                     and then Nkind (Name (Item)) not in N_Has_Entity)
          then
             null;