From 3702225c48a2db3cce92b96ca1648b16806c6abb Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 2 May 2016 11:12:46 +0200 Subject: Minor reformatting. From-SVN: r235711 --- gcc/ada/sem_ch4.adb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gcc/ada/sem_ch4.adb') diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 9982708..fdefb00 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -597,13 +597,15 @@ package body Sem_Ch4 is if Is_Tagged_Type (Type_Id) and then Has_Discriminants (Type_Id) and then not Is_Constrained (Type_Id) - and then Present - (Discriminant_Default_Value (First_Discriminant (Type_Id))) + and then + Present + (Discriminant_Default_Value + (First_Discriminant (Type_Id))) then declare + Constr : constant List_Id := New_List; Loc : constant Source_Ptr := Sloc (E); Discr : Entity_Id := First_Discriminant (Type_Id); - Constr : constant List_Id := New_List; begin if Present (Discriminant_Default_Value (Discr)) then @@ -612,11 +614,12 @@ package body Sem_Ch4 is Next_Discriminant (Discr); end loop; - Rewrite (E, Make_Subtype_Indication (Loc, - Subtype_Mark => New_Occurrence_Of (Type_Id, Loc), - Constraint => - Make_Index_Or_Discriminant_Constraint (Loc, - Constr))); + Rewrite (E, + Make_Subtype_Indication (Loc, + Subtype_Mark => New_Occurrence_Of (Type_Id, Loc), + Constraint => + Make_Index_Or_Discriminant_Constraint (Loc, + Constraints => Constr))); end if; end; end if; @@ -638,7 +641,7 @@ package body Sem_Ch4 is Error_Msg_N ("constraint not allowed here", E); if Nkind (Constraint (E)) = - N_Index_Or_Discriminant_Constraint + N_Index_Or_Discriminant_Constraint then Error_Msg_N -- CODEFIX ("\if qualified expression was meant, " & -- cgit v1.1