From d3289ba2b4ee27a776fa4c678739b50c6d1d919d Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Wed, 21 May 2014 13:17:41 +0000 Subject: [PATCH] sinfo.ads, [...]: Minor reformatting. 2014-05-21 Robert Dewar * sinfo.ads, sem_ch12.adb, sem_warn.adb: Minor reformatting. From-SVN: r210706 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/sem_ch12.adb | 21 +++++++++++++-------- gcc/ada/sem_warn.adb | 6 +++--- gcc/ada/sinfo.ads | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f09c608ef4a9..6b1eaaee8016 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2014-05-21 Robert Dewar + + * sinfo.ads, sem_ch12.adb, sem_warn.adb: Minor reformatting. + 2014-05-21 Robert Dewar * sem_elab.adb: Minor reformatting. diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 057f088cd704..2d7487667bc4 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -9946,6 +9946,10 @@ package body Sem_Ch12 is -- appear uninitialized. This is suspicious, unless the actual is a -- fully initialized type. + ----------------------------- + -- Check_Initialized_Types -- + ----------------------------- + procedure Check_Initialized_Types is Decl : Node_Id; Formal : Entity_Id; @@ -9958,11 +9962,10 @@ package body Sem_Ch12 is and then Needs_Initialized_Actual (Decl)) or else (Nkind (Decl) = N_Formal_Type_Declaration - and then - Nkind (Formal_Type_Definition (Decl)) = - N_Formal_Private_Type_Definition - and then Needs_Initialized_Actual - (Formal_Type_Definition (Decl))) + and then Nkind (Formal_Type_Definition (Decl)) = + N_Formal_Private_Type_Definition + and then Needs_Initialized_Actual + (Formal_Type_Definition (Decl))) then Formal := Defining_Identifier (Decl); Actual := First_Entity (Act_Decl_Id); @@ -9980,9 +9983,8 @@ package body Sem_Ch12 is and then Warn_On_No_Value_Assigned then Error_Msg_NE - ("from its use in generic unit, actual for&" - & " should be fully initialized type?", - Actual, Formal); + ("from its use in generic unit, actual for& should " + & "be fully initialized type??", Actual, Formal); exit; end if; @@ -9993,6 +9995,9 @@ package body Sem_Ch12 is Next (Decl); end loop; end Check_Initialized_Types; + + -- Start of processing for Instantiate_Package_Body + begin Gen_Body_Id := Corresponding_Body (Gen_Decl); diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 012345ee7efe..26202b0f0317 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -852,10 +852,10 @@ package body Sem_Warn is end if; if Res then - Error_Msg_N ("?!variable& of a generic type is " - & "potentially uninitialized", Ent); + Error_Msg_N ("?!variable& of a generic type is potentially " + & "uninitialized", Ent); Error_Msg_NE ("\?instantiations must provide fully initialized " - & "type for&", Ent, T); + & "type for&", Ent, T); end if; return Res; diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 3f3c312f609e..9a0afe7f5a74 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -10953,7 +10953,7 @@ package Sinfo is (1 => True, -- Expressions (List1) 2 => False, -- unused 3 => True, -- Prefix (Node3) - 4 => False, -- Generalized_Indexing (Node4-Sem) + 4 => False, -- Generalized_Indexing (Node4-Sem) 5 => False), -- Etype (Node5-Sem) N_Slice =>