[Ada] Minor reformatting

2018-05-30  Hristian Kirtchev  <kirtchev@adacore.com>

gcc/ada/

	* exp_aggr.adb, exp_unst.adb, freeze.adb, libgnat/a-direct.adb: Minor
	reformatting.

From-SVN: r260948

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index dfe018dbd795a39f44b4c182278552913a1c17f8..528eea4eaa20f6044236c4eefbd1ea4f65b20f2e 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-30  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * exp_aggr.adb, exp_unst.adb, freeze.adb, libgnat/a-direct.adb: Minor
+       reformatting.
+
 2018-05-30  Ed Schonberg  <schonberg@adacore.com>
 
        * exp_unst.adb (Visit_Node): Handle the semantic Procedure_To_Call

diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index e587c17f90ef2c1b0de3a6c85d38a71c91f5c928..b8955d73dd053856b1d7ef66cd36e3288a18d786 100644 (file)
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -4738,7 +4738,7 @@ package body Exp_Aggr is
             if Is_Packed (Etype (N))
               or else
                 (Is_Record_Type (Component_Type (Etype (N)))
-                 and then Has_Discriminants (Component_Type (Etype (N))))
+                  and then Has_Discriminants (Component_Type (Etype (N))))
             then
                null;
             else

diff --git a/gcc/ada/exp_unst.adb b/gcc/ada/exp_unst.adb
index 5469f28c79d106ad78807fa0a9d2e9a9b14abd27..6451246210a786869aacb1c6c2c51fc8a5fe5c58 100644 (file)
--- a/gcc/ada/exp_unst.adb
+++ b/gcc/ada/exp_unst.adb
@@ -720,8 +720,8 @@ package body Exp_Unst is
                --  other calls.
 
                when N_Allocator
-                  | N_Free_Statement
                   | N_Extended_Return_Statement
+                  | N_Free_Statement
                   | N_Simple_Return_Statement
                =>
                   declare
@@ -735,8 +735,8 @@ package body Exp_Unst is
                      end if;
                   end;
 
-               --  A 'Access reference is a (potential) call.
-               --  Other attributes require special handling.
+               --  A 'Access reference is a (potential) call. Other attributes
+               --  require special handling.
 
                when N_Attribute_Reference =>
                   declare
@@ -795,9 +795,9 @@ package body Exp_Unst is
                      end case;
                   end;
 
-               --  Component associations in aggregates are either static
-               --  or else the aggregate will be expanded into assignments,
-               --  in which case the expression is analyzed later and provides
+               --  Component associations in aggregates are either static or
+               --  else the aggregate will be expanded into assignments, in
+               --  which case the expression is analyzed later and provides
                --  no relevant code generation.
 
                when N_Component_Association =>

diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 4d7fe26c9627256ea8fe530726d5d7ec5b2b5508..3f0350a36823f7797aeef1a13de7122203481a22 100644 (file)
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -3447,12 +3447,11 @@ package body Freeze is
                      null;
                   else
                      Error_Msg_NE
-                       ("Thread_Local_Storage variable& is "
-                        & "improperly initialized", Decl, E);
+                       ("Thread_Local_Storage variable& is improperly "
+                        & "initialized", Decl, E);
                      Error_Msg_NE
-                       ("\only allowed initialization is explicit "
-                        & "NULL, static expression or static aggregate",
-                          Decl, E);
+                       ("\only allowed initialization is explicit NULL, "
+                        & "static expression or static aggregate", Decl, E);
                   end if;
                end if;
             end;

diff --git a/gcc/ada/libgnat/a-direct.adb b/gcc/ada/libgnat/a-direct.adb
index dd8b1acee42ca85f39ca9048ad2172639c1eaec2..c232223d5078a6de5b8cf8df3b32dfbfd2b3211b 100644 (file)
--- a/gcc/ada/libgnat/a-direct.adb
+++ b/gcc/ada/libgnat/a-direct.adb
@@ -1079,8 +1079,8 @@ package body Ada.Directories is
       Test_File : Directory_Entry_Type;
 
       function GNAT_name_case_equivalence return Interfaces.C.int;
-      pragma Import
-        (C, GNAT_name_case_equivalence, "__gnat_name_case_equivalence");
+      pragma Import (C, GNAT_name_case_equivalence,
+                     "__gnat_name_case_equivalence");
 
    begin
       --  Check for the invalid case
@@ -1101,10 +1101,11 @@ package body Ada.Directories is
       --  fall through to a Status_Error where we then take the imprecise
       --  default for the host OS.
 
-      Start_Search (Search    => S,
-                    Directory => To_String (Dir_Path),
-                    Pattern   => "",
-                    Filter    => (Directory => False, others => True));
+      Start_Search
+        (Search    => S,
+         Directory => To_String (Dir_Path),
+         Pattern   => "",
+         Filter    => (Directory => False, others => True));
 
       loop
          Get_Next_Entry (S, Test_File);
@@ -1112,7 +1113,7 @@ package body Ada.Directories is
          --  Check if we have found a "caseable" file
 
          exit when To_Lower (Simple_Name (Test_File)) /=
-                     To_Upper (Simple_Name (Test_File));
+                   To_Upper (Simple_Name (Test_File));
       end loop;
 
       End_Search (S);
@@ -1160,6 +1161,7 @@ package body Ada.Directories is
       return Case_Sensitive;
    exception
       when Status_Error =>
+
          --  There is no unobtrusive way to check for the directory's casing so
          --  return the OS default.
 
@@ -1437,10 +1439,11 @@ package body Ada.Directories is
             Case_Sensitive := False;
          end if;
 
-         Pat := Compile
-           (Pattern,
-            Glob           => True,
-            Case_Sensitive => Case_Sensitive);
+         Pat :=
+           Compile
+             (Pattern,
+              Glob           => True,
+              Case_Sensitive => Case_Sensitive);
       exception
          when Error_In_Regexp =>
             Free (Search.Value);