From b473ab453920166e23ab2f136e05cd1d30ee329f Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Tue, 20 May 2008 14:52:53 +0200 Subject: [PATCH] g-byorma.adb, [...]: Update comments. 2008-05-20 Robert Dewar * g-byorma.adb, gnatlink.adb, prepcomp.adb, sinfo.ads, sem_ch12.adb: Update comments. Minor reformatting. * exp_ch2.adb: Typo * s-unstyp.ads: Fixed some typos in comments. From-SVN: r135651 --- gcc/ada/exp_ch2.adb | 2 +- gcc/ada/g-byorma.adb | 5 +++-- gcc/ada/gnatlink.adb | 5 ++--- gcc/ada/prepcomp.adb | 5 ++--- gcc/ada/s-unstyp.ads | 2 +- gcc/ada/sem_ch12.adb | 13 ++++++++----- gcc/ada/sinfo.ads | 13 +++++++------ 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/gcc/ada/exp_ch2.adb b/gcc/ada/exp_ch2.adb index c3716c387fa..6093f2a7333 100644 --- a/gcc/ada/exp_ch2.adb +++ b/gcc/ada/exp_ch2.adb @@ -469,7 +469,7 @@ package body Exp_Ch2 is -- we also generate an extra parameter to hold the Constrained -- attribute of the actual. No renaming is generated for this flag. - -- Calling Node_Possible_Modifications in the expander is dubious, + -- Calling Note_Possible_Modification in the expander is dubious, -- because this generates a cross-reference entry, and should be -- done during semantic processing so it is called in -gnatc mode??? diff --git a/gcc/ada/g-byorma.adb b/gcc/ada/g-byorma.adb index 6bbaedf8b71..7e355b041b5 100755 --- a/gcc/ada/g-byorma.adb +++ b/gcc/ada/g-byorma.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2006-2007, AdaCore -- +-- Copyright (C) 2006-2008, 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- -- @@ -87,6 +87,7 @@ package body GNAT.Byte_Order_Mark is then Len := 2; BOM := UTF16_LE; + -- UTF-8 (endian-independent) elsif Str'Length >= 3 @@ -178,7 +179,7 @@ package body GNAT.Byte_Order_Mark is and then Str (Str'First + 2) = Character'Val (16#78#) and then Str (Str'First + 3) = Character'Val (16#6D#) then - -- Utf8, ASCII, some part of ISO8859, Shift-JIS, EUC,... + -- UTF-8, ASCII, some part of ISO8859, Shift-JIS, EUC,... Len := 0; BOM := Unknown; diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index 906a61abd91..3a1ef9b4dd7 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -935,14 +935,13 @@ procedure Gnatlink is Objs_End := Linker_Objects.Last; - -- Let's continue to compute the Link_Bytes, the linker options are - -- part of command line length. + -- Continue to compute the Link_Bytes, the linker options are part of + -- command line length. Store_File_Context; while Next_Line (Nfirst .. Nlast) /= End_Info loop Link_Bytes := Link_Bytes + Nlast - Nfirst + 2; - -- See comment above Get_Next_Line; end loop; diff --git a/gcc/ada/prepcomp.adb b/gcc/ada/prepcomp.adb index 818bb49e22b..a2b58be7ab1 100644 --- a/gcc/ada/prepcomp.adb +++ b/gcc/ada/prepcomp.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2003-2007, Free Software Foundation, Inc. -- +-- Copyright (C) 2003-2008, 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- -- @@ -245,8 +245,7 @@ package body Prepcomp is """ not found"); end if; - -- Initialize the scanner and set its behavior for a processing data - -- file + -- Initialize scanner and set its behavior for processing a data file Scn.Scanner.Initialize_Scanner (Source_Index_Of_Preproc_Data_File); Scn.Scanner.Set_End_Of_Line_As_Token (True); diff --git a/gcc/ada/s-unstyp.ads b/gcc/ada/s-unstyp.ads index 0609e0b0345..c951140ff09 100644 --- a/gcc/ada/s-unstyp.ads +++ b/gcc/ada/s-unstyp.ads @@ -32,7 +32,7 @@ ------------------------------------------------------------------------------ -- This package contains definitions of standard unsigned types that --- correspond in size to the standard signed types declared in Standard. +-- correspond in size to the standard signed types declared in Standard, -- and (unlike the types in Interfaces) have corresponding names. It -- also contains some related definitions for other specialized types -- used by the compiler in connection with packed array types. diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 60833fc2bdb..75f4512c72c 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -2729,7 +2729,7 @@ package body Sem_Ch12 is Save_Parent : Node_Id; begin - -- Create copy of generic unit,and save for instantiation. If the unit + -- Create copy of generic unit, and save for instantiation. If the unit -- is a child unit, do not copy the specifications for the parent, which -- are not part of the generic tree. @@ -4040,14 +4040,15 @@ package body Sem_Ch12 is Create_Instantiation_Source (N, Gen_Unit, False, S_Adjustment); -- Copy original generic tree, to produce text for instantiation - -- Inherit overriding indicator from instance node. Act_Tree := Copy_Generic_Node (Original_Node (Gen_Decl), Empty, Instantiating => True); + -- Inherit overriding indicator from instance node + Act_Spec := Specification (Act_Tree); - Set_Must_Override (Act_Spec, Must_Override (N)); + Set_Must_Override (Act_Spec, Must_Override (N)); Set_Must_Not_Override (Act_Spec, Must_Not_Override (N)); Renaming_List := @@ -4634,7 +4635,7 @@ package body Sem_Ch12 is -- Verify that the actual subprograms match. Note that actuals -- that are attributes are rewritten as subprograms. If the -- subprogram in the formal package is defaulted, no check is - -- needed. Note that this can only happen in Ada2005 when the + -- needed. Note that this can only happen in Ada 2005 when the -- formal package can be partially parametrized. if Nkind (Unit_Declaration_Node (E1)) = @@ -9982,7 +9983,9 @@ package body Sem_Ch12 is Check_Restriction (No_Fixed_Point, Actual); end if; - -- Deal with error of using incomplete type as generic actual + -- Deal with error of using incomplete type as generic actual. + -- This includes limited views of a type, even if the non-limited + -- view may be available. if Ekind (Act_T) = E_Incomplete_Type or else (Is_Class_Wide_Type (Act_T) diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 4686a7ac096..536118f9586 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -5797,9 +5797,9 @@ package Sinfo is -- Note: overriding indicator is an Ada 2005 feature - ------------------------------ - -- 12.3 Generic Actual Part -- - ------------------------------ + ------------------------------- + -- 12.3 Generic Actual Part -- + ------------------------------- -- GENERIC_ACTUAL_PART ::= -- (GENERIC_ASSOCIATION {, GENERIC_ASSOCIATION}) @@ -5812,9 +5812,10 @@ package Sinfo is -- [generic_formal_parameter_SELECTOR_NAME =>] -- Note: unlike the procedure call case, a generic association node - -- is generated for every association, even if no formal is present. - -- In this case the parser will leave the Selector_Name field set - -- to Empty, to be filled in later by the semantic pass. + -- is generated for every association, even if no formal parameter + -- selector name is present. In this case the parser will leave the + -- Selector_Name field set to Empty, to be filled in later by the + -- semantic pass. -- In Ada 2005, a formal may be associated with a box, if the -- association is part of the list of actuals for a formal package.