From 7d296b158cd2385f779b2ca307b34574d418667b Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 27 Oct 2009 14:14:44 +0000 Subject: [PATCH] 2009-10-27 Robert Dewar * s-fileio.adb, s-fileio.ads, sem_util.adb, sem_warn.adb, sem_warn.ads: Minor reformatting git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153597 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 ++++ gcc/ada/s-fileio.adb | 6 ++--- gcc/ada/s-fileio.ads | 74 +++++++++++++++++++++++++--------------------------- gcc/ada/sem_util.adb | 6 ++--- gcc/ada/sem_warn.adb | 22 +++++++--------- gcc/ada/sem_warn.ads | 4 +-- 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 794901f..9ba4bcf 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2009-10-27 Robert Dewar + * s-fileio.adb, s-fileio.ads, sem_util.adb, sem_warn.adb, + sem_warn.ads: Minor reformatting + +2009-10-27 Robert Dewar + * sem_warn.adb, sem_util.adb, sem_util.ads: Minor reformatting. Add comments. diff --git a/gcc/ada/s-fileio.adb b/gcc/ada/s-fileio.adb index df45003..803c2da 100644 --- a/gcc/ada/s-fileio.adb +++ b/gcc/ada/s-fileio.adb @@ -523,8 +523,7 @@ package body System.File_IO is function Form_Boolean (Form : String; Keyword : String; - Default : Boolean) - return Boolean + Default : Boolean) return Boolean is V1, V2 : Natural; pragma Unreferenced (V2); @@ -553,8 +552,7 @@ package body System.File_IO is function Form_Integer (Form : String; Keyword : String; - Default : Integer) - return Integer + Default : Integer) return Integer is V1, V2 : Natural; V : Integer; diff --git a/gcc/ada/s-fileio.ads b/gcc/ada/s-fileio.ads index e3a9abe..5ee0c5b 100644 --- a/gcc/ada/s-fileio.ads +++ b/gcc/ada/s-fileio.ads @@ -125,8 +125,8 @@ package System.File_IO is -- if used with temporary files or standard files. function Form (File : FCB.AFCB_Ptr) return String; - -- Returns the form as supplied by create, open or reset - -- The string is normalized to all lower case letters. + -- Returns the form as supplied by create, open or reset The string is + -- normalized to all lower case letters. function Is_Open (File : FCB.AFCB_Ptr) return Boolean; -- Determines if file is open or not @@ -145,25 +145,25 @@ package System.File_IO is -- 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 -- necessary (it is needed for the calls from within this unit itself, - -- but not required for the calls from Text_IO and Wide_Text_IO that - -- are made during elaboration of the environment task). + -- but not required for the calls from Text_IO and [Wide_]Wide_Text_IO + -- that are made during elaboration of the environment task). procedure Check_File_Open (File : FCB.AFCB_Ptr); - -- If the current file is not open, then Status_Error is raised. - -- Otherwise control returns normally (with File pointing to the - -- control block for the open file. + -- If the current file is not open, then Status_Error is raised. Otherwise + -- control returns normally (with File pointing to the control block for + -- the open file. procedure Check_Read_Status (File : FCB.AFCB_Ptr); - -- If the current file is not open, then Status_Error is raised. If - -- the file is open, then the mode is checked to ensure that reading - -- is permitted, and if not Mode_Error is raised, otherwise control - -- returns normally. + -- If the current file is not open, then Status_Error is raised. If the + -- file is open, then the mode is checked to make sure that reading is + -- permitted, and if not Mode_Error is raised, otherwise control returns + -- normally. procedure Check_Write_Status (File : FCB.AFCB_Ptr); - -- If the current file is not open, then Status_Error is raised. If - -- the file is open, then the mode is checked to ensure that writing - -- is permitted, and if not Mode_Error is raised, otherwise control - -- returns normally. + -- If the current file is not open, then Status_Error is raised. If the + -- file is open, then the mode is checked to ensure that writing is + -- permitted, and if not Mode_Error is raised, otherwise control returns + -- normally. function End_Of_File (File : FCB.AFCB_Ptr) return Boolean; -- File must be opened in read mode. True is returned if the stream is @@ -171,30 +171,28 @@ package System.File_IO is -- The position of the stream is not affected. procedure Flush (File : FCB.AFCB_Ptr); - -- Flushes the stream associated with the given file. The file must be - -- open and in write mode (if not, an appropriate exception is raised) + -- Flushes the stream associated with the given file. The file must be open + -- and in write mode (if not, an appropriate exception is raised) function Form_Boolean (Form : String; Keyword : String; - Default : Boolean) - return Boolean; - -- Searches form string for an entry of the form Keyword=xx where xx is - -- either Yes/No or y/n. Returns True if Yes or Y is found, False if No - -- or N is found. If the keyword parameter is not found, returns the - -- value given as Default. May raise Use_Error if a form string syntax - -- error is detected. Keyword and Form must be in lower case. + Default : Boolean) return Boolean; + -- Searches form string for an entry of the form keyword=xx where xx is + -- either yes/no or y/n. Returns True if yes or y is found, False if no or + -- n is found. If the keyword parameter is not found, returns the value + -- given as Default. May raise Use_Error if a form string syntax error is + -- detected. Keyword and Form must be in lower case. function Form_Integer (Form : String; Keyword : String; - Default : Integer) - return Integer; - -- Searches form string for an entry of the form Keyword=xx where xx is - -- an unsigned decimal integer in the range 0 to 999_999. Returns this - -- integer value if it is found. If the keyword parameter is not found, - -- returns the value given as Default. Raise Use_Error if a form string - -- syntax error is detected. Keyword and Form must be in lower case. + Default : Integer) return Integer; + -- Searches form string for an entry of the form Keyword=xx where xx is an + -- unsigned decimal integer in the range 0 to 999_999. Returns this integer + -- value if it is found. If the keyword parameter is not found, returns the + -- value given as Default. Raise Use_Error if a form string syntax error is + -- detected. Keyword and Form must be in lower case. procedure Form_Parameter (Form : String; @@ -221,22 +219,22 @@ package System.File_IO is Buf : Address; Siz : Interfaces.C_Streams.size_t; Count : out Interfaces.C_Streams.size_t); - -- Reads Siz bytes from File.Stream into Buf. The caller has checked - -- that the file is open in read mode. Device Error is raised if an error + -- Reads Siz bytes from File.Stream into Buf. The caller has checked that + -- the file is open in read mode. Device Error is raised if an error -- occurs. Count is the actual number of bytes read, which may be less -- than Siz if the end of file is encountered. procedure Append_Set (File : FCB.AFCB_Ptr); - -- If the mode of the file is Append_File, then the file is positioned - -- at the end of file using fseek, otherwise this call has no effect. + -- If the mode of the file is Append_File, then the file is positioned at + -- the end of file using fseek, otherwise this call has no effect. procedure Write_Buf (File : FCB.AFCB_Ptr; Buf : Address; Siz : Interfaces.C_Streams.size_t); - -- Writes size_t bytes to File.Stream from Buf. The caller has checked - -- that the file is open in write mode. Raises Device_Error if the - -- complete buffer cannot be written. + -- Writes size_t bytes to File.Stream from Buf. The caller has checked that + -- the file is open in write mode. Raises Device_Error if the complete + -- buffer cannot be written. procedure Make_Unbuffered (File : FCB.AFCB_Ptr); diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9c8de04..5baf60c 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -2146,7 +2146,7 @@ package body Sem_Util is -- If we have entity names, then must be same entity if Is_Entity_Name (A1) then - if Is_Entity_Name (A2)then + if Is_Entity_Name (A2) then return Entity (A1) = Entity (A2); else return False; @@ -2249,8 +2249,8 @@ package body Sem_Util is return Denotes_Same_Prefix (A2, A1); elsif Nkind_In (A1, N_Selected_Component, N_Indexed_Component, N_Slice) - and then - Nkind_In (A2, N_Selected_Component, N_Indexed_Component, N_Slice) + and then + Nkind_In (A2, N_Selected_Component, N_Indexed_Component, N_Slice) then declare Root1, Root2 : Node_Id; diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index f8124f2..12143c8 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -3554,17 +3554,15 @@ package body Sem_Warn is -- Exclude calls rewritten as enumeration literals - if not Nkind_In - (N, N_Function_Call, N_Procedure_Call_Statement) - then + if not Nkind_In (N, N_Function_Call, N_Procedure_Call_Statement) then return; end if; - -- Exclude calls to library subprograms. Container operations - -- specify safe behavior when source and target coincide. + -- Exclude calls to library subprograms. Container operations specify + -- safe behavior when source and target coincide. - if Is_Predefined_File_Name ( - Unit_File_Name (Get_Source_Unit (Sloc (Subp)))) + if Is_Predefined_File_Name + (Unit_File_Name (Get_Source_Unit (Sloc (Subp)))) then return; end if; @@ -3596,7 +3594,8 @@ package body Sem_Warn is null; elsif Is_Generic_Type (Etype (Act1)) - or else Is_Generic_Type (Etype (Act2)) + or else + Is_Generic_Type (Etype (Act2)) then null; @@ -3634,9 +3633,8 @@ package body Sem_Warn is if Is_Entity_Name (First_Actual (N)) and then Nkind (Original_Node (N)) = Nkind (N) - and then - Nkind (Name (Original_Node (N))) = - N_Selected_Component + and then Nkind (Name (Original_Node (N))) = + N_Selected_Component and then Is_Entity_Name (Prefix (Name (Original_Node (N)))) and then @@ -3645,7 +3643,7 @@ package body Sem_Warn is then if Act1 = First_Actual (N) then Error_Msg_FE - ("in-out prefix overlaps with actual for&?", + ("`IN OUT` prefix overlaps with actual for&?", Act1, Form); else Error_Msg_FE diff --git a/gcc/ada/sem_warn.ads b/gcc/ada/sem_warn.ads index 57d565c..365ad39 100644 --- a/gcc/ada/sem_warn.ads +++ b/gcc/ada/sem_warn.ads @@ -211,8 +211,8 @@ package Sem_Warn is -- an only OUT parameter, or if Warn_On_All_Unread_Out_Parameters is set. procedure Warn_On_Overlapping_Actuals (Subp : Entity_Id; N : Node_Id); - -- Called on a subprogram call. Checks whether an in-out actual that is - -- not by-copy may overlap with another actual, thus leadind to aliasing + -- Called on a subprogram call. Checks whether an IN OUT actual that is + -- not by-copy may overlap with another actual, thus leading to aliasing -- in the body of the called subprogram. procedure Warn_On_Suspicious_Index (Name : Entity_Id; X : Node_Id); -- 2.7.4