From 4404c2826c45ffb749e868b011c480a9d279f8e7 Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Tue, 24 Nov 2015 09:22:24 +0000 Subject: [PATCH] sem_ch3.adb, [...]: Minor reformatting, rewording, and typo corrections. 2015-11-24 Gary Dismukes * sem_ch3.adb, sem_type.adb, sem_ch7.adb, sem_ch9.adb, checks.adb, sem_prag.adb, contracts.adb, g-strhas.ads, sem_ch6.adb: Minor reformatting, rewording, and typo corrections. From-SVN: r230794 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/checks.adb | 4 ++-- gcc/ada/contracts.adb | 4 ++-- gcc/ada/g-strhas.ads | 2 +- gcc/ada/sem_ch3.adb | 6 +++--- gcc/ada/sem_ch6.adb | 2 +- gcc/ada/sem_ch7.adb | 2 +- gcc/ada/sem_ch9.adb | 6 +++--- gcc/ada/sem_prag.adb | 14 +++++++------- gcc/ada/sem_type.adb | 8 ++++---- 10 files changed, 30 insertions(+), 24 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index caea65a6a22..a83124f2cc2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2015-11-24 Gary Dismukes + + * sem_ch3.adb, sem_type.adb, sem_ch7.adb, sem_ch9.adb, checks.adb, + sem_prag.adb, contracts.adb, g-strhas.ads, sem_ch6.adb: Minor + reformatting, rewording, and typo corrections. + 2015-11-24 Eric Botcazou * gcc-interface/decl.c (gnat_to_gnu_entity) : In diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb index 05a313ebbd2..908837cd015 100644 --- a/gcc/ada/checks.adb +++ b/gcc/ada/checks.adb @@ -921,7 +921,7 @@ package body Checks is -- range of x op y is included in the range of type1 -- size of type1 is at least twice the result size of op - -- then we don't do an overflow check in any case, instead we transform + -- then we don't do an overflow check in any case. Instead, we transform -- the operation so that we end up with: -- type1 (type1 (x) op type1 (y)) @@ -1262,7 +1262,7 @@ package body Checks is -- is replaced with a reference to Rnn. -- If our parent is a conversion node then there is no point in - -- generating a conversion to Result_Type, we will let the parent + -- generating a conversion to Result_Type. Instead, we let the parent -- handle this. Note that this special case is not just about -- optimization. Consider diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb index 8eb5d8ea4f2..ebaecc09512 100644 --- a/gcc/ada/contracts.adb +++ b/gcc/ada/contracts.adb @@ -58,7 +58,7 @@ package body Contracts is -- Analyze_Previous_Constracts. Analyze the contracts of all constructs in -- the list L. If Freeze_Nod is set, then the analysis stops when the node -- is reached. Freeze_Id is the entity of some related context which caused - -- freezing upto node Freeze_Nod. + -- freezing up to node Freeze_Nod. procedure Expand_Subprogram_Contract (Body_Id : Entity_Id); -- Expand the contracts of a subprogram body and its correspoding spec (if @@ -1120,7 +1120,7 @@ package body Contracts is Par := Parent (Par); end loop; - -- Analyze the contracts of all eligible construct upto the body which + -- Analyze the contracts of all eligible construct up to the body which -- caused the "freezing". if Is_List_Member (Body_Decl) then diff --git a/gcc/ada/g-strhas.ads b/gcc/ada/g-strhas.ads index 6a7d251e6f4..c20b678c9fa 100644 --- a/gcc/ada/g-strhas.ads +++ b/gcc/ada/g-strhas.ads @@ -34,7 +34,7 @@ -- string hash functions in Ada.Containers. -- -- The algorithm used here is not appropriate for applications that require --- cryptographically strong hashes, or for application which wish to use very +-- cryptographically strong hashes, or for applications that wish to use very -- wide hash values as pseudo unique identifiers. In such cases please refer -- to GNAT.SHA1 and GNAT.MD5. diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 78fa19f0cbb..35d2b9810bf 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -2507,9 +2507,9 @@ package body Sem_Ch3 is Check_Unused_Body_States (Defining_Entity (Context)); - -- State refinements are visible upto the end the of the package - -- body declarations. Hide the state refinements from visibility - -- to restore the original state conditions. + -- State refinements are visible up to the end of the package body + -- declarations. Hide the state refinements from visibility to + -- restore the original state conditions. Remove_Visible_Refinements (Corresponding_Spec (Context)); end if; diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index f193f5527b1..9474ef57af5 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -2980,7 +2980,7 @@ package body Sem_Ch6 is begin -- A [generic] subprogram body "freezes" the contract of the nearest -- enclosing package body and all other contracts encountered in the - -- same declarative part upto and excluding the subprogram body: + -- same declarative part up to and excluding the subprogram body: -- package body Nearest_Enclosing_Package -- with Refined_State => (State => Constit) diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index 18cd618a547..e182771aef4 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -544,7 +544,7 @@ package body Sem_Ch7 is begin -- A [generic] package body "freezes" the contract of the nearest -- enclosing package body and all other contracts encountered in the - -- same declarative part upto and excluding the package body: + -- same declarative part up to and excluding the package body: -- package body Nearest_Enclosing_Package -- with Refined_State => (State => Constit) diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb index b67b248952f..bbb801824b1 100644 --- a/gcc/ada/sem_ch9.adb +++ b/gcc/ada/sem_ch9.adb @@ -1194,7 +1194,7 @@ package body Sem_Ch9 is begin -- An entry body "freezes" the contract of the nearest enclosing package -- body and all other contracts encountered in the same declarative part - -- upto and excluding the entry body. This ensures that any annotations + -- up to and excluding the entry body. This ensures that any annotations -- referenced by the contract of an entry or subprogram body declared -- within the current protected body are available. @@ -1769,7 +1769,7 @@ package body Sem_Ch9 is begin -- A protected body "freezes" the contract of the nearest enclosing -- package body and all other contracts encountered in the same - -- declarative part upto and excluding the protected body. This ensures + -- declarative part up to and excluding the protected body. This ensures -- that any annotations referenced by the contract of an entry or -- subprogram body declared within the current protected body are -- available. @@ -2810,7 +2810,7 @@ package body Sem_Ch9 is begin -- A task body "freezes" the contract of the nearest enclosing package -- body and all other contracts encountered in the same declarative part - -- upto and excluding the task body. This ensures that annotations + -- up to and excluding the task body. This ensures that annotations -- referenced by the contract of an entry or subprogram body declared -- within the current protected body are available. diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 5ad3a555ced..3c8b6a5fb2a 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -358,7 +358,7 @@ package body Sem_Prag is Others_Seen : Boolean := False; -- This flag is set when an "others" choice is encountered. It is used - -- to detect multiple illegal occurences of "others". + -- to detect multiple illegal occurrences of "others". procedure Analyze_Contract_Case (CCase : Node_Id); -- Verify the legality of a single contract case @@ -411,7 +411,7 @@ package body Sem_Prag is Preanalyze_Assert_Expression (Case_Guard, Standard_Boolean); -- Emit a clarification message when the case guard contains - -- at leat one undefined reference, possibly due to contract + -- at least one undefined reference, possibly due to contract -- "freezing". if Errors /= Serious_Errors_Detected @@ -426,7 +426,7 @@ package body Sem_Prag is Preanalyze_Assert_Expression (Conseq, Standard_Boolean); -- Emit a clarification message when the consequence contains - -- at leat one undefined reference, possibly due to contract + -- at least one undefined reference, possibly due to contract -- "freezing". if Errors /= Serious_Errors_Detected @@ -23230,8 +23230,8 @@ package body Sem_Prag is Errors := Serious_Errors_Detected; Preanalyze_Assert_Expression (Expr, Standard_Boolean); - -- Emit a clarification message when the expression contains at leat one - -- undefined reference, possibly due to contract "freezing". + -- Emit a clarification message when the expression contains at least + -- one undefined reference, possibly due to contract "freezing". if Errors /= Serious_Errors_Detected and then Present (Freeze_Id) @@ -26712,7 +26712,7 @@ package body Sem_Prag is begin Global_Seen := False; - -- Process all formal parameters of entries, [generic] subprograms and + -- Process all formal parameters of entries, [generic] subprograms, and -- their bodies. if Ekind_In (Subp_Id, E_Entry, @@ -26744,7 +26744,7 @@ package body Sem_Prag is Append_New_Elmt (Formal, Subp_Outputs); -- Out parameters can act as inputs when the related type is - -- tagged, unconstrained array, unconstrained record or record + -- tagged, unconstrained array, unconstrained record, or record -- with unconstrained components. if Ekind (Formal) = E_Out_Parameter diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb index f5826c488d9..f00639e0c48 100644 --- a/gcc/ada/sem_type.adb +++ b/gcc/ada/sem_type.adb @@ -137,7 +137,7 @@ package body Sem_Type is -- entities. We do not introduce explicit versions of primitive operators -- for each type definition. As a result, there is only one entity -- corresponding to predefined addition on all numeric types, etc. The - -- back-end resolves predefined operators according to their type. The + -- back end resolves predefined operators according to their type. The -- visibility of primitive operations then reduces to the visibility of the -- resulting type: (a + b) is a legal interpretation of some primitive -- operator + if the type of the result (which must also be the type of a @@ -1223,7 +1223,7 @@ package body Sem_Type is elsif From_Limited_With (T1) then - -- If the expected type is the non-limited view of a type, the + -- If the expected type is the nonlimited view of a type, the -- expression may have the limited view. If that one in turn is -- incomplete, get full view if available. @@ -2620,7 +2620,7 @@ package body Sem_Type is if Ekind (Target_Typ) = E_Incomplete_Type then - -- We must have either a full view or a non-limited view of the type + -- We must have either a full view or a nonlimited view of the type -- to locate the list of ancestors. if Present (Full_View (Target_Typ)) then @@ -2630,7 +2630,7 @@ package body Sem_Type is Target_Typ := Non_Limited_View (Target_Typ); end if; - -- Protect the frontend against previously detected errors + -- Protect the front end against previously detected errors if Ekind (Target_Typ) = E_Incomplete_Type then return False; -- 2.30.2