From d99ff0f407dadb7b1e576416c5de4dce43151222 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 26 Apr 2012 12:03:51 +0200 Subject: [PATCH] [multiple changes] 2012-04-26 Hristian Kirtchev * sem_ch5.adb (Analyze_Loop_Parameter_Specification): Do not freeze the loop variable while preanalyzing a quantified expression. 2012-04-26 Hristian Kirtchev * a-calend.adb (Split, Time_Of): Rename parameter Is_Ada_05 to Use_TZ to better illustrate its function. Update all references to the parameter. (To_Ada_Time): Update the call to Formatting_Operations.Time_Of. * a-calend.ads (Split, Time_Of): Rename parameter Is_Ada_05 to Use_TZ to better illustrate its function. Update the related comment on usage. * a-calend-vms.adb (Split, Time_Of): Rename parameter Is_Ada_05 to Use_TZ to better illustrate its function. Update all references to the parameter. (To_Ada_Time): Update the call to Formatting_Operations.Time_Of. * a-calend-vms.ads (Split, Time_Of): Rename parameter Is_Ada_05 to Use_TZ to better illustrate its function. Update the related comment on usage. * a-calfor.adb (Split, Time_Of): Update the call to Formatting_Operations.Time_Of. * sysdep.c (__gnat_localtime_tzoff): Dereference pointer "is_historic" and rewrite the check as a comparison. Add a comment on flag values. 2012-04-26 Robert Dewar * exp_ch2.adb, sem_ch8.adb: Minor reformatting. 2012-04-26 Vasiliy Fofanov * a-stzunb-shared.adb, gnat_ugn.texi, a-strunb-shared.adb, a-strunb-shared.ads, uintp.adb, a-stwiun-shared.adb, a-stwiun-shared.ads, a-cbhama.ads, vms_data.ads, a-cobove.adb, a-convec.adb, sem_ch13.adb, a-cbhase.ads: Fix common misuses of the word "then" where "than" should be used in English. From-SVN: r186871 --- gcc/ada/ChangeLog | 39 +++++++++++++++++++++++++++++++++++++ gcc/ada/a-calend-vms.adb | 24 +++++++++++------------ gcc/ada/a-calend-vms.ads | 14 ++++++------- gcc/ada/a-calend.adb | 23 +++++++++++----------- gcc/ada/a-calend.ads | 12 ++++++------ gcc/ada/a-calfor.adb | 18 ++++++++--------- gcc/ada/a-cbhama.ads | 2 +- gcc/ada/a-cbhase.ads | 2 +- gcc/ada/a-cobove.adb | 2 +- gcc/ada/a-convec.adb | 2 +- gcc/ada/a-strunb-shared.adb | 8 ++++---- gcc/ada/a-strunb-shared.ads | 4 ++-- gcc/ada/a-stwiun-shared.adb | 8 ++++---- gcc/ada/a-stwiun-shared.ads | 4 ++-- gcc/ada/a-stzunb-shared.adb | 8 ++++---- gcc/ada/exp_ch2.adb | 2 ++ gcc/ada/gnat_ugn.texi | 4 ++-- gcc/ada/sem_ch13.adb | 2 +- gcc/ada/sem_ch5.adb | 22 ++++++++++++--------- gcc/ada/sem_ch8.adb | 8 ++++---- gcc/ada/sysdep.c | 6 ++++-- gcc/ada/uintp.adb | 6 ++---- gcc/ada/vms_data.ads | 4 ++-- 23 files changed, 135 insertions(+), 89 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index db2dc69e674..c8e7b8e3a00 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,42 @@ +2012-04-26 Hristian Kirtchev + + * sem_ch5.adb (Analyze_Loop_Parameter_Specification): Do not freeze + the loop variable while preanalyzing a quantified expression. + +2012-04-26 Hristian Kirtchev + + * a-calend.adb (Split, Time_Of): Rename parameter Is_Ada_05 + to Use_TZ to better illustrate its function. Update all + references to the parameter. + (To_Ada_Time): Update the call to Formatting_Operations.Time_Of. + * a-calend.ads (Split, Time_Of): Rename parameter Is_Ada_05 + to Use_TZ to better illustrate its function. Update the related + comment on usage. + * a-calend-vms.adb (Split, Time_Of): Rename parameter + Is_Ada_05 to Use_TZ to better illustrate its function. Update + all references to the parameter. + (To_Ada_Time): Update the call to Formatting_Operations.Time_Of. + * a-calend-vms.ads (Split, Time_Of): Rename parameter Is_Ada_05 + to Use_TZ to better illustrate its function. Update the related + comment on usage. + * a-calfor.adb (Split, Time_Of): Update the call to + Formatting_Operations.Time_Of. + * sysdep.c (__gnat_localtime_tzoff): Dereference pointer + "is_historic" and rewrite the check as a comparison. Add a + comment on flag values. + +2012-04-26 Robert Dewar + + * exp_ch2.adb, sem_ch8.adb: Minor reformatting. + +2012-04-26 Vasiliy Fofanov + + * a-stzunb-shared.adb, gnat_ugn.texi, a-strunb-shared.adb, + a-strunb-shared.ads, uintp.adb, a-stwiun-shared.adb, + a-stwiun-shared.ads, a-cbhama.ads, vms_data.ads, a-cobove.adb, + a-convec.adb, sem_ch13.adb, a-cbhase.ads: Fix common misuses of the + word "then" where "than" should be used in English. + 2012-04-26 Robert Dewar * sem_ch5.adb (Check_Unreachable_Code): Skip past pragmas. diff --git a/gcc/ada/a-calend-vms.adb b/gcc/ada/a-calend-vms.adb index f9453c33501..1306488d9a4 100644 --- a/gcc/ada/a-calend-vms.adb +++ b/gcc/ada/a-calend-vms.adb @@ -517,8 +517,8 @@ package body Ada.Calendar is Le : Boolean; begin - -- Use UTC as the local time zone on VMS, the status of flag Is_Ada_05 - -- is irrelevant in this case. + -- Use UTC as the local time zone on VMS, the status of flag Use_TZ is + -- irrelevant in this case. Formatting_Operations.Split (Date => Date, @@ -531,7 +531,7 @@ package body Ada.Calendar is Second => Se, Sub_Sec => Ss, Leap_Sec => Le, - Is_Ada_05 => False, + Use_TZ => False, Time_Zone => 0); -- Validity checks @@ -573,8 +573,8 @@ package body Ada.Calendar is raise Time_Error; end if; - -- Use UTC as the local time zone on VMS, the status of flag Is_Ada_05 - -- is irrelevant in this case. + -- Use UTC as the local time zone on VMS, the status of flag Use_TZ is + -- irrelevant in this case. return Formatting_Operations.Time_Of @@ -588,7 +588,7 @@ package body Ada.Calendar is Sub_Sec => Ss, Leap_Sec => False, Use_Day_Secs => True, - Is_Ada_05 => False, + Use_TZ => False, Time_Zone => 0); end Time_Of; @@ -835,7 +835,7 @@ package body Ada.Calendar is Sub_Sec => 0.0, -- No precise sub second given Leap_Sec => Leap, Use_Day_Secs => False, -- Time is given in h:m:s - Is_Ada_05 => True, -- Force usage of explicit time zone + Use_TZ => True, -- Force usage of explicit time zone Time_Zone => 0)); -- Place the value in UTC -- Step 4: Daylight Savings Time @@ -990,12 +990,12 @@ package body Ada.Calendar is Second : out Integer; Sub_Sec : out Duration; Leap_Sec : out Boolean; - Is_Ada_05 : Boolean; + Use_TZ : Boolean; Time_Zone : Long_Integer) is - -- The flag Is_Ada_05 is present for interfacing purposes + -- The flag Use_TZ is present for interfacing purposes - pragma Unreferenced (Is_Ada_05); + pragma Unreferenced (Use_TZ); procedure Numtim (Status : out Unsigned_Longword; @@ -1106,7 +1106,7 @@ package body Ada.Calendar is Sub_Sec : Duration; Leap_Sec : Boolean := False; Use_Day_Secs : Boolean := False; - Is_Ada_05 : Boolean := False; + Use_TZ : Boolean := False; Time_Zone : Long_Integer := 0) return Time is procedure Cvt_Vectim @@ -1255,7 +1255,7 @@ package body Ada.Calendar is Rounded_Res_M := Res_M - (Res_M mod Mili); - if Is_Ada_05 + if Use_TZ and then Leap_Sec and then Rounded_Res_M /= Next_Leap_M then diff --git a/gcc/ada/a-calend-vms.ads b/gcc/ada/a-calend-vms.ads index 56c98697be1..83534c2c916 100644 --- a/gcc/ada/a-calend-vms.ads +++ b/gcc/ada/a-calend-vms.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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 -- @@ -228,11 +228,11 @@ private Second : out Integer; Sub_Sec : out Duration; Leap_Sec : out Boolean; - Is_Ada_05 : Boolean; + Use_TZ : Boolean; Time_Zone : Long_Integer); - -- Split a time value into its components. Set Is_Ada_05 to use the - -- local time zone (the value in Time_Zone is ignored) when splitting - -- a time value. + -- Split a time value into its components. Set Use_TZ to use the local + -- time zone (the value in Time_Zone is ignored) when splitting a time + -- value. function Time_Of (Year : Year_Number; @@ -245,12 +245,12 @@ private Sub_Sec : Duration; Leap_Sec : Boolean := False; Use_Day_Secs : Boolean := False; - Is_Ada_05 : Boolean := False; + Use_TZ : Boolean := False; Time_Zone : Long_Integer := 0) return Time; -- Given all the components of a date, return the corresponding time -- value. Set Use_Day_Secs to use the value in Day_Secs, otherwise the -- day duration will be calculated from Hour, Minute, Second and Sub_ - -- Sec. Set Is_Ada_05 to use the local time zone (the value in formal + -- Sec. Set Use_TZ to use the local time zone (the value in formal -- Time_Zone is ignored) when building a time value and to verify the -- validity of a requested leap second. diff --git a/gcc/ada/a-calend.adb b/gcc/ada/a-calend.adb index f79b9d1e7f5..94257c232f0 100644 --- a/gcc/ada/a-calend.adb +++ b/gcc/ada/a-calend.adb @@ -575,7 +575,7 @@ package body Ada.Calendar is pragma Unreferenced (H, M, Se, Ss, Le); begin - -- Even though the input time zone is UTC (0), the flag Is_Ada_05 will + -- Even though the input time zone is UTC (0), the flag Use_TZ will -- ensure that Split picks up the local time zone. Formatting_Operations.Split @@ -589,7 +589,7 @@ package body Ada.Calendar is Second => Se, Sub_Sec => Ss, Leap_Sec => Le, - Is_Ada_05 => False, + Use_TZ => False, Time_Zone => 0); -- Validity checks @@ -633,7 +633,7 @@ package body Ada.Calendar is raise Time_Error; end if; - -- Even though the input time zone is UTC (0), the flag Is_Ada_05 will + -- Even though the input time zone is UTC (0), the flag Use_TZ will -- ensure that Split picks up the local time zone. return @@ -648,7 +648,7 @@ package body Ada.Calendar is Sub_Sec => Ss, Leap_Sec => False, Use_Day_Secs => True, - Is_Ada_05 => False, + Use_TZ => False, Time_Zone => 0); end Time_Of; @@ -744,7 +744,8 @@ package body Ada.Calendar is Secs_T := time_t (Date_N / Nano); - -- Determine whether to treat the input date as historical or not + -- Determine whether to treat the input date as historical or not. A + -- value of "0" signifies that the date is NOT historic. Flag := (if Is_Historic then 1 else 0); @@ -975,7 +976,7 @@ package body Ada.Calendar is Sub_Sec => 0.0, -- No precise sub second given Leap_Sec => Leap, Use_Day_Secs => False, -- Time is given in h:m:s - Is_Ada_05 => True, -- Force usage of explicit time zone + Use_TZ => True, -- Force usage of explicit time zone Time_Zone => 0)); -- Place the value in UTC -- Step 4: Daylight Savings Time @@ -1204,7 +1205,7 @@ package body Ada.Calendar is Second : out Integer; Sub_Sec : out Duration; Leap_Sec : out Boolean; - Is_Ada_05 : Boolean; + Use_TZ : Boolean; Time_Zone : Long_Integer) is -- The following constants represent the number of nanoseconds @@ -1257,7 +1258,7 @@ package body Ada.Calendar is -- Step 2: Time zone processing. This action converts the input date -- from GMT to the requested time zone. Applies from Ada 2005 on. - if Is_Ada_05 then + if Use_TZ then if Time_Zone /= 0 then Date_N := Date_N + Time_Rep (Time_Zone) * 60 * Nano; end if; @@ -1385,7 +1386,7 @@ package body Ada.Calendar is Sub_Sec : Duration; Leap_Sec : Boolean := False; Use_Day_Secs : Boolean := False; - Is_Ada_05 : Boolean := False; + Use_TZ : Boolean := False; Time_Zone : Long_Integer := 0) return Time is Count : Integer; @@ -1479,7 +1480,7 @@ package body Ada.Calendar is -- a uniform representation which can be treated by arithmetic -- operations for instance without any additional corrections. - if Is_Ada_05 then + if Use_TZ then if Time_Zone /= 0 then Res_N := Res_N - Time_Rep (Time_Zone) * 60 * Nano; end if; @@ -1519,7 +1520,7 @@ package body Ada.Calendar is Rounded_Res_N := Res_N - (Res_N mod Nano); - if Is_Ada_05 + if Use_TZ and then Leap_Sec and then Rounded_Res_N /= Next_Leap_N then diff --git a/gcc/ada/a-calend.ads b/gcc/ada/a-calend.ads index 60319c25478..d1697196855 100644 --- a/gcc/ada/a-calend.ads +++ b/gcc/ada/a-calend.ads @@ -351,11 +351,11 @@ private Second : out Integer; Sub_Sec : out Duration; Leap_Sec : out Boolean; - Is_Ada_05 : Boolean; + Use_TZ : Boolean; Time_Zone : Long_Integer); - -- Split a time value into its components. Set Is_Ada_05 to use the - -- local time zone (the value in Time_Zone is ignored) when splitting - -- a time value. + -- Split a time value into its components. Set Use_TZ to use the local + -- time zone (the value in Time_Zone is ignored) when splitting a time + -- value. function Time_Of (Year : Year_Number; @@ -368,12 +368,12 @@ private Sub_Sec : Duration; Leap_Sec : Boolean := False; Use_Day_Secs : Boolean := False; - Is_Ada_05 : Boolean := False; + Use_TZ : Boolean := False; Time_Zone : Long_Integer := 0) return Time; -- Given all the components of a date, return the corresponding time -- value. Set Use_Day_Secs to use the value in Day_Secs, otherwise the -- day duration will be calculated from Hour, Minute, Second and Sub_ - -- Sec. Set Is_Ada_05 to use the local time zone (the value in formal + -- Sec. Set Use_TZ to use the local time zone (the value in formal -- Time_Zone is ignored) when building a time value and to verify the -- validity of a requested leap second. diff --git a/gcc/ada/a-calfor.adb b/gcc/ada/a-calfor.adb index e683e3c389b..e328a4eff5d 100644 --- a/gcc/ada/a-calfor.adb +++ b/gcc/ada/a-calfor.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2006-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 2006-2012, 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- -- @@ -431,8 +431,8 @@ package body Ada.Calendar.Formatting is Second => Se, Sub_Sec => Su, Leap_Sec => Leap_Second, - Time_Zone => Tz, - Is_Ada_05 => True); + Use_TZ => True, + Time_Zone => Tz); -- Validity checks @@ -476,8 +476,8 @@ package body Ada.Calendar.Formatting is Second => Second, Sub_Sec => Sub_Second, Leap_Sec => Le, - Time_Zone => Tz, - Is_Ada_05 => True); + Use_TZ => True, + Time_Zone => Tz); -- Validity checks @@ -524,8 +524,8 @@ package body Ada.Calendar.Formatting is Second => Second, Sub_Sec => Sub_Second, Leap_Sec => Leap_Second, - Time_Zone => Tz, - Is_Ada_05 => True); + Use_TZ => True, + Time_Zone => Tz); -- Validity checks @@ -629,7 +629,7 @@ package body Ada.Calendar.Formatting is Sub_Sec => Ss, Leap_Sec => Leap_Second, Use_Day_Secs => True, - Is_Ada_05 => True, + Use_TZ => True, Time_Zone => Tz); end Time_Of; @@ -678,7 +678,7 @@ package body Ada.Calendar.Formatting is Sub_Sec => Sub_Second, Leap_Sec => Leap_Second, Use_Day_Secs => False, - Is_Ada_05 => True, + Use_TZ => True, Time_Zone => Tz); end Time_Of; diff --git a/gcc/ada/a-cbhama.ads b/gcc/ada/a-cbhama.ads index e4bba3332de..71ec0e3d956 100644 --- a/gcc/ada/a-cbhama.ads +++ b/gcc/ada/a-cbhama.ads @@ -162,7 +162,7 @@ package Ada.Containers.Bounded_Hashed_Maps is procedure Assign (Target : in out Map; Source : Map); -- If Target denotes the same object as Source, then the operation has no - -- effect. If the Target capacity is less then the Source length, then + -- effect. If the Target capacity is less than the Source length, then -- Assign raises Capacity_Error. Otherwise, Assign clears Target and then -- copies the (active) elements from Source to Target. diff --git a/gcc/ada/a-cbhase.ads b/gcc/ada/a-cbhase.ads index 0befce62d1e..ed47b798683 100644 --- a/gcc/ada/a-cbhase.ads +++ b/gcc/ada/a-cbhase.ads @@ -153,7 +153,7 @@ package Ada.Containers.Bounded_Hashed_Sets is procedure Assign (Target : in out Set; Source : Set); -- If Target denotes the same object as Source, then the operation has no - -- effect. If the Target capacity is less then the Source length, then + -- effect. If the Target capacity is less than the Source length, then -- Assign raises Capacity_Error. Otherwise, Assign clears Target and then -- copies the (active) elements from Source to Target. diff --git a/gcc/ada/a-cobove.adb b/gcc/ada/a-cobove.adb index 9148fa17454..af9ea25e0f2 100644 --- a/gcc/ada/a-cobove.adb +++ b/gcc/ada/a-cobove.adb @@ -2368,7 +2368,7 @@ package body Ada.Containers.Bounded_Vectors is begin -- Set_Length allows the user to set the length explicitly, instead of -- implicitly as a side-effect of deletion or insertion. If the - -- requested length is less then the current length, this is equivalent + -- requested length is less than the current length, this is equivalent -- to deleting items from the back end of the vector. If the requested -- length is greater than the current length, then this is equivalent to -- inserting "space" (nonce items) at the end. diff --git a/gcc/ada/a-convec.adb b/gcc/ada/a-convec.adb index 709e1fe7e90..e2e5d93f217 100644 --- a/gcc/ada/a-convec.adb +++ b/gcc/ada/a-convec.adb @@ -3199,7 +3199,7 @@ package body Ada.Containers.Vectors is begin -- Set_Length allows the user to set the length explicitly, instead -- of implicitly as a side-effect of deletion or insertion. If the - -- requested length is less then the current length, this is equivalent + -- requested length is less than the current length, this is equivalent -- to deleting items from the back end of the vector. If the requested -- length is greater than the current length, then this is equivalent -- to inserting "space" (nonce items) at the end. diff --git a/gcc/ada/a-strunb-shared.adb b/gcc/ada/a-strunb-shared.adb index cf2582a7dea..0ba9bd14285 100644 --- a/gcc/ada/a-strunb-shared.adb +++ b/gcc/ada/a-strunb-shared.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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- -- @@ -877,7 +877,7 @@ package body Ada.Strings.Unbounded is if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less then requested, copy all + -- Length of the source string is less than requested, copy all -- contents and fill others by Pad character. else @@ -931,13 +931,13 @@ package body Ada.Strings.Unbounded is else DR := Allocate (Count); - -- Length of the source string is greater then requested, copy + -- Length of the source string is greater than requested, copy -- corresponding slice. if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less the requested, copy all + -- Length of the source string is less than requested, copy all -- existing data and fill remaining positions with Pad characters. else diff --git a/gcc/ada/a-strunb-shared.ads b/gcc/ada/a-strunb-shared.ads index 7d2bc84aae0..3ec961f5c34 100644 --- a/gcc/ada/a-strunb-shared.ads +++ b/gcc/ada/a-strunb-shared.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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 -- @@ -56,7 +56,7 @@ -- reallocation when all of the following requirements are met: -- - the shared data object is no longer used by anyone else; -- - the size is sufficient to store the new value; - -- - the gap after reuse is less then a defined threshold. + -- - the gap after reuse is less than a defined threshold. -- - Memory preallocation. Most of used memory allocation algorithms -- align allocated segments on the some boundary, thus some amount of diff --git a/gcc/ada/a-stwiun-shared.adb b/gcc/ada/a-stwiun-shared.adb index 5ee93e85ff3..731be43bf46 100644 --- a/gcc/ada/a-stwiun-shared.adb +++ b/gcc/ada/a-stwiun-shared.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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- -- @@ -883,7 +883,7 @@ package body Ada.Strings.Wide_Unbounded is if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less then requested, copy all + -- Length of the source string is less than requested, copy all -- contents and fill others by Pad character. else @@ -937,13 +937,13 @@ package body Ada.Strings.Wide_Unbounded is else DR := Allocate (Count); - -- Length of the source string is greater then requested, copy + -- Length of the source string is greater than requested, copy -- corresponding slice. if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less the requested, copy all + -- Length of the source string is less than requested, copy all -- exists data and fill others by Pad character. else diff --git a/gcc/ada/a-stwiun-shared.ads b/gcc/ada/a-stwiun-shared.ads index 4c05d7309ec..b3b62afc2bd 100644 --- a/gcc/ada/a-stwiun-shared.ads +++ b/gcc/ada/a-stwiun-shared.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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 -- @@ -463,7 +463,7 @@ private -- reallocation when all of the following requirements are meat: -- - shared data object don't used anywhere longer; -- - its size is sufficient to store new value; - -- - the gap after reuse is less then some threshold. + -- - the gap after reuse is less than some threshold. -- - memory preallocation. Most of used memory allocation algorithms -- aligns allocated segment on the some boundary, thus some amount of diff --git a/gcc/ada/a-stzunb-shared.adb b/gcc/ada/a-stzunb-shared.adb index 18fe75b8c54..9ec5d4764e7 100644 --- a/gcc/ada/a-stzunb-shared.adb +++ b/gcc/ada/a-stzunb-shared.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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- -- @@ -889,7 +889,7 @@ package body Ada.Strings.Wide_Wide_Unbounded is if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less then requested, copy all + -- Length of the source string is less than requested, copy all -- contents and fill others by Pad character. else @@ -943,13 +943,13 @@ package body Ada.Strings.Wide_Wide_Unbounded is else DR := Allocate (Count); - -- Length of the source string is greater then requested, copy + -- Length of the source string is greater than requested, copy -- corresponding slice. if Count < SR.Last then DR.Data (1 .. Count) := SR.Data (1 .. Count); - -- Length of the source string is less the requested, copy all + -- Length of the source string is less than requested, copy all -- exists data and fill others by Pad character. else diff --git a/gcc/ada/exp_ch2.adb b/gcc/ada/exp_ch2.adb index 2f19d20996b..d9143673b72 100644 --- a/gcc/ada/exp_ch2.adb +++ b/gcc/ada/exp_ch2.adb @@ -723,8 +723,10 @@ package body Exp_Ch2 is -- typ!(recobj).rec.all'Constrained -- where rec is a selector whose Entry_Formal link points to the formal + -- If the type of the entry parameter has a representation clause, then an -- extra temp is involved (see below). + -- For a formal of a task entity, the formal is rewritten as a local -- renaming. diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 996137cc17f..d5130d9b61e 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -13390,7 +13390,7 @@ stops. @cindex @option{^--no-separate-is^/NO_SEPARATE_IS^} (@command{gnatpp}) @item ^--no-separate-is^/NO_SEPARATE_IS^ Do not place the keyword @code{is} on a separate line in a subprogram body in -case if the spec occupies more then one line. +case if the spec occupies more than one line. @cindex @option{^--separate-label^/SEPARATE_LABEL^} (@command{gnatpp}) @item ^--separate-label^/SEPARATE_LABEL^ @@ -13465,7 +13465,7 @@ Indentation level, @var{nnn} from 1@dots{}9, the default value is 3 Indentation level for continuation lines (relative to the line being continued), @var{nnn} from 1@dots{}9. The default -value is one less then the (normal) indentation level, unless the +value is one less than the (normal) indentation level, unless the indentation is set to 1 (in which case the default value for continuation line indentation is also 1) @end table diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 52f05453dd7..3c3cce275e7 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -3187,7 +3187,7 @@ package body Sem_Ch13 is elsif Small > Delta_Value (U_Ent) then Error_Msg_N - ("small value must not be greater then delta value", Nam); + ("small value must not be greater than delta value", Nam); else Set_Small_Value (U_Ent, Small); diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb index 3d96591967a..aedb97334a4 100644 --- a/gcc/ada/sem_ch5.adb +++ b/gcc/ada/sem_ch5.adb @@ -2337,16 +2337,20 @@ package body Sem_Ch5 is Generate_Reference (Base_Type (Etype (DS)), N, ' '); Set_Is_Known_Valid (Id, True); - -- The loop is not a declarative part, so the only entity declared - -- "within" must be frozen explicitly. + -- The loop is not a declarative part, so the loop variable must be + -- frozen explicitly. Do not freeze while preanalyzing a quantified + -- expression because the freeze node will not be inserted into the + -- tree due to flag Is_Spec_Expression being set. - declare - Flist : constant List_Id := Freeze_Entity (Id, N); - begin - if Is_Non_Empty_List (Flist) then - Insert_Actions (N, Flist); - end if; - end; + if Nkind (Parent (N)) /= N_Quantified_Expression then + declare + Flist : constant List_Id := Freeze_Entity (Id, N); + begin + if Is_Non_Empty_List (Flist) then + Insert_Actions (N, Flist); + end if; + end; + end if; -- Check for null or possibly null range and issue warning. We suppress -- such messages in generic templates and instances, because in practice diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index f31110b088a..3fb8ad34403 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -7962,17 +7962,17 @@ package body Sem_Ch8 is declare Spec : constant Node_Id := Parent (List_Containing (Parent (Id))); - begin + begin -- Check whether type is declared in a package specification, -- and current unit is the corresponding package body. The -- use clauses themselves may be within a nested package. return Nkind (Spec) = N_Package_Specification - and then - In_Same_Source_Unit (Corresponding_Body (Parent (Spec)), - Cunit_Entity (Current_Sem_Unit)); + and then + In_Same_Source_Unit (Corresponding_Body (Parent (Spec)), + Cunit_Entity (Current_Sem_Unit)); end; end if; diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index 61e934f4ba6..ee31840d8d6 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -665,9 +665,11 @@ __gnat_localtime_tzoff (const time_t *timer, const int *is_historic, long *off) tzi_status = GetTimeZoneInformation (&tzi); /* Processing for RTX targets or cases where we simply want to extract the - offset of the current time zone, regardless of the date. */ + offset of the current time zone, regardless of the date. A value of "0" + for flag "is_historic" signifies that the date is NOT historic, see the + body of Ada.Calendar.UTC_Time_Offset. */ - if (rtx_active || !is_historic) { + if (rtx_active || *is_historic == 0) { *off = tzi.Bias; /* The system is operating in the range covered by the StandardDate diff --git a/gcc/ada/uintp.adb b/gcc/ada/uintp.adb index 713e0b15dd7..1afd8b8a38b 100644 --- a/gcc/ada/uintp.adb +++ b/gcc/ada/uintp.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, 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- -- @@ -159,7 +159,7 @@ package body Uintp is function Sum_Digits (Left : Uint; Sign : Int) return Int; -- If Sign = 1 return the sum of the "digits" of Abs (Left). If the total - -- has more then one digit then return Sum_Digits of total. + -- has more than one digit then return Sum_Digits of total. function Sum_Double_Digits (Left : Uint; Sign : Int) return Int; -- Same as above but work in New_Base = Base * Base @@ -1270,8 +1270,6 @@ package body Uintp is Discard_Quotient : Boolean := False; Discard_Remainder : Boolean := False) is - pragma Warnings (Off, Quotient); - pragma Warnings (Off, Remainder); begin pragma Assert (Right /= Uint_0); diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads index f89ab630449..a71f2319db2 100644 --- a/gcc/ada/vms_data.ads +++ b/gcc/ada/vms_data.ads @@ -5996,7 +5996,7 @@ package VMS_Data is -- /CONTINUATION_INDENT=nnn -- -- Indentation level for continuation lines, nnn from 1 .. 9. - -- The default value is one less then the (normal) indentation level, + -- The default value is one less than the (normal) indentation level, -- unless the indentation is set to 1: in that case the default value for -- continuation line indentation is also 1. @@ -6005,7 +6005,7 @@ package VMS_Data is -- /NO_SEPARATE_IS -- -- Do not place the IS keyword on a separate line in a subprogram body in - -- case if the specification occupies more then one line. + -- case if the specification occupies more than one line. S_Pretty_Sep_Label : aliased constant S := "/SEPARATE_LABEL " & "--separate-label"; -- 2.30.2