From d7cb47b448ef3d183f006a2f5dd6ac1f77ec20ad Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Wed, 19 Feb 2014 16:05:43 +0100 Subject: [PATCH] [multiple changes] 2014-02-19 Robert Dewar * sem_ch5.adb, sem_prag.adb, sem_attr.adb: Minor reformatting. * debug.adb: Remove -gnatd.X switch, no longer used. * styleg.adb (Check_Then): Remove check of -gnatd.X, check is now always made. 2014-02-19 Bob Duff * g-socket.ads: Minor: Correct some comments. From-SVN: r207907 --- gcc/ada/ChangeLog | 11 +++++++++++ gcc/ada/debug.adb | 6 +----- gcc/ada/g-socket.ads | 6 +++--- gcc/ada/sem_attr.adb | 10 ++++------ gcc/ada/sem_ch5.adb | 2 +- gcc/ada/sem_prag.adb | 4 ++-- gcc/ada/styleg.adb | 5 +---- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1fb722dd354..f880738380c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,14 @@ +2014-02-19 Robert Dewar + + * sem_ch5.adb, sem_prag.adb, sem_attr.adb: Minor reformatting. + * debug.adb: Remove -gnatd.X switch, no longer used. + * styleg.adb (Check_Then): Remove check of -gnatd.X, check is + now always made. + +2014-02-19 Bob Duff + + * g-socket.ads: Minor: Correct some comments. + 2014-02-19 Ed Schonberg * sem_ch5.adb: Inhibit iterator rewriting in ASIS mode. diff --git a/gcc/ada/debug.adb b/gcc/ada/debug.adb index 2ab5735329e..11237e23dc9 100644 --- a/gcc/ada/debug.adb +++ b/gcc/ada/debug.adb @@ -141,7 +141,7 @@ package body Debug is -- d.U Ignore indirect calls for static elaboration -- d.V -- d.W Print out debugging information for Walk_Library_Items - -- d.X Activate check on THEN appearing in wrong place + -- d.X -- d.Y -- d.Z @@ -664,10 +664,6 @@ package body Debug is -- the order in which units are walked. This is primarily for use in -- debugging CodePeer mode. - -- d.X Activates check for proper placement of THEN in -gnatyi mode. A - -- THEN keyword must appear on the same line as IF, or on a separate - -- line all on its own, lined up with the IF. - -- d1 Error messages have node numbers where possible. Normally error -- messages have only source locations. This option is useful when -- debugging errors caused by expanded code, where the source location diff --git a/gcc/ada/g-socket.ads b/gcc/ada/g-socket.ads index 06add2c63a9..876e5359206 100644 --- a/gcc/ada/g-socket.ads +++ b/gcc/ada/g-socket.ads @@ -107,8 +107,6 @@ package GNAT.Sockets is -- Channel : Stream_Access; -- begin - -- accept Start; - -- -- -- Get an Internet address of a host (here the local host name). -- -- Note that a host can have several addresses. Here we get -- -- the first one which is supposed to be the official one. @@ -145,6 +143,8 @@ package GNAT.Sockets is -- -- represents the server side of the connection. Server remains -- -- available to receive further connections. + -- accept Start; + -- Accept_Socket (Server, Socket, Address); -- -- Return a stream associated to the connected socket @@ -278,7 +278,7 @@ package GNAT.Sockets is -- Socket_Level, -- (Reuse_Address, True)); - -- -- Force Pong to block + -- -- Force Ping to block -- delay 0.2; diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index 7e1a15eb058..804a9c6b09a 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -9694,8 +9694,7 @@ package body Sem_Attr is elsif Ekind (Entity (P)) = E_Enumeration_Literal then Error_Msg_F - ("prefix of % attribute cannot be enumeration literal", - P); + ("prefix of % attribute cannot be enumeration literal", P); Set_Etype (N, Any_Type); -- An attempt to take 'Access of a function that renames an @@ -9706,13 +9705,12 @@ package body Sem_Attr is and then Ekind (Alias (Entity (P))) = E_Enumeration_Literal then Error_Msg_F - ("prefix of % attribute cannot be function renaming " & - "an enumeration literal", P); + ("prefix of % attribute cannot be function renaming " + & "an enumeration literal", P); Set_Etype (N, Any_Type); elsif Convention (Entity (P)) = Convention_Intrinsic then - Error_Msg_F - ("prefix of % attribute cannot be intrinsic", P); + Error_Msg_F ("prefix of % attribute cannot be intrinsic", P); Set_Etype (N, Any_Type); end if; diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb index bba4477bb44..cb8d1c42f81 100644 --- a/gcc/ada/sem_ch5.adb +++ b/gcc/ada/sem_ch5.adb @@ -1727,7 +1727,7 @@ package body Sem_Ch5 is -- Do not perform this expansion in SPARK mode, since the formal -- verification directly deals with the source form of the iterator. - -- Ditto for ASIS, where the temporary amy hide the transformation + -- Ditto for ASIS, where the temporary may hide the transformation -- of a selected component into a prefixed function call. and then not GNATprove_Mode diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 8e86d6144f9..23611239c22 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -17881,8 +17881,8 @@ package body Sem_Prag is if not Relaxed_RM_Semantics and then (Val < 0 - or else Val > Expr_Value (Expression - (Parent (RTE (RE_Max_Priority))))) + or else Val > Expr_Value (Expression + (Parent (RTE (RE_Max_Priority))))) then Error_Pragma_Arg ("main subprogram priority is out of range", Arg1); diff --git a/gcc/ada/styleg.adb b/gcc/ada/styleg.adb index 67af2fcc58a..0a1880f419e 100644 --- a/gcc/ada/styleg.adb +++ b/gcc/ada/styleg.adb @@ -30,7 +30,6 @@ with Atree; use Atree; with Casing; use Casing; with Csets; use Csets; -with Debug; use Debug; with Einfo; use Einfo; with Err_Vars; use Err_Vars; with Opt; use Opt; @@ -1019,9 +1018,7 @@ package body Styleg is begin if If_Line = Then_Line then null; - elsif Debug_Flag_Dot_XX - and then Token_Ptr /= First_Non_Blank_Location - then + elsif Token_Ptr /= First_Non_Blank_Location then Error_Msg_SC ("(style) misplaced THEN"); end if; end;