From a3559241b73521087af5217a33fb4e0a5c5ddb4d Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Mon, 3 Dec 2018 15:49:37 +0000 Subject: [PATCH] [Ada] Spelling fixes and minor reformatting 2018-12-03 Gary Dismukes gcc/ada/ * exp_ch3.adb, libgnarl/s-taasde.adb, libgnarl/s-taenca.adb, libgnarl/s-tarest.adb, libgnarl/s-tasini.adb, libgnarl/s-taskin.ads, libgnarl/s-tasren.adb, libgnarl/s-tassta.adb, libgnarl/s-tasuti.adb: Spelling fixes and minor reformatting. From-SVN: r266756 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/exp_ch3.adb | 2 +- gcc/ada/libgnarl/s-taasde.adb | 6 +++--- gcc/ada/libgnarl/s-taenca.adb | 2 +- gcc/ada/libgnarl/s-tarest.adb | 2 +- gcc/ada/libgnarl/s-tasini.adb | 6 +++--- gcc/ada/libgnarl/s-taskin.ads | 8 ++++---- gcc/ada/libgnarl/s-tasren.adb | 2 +- gcc/ada/libgnarl/s-tassta.adb | 2 +- gcc/ada/libgnarl/s-tasuti.adb | 2 +- 10 files changed, 24 insertions(+), 16 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 132cc0a76fd..73627f078f7 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2018-12-03 Gary Dismukes + + * exp_ch3.adb, libgnarl/s-taasde.adb, libgnarl/s-taenca.adb, + libgnarl/s-tarest.adb, libgnarl/s-tasini.adb, + libgnarl/s-taskin.ads, libgnarl/s-tasren.adb, + libgnarl/s-tassta.adb, libgnarl/s-tasuti.adb: Spelling fixes and + minor reformatting. + 2018-12-03 Eric Botcazou * exp_aggr.adb (Convert_To_Positional): Use diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 35b8fe3c816..22ea00663ce 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6589,7 +6589,7 @@ package body Exp_Ch3 is -- An aggregate that must be built in place is not resolved and -- expanded until the enclosing construct is expanded. This will - -- happen when the aggregqte is limited and the declared object + -- happen when the aggregate is limited and the declared object -- has a following address clause. if Is_Limited_Type (Typ) and then not Analyzed (Expr) then diff --git a/gcc/ada/libgnarl/s-taasde.adb b/gcc/ada/libgnarl/s-taasde.adb index 4f5b3e48185..ae2eecaed1d 100644 --- a/gcc/ada/libgnarl/s-taasde.adb +++ b/gcc/ada/libgnarl/s-taasde.adb @@ -106,7 +106,7 @@ package body System.Tasking.Async_Delays is begin -- A delay block level of Level_No_Pending_Abort indicates the delay - -- has been cancelled. If the delay has already been canceled, there is + -- has been canceled. If the delay has already been canceled, there is -- nothing more to be done. if D.Level = Level_No_Pending_Abort then @@ -181,8 +181,8 @@ package body System.Tasking.Async_Delays is -- Allocate a queue element for the wakeup time T and put it in the -- queue in wakeup time order. Assume we are on an asynchronous - -- select statement with delay trigger. Put the calling task to - -- sleep until either the delay expires or is cancelled. + -- select statement with delay trigger. Put the calling task to + -- sleep until either the delay expires or is canceled. -- We use one entry call record for this delay, since we have -- to increment the ATC nesting level, but since it is not a diff --git a/gcc/ada/libgnarl/s-taenca.adb b/gcc/ada/libgnarl/s-taenca.adb index 965bd1d531e..9073f453113 100644 --- a/gcc/ada/libgnarl/s-taenca.adb +++ b/gcc/ada/libgnarl/s-taenca.adb @@ -615,7 +615,7 @@ package body System.Tasking.Entry_Calls is Call : Entry_Call_Link) is begin - pragma Assert (Self_ID.ATC_Nesting_Level > Level_No_ATC_Occuring); + pragma Assert (Self_ID.ATC_Nesting_Level > Level_No_ATC_Occurring); pragma Assert (Call.Mode = Asynchronous_Call); STPO.Write_Lock (Self_ID); diff --git a/gcc/ada/libgnarl/s-tarest.adb b/gcc/ada/libgnarl/s-tarest.adb index 1966a9163d8..f3db81ec6c4 100644 --- a/gcc/ada/libgnarl/s-tarest.adb +++ b/gcc/ada/libgnarl/s-tarest.adb @@ -563,7 +563,7 @@ package body System.Tasking.Restricted.Stages is end if; -- Only the first element of the Entry_Calls array is used when the - -- Ravenscar Profile is active as no asynchronous transfer of control + -- Ravenscar Profile is active, as no asynchronous transfer of control -- is allowed. Created_Task.Entry_Calls (Created_Task.Entry_Calls'First) := diff --git a/gcc/ada/libgnarl/s-tasini.adb b/gcc/ada/libgnarl/s-tasini.adb index 2164c19d537..3512682f9ac 100644 --- a/gcc/ada/libgnarl/s-tasini.adb +++ b/gcc/ada/libgnarl/s-tasini.adb @@ -440,9 +440,9 @@ package body System.Tasking.Initialization is when Activating | Runnable => - if T.ATC_Nesting_Level > Level_No_ATC_Occuring then + if T.ATC_Nesting_Level > Level_No_ATC_Occurring then -- This scenario occurs when an asynchronous protected entry - -- call is canceld during a requeue with abort. + -- call is canceled during a requeue with abort. T.Entry_Calls (T.ATC_Nesting_Level).Cancellation_Attempted := True; @@ -467,7 +467,7 @@ package body System.Tasking.Initialization is Wakeup (T, T.Common.State); when Entry_Caller_Sleep => - pragma Assert (T.ATC_Nesting_Level > Level_No_ATC_Occuring); + pragma Assert (T.ATC_Nesting_Level > Level_No_ATC_Occurring); T.Entry_Calls (T.ATC_Nesting_Level).Cancellation_Attempted := True; diff --git a/gcc/ada/libgnarl/s-taskin.ads b/gcc/ada/libgnarl/s-taskin.ads index 1bc33d17b92..657d24743b8 100644 --- a/gcc/ada/libgnarl/s-taskin.ads +++ b/gcc/ada/libgnarl/s-taskin.ads @@ -826,7 +826,7 @@ package System.Tasking is -- ATC_Level of a task that has "completed". A task reaches the completed -- state after an abort, exception propagation, or normal exit. - Level_No_ATC_Occuring : constant ATC_Level_Base := 0; + Level_No_ATC_Occurring : constant ATC_Level_Base := 0; -- ATC_Level of a task not executing a entry call or an asynchronous -- select statement. @@ -834,11 +834,11 @@ package System.Tasking is -- ATC_Level when there is no pending abort subtype ATC_Level is ATC_Level_Base range - Level_No_ATC_Occuring .. Level_No_Pending_Abort - 1; + Level_No_ATC_Occurring .. Level_No_Pending_Abort - 1; -- Nested ATC_Levels valid during the execution of a task subtype ATC_Level_Index is ATC_Level range - Level_No_ATC_Occuring + 1 .. ATC_Level'Last; + Level_No_ATC_Occurring + 1 .. ATC_Level'Last; -- ATC_Levels valid when a task is executing an entry call or asynchronous -- task control statements. @@ -1101,7 +1101,7 @@ package System.Tasking is -- Beginning of counts - ATC_Nesting_Level : ATC_Level := Level_No_ATC_Occuring; + ATC_Nesting_Level : ATC_Level := Level_No_ATC_Occurring; -- The dynamic level of ATC nesting (currently executing nested -- asynchronous select statements) in this task. diff --git a/gcc/ada/libgnarl/s-tasren.adb b/gcc/ada/libgnarl/s-tasren.adb index 5ce200a9495..a7b285f1587 100644 --- a/gcc/ada/libgnarl/s-tasren.adb +++ b/gcc/ada/libgnarl/s-tasren.adb @@ -206,7 +206,7 @@ package body System.Tasking.Rendezvous is if Self_Id.Common.Call /= null then Caller := Self_Id.Common.Call.Self; - pragma Assert (Caller.ATC_Nesting_Level > Level_No_ATC_Occuring); + pragma Assert (Caller.ATC_Nesting_Level > Level_No_ATC_Occurring); Uninterpreted_Data := Caller.Entry_Calls (Caller.ATC_Nesting_Level).Uninterpreted_Data; diff --git a/gcc/ada/libgnarl/s-tassta.adb b/gcc/ada/libgnarl/s-tassta.adb index b48f2384a65..171baed4e1e 100644 --- a/gcc/ada/libgnarl/s-tassta.adb +++ b/gcc/ada/libgnarl/s-tassta.adb @@ -1982,7 +1982,7 @@ package body System.Tasking.Stages is Self_ID.Master_Of_Task .. Self_ID.Master_Of_Task + 3); pragma Assert (Self_ID.Common.Wait_Count = 0); pragma Assert (Self_ID.Open_Accepts = null); - pragma Assert (Self_ID.ATC_Nesting_Level = Level_No_ATC_Occuring); + pragma Assert (Self_ID.ATC_Nesting_Level = Level_No_ATC_Occurring); pragma Debug (Debug.Trace (Self_ID, "V_Complete_Task", 'C')); diff --git a/gcc/ada/libgnarl/s-tasuti.adb b/gcc/ada/libgnarl/s-tasuti.adb index f3708fde710..58dc86f4ec4 100644 --- a/gcc/ada/libgnarl/s-tasuti.adb +++ b/gcc/ada/libgnarl/s-tasuti.adb @@ -206,7 +206,7 @@ package body System.Tasking.Utilities is procedure Exit_One_ATC_Level (Self_ID : Task_Id) is begin - pragma Assert (Self_ID.ATC_Nesting_Level > Level_No_ATC_Occuring); + pragma Assert (Self_ID.ATC_Nesting_Level > Level_No_ATC_Occurring); Self_ID.ATC_Nesting_Level := Self_ID.ATC_Nesting_Level - 1; -- 2.30.2