From 804ec349d065e79f5f54d513156a46b3d95b69bf Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Fri, 13 Jan 2017 10:56:14 +0000 Subject: [PATCH] bindgen.adb, [...]: Minor reformatting and typo fixes. 2017-01-13 Gary Dismukes * bindgen.adb, sem_ch6.adb, binde.adb, exp_ch3.adb: Minor reformatting and typo fixes. From-SVN: r244420 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/binde.adb | 22 +++++++++++----------- gcc/ada/bindgen.adb | 2 +- gcc/ada/exp_ch3.adb | 4 ++-- gcc/ada/sem_ch6.adb | 15 ++++++++------- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fba33935f16..ba0408a44f0 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2017-01-13 Gary Dismukes + + * bindgen.adb, sem_ch6.adb, binde.adb, exp_ch3.adb: Minor reformatting + and typo fixes. + 2017-01-13 Javier Miranda * einfo.ads (Component_Bit_Offset): Fix documentation. diff --git a/gcc/ada/binde.adb b/gcc/ada/binde.adb index ea341272b56..7ab20924f92 100644 --- a/gcc/ada/binde.adb +++ b/gcc/ada/binde.adb @@ -83,8 +83,8 @@ package body Binde is -- will be a successor of X (spec), and X (spec) will be a predecessor of -- Y (body). -- - -- Note that we store the successors of each unit explictly. We don't store - -- the predecessors, but we store a count of them. + -- Note that we store the successors of each unit explicitly. We don't + -- store the predecessors, but we store a count of them. -- -- The basic algorithm is to first compute a directed graph of units (type -- Unit_Node_Record, below), with successors as edges. A unit is "ready" @@ -538,7 +538,7 @@ package body Binde is return False; - -- Prefer a pure or preelaborated unit to one that is not Pure should + -- Prefer a pure or preelaborated unit to one that is not. Pure should -- come before preelaborated. elsif Is_Pure_Or_Preelab_Unit (U1) @@ -734,7 +734,7 @@ package body Binde is -- If either unit is predefined or internal, then we use the normal -- Better_Choice_Optimistic rule, since we don't want to disturb the - -- elaboration rules of the language with -p, same treatment for + -- elaboration rules of the language with -p; same treatment for -- Pure/Preelab. -- Prefer a predefined unit to a non-predefined unit @@ -1035,7 +1035,7 @@ package body Binde is end if; -- For all successors, decrement the number of predecessors, and if it - -- becomes zero, then add to no predecessor list. + -- becomes zero, then add to no-predecessor list. S := UNR.Table (Chosen).Successors; while S /= No_Successor loop @@ -2543,7 +2543,7 @@ package body Binde is -- private;", and pass in iterators to iterate over all nodes, and over -- the successors of a given node. However, that leads to using advanced -- features of Ada that are not allowed in the compiler and binder for - -- bootstrapping reason. It also leads to trampolines, which are not + -- bootstrapping reasons. It also leads to trampolines, which are not -- allowed in the compiler and binder. Restricting Node to be discrete -- allows us to iterate over all nodes with a 'for' loop, and allows us -- to attach temporary information to nodes by having an array indexed @@ -2617,7 +2617,7 @@ package body Binde is Low_Links (N) := Index; Index := Index + 1; - -- Push it one the stack: + -- Push it on the stack: Top := Stack_Position_Of_N; Stack (Top) := N; @@ -2902,7 +2902,7 @@ package body Binde is Compute_Unit_SCCs; - -- Initialize the no predecessor list + -- Initialize the no-predecessor list No_Pred := No_Unit_Id; for U in UNR.First .. UNR.Last loop @@ -2913,7 +2913,7 @@ package body Binde is end loop; -- OK, now we determine the elaboration order proper. All we do is to - -- select the best choice from the no predecessor list until all the + -- select the best choice from the no-predecessor list until all the -- nodes have been chosen. Outer : loop @@ -3100,7 +3100,7 @@ package body Binde is Gather_Dependencies; - -- Initialize the no predecessor list + -- Initialize the no-predecessor list No_Pred := No_Unit_Id; for U in UNR.First .. UNR.Last loop @@ -3111,7 +3111,7 @@ package body Binde is end loop; -- OK, now we determine the elaboration order proper. All we do is to - -- select the best choice from the no predecessor list until all the + -- select the best choice from the no-predecessor list until all the -- nodes have been chosen. Outer : loop diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index d6c9a83d7dc..b4d7cecc385 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -404,7 +404,7 @@ package body Bindgen is procedure Write_Statement_Buffer (S : String); -- First writes its argument (using Set_String (S)), then writes out the - -- contents of statement buffer up to Stm_Last, and reset Stm_Last to 0 + -- contents of statement buffer up to Stm_Last, and resets Stm_Last to 0. procedure Write_Bind_Line (S : String); -- Write S (an LF-terminated string) to the binder file (for use with diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 219262dd550..bae35be45fe 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -5655,8 +5655,8 @@ package body Exp_Ch3 is if Is_Imported (Def_Id) or else Suppress_Initialization (Def_Id) then return; - -- Nothing to do if the object being initializes is of a task type - -- and restriction No_Tasking is in effect because this is a direct + -- Nothing to do if the object being initialized is of a task type + -- and restriction No_Tasking is in effect, because this is a direct -- violation of the restriction. elsif Is_Task_Type (Base_Typ) diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 7cb90bfc6da..86bbb532771 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -379,7 +379,7 @@ package body Sem_Ch6 is -- An entity can only be frozen if it has a completion, so we must -- check this explicitly. If it is declared elsewhere it will have - -- been frozen already, so only types declared in currently opend + -- been frozen already, so only types declared in currently opened -- scopes need to be tested. if Ekind (Ret_Type) = E_Private_Type @@ -2245,9 +2245,9 @@ package body Sem_Ch6 is -- to be used to undo the transformation. procedure Freeze_Expr_Types (Spec_Id : Entity_Id); - -- (AI12-0103) N is the body associated with an expression function that - -- is a completion, and Spec_Id its defining entity. Freeze before N all - -- the types referenced by the expression of the function. + -- AI12-0103: N is the body associated with an expression function that + -- is a completion, and Spec_Id is its defining entity. Freeze before N + -- all the types referenced by the expression of the function. function Is_Private_Concurrent_Primitive (Subp_Id : Entity_Id) return Boolean; @@ -3498,8 +3498,9 @@ package body Sem_Ch6 is Set_Has_Delayed_Freeze (Spec_Id); Freeze_Before (N, Spec_Id); - -- At the occurrence of an expression function declaration that is - -- a completion, its expression causes freezing (AI12-0103). + -- AI12-0103: At the occurrence of an expression function + -- declaration that is a completion, its expression causes + -- freezing. if Has_Completion (Spec_Id) and then Was_Expression_Function (N) @@ -8544,7 +8545,7 @@ package body Sem_Ch6 is and then Ekind (Entity (E1)) = E_Discriminant and then Ekind (Entity (E2)) = E_In_Parameter) - -- AI12-050 : The loop variables of quantified expressions + -- AI12-050: The loop variables of quantified expressions -- match if they have the same identifier, even though they -- are different entities. -- 2.30.2