From ccf255117d1a4e2b57cb138b1b8a5696db18c7dd Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 19 Nov 2004 11:55:59 +0100 Subject: butil.ads, [...] (Get_Unit_Name_String): Remove incomplete duplicate implementation of this subprogram from butil. * butil.ads, butil.adb, bindgen.adb (Get_Unit_Name_String): Remove incomplete duplicate implementation of this subprogram from butil. From-SVN: r90902 --- gcc/ada/bindgen.adb | 5 ++--- gcc/ada/butil.adb | 19 +------------------ gcc/ada/butil.ads | 6 +----- 3 files changed, 4 insertions(+), 26 deletions(-) (limited to 'gcc') diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index dca5bbe..d2e0652 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -26,7 +26,6 @@ with ALI; use ALI; with Binde; use Binde; -with Butil; use Butil; with Casing; use Casing; with Fname; use Fname; with GNAT.OS_Lib; use GNAT.OS_Lib; @@ -1203,7 +1202,7 @@ package body Bindgen is for J in Elab_Order.First .. Elab_Order.Last loop Set_String (" -- "); - Get_Unit_Name_String (Units.Table (Elab_Order.Table (J)).Uname); + Get_Name_String (Units.Table (Elab_Order.Table (J)).Uname); Set_Name_Buffer; Write_Statement_Buffer; end loop; @@ -1221,7 +1220,7 @@ package body Bindgen is WBI ("/* BEGIN ELABORATION ORDER"); for J in Elab_Order.First .. Elab_Order.Last loop - Get_Unit_Name_String (Units.Table (Elab_Order.Table (J)).Uname); + Get_Name_String (Units.Table (Elab_Order.Table (J)).Uname); Set_Name_Buffer; Write_Statement_Buffer; end loop; diff --git a/gcc/ada/butil.adb b/gcc/ada/butil.adb index 3ef72e4..943c62d 100644 --- a/gcc/ada/butil.adb +++ b/gcc/ada/butil.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2001 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2004 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- -- @@ -30,23 +30,6 @@ with Output; use Output; package body Butil is - -------------------------- - -- Get_Unit_Name_String -- - -------------------------- - - procedure Get_Unit_Name_String (U : Unit_Name_Type) is - begin - Get_Name_String (U); - - if Name_Buffer (Name_Len) = 's' then - Name_Buffer (Name_Len - 1 .. Name_Len + 5) := " (spec)"; - else - Name_Buffer (Name_Len - 1 .. Name_Len + 5) := " (body)"; - end if; - - Name_Len := Name_Len + 5; - end Get_Unit_Name_String; - ---------------------- -- Is_Internal_Unit -- ---------------------- diff --git a/gcc/ada/butil.ads b/gcc/ada/butil.ads index 79d5ebd..facf507 100644 --- a/gcc/ada/butil.ads +++ b/gcc/ada/butil.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2001 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2004 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- -- @@ -48,10 +48,6 @@ package Butil is function Uname_Less (U1, U2 : Unit_Name_Type) return Boolean; -- Determines if the unit name U1 is alphabetically before U2 - procedure Get_Unit_Name_String (U : Unit_Name_Type); - -- Compute unit name with (body) or (spec) after as required. On return - -- the result is stored in Name_Buffer and Name_Len is the length. - procedure Write_Unit_Name (U : Unit_Name_Type); -- Output unit name with (body) or (spec) after as required. On return -- Name_Len is set to the number of characters which were output. -- cgit v1.1