diff options
| author | Hristian Kirtchev <kirtchev@adacore.com> | 2018-05-21 14:51:25 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-05-21 14:51:25 +0000 |
| commit | 663afa9fac474647f69f242deab6bdc0bcaf1bf8 (patch) | |
| tree | ee7fd35b83396379f6d639069eebba6b4e27bae5 | |
| parent | 031936bc50832e0159efbac1157790d07a7bafae (diff) | |
| download | gcc-663afa9fac474647f69f242deab6bdc0bcaf1bf8.zip gcc-663afa9fac474647f69f242deab6bdc0bcaf1bf8.tar.gz gcc-663afa9fac474647f69f242deab6bdc0bcaf1bf8.tar.bz2 | |
[Ada] Minor reformatting
2018-05-21 Hristian Kirtchev <kirtchev@adacore.com>
gcc/ada/
* exp_ch3.adb: Minor reformatting.
* exp_ch6.adb: Likewise.
* freeze.adb: Likewise.
* inline.adb: Likewise.
* sem_util.adb: Likewise.
From-SVN: r260459
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/exp_ch3.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/exp_ch6.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/freeze.adb | 3 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 8 |
6 files changed, 18 insertions, 14 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 19b1278..0720a9c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2018-04-04 Hristian Kirtchev <kirtchev@adacore.com> + + * exp_ch3.adb: Minor reformatting. + * exp_ch6.adb: Likewise. + * freeze.adb: Likewise. + * inline.adb: Likewise. + * sem_util.adb: Likewise. + 2018-04-04 Yannick Moy <moy@adacore.com> * inline.adb (Expand_Inlined_Call.Process_Formals): Use a type diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 7818173..9d7fda4 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6052,10 +6052,11 @@ package body Exp_Ch3 is and then not Has_Init_Expression (N) then Set_No_Initialization (N, False); - Set_Expression - (N, New_Copy_Tree - (Get_Simple_Init_Val (Typ, N, Esize (Def_Id)), - New_Sloc => Sloc (Obj_Def))); + Set_Expression (N, + New_Copy_Tree + (Source => Get_Simple_Init_Val (Typ, N, Esize (Def_Id)), + New_Sloc => Sloc (Obj_Def))); + Analyze_And_Resolve (Expression (N), Typ); end if; diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index c9d4043..21d87ef 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -8439,7 +8439,7 @@ package body Exp_Ch6 is begin while Present (N) - and then Nkind_In (N, N_Pragma, N_Attribute_Reference) + and then Nkind_In (N, N_Attribute_Reference, N_Pragma) loop Analyze (N); D := N; diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 08163ef..958f3e0 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -716,9 +716,8 @@ package body Freeze is if Present (Init) and then (Nkind (Init) /= N_Function_Call - or else not Is_Expanded_Build_In_Place_Call (Init)) + or else not Is_Expanded_Build_In_Place_Call (Init)) then - -- Capture initialization value at point of declaration, and make -- explicit assignment legal, because object may be a constant. diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index e1c603f..72cb5c0 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -2492,8 +2492,8 @@ package body Inline is -- type, because those must be resolved to a specific type. if Nkind_In (Expression (N), N_Aggregate, - N_Null, N_Character_Literal, + N_Null, N_String_Literal) or else Yields_Universal_Type (Expression (N)) then diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index cba7c46..5555441 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -19533,9 +19533,7 @@ package body Sem_Util is begin -- Discriminant_Constraint - if Is_Type (Id) - and then Has_Discriminants (Base_Type (Id)) - then + if Is_Type (Id) and then Has_Discriminants (Base_Type (Id)) then Set_Discriminant_Constraint (Id, Elist_Id ( Copy_Field_With_Replacement (Field => Union_Id (Discriminant_Constraint (Id)), @@ -19992,9 +19990,7 @@ package body Sem_Util is -- Discriminant_Constraint - if Is_Type (Id) - and then Has_Discriminants (Base_Type (Id)) - then + if Is_Type (Id) and then Has_Discriminants (Base_Type (Id)) then Visit_Field (Field => Union_Id (Discriminant_Constraint (Id)), Semantic => True); |