From 0f168ccca1bb7a72e5456f9a6ff82a256e774073 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Tue, 25 Apr 2017 15:33:32 +0200
Subject: [PATCH] Minor reformatting.

From-SVN: r247232
---
 gcc/ada/sem_cat.adb  |  1 -
 gcc/ada/sem_ch13.adb | 17 ++++++++---------
 gcc/ada/sem_util.adb | 10 ++++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index e922fb35b1c..92127832920 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -1978,7 +1978,6 @@ package body Sem_Cat is
          if Comes_From_Source (Typ) and then Is_Type (Typ)
            and then Ekind (Typ) /= E_Incomplete_Type
          then
-
             --  Check that the type can be meaningfully transmitted to another
             --  partition (E.2.2(8)).
 
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 833770624e8..9ce5f6619f0 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -1181,11 +1181,11 @@ package body Sem_Ch13 is
    --  Start of processing for Analyze_Aspects_At_Freeze_Point
 
    begin
-      --  Must be visible in current scope, but if this is a type from
-      --  a nested package it may be frozen from an object declaration
-      --  in the enclosing scope, so install the package declarations
-      --  to complete the analysis of the aspects, if any. If the package
-      --  itself is frozen the type will have been frozen as well.
+      --  Must be visible in current scope, but if this is a type from a nested
+      --  package it may be frozen from an object declaration in the enclosing
+      --  scope, so install the package declarations to complete the analysis
+      --  of the aspects, if any. If the package itself is frozen the type will
+      --  have been frozen as well.
 
       if not Scope_Within_Or_Same (Current_Scope, Scope (E)) then
          if Is_Type (E) and then From_Nested_Package (E) then
@@ -1208,11 +1208,10 @@ package body Sem_Ch13 is
                return;
             end;
 
-         else
-
-            --  Aspects from other entities in different contexts are
-            --  analyzed elsewhere.
+         --  Aspects from other entities in different contexts are analyzed
+         --  elsewhere.
 
+         else
             return;
          end if;
       end if;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 7c050d45e21..ee57f279a22 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -7581,11 +7581,13 @@ package body Sem_Util is
 
    function From_Nested_Package (T : Entity_Id) return Boolean is
       Pack : constant Entity_Id := Scope (T);
+
    begin
-      return Ekind (Pack) = E_Package
-        and then not Is_Frozen (Pack)
-        and then not Scope_Within_Or_Same (Current_Scope, Pack)
-        and then In_Open_Scopes (Scope (Pack));
+      return
+        Ekind (Pack) = E_Package
+          and then not Is_Frozen (Pack)
+          and then not Scope_Within_Or_Same (Current_Scope, Pack)
+          and then In_Open_Scopes (Scope (Pack));
    end From_Nested_Package;
 
    -----------------------
-- 
2.30.2