From 2d249f52b53c9c4b0d6fdbd1490f3871d1df5d40 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 2 May 2017 11:04:23 +0200 Subject: [multiple changes] 2017-05-02 Arnaud Charlet * sem_case.adb: Remove extra spaces in parameter declarations. 2017-05-02 Justin Squirek * usage.adb: Replace space with hyphen ("run time" -> "run-time") in usage line for new -gnatwE switch. 2017-05-02 Claire Dross * a-cofuve.ads (Remove): Remove unnecessary conditions in precondition. 2017-05-02 Vasiliy Fofanov * a-stream.ads, exp_imgv.adb, sem_ch10.adb, sem_attr.adb, s-finmas.ads, osint.adb: Minor typo fix. From-SVN: r247479 --- gcc/ada/ChangeLog | 19 +++++++++++++++++++ gcc/ada/a-cofuve.ads | 5 +---- gcc/ada/a-stream.ads | 4 ++-- gcc/ada/errout.adb | 2 +- gcc/ada/exp_imgv.adb | 4 ++-- gcc/ada/opt.ads | 12 ++++++------ gcc/ada/osint.adb | 2 +- gcc/ada/s-finmas.ads | 6 +++--- gcc/ada/sem_attr.adb | 4 ++-- gcc/ada/sem_case.adb | 6 +++--- gcc/ada/sem_ch10.adb | 2 +- gcc/ada/switch-b.adb | 2 +- gcc/ada/usage.adb | 2 +- gcc/ada/warnsw.adb | 2 +- 14 files changed, 44 insertions(+), 28 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ffa3976..f91a3eb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,22 @@ +2017-05-02 Arnaud Charlet + + * sem_case.adb: Remove extra spaces in parameter declarations. + +2017-05-02 Justin Squirek + + * usage.adb: Replace space with hyphen ("run time" -> "run-time") + in usage line for new -gnatwE switch. + +2017-05-02 Claire Dross + + * a-cofuve.ads (Remove): Remove unnecessary + conditions in precondition. + +2017-05-02 Vasiliy Fofanov + + * a-stream.ads, exp_imgv.adb, sem_ch10.adb, + sem_attr.adb, s-finmas.ads, osint.adb: Minor typo fix. + 2017-05-02 Justin Squirek * sem_ch4.adb (Analyze_Case_Expression): Add check for valid diff --git a/gcc/ada/a-cofuve.ads b/gcc/ada/a-cofuve.ads index db1edd5..b48330c 100644 --- a/gcc/ada/a-cofuve.ads +++ b/gcc/ada/a-cofuve.ads @@ -319,10 +319,7 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is with Global => null, - Pre => - Length (Container) < Count_Type'Last - and Last (Container) < Index_Type'Last - and Position in Index_Type'First .. Last (Container), + Pre => Position in Index_Type'First .. Last (Container), Post => Length (Remove'Result) = Length (Container) - 1 and then Range_Equal diff --git a/gcc/ada/a-stream.ads b/gcc/ada/a-stream.ads index 40e60ce..f3aa008 100644 --- a/gcc/ada/a-stream.ads +++ b/gcc/ada/a-stream.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, 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 -- @@ -42,7 +42,7 @@ package Ada.Streams is type Stream_Element is mod 2 ** Standard'Storage_Unit; type Stream_Element_Offset is new Long_Long_Integer; - -- Stream_Element_Offset needs 64 bits to accomodate large stream files. + -- Stream_Element_Offset needs 64 bits to accommodate large stream files. -- However, rather than make this explicitly 64-bits we derive from -- Long_Long_Integer. In normal usage this will have the same effect. -- But in the case of CodePeer with a target configuration file with a diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb index 3378190..762ccda 100644 --- a/gcc/ada/errout.adb +++ b/gcc/ada/errout.adb @@ -3103,7 +3103,7 @@ package body Errout is -- as errors. if Is_Warning_Msg - and then Warning_Mode = Treat_Run_Time_As_Error + and then Warning_Mode = Treat_Run_Time_Warnings_As_Errors then Is_Warning_Msg := False; end if; diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb index e4a07f7..28de1f4 100644 --- a/gcc/ada/exp_imgv.adb +++ b/gcc/ada/exp_imgv.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2016, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2017, 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- -- @@ -1165,7 +1165,7 @@ package body Exp_Imgv is pragma Assert (Is_Enumeration_Type (Rtyp)); -- Whenever pragma Discard_Names is in effect, the value we need - -- is the value needed to accomodate the largest integer pos value + -- is the value needed to accommodate the largest integer pos value -- in the range of the subtype + 1 for the space at the start. We -- build: diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads index 2140d5e..2dbfef0 100644 --- a/gcc/ada/opt.ads +++ b/gcc/ada/opt.ads @@ -1861,17 +1861,17 @@ package Opt is -- Modified by use of -gnatw.w/.W. type Warning_Mode_Type is - (Suppress, Normal, Treat_As_Error, Treat_Run_Time_As_Error); + (Suppress, Normal, Treat_As_Error, Treat_Run_Time_Warnings_As_Errors); Warning_Mode : Warning_Mode_Type := Normal; -- GNAT, GNATBIND -- Controls treatment of warning messages. If set to Suppress, warning -- messages are not generated at all. In Normal mode, they are generated -- but do not count as errors. In Treat_As_Error mode, warning messages are - -- generated and are treated as errors. In Treat_Run_Time_As_Error, warning - -- messages regarding errors raised at run time are treated as errors. Note - -- that Warning_Mode = Suppress causes pragma Warnings to be ignored - -- (except for legality checks), unless we are in GNATprove_Mode, which - -- requires pragma Warnings to be stored for the formal verification + -- generated and treated as errors. In Treat_Run_Time_Warnings_As_Errors, + -- warning messages regarding errors raised at run time are treated as + -- errors. Note that Warning_Mode = Suppress causes pragma Warnings to be + -- ignored (except for legality checks), unless we are in GNATprove_Mode, + -- which requires pragma Warnings to be stored for the formal verification -- backend. Warnings_As_Errors_Count : Natural; diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb index 566a234..105e866 100644 --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -2312,7 +2312,7 @@ package body Osint is -- Read the file. Note that the loop is probably not necessary since the -- whole file is read at once but the loop is harmless and that way we - -- are sure to accomodate systems where this is not the case. + -- are sure to accommodate systems where this is not the case. Curr := 1; Actual_Len := Len; diff --git a/gcc/ada/s-finmas.ads b/gcc/ada/s-finmas.ads index a4e6cb1..28f862f 100644 --- a/gcc/ada/s-finmas.ads +++ b/gcc/ada/s-finmas.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2011-2015, Free Software Foundation, Inc. -- +-- Copyright (C) 2011-2017, 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- -- @@ -62,7 +62,7 @@ package System.Finalization_Masters is -- Finalization master type structure. A unique master is associated with -- each access-to-controlled or access-to-class-wide type. Masters also act -- as components of subpools. By default, a master contains objects of the - -- same designated type but it may also accomodate heterogeneous objects. + -- same designated type but it may also accommodate heterogeneous objects. type Finalization_Master is new Ada.Finalization.Limited_Controlled with private; @@ -156,7 +156,7 @@ private -- Finalization master type structure. A unique master is associated with -- each access-to-controlled or access-to-class-wide type. Masters also act -- as components of subpools. By default, a master contains objects of the - -- same designated type but it may also accomodate heterogeneous objects. + -- same designated type but it may also accommodate heterogeneous objects. type Finalization_Master is new Ada.Finalization.Limited_Controlled with diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index ecb6ab2..5cbc08c 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -6173,7 +6173,7 @@ package body Sem_Attr is elsif Val < 0 then Set_Etype (E1, Universal_Integer); - -- Otherwise set type to Unsigned_64 to accomodate max values + -- Otherwise set type to Unsigned_64 to accommodate max values else Set_Etype (E1, Standard_Unsigned_64); @@ -10056,7 +10056,7 @@ package body Sem_Attr is -- If range is null, result is zero, that has already -- been dealt with, so what we need is the power of ten - -- that accomodates the Pos of the largest value, which + -- that accommodates the Pos of the largest value, which -- is the high bound of the range + one for the space. W := 1; diff --git a/gcc/ada/sem_case.adb b/gcc/ada/sem_case.adb index 187a98b..6f66d6f 100644 --- a/gcc/ada/sem_case.adb +++ b/gcc/ada/sem_case.adb @@ -92,9 +92,9 @@ package body Sem_Case is -- ID of an appropriate string to be used in error message output. procedure Expand_Others_Choice - (Case_Table : Choice_Table_Type; - Others_Choice : Node_Id; - Choice_Type : Entity_Id); + (Case_Table : Choice_Table_Type; + Others_Choice : Node_Id; + Choice_Type : Entity_Id); -- The case table is the table generated by a call to Check_Choices -- (with just 1 .. Last_Choice entries present). Others_Choice is a -- pointer to the N_Others_Choice node (this routine is only called if diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb index 07f9f8c..358b20a 100644 --- a/gcc/ada/sem_ch10.adb +++ b/gcc/ada/sem_ch10.adb @@ -6145,7 +6145,7 @@ package body Sem_Ch10 is Last_Public_Shadow := Last_Shadow; -- Ada 2005 (AI-262): Build the limited view of the private declarations - -- to accomodate limited private with clauses. + -- to accommodate limited private with clauses. Process_Declarations_And_States (Pack => Pack, diff --git a/gcc/ada/switch-b.adb b/gcc/ada/switch-b.adb index 1e13f3c..52a72e4 100644 --- a/gcc/ada/switch-b.adb +++ b/gcc/ada/switch-b.adb @@ -491,7 +491,7 @@ package body Switch.B is Warning_Mode := Treat_As_Error; when 'E' => - Warning_Mode := Treat_Run_Time_As_Error; + Warning_Mode := Treat_Run_Time_Warnings_As_Errors; when 's' => Warning_Mode := Suppress; diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb index 5e3ecbd..7ffb424 100644 --- a/gcc/ada/usage.adb +++ b/gcc/ada/usage.adb @@ -488,7 +488,7 @@ begin Write_Line (" e treat all warnings (but not info) as errors"); Write_Line (" .e turn on every optional info/warning " & "(no exceptions)"); - Write_Line (" E treat all run time warnings as errors"); + Write_Line (" E treat all run-time warnings as errors"); Write_Line (" f+ turn on warnings for unreferenced formal"); Write_Line (" F* turn off warnings for unreferenced formal"); Write_Line (" .f turn on warnings for suspicious Subp'Access"); diff --git a/gcc/ada/warnsw.adb b/gcc/ada/warnsw.adb index 5165bf0..2fd1330 100644 --- a/gcc/ada/warnsw.adb +++ b/gcc/ada/warnsw.adb @@ -533,7 +533,7 @@ package body Warnsw is Warning_Mode := Treat_As_Error; when 'E' => - Warning_Mode := Treat_Run_Time_As_Error; + Warning_Mode := Treat_Run_Time_Warnings_As_Errors; when 'f' => Check_Unreferenced_Formals := True; -- cgit v1.1