From 1b1d88b1ac064a407f1c8e177da29f993f895638 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 20 Oct 2015 12:37:13 +0000 Subject: [PATCH] sem_aggr.adb, [...]: Fix typos. 2015-10-20 Arnaud Charlet * sem_aggr.adb, mlib-prj.adb, prep.adb, eval_fat.adb, rtsfind.adb, freeze.adb, sem_util.adb, sem_res.adb, sem_attr.adb, gnatlink.adb, par-ch6.adb, exp_tss.adb, exp_ch4.adb, s-shasto.adb, exp_fixd.adb, sem_ch6.adb, clean.adb, sem_ch8.adb, sem_eval.adb, sem_ch9.adb: Fix typos. From-SVN: r229074 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/clean.adb | 2 +- gcc/ada/eval_fat.adb | 2 +- gcc/ada/exp_ch4.adb | 2 +- gcc/ada/exp_fixd.adb | 2 +- gcc/ada/exp_tss.adb | 4 ++-- gcc/ada/freeze.adb | 2 +- gcc/ada/gnatlink.adb | 2 +- gcc/ada/mlib-prj.adb | 4 ++-- gcc/ada/par-ch6.adb | 2 +- gcc/ada/prep.adb | 2 +- gcc/ada/rtsfind.adb | 2 +- gcc/ada/s-shasto.adb | 4 ++-- gcc/ada/sem_aggr.adb | 2 +- gcc/ada/sem_attr.adb | 2 +- gcc/ada/sem_ch6.adb | 2 +- gcc/ada/sem_ch8.adb | 2 +- gcc/ada/sem_ch9.adb | 6 +++--- gcc/ada/sem_eval.adb | 2 +- gcc/ada/sem_res.adb | 44 ++++++++++++++++++++++---------------------- gcc/ada/sem_util.adb | 4 ++-- 21 files changed, 55 insertions(+), 47 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1c51c9feb63..acfc2e48103 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2015-10-20 Arnaud Charlet + + * sem_aggr.adb, mlib-prj.adb, prep.adb, eval_fat.adb, rtsfind.adb, + freeze.adb, sem_util.adb, sem_res.adb, sem_attr.adb, gnatlink.adb, + par-ch6.adb, exp_tss.adb, exp_ch4.adb, s-shasto.adb, exp_fixd.adb, + sem_ch6.adb, clean.adb, sem_ch8.adb, sem_eval.adb, sem_ch9.adb: Fix + typos. + 2015-10-20 Ed Schonberg * sem_ch11.adb (Analyze_Handled_Statements): If the scope is a diff --git a/gcc/ada/clean.adb b/gcc/ada/clean.adb index e410c3ba88a..805f65393a8 100644 --- a/gcc/ada/clean.adb +++ b/gcc/ada/clean.adb @@ -686,7 +686,7 @@ package body Clean is Delete_File := False; if (Project.Library_Kind = Static - and then Name (1 .. Last) = Archive_Name) + and then Name (1 .. Last) = Archive_Name) or else ((Project.Library_Kind = Dynamic or else diff --git a/gcc/ada/eval_fat.adb b/gcc/ada/eval_fat.adb index 7217048c54e..5b56ddd5ea2 100644 --- a/gcc/ada/eval_fat.adb +++ b/gcc/ada/eval_fat.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2015, 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- -- diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 9d4dff8d1ff..45d223cdd82 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -6275,7 +6275,7 @@ package body Exp_Ch4 is N_Procedure_Call_Statement) or else (Nkind (Parnt) = N_Parameter_Association and then - Nkind (Parent (Parnt)) = N_Procedure_Call_Statement) + Nkind (Parent (Parnt)) = N_Procedure_Call_Statement) then return; diff --git a/gcc/ada/exp_fixd.adb b/gcc/ada/exp_fixd.adb index 564c527927c..de4a60a8b47 100644 --- a/gcc/ada/exp_fixd.adb +++ b/gcc/ada/exp_fixd.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2015, 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- -- diff --git a/gcc/ada/exp_tss.adb b/gcc/ada/exp_tss.adb index 2b6dc92d315..94c15dfb2e1 100644 --- a/gcc/ada/exp_tss.adb +++ b/gcc/ada/exp_tss.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2015, 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- -- @@ -517,7 +517,7 @@ package body Exp_Tss is else Elmt := First_Elmt (TSS_Elist (FN)); while Present (Elmt) loop - if Chars (Node (Elmt)) = Nam then + if Chars (Node (Elmt)) = Nam then Subp := Node (Elmt); -- For stream subprograms, the TSS entity may be a renaming- diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 4dcb037de0b..36822ec05b6 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -581,7 +581,7 @@ package body Freeze is -- the body is analyzed when the renamed entity is frozen, it may -- be necessary to restore the proper scope (see package Exp_Ch13). - if Nkind (N) = N_Subprogram_Renaming_Declaration + if Nkind (N) = N_Subprogram_Renaming_Declaration and then Present (Corresponding_Spec (N)) then Set_Corresponding_Spec (Body_Node, Corresponding_Spec (N)); diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index f50c946eba9..6298903901a 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -376,7 +376,7 @@ procedure Gnatlink is new String'(Arg); elsif Arg'Length /= 0 and then Arg (1) = '-' then - if Arg'Length > 4 and then Arg (2 .. 5) = "gnat" then + if Arg'Length > 4 and then Arg (2 .. 5) = "gnat" then Exit_With_Error ("invalid switch: """ & Arg & """ (gnat not needed here)"); end if; diff --git a/gcc/ada/mlib-prj.adb b/gcc/ada/mlib-prj.adb index ff84abace85..97797b468e3 100644 --- a/gcc/ada/mlib-prj.adb +++ b/gcc/ada/mlib-prj.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2014, AdaCore -- +-- Copyright (C) 2001-2015, AdaCore -- -- -- -- 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- -- @@ -1816,7 +1816,7 @@ package body MLib.Prj is Delete := False; if (The_Build_Mode = Static - and then Name (1 .. Last) = Archive_Name) + and then Name (1 .. Last) = Archive_Name) or else ((The_Build_Mode = Dynamic or else diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb index 7cc2f5da1da..627e657cfb6 100644 --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2015, 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- -- diff --git a/gcc/ada/prep.adb b/gcc/ada/prep.adb index c38234b052e..bb215c3b2c2 100644 --- a/gcc/ada/prep.adb +++ b/gcc/ada/prep.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2002-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 2002-2015, 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- -- diff --git a/gcc/ada/rtsfind.adb b/gcc/ada/rtsfind.adb index d6da1719612..3c84bbe1153 100644 --- a/gcc/ada/rtsfind.adb +++ b/gcc/ada/rtsfind.adb @@ -1107,7 +1107,7 @@ package body Rtsfind is begin Clause := U.First_Implicit_With; while Present (Clause) loop - if Parent (Clause) = Cunit (Current_Sem_Unit) then + if Parent (Clause) = Cunit (Current_Sem_Unit) then return; end if; diff --git a/gcc/ada/s-shasto.adb b/gcc/ada/s-shasto.adb index 6e0749c14ce..2d9b9e8b876 100644 --- a/gcc/ada/s-shasto.adb +++ b/gcc/ada/s-shasto.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2015, 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- -- @@ -201,7 +201,7 @@ package body System.Shared_Storage is -- Release least recently used entry if we have to - if Shared_Var_Files_Open = Max_Shared_Var_Files then + if Shared_Var_Files_Open = Max_Shared_Var_Files then Freed := LRU_Head; if Freed.Next /= null then diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 5300d3ab87f..9e436405e63 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -4416,7 +4416,7 @@ package body Sem_Aggr is -- have already been inserted into the component -- list of the current aggregate. - if Nkind (Def_Node) = N_Record_Definition + if Nkind (Def_Node) = N_Record_Definition and then Present (Component_List (Def_Node)) and then Present diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index 5be1b3941f8..4c5add8b69c 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -3865,7 +3865,7 @@ package body Sem_Attr is Check_E0; Analyze (P); - if Etype (P) = Standard_Exception_Type then + if Etype (P) = Standard_Exception_Type then Set_Etype (N, RTE (RE_Exception_Id)); -- Ada 2005 (AI-345): Attribute 'Identity may be applied to task diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 609babcfaa0..455d7023e89 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -10009,7 +10009,7 @@ package body Sem_Ch6 is function Is_Class_Wide_Default (D : Node_Id) return Boolean is begin return Is_Class_Wide_Type (Designated_Type (Etype (D))) - or else (Nkind (D) = N_Attribute_Reference + or else (Nkind (D) = N_Attribute_Reference and then Attribute_Name (D) = Name_Access and then Is_Class_Wide_Type (Etype (Prefix (D)))); end Is_Class_Wide_Default; diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index d6cce978183..290d933bdf0 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -9014,7 +9014,7 @@ package body Sem_Ch8 is function Entity_Of_Unit (U : Node_Id) return Entity_Id is begin - if Nkind (U) = N_Package_Instantiation + if Nkind (U) = N_Package_Instantiation and then Analyzed (U) then return Defining_Entity (Instance_Spec (U)); diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb index 35877e530e1..1f00ea776c1 100644 --- a/gcc/ada/sem_ch9.adb +++ b/gcc/ada/sem_ch9.adb @@ -1193,7 +1193,7 @@ package body Sem_Ch9 is Tasking_Used := True; -- Entry_Name is initialized to Any_Id. It should get reset to the - -- matching entry entity. An error is signalled if it is not reset + -- matching entry entity. An error is signalled if it is not reset. Entry_Name := Any_Id; @@ -1311,7 +1311,7 @@ package body Sem_Ch9 is -- The entity for the protected subprogram corresponding to the entry -- has been created. We retain the name of this entity in the entry -- body, for use when the corresponding subprogram body is created. - -- Note that entry bodies have no corresponding_spec, and there is no + -- Note that entry bodies have no Corresponding_Spec, and there is no -- easy link back in the tree between the entry body and the entity for -- the entry itself, which is why we must propagate some attributes -- explicitly from spec to body. @@ -1738,7 +1738,7 @@ package body Sem_Ch9 is -- are no language-defined aspects that apply to a protected body, it is -- not worth changing the whole expansion to accomodate implementation- -- defined aspects. Plus we cannot possibly known the semantics of such - -- future implementation defined aspects in order to plan ahead. + -- future implementation-defined aspects in order to plan ahead. if Has_Aspects (N) then Error_Msg_N diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 9f97836477c..f8420d4ad74 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -5434,7 +5434,7 @@ package body Sem_Eval is -- Case where call to predicate function appears on its own (this means -- that the predicate at this level is just inherited from the parent). - elsif Nkind (Expr) = N_Function_Call then + elsif Nkind (Expr) = N_Function_Call then declare Typ : constant Entity_Id := Etype (First_Formal (Entity (Name (Expr)))); diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 5eb47053c20..67278efa456 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -1676,39 +1676,39 @@ package body Sem_Res is -- Use CASE statement or array??? if Is_Binary then - if Op_Name = Name_Op_And then + if Op_Name = Name_Op_And then Kind := N_Op_And; - elsif Op_Name = Name_Op_Or then + elsif Op_Name = Name_Op_Or then Kind := N_Op_Or; - elsif Op_Name = Name_Op_Xor then + elsif Op_Name = Name_Op_Xor then Kind := N_Op_Xor; - elsif Op_Name = Name_Op_Eq then + elsif Op_Name = Name_Op_Eq then Kind := N_Op_Eq; - elsif Op_Name = Name_Op_Ne then + elsif Op_Name = Name_Op_Ne then Kind := N_Op_Ne; - elsif Op_Name = Name_Op_Lt then + elsif Op_Name = Name_Op_Lt then Kind := N_Op_Lt; - elsif Op_Name = Name_Op_Le then + elsif Op_Name = Name_Op_Le then Kind := N_Op_Le; - elsif Op_Name = Name_Op_Gt then + elsif Op_Name = Name_Op_Gt then Kind := N_Op_Gt; - elsif Op_Name = Name_Op_Ge then + elsif Op_Name = Name_Op_Ge then Kind := N_Op_Ge; - elsif Op_Name = Name_Op_Add then + elsif Op_Name = Name_Op_Add then Kind := N_Op_Add; - elsif Op_Name = Name_Op_Subtract then + elsif Op_Name = Name_Op_Subtract then Kind := N_Op_Subtract; - elsif Op_Name = Name_Op_Concat then + elsif Op_Name = Name_Op_Concat then Kind := N_Op_Concat; - elsif Op_Name = Name_Op_Multiply then + elsif Op_Name = Name_Op_Multiply then Kind := N_Op_Multiply; - elsif Op_Name = Name_Op_Divide then + elsif Op_Name = Name_Op_Divide then Kind := N_Op_Divide; - elsif Op_Name = Name_Op_Mod then + elsif Op_Name = Name_Op_Mod then Kind := N_Op_Mod; - elsif Op_Name = Name_Op_Rem then + elsif Op_Name = Name_Op_Rem then Kind := N_Op_Rem; - elsif Op_Name = Name_Op_Expon then + elsif Op_Name = Name_Op_Expon then Kind := N_Op_Expon; else raise Program_Error; @@ -1717,13 +1717,13 @@ package body Sem_Res is -- Unary operators else - if Op_Name = Name_Op_Add then + if Op_Name = Name_Op_Add then Kind := N_Op_Plus; - elsif Op_Name = Name_Op_Subtract then + elsif Op_Name = Name_Op_Subtract then Kind := N_Op_Minus; - elsif Op_Name = Name_Op_Abs then + elsif Op_Name = Name_Op_Abs then Kind := N_Op_Abs; - elsif Op_Name = Name_Op_Not then + elsif Op_Name = Name_Op_Not then Kind := N_Op_Not; else raise Program_Error; @@ -9881,7 +9881,7 @@ package body Sem_Res is -- appearing within a variant. if Has_Discriminants (T) - and then Ekind (Entity (S)) = E_Component + and then Ekind (Entity (S)) = E_Component and then Present (Original_Record_Component (Entity (S))) and then Ekind (Original_Record_Component (Entity (S))) = E_Component and then diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index a6eb50c52b7..162e2bbfb7e 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -12655,7 +12655,7 @@ package body Sem_Util is -- occurrence of 'Old in that operand is potentially unevaluated. -- See Sem_ch13.adb for details of this transformation. - if Nkind (Original_Node (Par)) = N_And_Then then + if Nkind (Original_Node (Par)) = N_And_Then then return True; end if; @@ -14851,7 +14851,7 @@ package body Sem_Util is and then Present (Next_Named_Actual (Old_E)) then if First_Named_Actual (Old_Node) - = Explicit_Actual_Parameter (Old_E) + = Explicit_Actual_Parameter (Old_E) then Set_First_Named_Actual (New_Node, Explicit_Actual_Parameter (New_E)); -- 2.30.2