From aa63543913b12c7774820c8761b935be8ad0ea64 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 15 Nov 2005 15:05:30 +0100 Subject: [PATCH] [multiple changes] 2005-11-14 Vincent Celier * makegpr.adb (Gprmake): Do not attempt to build the global archive if there is no object directory. 2005-11-14 Robert Dewar * usage.adb: Minor adjustment to output format, use nn instead of nnn (so that -gnateInnn does not run into next column) 2005-11-14 Ed Falis * s-bitops.adb (Bits_Array): corrected comment: "unconstrained" => "constrained" 2005-11-14 Cyrille Comar * s-chepoo.ads: Add comments on Dereference. Remove unnecessary inherited abstract primitives. Cosmetic cleanup. 2005-11-14 Robert Dewar * sem_cat.ads (Validate_Access_Type_Declaration): Remove declaration node parameter, not needed, since it is available as Declaration_Node. 2005-11-14 Geert Bosch * s-exnllf.adb (Exn_LLF): Fix comment to be more precise and grammatically correct. 2005-11-14 Vincent Celier * s-fileio.ads: Correct spelling error in comment From-SVN: r107014 --- gcc/ada/makegpr.adb | 15 +++++++++------ gcc/ada/s-bitops.adb | 2 +- gcc/ada/s-chepoo.ads | 28 +++++++--------------------- gcc/ada/s-exnllf.adb | 6 +++--- gcc/ada/s-fileio.ads | 4 ++-- gcc/ada/sem_cat.ads | 4 ++-- gcc/ada/usage.adb | 16 ++++++++-------- 7 files changed, 32 insertions(+), 43 deletions(-) diff --git a/gcc/ada/makegpr.adb b/gcc/ada/makegpr.adb index 951e77815fd..2e8f5c22355 100644 --- a/gcc/ada/makegpr.adb +++ b/gcc/ada/makegpr.adb @@ -129,7 +129,7 @@ package body Makegpr is -- ar commands. Archive_Indexer_Path : String_Access := null; - -- The path name of the archive indexer (ranlib), if it exists. + -- The path name of the archive indexer (ranlib), if it exists Copyright_Output : Boolean := False; Usage_Output : Boolean := False; @@ -356,7 +356,7 @@ package body Makegpr is procedure Add_Argument (Arg : String_Access; Display : Boolean); procedure Add_Argument (Arg : String; Display : Boolean); - -- Add an argument to Arguments. Reallocate if necessary. + -- Add an argument to Arguments. Reallocate if necessary procedure Add_Arguments (Args : Argument_List; Display : Boolean); -- Add a list of arguments to Arguments. Reallocate if necessary @@ -2015,7 +2015,7 @@ package body Makegpr is end if; end; - -- If the source path name ends the line, we are done. + -- If the source path name ends the line, we are done exit Line_Loop when Finish = Last; @@ -2609,7 +2609,7 @@ package body Makegpr is -- Keep_Going is True, to inhibit the building of the archive. Need_To_Compile : Boolean; - -- Set to True when a source needs to be compiled/recompiled. + -- Set to True when a source needs to be compiled/recompiled Need_To_Rebuild_Archive : Boolean := Force_Compilations; -- True when the archive needs to be built/rebuilt unconditionally @@ -3217,7 +3217,10 @@ package body Makegpr is -- If -c was not specified, link the executables, -- if there are any. - if not Compile_Only and then not Data.Library then + if not Compile_Only + and then not Data.Library + and then Data.Object_Directory /= No_Name + then Build_Global_Archive; Link_Executables; end if; @@ -3677,7 +3680,7 @@ package body Makegpr is -- project. Any main that is not a source of the other languages -- will be deemed to be an Ada main. - -- Find the mains of the other languages and the Ada mains. + -- Find the mains of the other languages and the Ada mains Mains.Reset; Ada_Mains.Set_Last (0); diff --git a/gcc/ada/s-bitops.adb b/gcc/ada/s-bitops.adb index 0ac62c32781..2224ff0a650 100644 --- a/gcc/ada/s-bitops.adb +++ b/gcc/ada/s-bitops.adb @@ -40,7 +40,7 @@ with Unchecked_Conversion; package body System.Bit_Ops is subtype Bits_Array is System.Unsigned_Types.Packed_Bytes1 (Positive); - -- Unconstrained array used to interprete the address values. We use the + -- Constrained array used to interpret the address values. We use the -- unaligned version always, since this will handle both the aligned and -- unaligned cases, and we always do these operations by bytes anyway. -- Note: we use a ones origin array here so that the computations of the diff --git a/gcc/ada/s-chepoo.ads b/gcc/ada/s-chepoo.ads index 3c4143927c5..27d840fb7a8 100644 --- a/gcc/ada/s-chepoo.ads +++ b/gcc/ada/s-chepoo.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-1996, 2005 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- -- @@ -41,32 +41,18 @@ package System.Checked_Pools is -- called on each implicit or explicit dereference of a pointer which -- has such a storage pool - procedure Allocate - (Pool : in out Checked_Pool; - Storage_Address : out Address; - Size_In_Storage_Elements : in System.Storage_Elements.Storage_Count; - Alignment : in System.Storage_Elements.Storage_Count) - is abstract; - - procedure Deallocate - (Pool : in out Checked_Pool; - Storage_Address : in Address; - Size_In_Storage_Elements : in System.Storage_Elements.Storage_Count; - Alignment : in System.Storage_Elements.Storage_Count) - is abstract; - - function Storage_Size - (Pool : Checked_Pool) - return System.Storage_Elements.Storage_Count - is abstract; - procedure Dereference (Pool : in out Checked_Pool; Storage_Address : in Address; Size_In_Storage_Elements : in System.Storage_Elements.Storage_Count; Alignment : in System.Storage_Elements.Storage_Count) is abstract; - -- Called each time a pointer to a checked pool is dereferenced + -- Called implicitly each time a pointer to a checked pool is dereferenced + -- All parameters in the profile are compatible with the profile of + -- Allocate/Deallocate: the Storage_Address corresponds to the address of + -- the dereferenced object, Size_in_Storage_Elements is its dynamic size + -- (and thus may involve an implicit dispatching call to size) and + -- Alignment is the alignment of the object. private type Checked_Pool is abstract diff --git a/gcc/ada/s-exnllf.adb b/gcc/ada/s-exnllf.adb index 518370fd7a9..ae282c8110a 100644 --- a/gcc/ada/s-exnllf.adb +++ b/gcc/ada/s-exnllf.adb @@ -49,9 +49,9 @@ package body System.Exn_LLF is begin -- We use the standard logarithmic approach, Exp gets shifted right -- testing successive low order bits and Factor is the value of the - -- base raised to the next power of 2. For positive exponents we - -- multiply the result by this factor, for negative exponents, we - -- Division by this factor. + -- base raised to the next power of 2. If the low order bit or Exp is + -- set, multiply the result by this factor. For negative exponents, + -- invert result upon return. if Exp >= 0 then loop diff --git a/gcc/ada/s-fileio.ads b/gcc/ada/s-fileio.ads index feb1efe78f0..75636ef5e45 100644 --- a/gcc/ada/s-fileio.ads +++ b/gcc/ada/s-fileio.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2004, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005, 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- -- @@ -139,7 +139,7 @@ package System.File_IO is procedure Chain_File (File : FCB.AFCB_Ptr); -- Used to chain the given file into the list of open files. Normally this - -- is done implicitly by Open. Chain_File is used for the spcial cases of + -- is done implicitly by Open. Chain_File is used for the special cases of -- the system files defined by Text_IO (stdin, stdout, stderr) which are -- not opened in the normal manner. Note that the caller is responsible -- for task lock out to protect the global data structures if this is diff --git a/gcc/ada/sem_cat.ads b/gcc/ada/sem_cat.ads index 0792ff00fc4..7296bbe565f 100644 --- a/gcc/ada/sem_cat.ads +++ b/gcc/ada/sem_cat.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2002 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005, 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- -- @@ -96,7 +96,7 @@ package Sem_Cat is -- the checks cannot be made before knowing if the object is imported. procedure Validate_RCI_Declarations (P : Entity_Id); - -- Apply semantic checks given in E2.3(10-14). + -- Apply semantic checks given in E2.3(10-14) procedure Validate_RCI_Subprogram_Declaration (N : Node_Id); -- Check for RCI unit subprogram declarations with respect to diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb index 39f3b71f5e0..1a2d902c272 100644 --- a/gcc/ada/usage.adb +++ b/gcc/ada/usage.adb @@ -162,7 +162,7 @@ begin -- Line for -gnateI switch - Write_Switch_Char ("eInnn"); + Write_Switch_Char ("eInn"); Write_Line ("Index in multi-unit source, e.g. -gnateI2"); -- Line for -gnatem switch @@ -213,7 +213,7 @@ begin -- Line for -gnatk switch Write_Switch_Char ("k"); - Write_Line ("Limit file names to nnn characters (k = krunch)"); + Write_Line ("Limit file names to nn characters (k = krunch)"); -- Line for -gnatl switch @@ -222,8 +222,8 @@ begin -- Line for -gnatm switch - Write_Switch_Char ("mnnn"); - Write_Line ("Limit number of detected errors to nnn (1-999999)"); + Write_Switch_Char ("mnn"); + Write_Line ("Limit number of detected errors to nn (1-999999)"); -- Line for -gnatn switch @@ -289,8 +289,8 @@ begin -- Line for -gnatT switch - Write_Switch_Char ("Tnnn"); - Write_Line ("All compiler tables start at nnn times usual starting size"); + Write_Switch_Char ("Tnn"); + Write_Line ("All compiler tables start at nn times usual starting size"); -- Line for -gnatu switch @@ -438,10 +438,10 @@ begin Write_Line (" i check if-then layout"); Write_Line (" k check casing rules for keywords"); Write_Line (" l check reference manual layout"); - Write_Line (" Lnnn check max nest level < nnn"); + Write_Line (" Lnn check max nest level < nn "); Write_Line (" m check line length <= 79 characters"); Write_Line (" n check casing of package Standard identifiers"); - Write_Line (" Mnnn check line length <= nnn characters"); + Write_Line (" Mnn check line length <= nn characters"); Write_Line (" o check subprogram bodies in alphabetical order"); Write_Line (" p check pragma casing"); Write_Line (" r check casing for identifier references");