From e80f0cb0b4c0313379c872ef4a8777313c809799 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Thu, 17 Jul 2014 06:37:45 +0000 Subject: [PATCH] sem_ch3.adb, [...]: Remove the word kludge from ada sources. 2014-07-17 Robert Dewar * sem_ch3.adb, a-ztexio.ads, exp_imgv.adb, casing.adb, casing.ads, einfo.ads, checks.adb, sem_ch12.adb, a-textio.ads, freeze.adb, repinfo.adb, exp_ch6.adb, sem_ch4.adb, a-witeio.ads, sem_ch8.adb, sem_warn.adb, exp_aggr.adb, exp_dist.adb, par-tchk.adb, s-fatgen.adb, treepr.adb, lib-xref.adb: Remove the word kludge from ada sources. From-SVN: r212726 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/a-textio.ads | 4 ++-- gcc/ada/a-witeio.ads | 4 ++-- gcc/ada/a-ztexio.ads | 4 ++-- gcc/ada/casing.adb | 4 ++-- gcc/ada/casing.ads | 6 ++++-- gcc/ada/checks.adb | 8 ++++---- gcc/ada/einfo.ads | 8 ++++---- gcc/ada/exp_aggr.adb | 14 +++++++------- gcc/ada/exp_ch6.adb | 8 ++++---- gcc/ada/exp_dist.adb | 4 ++-- gcc/ada/exp_imgv.adb | 6 +++--- gcc/ada/freeze.adb | 14 +++++++------- gcc/ada/lib-xref.adb | 4 ++-- gcc/ada/par-tchk.adb | 13 ++++++------- gcc/ada/repinfo.adb | 21 +++++++++++---------- gcc/ada/s-fatgen.adb | 7 +++---- gcc/ada/sem_ch12.adb | 12 ++++++------ gcc/ada/sem_ch3.adb | 19 ++++++++++--------- gcc/ada/sem_ch4.adb | 16 +++++++--------- gcc/ada/sem_ch8.adb | 12 ++++++------ gcc/ada/sem_warn.adb | 4 ++-- gcc/ada/treepr.adb | 12 ++++++------ 23 files changed, 110 insertions(+), 102 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 003bde3..a96b0ce 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,13 @@ 2014-07-17 Robert Dewar + * sem_ch3.adb, a-ztexio.ads, exp_imgv.adb, casing.adb, casing.ads, + einfo.ads, checks.adb, sem_ch12.adb, a-textio.ads, freeze.adb, + repinfo.adb, exp_ch6.adb, sem_ch4.adb, a-witeio.ads, sem_ch8.adb, + sem_warn.adb, exp_aggr.adb, exp_dist.adb, par-tchk.adb, s-fatgen.adb, + treepr.adb, lib-xref.adb: Remove the word kludge from ada sources. + +2014-07-17 Robert Dewar + * debug.adb: Remove -gnatdQ. * exp_disp.adb: Remove -gnatdQ. * a-ztenio.ads, a-wtinio.ads, a-wtmoio.ads, a-ztcoau.ads, a-tiinio.ads, diff --git a/gcc/ada/a-textio.ads b/gcc/ada/a-textio.ads index 5ae8334..d04b2e9 100644 --- a/gcc/ada/a-textio.ads +++ b/gcc/ada/a-textio.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -389,7 +389,7 @@ private -- there is no convenient way of backing up more than one character, -- what we do is to leave ourselves positioned past the LM, but set -- this flag, so that we know that from an Ada point of view we are - -- in front of the LM, not after it. A bit of a kludge, but it works. + -- in front of the LM, not after it. A little odd, but it works. Before_LM_PM : Boolean := False; -- This flag similarly handles the case of being physically positioned diff --git a/gcc/ada/a-witeio.ads b/gcc/ada/a-witeio.ads index 9151bf9..70375f2 100644 --- a/gcc/ada/a-witeio.ads +++ b/gcc/ada/a-witeio.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -389,7 +389,7 @@ private -- there is no convenient way of backing up more than one character, -- what we do is to leave ourselves positioned past the LM, but set -- this flag, so that we know that from an Ada point of view we are - -- in front of the LM, not after it. A bit of a kludge, but it works. + -- in front of the LM, not after it. A bit odd, but it works. Before_LM_PM : Boolean := False; -- This flag similarly handles the case of being physically positioned diff --git a/gcc/ada/a-ztexio.ads b/gcc/ada/a-ztexio.ads index b081906..ef90c92 100644 --- a/gcc/ada/a-ztexio.ads +++ b/gcc/ada/a-ztexio.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -389,7 +389,7 @@ private -- there is no convenient way of backing up more than one character, -- what we do is to leave ourselves positioned past the LM, but set -- this flag, so that we know that from an Ada point of view we are - -- in front of the LM, not after it. A bit of a kludge, but it works. + -- in front of the LM, not after it. A bit odd, but it works. Before_LM_PM : Boolean := False; -- This flag similarly handles the case of being physically positioned diff --git a/gcc/ada/casing.adb b/gcc/ada/casing.adb index dce1e0b..5ed97be 100644 --- a/gcc/ada/casing.adb +++ b/gcc/ada/casing.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -59,7 +59,7 @@ package body Casing is -- True at start of string, and after an underline character begin - -- A special kludge, consider SPARK_Mode to be mixed case + -- A special exception, consider SPARK_Mode to be mixed case if Ident = "SPARK_Mode" then return Mixed_Case; diff --git a/gcc/ada/casing.ads b/gcc/ada/casing.ads index 8d169fb..dec27ee 100644 --- a/gcc/ada/casing.ads +++ b/gcc/ada/casing.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -84,6 +84,8 @@ package Casing is -- equivalent to Set_Casing (All_Upper_Case). function Determine_Casing (Ident : Text_Buffer) return Casing_Type; - -- Determines the casing of the identifier/keyword string Ident + -- Determines the casing of the identifier/keyword string Ident. A special + -- test is made for SPARK_Mode which is considered to be mixed case, since + -- this gives a better general behavior. end Casing; diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb index 81bbc67..587092b 100644 --- a/gcc/ada/checks.adb +++ b/gcc/ada/checks.adb @@ -6515,10 +6515,10 @@ package body Checks is PV := Duplicate_Subexpr_No_Checks (Exp, Name_Req => False); - -- A rather specialized kludge. If PV is an analyzed expression - -- which is an indexed component of a packed array that has not - -- been properly expanded, turn off its Analyzed flag to make sure - -- it gets properly reexpanded. + -- A rather specialized test. If PV is an analyzed expression which + -- is an indexed component of a packed array that has not been + -- properly expanded, turn off its Analyzed flag to make sure it + -- gets properly reexpanded. -- The reason this arises is that Duplicate_Subexpr_No_Checks did -- an analyze with the old parent pointer. This may point e.g. to diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index a234634..4024373 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -6936,9 +6936,9 @@ package Einfo is -- It would be cleaner to use No_Uint in all these cases, but historically -- we chose to use Uint_0 at first, and the change over will take time ??? -- This is particularly true for the RM_Size field, where a value of zero - -- is legitimate. We deal with this by a nasty kludge that knows that the - -- value is always known static for discrete types (and no other types can - -- have an RM_Size value of zero). + -- is legitimate. We deal with this by a considering that the value is + -- always known static for discrete types (and no other types can have + -- an RM_Size value of zero). -- In two cases, Known_Static_Esize and Known_Static_RM_Size, there is one -- more consideration, which is that we always return False for generic @@ -7439,7 +7439,7 @@ package Einfo is -- It would be cleaner to use No_Uint in all these cases, but historically -- we chose to use Uint_0 at first, and the change over will take time ??? -- This is particularly true for the RM_Size field, where a value of zero - -- is legitimate and causes some kludges around the code. + -- is legitimate and causes some special tests around the code. -- Contrary to the corresponding Set procedures above, these routines -- do NOT check the entity kind of their argument, instead they set the diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 44edd88..1bc6fb6 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -1952,13 +1952,13 @@ package body Exp_Aggr is Assoc := Expression (Assoc); end if; - -- If the located association directly denotes a - -- discriminant, then use the value of a saved - -- association of the aggregate. This is a kludge to - -- handle certain cases involving multiple discriminants - -- mapped to a single discriminant of a descendant. It's - -- not clear how to locate the appropriate discriminant - -- value for such cases. ??? + -- If the located association directly denotes + -- a discriminant, then use the value of a saved + -- association of the aggregate. This is an approach + -- used to handle certain cases involving multiple + -- discriminants mapped to a single discriminant of + -- a descendant. It's not clear how to locate the + -- appropriate discriminant value for such cases. ??? if Is_Entity_Name (Assoc) and then Ekind (Entity (Assoc)) = E_Discriminant diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 4a92896..374e26f 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -2614,16 +2614,16 @@ package body Exp_Ch6 is -- Detect the following code in System.Finalization_Masters only on -- .NET/JVM targets: - -- + -- procedure Finalize (Master : in out Finalization_Master) is -- begin -- . . . -- begin -- Finalize (Curr_Ptr.all); - -- + -- Since .NET/JVM compilers lack address arithmetic and Deep_Finalize - -- cannot be named in library or user code, the compiler has to install - -- a kludge and transform the call to Finalize into Deep_Finalize. + -- cannot be named in library or user code, the compiler has to deal + -- with this by transforming the call to Finalize into Deep_Finalize. if VM_Target /= No_VM and then Chars (Subp) = Name_Finalize diff --git a/gcc/ada/exp_dist.adb b/gcc/ada/exp_dist.adb index da908fc..9e8b32d 100644 --- a/gcc/ada/exp_dist.adb +++ b/gcc/ada/exp_dist.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -2036,7 +2036,7 @@ package body Exp_Dist is Append_To (Decls, RPC_Receiver_Decl); else - -- Kludge, requires comment??? + -- Comments required here??? RPC_Receiver_Decl := Last (Decls); end if; diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb index 1c953d6..f249afe 100644 --- a/gcc/ada/exp_imgv.adb +++ b/gcc/ada/exp_imgv.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2014, 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- -- @@ -742,9 +742,9 @@ package body Exp_Imgv is -- generating spurious errors caused by the use of Integer_Address'Value -- in our implementation of Ada.Tags.Internal_Tag - -- Seems like a bit of a kludge, there should be a better way ??? + -- Seems like a bit of a odd approach, there should be a better way ??? - -- There is a better way, you should also test RTE_Available ??? + -- There is a better way, test RTE_Available ??? if No_Run_Time_Mode and then Rtyp = RTE (RE_Integer_Address) diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 45175d7..5a18f3e 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -2939,12 +2939,12 @@ package body Freeze is S : Entity_Id; begin - -- We have a pretty bad kludge here. Suppose Rec is subtype - -- being defined in a subprogram that's created as part of - -- the freezing of Rec'Base. In that case, we know that - -- Comp'Base must have already been frozen by the time we - -- get to elaborate this because Gigi doesn't elaborate any - -- bodies until it has elaborated all of the declarative + -- We have a difficult case to handle here. Suppose Rec is + -- subtype being defined in a subprogram that's created as + -- part of the freezing of Rec'Base. In that case, we know + -- that Comp'Base must have already been frozen by the time + -- we get to elaborate this because Gigi doesn't elaborate + -- any bodies until it has elaborated all of the declarative -- part. But Is_Frozen will not be set at this point because -- we are processing code in lexical order. @@ -7165,7 +7165,7 @@ package body Freeze is -- Since we don't want T to have a Freeze_Node, we don't want its -- Full_View or Corresponding_Record_Type to have one either. - -- ??? Fundamentally, this whole handling is a kludge. What we really + -- ??? Fundamentally, this whole handling is unpleasant. What we really -- want is to be sure that for an Itype that's part of record R and is a -- subtype of type T, that it's frozen after the later of the freeze -- points of R and T. We have no way of doing that directly, so what we diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb index 283c029..95c87ef 100644 --- a/gcc/ada/lib-xref.adb +++ b/gcc/ada/lib-xref.adb @@ -477,8 +477,8 @@ package body Lib.Xref is elsif (K = N_Selected_Component or else K = N_Indexed_Component) and then Prefix (P) = N then - -- Check for access type. First a kludge, In some cases this is - -- called too early (see comments in Sem_Ch8.Find_Direct_Name), + -- Check for access type. First a special test, In some cases + -- this is called too early (see comments in Find_Direct_Name), -- at a point where the tree is not fully typed yet. In that -- case we may lack an Etype for N, and we can't check the -- Etype. For now, we always return False in such a case, diff --git a/gcc/ada/par-tchk.adb b/gcc/ada/par-tchk.adb index c2d37bd..f9f2ec5 100644 --- a/gcc/ada/par-tchk.adb +++ b/gcc/ada/par-tchk.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -452,12 +452,11 @@ package body Tchk is Scan; return; - -- An interesting little kludge. If the previous token is a semicolon, + -- An interesting little case. If the previous token is a semicolon, -- then there is no way that we can legitimately need another semicolon. - -- This could only arise in an error situation where an error has - -- already been signalled. By simply ignoring the request for a - -- semicolon in this case, we avoid some spurious missing semicolon - -- messages. + -- This could only arise in an situation where an error has already been + -- signalled. By simply ignoring the request for a semicolon in this + -- case, we avoid some spurious missing semicolon messages. elsif Prev_Token = Tok_Semicolon then return; @@ -703,7 +702,7 @@ package body Tchk is T_Semicolon; return; - -- An interesting little kludge here. If the previous token is a + -- An interesting little test here. If the previous token is a -- semicolon, then there is no way that we can legitimately need -- another semicolon. This could only arise in an error situation -- where an error has already been signalled. By simply ignoring diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb index 19b6339..5d1c1db 100644 --- a/gcc/ada/repinfo.adb +++ b/gcc/ada/repinfo.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1999-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1999-2014, 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- -- @@ -946,11 +946,11 @@ package body Repinfo is UI_Write (Fbit); Write_Str (" .. "); - -- Allowing Uint_0 here is a kludge, really this should be a - -- fine Esize value but currently it means unknown, except that - -- we know after gigi has back annotated that a size of zero is - -- real, since otherwise gigi back annotates using No_Uint as - -- the value to indicate unknown). + -- Allowing Uint_0 here is an annoying special case. Really this + -- should be a fine Esize value but currently it means unknown, + -- except that we know after gigi has back annotated that a size + -- of zero is real, since otherwise gigi back annotates using + -- No_Uint as the value to indicate unknown). if (Esize (Comp) = Uint_0 or else Known_Static_Esize (Comp)) and then Known_Static_Normalized_First_Bit (Comp) @@ -963,10 +963,11 @@ package body Repinfo is UI_Write (Lbit); - -- The test for Esize (Comp) not being Uint_0 here is a kludge. - -- Officially a value of zero for Esize means unknown, but here - -- we use the fact that we know that gigi annotates Esize with - -- No_Uint, not Uint_0. Really everyone should use No_Uint??? + -- The test for Esize (Comp) not Uint_0 here is an annoying + -- special case. Officially a value of zero for Esize means + -- unknown, but here we use the fact that we know that gigi + -- annotates Esize with No_Uint, not Uint_0. Really everyone + -- should use No_Uint??? elsif List_Representation_Info < 3 or else (Esize (Comp) /= Uint_0 and then Unknown_Esize (Comp)) diff --git a/gcc/ada/s-fatgen.adb b/gcc/ada/s-fatgen.adb index f68dc76..2644e67 100644 --- a/gcc/ada/s-fatgen.adb +++ b/gcc/ada/s-fatgen.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -832,9 +832,8 @@ package body System.Fat_Gen is Boolean'Pos (Most_Significant_Word /= 2) + Boolean'Pos (Most_Significant_Word = 2); -- Factor that the extracted exponent needs to be divided by to be in - -- range 0 .. IEEE_Emax - IEEE_Emin + 2. Special kludge: Exponent_Factor - -- is 1 for x86/IA64 double extended as GCC adds unused bits to the - -- type. + -- range 0 .. IEEE_Emax - IEEE_Emin + 2. Special case: Exponent_Factor + -- is 1 for x86/IA64 double extended (GCC adds unused bits to the type). Exponent_Mask : constant Float_Word := Float_Word (IEEE_Emax - IEEE_Emin + 2) * diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 49adf85..24dfa4e 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -3423,8 +3423,8 @@ package body Sem_Ch12 is begin Check_SPARK_Restriction ("generic is not allowed", N); - -- Very first thing: apply the special kludge for Text_IO processing - -- in case we are instantiating one of the children of [Wide_]Text_IO. + -- Very first thing: check for Text_IO sp[ecial unit in case we are + -- instantiating one of the children of [[Wide_]Wide_]Text_IO. Check_Text_IO_Special_Unit (Name (N)); @@ -4670,10 +4670,10 @@ package body Sem_Ch12 is begin Check_SPARK_Restriction ("generic is not allowed", N); - -- Very first thing: apply the special kludge for Text_IO processing - -- in case we are instantiating one of the children of [Wide_]Text_IO. - -- Of course such an instantiation is bogus (these are packages, not - -- subprograms), but we get a better error message if we do this. + -- Very first thing: check for special Text_IO unit in case we are + -- instantiating one of the children of [[Wide_]Wide_]Text_IO. Of course + -- such an instantiation is bogus (these are packages, not subprograms), + -- but we get a better error message if we do this. Check_Text_IO_Special_Unit (Gen_Id); diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index f1cb239..48982bd 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -1185,10 +1185,11 @@ package body Sem_Ch3 is if Present (Formals) then Push_Scope (Desig_Type); - -- A bit of a kludge here. These kludges will be removed when Itypes - -- have proper parent pointers to their declarations??? + -- Some special tests here. These special tests can be removed + -- if and when Itypes always have proper parent pointers to their + -- declarations??? - -- Kludge 1) Link defining_identifier of formals. Required by + -- Special test 1) Link defining_identifier of formals. Required by -- First_Formal to provide its functionality. declare @@ -1224,8 +1225,8 @@ package body Sem_Ch3 is Process_Formals (Formals, Parent (T_Def)); - -- Kludge 2) End_Scope requires that the parent pointer be set to - -- something reasonable, but Itypes don't have parent pointers. So + -- Special test 2) End_Scope requires that the parent pointer be set + -- to something reasonable, but Itypes don't have parent pointers. So -- we set it and then unset it ??? Set_Parent (Desig_Type, T_Name); @@ -4369,8 +4370,8 @@ package body Sem_Ch3 is -- If ancestor has predicates then so does the subtype, and in addition -- we must delay the freeze to properly arrange predicate inheritance. - -- The Ancestor_Type test is a big kludge, there seem to be cases in - -- which T = ID, so the above tests and assignments do nothing??? + -- The Ancestor_Type test is really unpleasant, there seem to be cases + -- in which T = ID, so the above tests and assignments do nothing??? if Has_Predicates (T) or else (Present (Ancestor_Subtype (T)) @@ -11220,7 +11221,7 @@ package body Sem_Ch3 is or else Is_Incomplete_Or_Private_Type (Desig_Type)) and then not Is_Constrained (Desig_Type) then - -- ??? The following code is a temporary kludge to ignore a + -- ??? The following code is a temporary bypass to ignore a -- discriminant constraint on access type if it is constraining -- the current record. Avoid creating the implicit subtype of the -- record we are currently compiling since right now, we cannot @@ -18754,7 +18755,7 @@ package body Sem_Ch3 is if Known_To_Have_Preelab_Init (Priv_T) then -- Case where there is a pragma Preelaborable_Initialization. We - -- always allow this in predefined units, which is a bit of a kludge, + -- always allow this in predefined units, which is cheating a bit, -- but it means we don't have to struggle to meet the requirements in -- the RM for having Preelaborable Initialization. Otherwise we -- require that the type meets the RM rules. But we can't check that diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 2e692c6..8c68dab 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -6707,10 +6707,10 @@ package body Sem_Ch4 is -------------------------------- procedure Remove_Abstract_Operations (N : Node_Id) is - Abstract_Op : Entity_Id := Empty; - Address_Kludge : Boolean := False; - I : Interp_Index; - It : Interp; + Abstract_Op : Entity_Id := Empty; + Address_Descendent : Boolean := False; + I : Interp_Index; + It : Interp; -- AI-310: If overloaded, remove abstract non-dispatching operations. We -- activate this if either extensions are enabled, or if the abstract @@ -6746,7 +6746,7 @@ package body Sem_Ch4 is end if; if Is_Descendent_Of_Address (Etype (Formal)) then - Address_Kludge := True; + Address_Descendent := True; Remove_Interp (I); end if; @@ -6774,7 +6774,7 @@ package body Sem_Ch4 is Abstract_Op := It.Nam; if Is_Descendent_Of_Address (It.Typ) then - Address_Kludge := True; + Address_Descendent := True; Remove_Interp (I); exit; @@ -6943,9 +6943,7 @@ package body Sem_Ch4 is -- predefined operators when addresses are involved since this -- case is handled separately. - elsif Ada_Version >= Ada_2005 - and then not Address_Kludge - then + elsif Ada_Version >= Ada_2005 and then not Address_Descendent then while Present (It.Nam) loop if Is_Numeric_Type (It.Typ) and then Scope (It.Typ) = Standard_Standard diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 42a1487..7598d5c 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -625,8 +625,8 @@ package body Sem_Ch8 is procedure Analyze_Generic_Package_Renaming (N : Node_Id) is begin - -- Apply the Text_IO Kludge here, since we may be renaming one of the - -- subpackages of Text_IO, then join common routine. + -- Test for the Text_IO special unit case here, since we may be renaming + -- one of the subpackages of Text_IO, then join common routine. Check_Text_IO_Special_Unit (Name (N)); @@ -1317,7 +1317,7 @@ package body Sem_Ch8 is return; end if; - -- Apply Text_IO kludge here since we may be renaming a child of Text_IO + -- Check for Text_IO special unit (we may be renaming a Text_IO child) Check_Text_IO_Special_Unit (Name (N)); @@ -2615,9 +2615,9 @@ package body Sem_Ch8 is -- Ada_83 because there is no requirement of full conformance between -- renamed entity and new entity, even though the same circuit is used. - -- This is a bit of a kludge, which introduces a really irregular use of - -- Ada_Version[_Explicit]. Would be nice to find cleaner way to do this - -- ??? + -- This is a bit of an odd case, which introduces a really irregular use + -- of Ada_Version[_Explicit]. Would be nice to find cleaner way to do + -- this. ??? Ada_Version := Ada_Version_Type'Max (Ada_Version, Ada_95); Ada_Version_Pragma := Empty; diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index d54937b..8b47332 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -252,8 +252,8 @@ package body Sem_Warn is -- Given an entity name, see if the name appears to have something to -- do with I/O or network stuff, and if so, return True. Used to kill -- some false positives on a heuristic basis that such functions will - -- likely have some strange side effect dependencies. A rather funny - -- kludge, but warning messages are in the heuristics business. + -- likely have some strange side effect dependencies. A rather strange + -- test, but warning messages are in the heuristics business. function Test_Ref (N : Node_Id) return Traverse_Result; -- Test for reference to variable in question. Returns Abandon if diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb index 0cce75f..5bc09a7 100644 --- a/gcc/ada/treepr.adb +++ b/gcc/ada/treepr.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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- -- @@ -2090,11 +2090,11 @@ package body Treepr is Visit_Descendent (Field22 (N)); Visit_Descendent (Field23 (N)); - -- Now an interesting kludge. Normally parents are always printed - -- since we traverse the tree in a downwards direction. There is - -- however an exception to this rule, which is the case where a - -- parent is constructed by the compiler and is not referenced - -- elsewhere in the tree. The following catches this case + -- Now an interesting special case. Normally parents are always + -- printed since we traverse the tree in a downwards direction. + -- However, there is an exception to this rule, which is the + -- case where a parent is constructed by the compiler and is not + -- referenced elsewhere in the tree. The following catches this case. if not Comes_From_Source (N) then Visit_Descendent (Union_Id (Parent (N))); -- 2.7.4