From 6daa9793b1ef371660af587a47708dac64fc10e6 Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 2 Aug 2011 14:43:43 +0000 Subject: [PATCH] 2011-08-02 Robert Dewar * exp_ch7.adb exp_ch6.adb, exp_disp.adb: Minor reformatting git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177165 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/exp_ch6.adb | 8 ++++---- gcc/ada/exp_ch7.adb | 19 +++++++++---------- gcc/ada/exp_disp.adb | 13 +++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f980c73..2c473c0 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2011-08-02 Robert Dewar + + * exp_ch7.adb exp_ch6.adb, exp_disp.adb: Minor reformatting + 2011-08-02 Javier Miranda * exp_ch6.adb (Expand_N_Subprogram_Body): Temporarily restrict the diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index cb4b6c8..a2564c4 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -5121,9 +5121,9 @@ package body Exp_Ch6 is -- Start of processing for Expand_N_Subprogram_Body begin - -- If this is the main compilation unit and we are generating code for - -- VM targets we generate now the Type Specific Data record of all the - -- enclosing tagged type declarations + -- If this is the main compilation unit, and we are generating code for + -- VM targets, we now generate the Type Specific Data record of all the + -- enclosing tagged type declarations. -- Temporarily restrict this support to the .NET compiler??? diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 40e0221..6e67362 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1557,7 +1557,7 @@ package body Exp_Ch7 is Build_Static_Dispatch_Tables (N); -- In VM targets there is no need to build dispatch tables but - -- we must generate the corresponding Type Specific Data record + -- we must generate the corresponding Type Specific Data record. -- Temporarily restrict this support to the .NET compiler??? @@ -1664,23 +1664,22 @@ package body Exp_Ch7 is if Is_Compilation_Unit (Id) or else (Is_Generic_Instance (Id) - and then Is_Library_Level_Entity (Id)) + and then Is_Library_Level_Entity (Id)) then if Tagged_Type_Expansion then Build_Static_Dispatch_Tables (N); - -- In VM targets there is no need to build dispatch tables but - -- we must generate the corresponding Type Specific Data record + -- In VM targets there is no need to build dispatch tables, but we + -- must generate the corresponding Type Specific Data record. -- Temporarily restrict this support to the .NET compiler??? elsif Unit (Cunit (Main_Unit)) = N and then VM_Target = CLI_Target then - - -- Enter the scope of the package because the new declarations - -- are appended at the end of the package and must be analyzed - -- in that context. + -- Enter the scope of the package because the new declarations are + -- appended at the end of the package and must be analyzed in that + -- context. Push_Scope (Id); @@ -1721,7 +1720,7 @@ package body Exp_Ch7 is R : Node_Id; begin - -- If the restriction No_Finalization applies, then there's not any + -- If the restriction No_Finalization applies, then there isn't a -- finalization list available to return, so return Empty. if Restriction_Active (No_Finalization) then diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 88f4b80..4b0e8c9 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -478,7 +478,7 @@ package body Exp_Disp is procedure Build_TSDs (List : List_Id); -- Build the static dispatch table of tagged types found in the list of - -- declarations. The generated nodes are added at the end of Target_List + -- declarations. Add the generated nodes to the end of Target_List. procedure Build_Package_TSDs (N : Node_Id); -- Build static dispatch tables associated with package declaration N @@ -6255,9 +6255,9 @@ package body Exp_Disp is Loc : constant Source_Ptr := Sloc (Typ); Result : constant List_Id := New_List; AI : Elmt_Id; - I_Depth : Nat := 0; + I_Depth : Nat := 0; -- why initialized here ??? Iface_Table_Node : Node_Id; - Num_Ifaces : Nat := 0; + Num_Ifaces : Nat := 0; -- why initialized here ??? TSD_Aggr_List : List_Id; Typ_Ifaces : Elist_Id; TSD_Tags_List : List_Id; @@ -6341,11 +6341,9 @@ package body Exp_Disp is declare Type_Is_Library_Level : Entity_Id; - begin Type_Is_Library_Level := Boolean_Literals (Is_Library_Level_Entity (Typ)); - Append_To (TSD_Aggr_List, New_Occurrence_Of (Type_Is_Library_Level, Loc)); end; @@ -6382,8 +6380,7 @@ package body Exp_Disp is Expressions => New_List ( Make_Attribute_Reference (Loc, Prefix => New_Reference_To (Node (AI), Loc), - Attribute_Name => Name_Tag) - ))); + Attribute_Name => Name_Tag)))); Next_Elmt (AI); end loop; -- 2.7.4