From 866000e7fb53a137db4e876dcd3f6b46195a6683 Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Wed, 3 Jul 2019 08:15:39 +0000 Subject: [PATCH] [Ada] Minor editorial corrections and reformatting 2019-07-03 Gary Dismukes gcc/ada/ * bindo-augmentors.adb, bindo-augmentors.ads, bindo-builders.ads, bindo-elaborators.adb, sem_ch12.adb, sem_ch13.adb, sem_spark.adb, sinfo.ads: Minor editorial corrections and reformatting. From-SVN: r272979 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/bindo-augmentors.adb | 8 ++++---- gcc/ada/bindo-augmentors.ads | 6 +++--- gcc/ada/bindo-builders.ads | 6 +++--- gcc/ada/bindo-elaborators.adb | 18 +++++++++--------- gcc/ada/sem_ch12.adb | 6 +++--- gcc/ada/sem_ch13.adb | 6 +++--- gcc/ada/sem_spark.adb | 2 +- gcc/ada/sinfo.ads | 4 ++-- 9 files changed, 35 insertions(+), 28 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 02f35d5..d2566c8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2019-07-03 Gary Dismukes + + * bindo-augmentors.adb, bindo-augmentors.ads, + bindo-builders.ads, bindo-elaborators.adb, sem_ch12.adb, + sem_ch13.adb, sem_spark.adb, sinfo.ads: Minor editorial + corrections and reformatting. + 2019-07-03 Bob Duff * sem_warn.adb (Check_Infinite_Loop_Warning): Avoid the warning diff --git a/gcc/ada/bindo-augmentors.adb b/gcc/ada/bindo-augmentors.adb index b94ff7a..f97f0d0 100644 --- a/gcc/ada/bindo-augmentors.adb +++ b/gcc/ada/bindo-augmentors.adb @@ -124,8 +124,8 @@ package body Bindo.Augmentors is -- * Visit the neighbours of Curr_IGV_Id. -- -- Flag Internal_Ctrl should be set when the DFS traversal visited an - -- internal controlled invocation edge. Path denotes is the length of - -- the path. + -- internal controlled invocation edge. Path denotes the length of the + -- path. procedure Write_Statistics; pragma Inline (Write_Statistics); @@ -277,7 +277,7 @@ package body Bindo.Augmentors is Set_Is_Visited (Curr_IGV_Id); - -- Update the statictics + -- Update the statistics Longest_Path := Natural'Max (Longest_Path, New_Path); Total_Visited := Total_Visited + 1; @@ -343,7 +343,7 @@ package body Bindo.Augmentors is procedure Write_Statistics is begin - -- Nothing to do when switch -d_L (output library item graph) is no + -- Nothing to do when switch -d_L (output library item graph) is not -- in effect. if not Debug_Flag_Underscore_LL then diff --git a/gcc/ada/bindo-augmentors.ads b/gcc/ada/bindo-augmentors.ads index 0efae61..de6317c 100644 --- a/gcc/ada/bindo-augmentors.ads +++ b/gcc/ada/bindo-augmentors.ads @@ -25,9 +25,9 @@ -- For full architecture, see unit Bindo. --- The following unit contains facilities to enhance the library graph which --- reflects source dependencies between units with information obtained from --- the invocation graph which reflects all activations of tasks, calls, and +-- The following unit contains facilities to enhance the library graph, which +-- reflects source dependencies between units, with information obtained from +-- the invocation graph, which reflects all activations of tasks, calls, and -- instantiations within units. with Bindo.Graphs; diff --git a/gcc/ada/bindo-builders.ads b/gcc/ada/bindo-builders.ads index 39cde4f..54c39e4 100644 --- a/gcc/ada/bindo-builders.ads +++ b/gcc/ada/bindo-builders.ads @@ -43,10 +43,10 @@ package Bindo.Builders is package Invocation_Graph_Builders is function Build_Invocation_Graph (Lib_G : Library_Graph) return Invocation_Graph; - -- Return a new invocation graph which reflects the activations of + -- Return a new invocation graph that reflects the activations of -- tasks, calls, and instantiations in all units of the bind. Each -- invocation graph vertex is linked with the corresponding vertex - -- of library graph Lib_G which contains the body of the activated + -- of library graph Lib_G, which contains the body of the activated -- task, invoked subprogram, or instantiated generic. end Invocation_Graph_Builders; @@ -57,7 +57,7 @@ package Bindo.Builders is package Library_Graph_Builders is function Build_Library_Graph return Library_Graph; - -- Return a new library graph which reflects the dependencies between + -- Return a new library graph that reflects the dependencies between -- all units of the bind. end Library_Graph_Builders; diff --git a/gcc/ada/bindo-elaborators.adb b/gcc/ada/bindo-elaborators.adb index 42b5b6d..b11598c 100644 --- a/gcc/ada/bindo-elaborators.adb +++ b/gcc/ada/bindo-elaborators.adb @@ -112,9 +112,9 @@ package body Bindo.Elaborators is Indent : Indentation_Level); pragma Inline (Add_Vertex); -- Add vertex LGV_Id of library graph G to membership set Set. Msg is - -- a message emitted for traching purposes. Step is the current step - -- in the elaboration order. Indent is the desired indentation level - -- for tracing. + -- a message emitted for tracing purposes. Step is the current step in + -- the elaboration order. Indent is the desired indentation level for + -- tracing. procedure Add_Vertex_If_Elaborable (G : Library_Graph; @@ -125,8 +125,8 @@ package body Bindo.Elaborators is Indent : Indentation_Level); pragma Inline (Add_Vertex_If_Elaborable); -- Add vertex LGV_Id of library graph G to membership set Set if it can - -- be elaborated. Msg is a message emitted for traching purposes. Step - -- is the current step in the elaboration order. Indent is the desired + -- be elaborated. Msg is a message emitted for tracing purposes. Step is + -- the current step in the elaboration order. Indent is the desired -- indentation level for tracing. function Create_All_Candidates_Set @@ -153,7 +153,7 @@ package body Bindo.Elaborators is Order : in out Unit_Id_Table; Step : Elaboration_Order_Step); pragma Inline (Elaborate_Component); - -- Elaborate as many vertices as possible which appear in component + -- Elaborate as many vertices as possible that appear in component -- Comp of library graph G. All_Candidates is the set of all elaborable -- vertices across the whole library graph. Remaining_Vertices is the -- number of vertices that remain to be elaborated. Order denotes the @@ -679,14 +679,14 @@ package body Bindo.Elaborators is Status : out Elaboration_Order_Status) is begin - -- Create, validate, and output the library graph which captures the + -- Create, validate, and output the library graph that captures the -- dependencies between library items. Lib_Graph := Build_Library_Graph; Validate_Library_Graph (Lib_Graph); Write_Library_Graph (Lib_Graph); - -- Create, validate, output, and use the invocation graph which + -- Create, validate, output, and use the invocation graph that -- represents the flow of execusion only when requested by the -- caller. @@ -707,7 +707,7 @@ package body Bindo.Elaborators is -- Traverse the invocation graph starting from elaboration code in -- order to discover transitions of the execution flow from a unit - -- to a unit which result in extra edges within the library graph. + -- to a unit that result in extra edges within the library graph. Augment_Library_Graph (Inv_Graph, Lib_Graph); diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index bf85b28..42feab0 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -6223,9 +6223,9 @@ package body Sem_Ch12 is -- actual instance and those of the formal package. function Is_Defaulted (Param : Entity_Id) return Boolean; - -- If the formql package has partly box-initialized formals, skip - -- conformace check for these formals. Previously the code assumed - -- that boc initialization for a formal package applied to all its + -- If the formal package has partly box-initialized formals, skip + -- conformance check for these formals. Previously the code assumed + -- that box initialization for a formal package applied to all its -- formal parameters. function Same_Instantiated_Constant (E1, E2 : Entity_Id) return Boolean; diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 6d9b09d..2a4afb8 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -4933,9 +4933,9 @@ package body Sem_Ch13 is elsif Is_Object (Ent) and then Present (Renamed_Object (Ent)) then - -- Case of renamed object from source, this is an error - -- unless the pbject is an aggregate and the renaming is - -- created for an object declaration. + -- In the case of a renamed object from source, this is an error + -- unless the object is an aggregate and the renaming is created + -- for an object declaration. if Comes_From_Source (Renamed_Object (Ent)) and then Nkind (Renamed_Object (Ent)) /= N_Aggregate diff --git a/gcc/ada/sem_spark.adb b/gcc/ada/sem_spark.adb index ff99e60..ef82e60 100644 --- a/gcc/ada/sem_spark.adb +++ b/gcc/ada/sem_spark.adb @@ -671,7 +671,7 @@ package body Sem_SPARK is Through_Traversal : Boolean := True) return Entity_Id; pragma Precondition (Is_Path_Expression (Expr)); -- Return the root of the path expression Expr, or Empty for an allocator, - -- NULL, or a function call. Through_Traversal is True if it should fo + -- NULL, or a function call. Through_Traversal is True if it should follow -- through calls to traversal functions. generic diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 75883f0..b1e57bf 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -3226,8 +3226,8 @@ package Sinfo is -- in package Einfo. -- Note: N_Defining_Character_Literal is an extended node whose fields - -- are deliberate laid out to match the layout of fields in an ordinary - -- N_Character_Literal node allowing for easy alteration of a character + -- are deliberately laid out to match layout of fields in an ordinary + -- N_Character_Literal node, allowing for easy alteration of a character -- literal node into a defining character literal node. For details, see -- Sinfo.CN.Change_Character_Literal_To_Defining_Character_Literal. -- 2.7.4