From 0b254a4dd1922150c0fc99e8824f27d642f5eadd Mon Sep 17 00:00:00 2001 From: charlet Date: Thu, 21 Apr 2016 10:27:54 +0000 Subject: 2016-04-21 Hristian Kirtchev * sem_prag.adb (Match_Constituent): Treat a constant as a legal constituent even if it is not to prevent spurious errors. 2016-04-21 Gary Dismukes * sem_ch4.adb: Minor typo fixes and reformatting. 2016-04-21 Dmitriy Anisimkov * g-calend.ads (No_Time): The same value in any timezone. * g-socket.adb (Raise_Host_Error): Remove ending dot from original error message before append colon delimited host name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235331 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 16 ++++++++++++++++ gcc/ada/g-calend.ads | 10 ++++++---- gcc/ada/g-socket.adb | 6 +++++- gcc/ada/sem_ch4.adb | 4 ++-- gcc/ada/sem_prag.adb | 2 +- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 05f1f2bb559..0051dbd7f7c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,19 @@ +2016-04-21 Hristian Kirtchev + + * sem_prag.adb (Match_Constituent): Treat a constant as a legal + constituent even if it is not to prevent spurious errors. + +2016-04-21 Gary Dismukes + + * sem_ch4.adb: Minor typo fixes and reformatting. + +2016-04-21 Dmitriy Anisimkov + + * g-calend.ads (No_Time): The same value in any timezone. + * g-socket.adb (Raise_Host_Error): Remove ending + dot from original error message before append colon delimited + host name. + 2016-04-21 Hristian Kirtchev * sem_ch3.adb: Code cleanup. diff --git a/gcc/ada/g-calend.ads b/gcc/ada/g-calend.ads index 4234061e724..3559130e1f1 100644 --- a/gcc/ada/g-calend.ads +++ b/gcc/ada/g-calend.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1999-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1999-2016, 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- -- @@ -39,7 +39,7 @@ -- Second_Duration. Other functions are to access more advanced values like -- Day_Of_Week, Day_In_Year and Week_In_Year. -with Ada.Calendar; +with Ada.Calendar.Formatting; with Interfaces.C; package GNAT.Calendar is @@ -175,9 +175,11 @@ private -- Robert G. Tantzen. No_Time : constant Ada.Calendar.Time := - Ada.Calendar.Time_Of + Ada.Calendar.Formatting.Time_Of (Ada.Calendar.Year_Number'First, Ada.Calendar.Month_Number'First, - Ada.Calendar.Day_Number'First); + Ada.Calendar.Day_Number'First, + Time_Zone => 0); + -- Use Time_Zone => 0 to be the same binary representation in any timezone end GNAT.Calendar; diff --git a/gcc/ada/g-socket.adb b/gcc/ada/g-socket.adb index 2baa4f7315e..477150de573 100644 --- a/gcc/ada/g-socket.adb +++ b/gcc/ada/g-socket.adb @@ -1702,10 +1702,14 @@ package body GNAT.Sockets is ---------------------- procedure Raise_Host_Error (H_Error : Integer; Name : String) is + function Dedot (Value : String) return String is + (if Value /= "" and then Value (Value'Last) = '.' + then Value (Value'First .. Value'Last - 1) else Value); + -- Removes dot at the end of error message begin raise Host_Error with Err_Code_Image (H_Error) - & Host_Error_Messages.Host_Error_Message (H_Error) + & Dedot (Host_Error_Messages.Host_Error_Message (H_Error)) & ": " & Name; end Raise_Host_Error; diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 5b463cbd29a..68375299dce 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -7569,8 +7569,8 @@ package body Sem_Ch4 is while Present (It.Nam) loop Add_One_Interp (N, It.Nam, It.Typ); - -- Add dereference interpretation if the result type type - -- has implicit reference discriminants. + -- Add dereference interpretation if the result type has + -- implicit reference discriminants. if Has_Discriminants (Etype (It.Nam)) then Check_Implicit_Dereference (N, Etype (It.Nam)); diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 0d75d220261..3d3683c9ba0 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -25522,7 +25522,7 @@ package body Sem_Prag is -- a visible state or lacks a Part_Of indicator. if Ekind (Constit_Id) = E_Constant then - null; + Collect_Constituent; -- If we get here, then the constituent is not a hidden -- state of the related package and may not be used in a -- cgit v1.2.1