From 07fb1ef48334827934ea5fd204e31b25398fcf3e Mon Sep 17 00:00:00 2001 From: Hristian Kirtchev Date: Wed, 30 May 2018 08:58:51 +0000 Subject: [PATCH] [Ada] Minor reformatting 2018-05-30 Hristian Kirtchev gcc/ada/ * exp_aggr.adb, exp_unst.adb, freeze.adb, libgnat/a-direct.adb: Minor reformatting. From-SVN: r260948 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/exp_aggr.adb | 2 +- gcc/ada/exp_unst.adb | 12 ++++++------ gcc/ada/freeze.adb | 9 ++++----- gcc/ada/libgnat/a-direct.adb | 25 ++++++++++++++----------- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index dfe018dbd79..528eea4eaa2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-05-30 Hristian Kirtchev + + * exp_aggr.adb, exp_unst.adb, freeze.adb, libgnat/a-direct.adb: Minor + reformatting. + 2018-05-30 Ed Schonberg * 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 e587c17f90e..b8955d73dd0 100644 --- 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 5469f28c79d..6451246210a 100644 --- 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 4d7fe26c962..3f0350a3682 100644 --- 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 dd8b1acee42..c232223d507 100644 --- 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); -- 2.30.2