diff options
| author | Vincent Celier <celier@adacore.com> | 2007-06-06 12:19:40 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2007-06-06 12:19:40 +0200 |
| commit | 39f4e199a51bc4ff869d273937d363902cc963c3 (patch) | |
| tree | 2c708600f1cac4ba92be2eb201eabd01f089e8cf /gcc/ada/prj-util.adb | |
| parent | 379ec90449ee88ae149c19e377910f453007e137 (diff) | |
| download | gcc-39f4e199a51bc4ff869d273937d363902cc963c3.zip gcc-39f4e199a51bc4ff869d273937d363902cc963c3.tar.gz gcc-39f4e199a51bc4ff869d273937d363902cc963c3.tar.bz2 | |
bcheck.adb, [...]: Move Name_Id, File_Name_Type and Unit_Name_Type from package Types to package Namet.
2007-04-20 Vincent Celier <celier@adacore.com>
Robert Dewar <dewar@adacore.com>
* bcheck.adb, binde.adb, binderr.adb, binderr.ads, butil.adb,
butil.ads, erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
err_vars.ads, exp_tss.adb, exp_tss.ads, fmap.adb, fmap.ads,
fname.adb, fname.ads, fname-sf.adb, fname-uf.adb, fname-uf.ads,
lib-sort.adb, lib-util.adb, lib-util.ads, lib-xref.adb, makeutl.ads,
makeutl.adb, nmake.adt, osint.adb, osint.ads, osint-b.adb,
par-load.adb, prj-attr.adb, prj-dect.adb, prj-err.adb, prj-makr.adb,
prj-part.adb, prj-pp.adb, prj-proc.adb, prj-tree.adb, prj-tree.ads,
prj-util.adb, prj-util.ads, scans.adb, scans.ads, sem_ch2.adb,
sinput-c.adb, styleg-c.adb, tempdir.adb, tempdir.ads, uname.adb,
uname.ads, atree.h, atree.ads, atree.adb, ali-util.ads, ali-util.adb,
ali.ads, ali.adb:
Move Name_Id, File_Name_Type and Unit_Name_Type from package Types to
package Namet. Make File_Name_Type and Unit_Name_Type types derived from
Mame_Id. Add new type Path_Name_Type, also derived from Name_Id.
Use variables of types File_Name_Type and Unit_Name_Type in error
messages.
(Get_Name): Add parameter Ignore_Special, and set it reading file name
(New_Copy): When debugging the compiler, call New_Node_Debugging_Output
here.
Define flags Flag217-Flag230 with associated subprograms
(Flag_Word5): New record type.
(Flag_Word5_Ptr): New access type.
(To_Flag_Word5): New unchecked conversion.
(To_Flag_Word5_Ptr): Likewise.
(Flag216): New function.
(Set_Flag216): New procedure.
From-SVN: r125377
Diffstat (limited to 'gcc/ada/prj-util.adb')
| -rw-r--r-- | gcc/ada/prj-util.adb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb index 845b546..4c00ac4 100644 --- a/gcc/ada/prj-util.adb +++ b/gcc/ada/prj-util.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2006, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2007, 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- -- @@ -26,9 +26,8 @@ with Ada.Unchecked_Deallocation; -with GNAT.Case_Util; use GNAT.Case_Util; +with System.Case_Util; use System.Case_Util; -with Namet; use Namet; with Osint; use Osint; with Output; use Output; with Prj.Com; @@ -77,9 +76,9 @@ package body Prj.Util is function Executable_Of (Project : Project_Id; In_Tree : Project_Tree_Ref; - Main : Name_Id; + Main : File_Name_Type; Index : Int; - Ada_Main : Boolean := True) return Name_Id + Ada_Main : Boolean := True) return File_Name_Type is pragma Assert (Project /= No_Project); @@ -94,7 +93,7 @@ package body Prj.Util is Executable : Variable_Value := Prj.Util.Value_Of - (Name => Main, + (Name => Name_Id (Main), Index => Index, Attribute_Or_Array_Name => Name_Executable, In_Package => Builder_Package, @@ -184,7 +183,7 @@ package body Prj.Util is declare Saved_EEOT : constant Name_Id := Executable_Extension_On_Target; - Result : Name_Id; + Result : File_Name_Type; begin if Executable_Suffix /= Nil_Variable_Value @@ -193,7 +192,7 @@ package body Prj.Util is Executable_Extension_On_Target := Executable_Suffix.Value; end if; - Result := Executable_Name (Executable.Value); + Result := Executable_Name (File_Name_Type (Executable.Value)); Executable_Extension_On_Target := Saved_EEOT; return Result; end; @@ -348,7 +347,7 @@ package body Prj.Util is File_Name (1 .. Name'Length) := Name; File_Name (File_Name'Last) := ASCII.NUL; FD := Open_Read (Name => File_Name'Address, - Fmode => GNAT.OS_Lib.Text); + Fmode => GNAT.OS_Lib.Text); if FD = Invalid_FD then File := null; else |