From ff7a5bcbdf9f3d0c219550cd0aa0ef248f7504eb Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Mon, 4 Aug 2014 10:01:41 +0000 Subject: [PATCH] exp_prag.adb, [...]: Minor reformatting. 2014-08-04 Robert Dewar * exp_prag.adb, sem_ch7.adb, einfo.adb, sem_prag.adb, sem_util.adb, exp_ch3.adb: Minor reformatting. From-SVN: r213553 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/einfo.adb | 7 +++---- gcc/ada/exp_ch3.adb | 5 +++-- gcc/ada/exp_prag.adb | 3 +-- gcc/ada/sem_ch7.adb | 3 +-- gcc/ada/sem_prag.adb | 2 +- gcc/ada/sem_util.adb | 3 +-- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7659de4..94286c5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2014-08-04 Robert Dewar + * exp_prag.adb, sem_ch7.adb, einfo.adb, sem_prag.adb, sem_util.adb, + exp_ch3.adb: Minor reformatting. + +2014-08-04 Robert Dewar + * prj-strt.adb, prj-strt.ads, sem_attr.adb: Minor reformatting. 2014-08-04 Hristian Kirtchev diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb index 76e5a6d..f63e6fa 100644 --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -7896,7 +7896,6 @@ package body Einfo is (Num => Significand * 2 ** (Exponent mod 4), Den => -Exponent / 4, Rbase => 16); - else return UR_From_Components @@ -7981,9 +7980,9 @@ package body Einfo is begin pragma Assert - (Is_Type (Id) - and then (Has_Default_Init_Cond (Id) - or Has_Inherited_Default_Init_Cond (Id))); + (Is_Type (Id) and then (Has_Default_Init_Cond (Id) + or + Has_Inherited_Default_Init_Cond (Id))); S := Subprograms_For_Type (Id); Set_Subprograms_For_Type (Id, V); diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 868f9e1..503b374 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6039,8 +6039,9 @@ package body Exp_Ch3 is -- Note that the check is generated for source objects only if Comes_From_Source (Def_Id) - and then (Has_Default_Init_Cond (Base_Typ) - or else Has_Inherited_Default_Init_Cond (Base_Typ)) + and then (Has_Default_Init_Cond (Base_Typ) + or else + Has_Inherited_Default_Init_Cond (Base_Typ)) then declare DIC_Call : constant Node_Id := diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb index bb4bcae..ae97013 100644 --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -1159,8 +1159,7 @@ package body Exp_Prag is Expression => New_Copy_Tree (Internal)), Make_Pragma_Argument_Association (Eloc, Expression => - Make_String_Literal (Sloc => Ploc, - Strval => "common_object")), + Make_String_Literal (Sloc => Ploc, Strval => "common_object")), Make_Pragma_Argument_Association (Ploc, Expression => New_Copy_Tree (Psect))))); end Expand_Pragma_Common_Object; diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index e899132..c018c1c 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -1352,8 +1352,7 @@ package body Sem_Ch7 is -- Inspect the entities defined in the package and ensure that all -- incomplete types have received full declarations. Build default - -- initial condition and invariant procedures for all types that - -- qualify. + -- initial condition and invariant procedures for all qualifying types. E := First_Entity (Id); while Present (E) loop diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 82d7df4..f8c6bd3 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -12781,7 +12781,7 @@ package body Sem_Prag is if Pragma_Name (Stmt) = Pname then Error_Msg_Name_1 := Pname; Error_Msg_Sloc := Sloc (Stmt); - Error_Msg_N ("pragma % duplicates pragma declared #", N); + Error_Msg_N ("pragma % duplicates pragma declared#", N); end if; -- Skip internally generated code diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index e325b9f..607617c 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -1392,8 +1392,7 @@ package body Sem_Util is Make_Defining_Identifier (Loc, Chars => New_External_Name (Chars (Typ), "Default_Init_Cond")); - -- Associate the default initial condition procedure with the private - -- type. + -- Associate default initial condition procedure with the private type Set_Ekind (Proc_Id, E_Procedure); Set_Is_Default_Init_Cond_Procedure (Proc_Id); -- 2.7.4