From facfa16502ba988917c46d40d0b2cad07c989bc3 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Wed, 30 Jul 2014 14:15:28 +0000 Subject: [PATCH] inline.adb, [...]: Minor reformatting. 2014-07-30 Robert Dewar * inline.adb, a-coorse.adb, a-coorse.ads, a-cohase.adb, a-cohase.ads, a-tasatt.adb: Minor reformatting. 2014-07-30 Robert Dewar * exp_ch4.adb: Minor reformatting. From-SVN: r213278 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/a-cohase.adb | 17 ++++++++--------- gcc/ada/a-cohase.ads | 8 +++----- gcc/ada/a-coorse.adb | 4 ++-- gcc/ada/a-coorse.ads | 6 ++---- gcc/ada/a-tasatt.adb | 8 ++++---- gcc/ada/exp_ch4.adb | 4 ++-- gcc/ada/inline.adb | 4 ++-- 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fba9ada2d47..5c4a30b127a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2014-07-30 Robert Dewar + + * inline.adb, a-coorse.adb, a-coorse.ads, a-cohase.adb, a-cohase.ads, + a-tasatt.adb: Minor reformatting. + +2014-07-30 Robert Dewar + + * exp_ch4.adb: Minor reformatting. + 2014-07-30 Ed Schonberg * a-coorse.adb, a-coorse.ads (Generic_Keys): Add a diff --git a/gcc/ada/a-cohase.adb b/gcc/ada/a-cohase.adb index 421ac3e63e0..b0c16df907b 100644 --- a/gcc/ada/a-cohase.adb +++ b/gcc/ada/a-cohase.adb @@ -136,7 +136,6 @@ package body Ada.Containers.Hashed_Sets is (C : in out Set; Indx : Hash_Type; X : in out Node_Access); - -- Delete a node whose bucket position is known. Used to remove a node -- whose element has been modified through a key_preserving reference. -- We cannot use the value of the element precisely because the current @@ -878,7 +877,7 @@ package body Ada.Containers.Hashed_Sets is if HT.Busy > 0 then raise Program_Error with - "attempt tp tamper with cursors (set is busy)"; + "attempt to tamper with cursors (set is busy)"; end if; Local_Insert (HT, New_Item, Node, Inserted); @@ -2140,7 +2139,7 @@ package body Ada.Containers.Hashed_Sets is if Hash (Key (Element (Control.Old_Pos))) /= Control.Old_Hash then Delete_Node - (Control.Container.all, Control.Index, Control.Old_Pos.Node); + (Control.Container.all, Control.Index, Control.Old_Pos.Node); raise Program_Error with "key not preserved in reference"; end if; @@ -2245,22 +2244,22 @@ package body Ada.Containers.Hashed_Sets is begin if Node = null then - raise Constraint_Error with "Key not in set"; + raise Constraint_Error with "key not in set"; end if; declare HT : Hash_Table_Type renames Container.HT; - B : Natural renames HT.Busy; - L : Natural renames HT.Lock; - P : constant Cursor := Find (Container, Key); + B : Natural renames HT.Busy; + L : Natural renames HT.Lock; + P : constant Cursor := Find (Container, Key); begin return R : constant Reference_Type := (Element => Node.Element'Access, Control => (Controlled with Container'Unrestricted_Access, - Index => HT_Ops.Index (HT, P.Node), - Old_Pos => P, + Index => HT_Ops.Index (HT, P.Node), + Old_Pos => P, Old_Hash => Hash (Key))) do B := B + 1; diff --git a/gcc/ada/a-cohase.ads b/gcc/ada/a-cohase.ads index cfe048aa56a..a9990ce6b8d 100644 --- a/gcc/ada/a-cohase.ads +++ b/gcc/ada/a-cohase.ads @@ -34,8 +34,8 @@ with Ada.Iterator_Interfaces; private with Ada.Containers.Hash_Tables; -private with Ada.Streams; private with Ada.Finalization; +private with Ada.Streams; generic type Element_Type is private; @@ -460,12 +460,10 @@ package Ada.Containers.Hashed_Sets is Old_Hash : Hash_Type; end record; - overriding procedure - Adjust (Control : in out Reference_Control_Type); + overriding procedure Adjust (Control : in out Reference_Control_Type); pragma Inline (Adjust); - overriding procedure - Finalize (Control : in out Reference_Control_Type); + overriding procedure Finalize (Control : in out Reference_Control_Type); pragma Inline (Finalize); type Reference_Type (Element : not null access Element_Type) is record diff --git a/gcc/ada/a-coorse.adb b/gcc/ada/a-coorse.adb index 116305bbf25..0f45308d669 100644 --- a/gcc/ada/a-coorse.adb +++ b/gcc/ada/a-coorse.adb @@ -820,8 +820,8 @@ package body Ada.Containers.Ordered_Sets is if Control.Container /= null then declare Tree : Tree_Type renames Control.Container.Tree; - B : Natural renames Tree.Busy; - L : Natural renames Tree.Lock; + B : Natural renames Tree.Busy; + L : Natural renames Tree.Lock; begin B := B - 1; L := L - 1; diff --git a/gcc/ada/a-coorse.ads b/gcc/ada/a-coorse.ads index eea99f1c411..315134554e9 100644 --- a/gcc/ada/a-coorse.ads +++ b/gcc/ada/a-coorse.ads @@ -291,12 +291,10 @@ package Ada.Containers.Ordered_Sets is Old_Key : Key_Access; end record; - overriding procedure - Adjust (Control : in out Reference_Control_Type); + overriding procedure Adjust (Control : in out Reference_Control_Type); pragma Inline (Adjust); - overriding procedure - Finalize (Control : in out Reference_Control_Type); + overriding procedure Finalize (Control : in out Reference_Control_Type); pragma Inline (Finalize); type Reference_Type (Element : not null access Element_Type) is record diff --git a/gcc/ada/a-tasatt.adb b/gcc/ada/a-tasatt.adb index 6e35d2668fd..e0ef9b22fb5 100644 --- a/gcc/ada/a-tasatt.adb +++ b/gcc/ada/a-tasatt.adb @@ -106,8 +106,8 @@ package body Ada.Task_Attributes is pragma Warnings (On); - function To_Task_Id is new Ada.Unchecked_Conversion - (Task_Identification.Task_Id, Task_Id); + function To_Task_Id is new + Ada.Unchecked_Conversion (Task_Identification.Task_Id, Task_Id); -- To access TCB of identified task procedure Free is new @@ -119,8 +119,8 @@ package body Ada.Task_Attributes is and then To_Address (Initial_Value) = 0; -- If the attribute fits in an Atomic_Address (both size and alignment) -- and Initial_Value is 0 (or null), then we will map the attribute - -- directly into ATCB.Attributes (Index), otherwise we will create a level - -- of indirection and instead use Attributes (Index) as a + -- directly into ATCB.Attributes (Index), otherwise we will create + -- a level of indirection and instead use Attributes (Index) as a -- Real_Attribute_Access. Index : constant Integer := diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index b3d180ff4d7..70153fe4933 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -7364,10 +7364,10 @@ package body Exp_Ch4 is if Comes_From_Source (N) then Error_Msg_N - ("??Unchecked_Union discriminants cannot be determined", + ("Unchecked_Union discriminants cannot be determined??", N); Error_Msg_N - ("\Program_Error will be raised for equality operation", + ("\Program_Error will be raised for equality operation??", N); end if; diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 315a21d3906..a856ad716dc 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -1940,8 +1940,8 @@ package body Inline is function Has_Single_Return_In_GNATprove_Mode return Boolean; -- This function is called only in GNATprove mode, and it returns - -- True if the subprogram has no or a single return statement as - -- last statement. + -- True if the subprogram has no return statement or a single return + -- statement as last statement. function Returns_Compile_Time_Constant (N : Node_Id) return Boolean; -- Return True if all the return statements of the function body N -- 2.30.2