From c2052d920b49395f766c1a47448d02f8896296e2 Mon Sep 17 00:00:00 2001
From: charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 6 Jun 2007 10:19:40 +0000
Subject: 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.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125377 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ada/fname-uf.adb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gcc/ada/fname-uf.adb')

diff --git a/gcc/ada/fname-uf.adb b/gcc/ada/fname-uf.adb
index 0ec94050b71..75809de7c9f 100644
--- a/gcc/ada/fname-uf.adb
+++ b/gcc/ada/fname-uf.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-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- --
@@ -28,7 +28,6 @@ with Alloc;
 with Debug;    use Debug;
 with Fmap;     use Fmap;
 with Krunch;
-with Namet;    use Namet;
 with Opt;      use Opt;
 with Osint;    use Osint;
 with Table;
@@ -194,7 +193,7 @@ package body Fname.UF is
       --  Null or error name means that some previous error occurred
       --  This is an unrecoverable error, so signal it.
 
-      if Uname <= Error_Name then
+      if Uname in Error_Unit_Name_Or_No_Unit_Name then
          raise Unrecoverable_Error;
       end if;
 
@@ -434,7 +433,7 @@ package body Fname.UF is
                         Debug_Flag_4);
                   end if;
 
-                  Fnam := File_Name_Type (Name_Find);
+                  Fnam := Name_Find;
 
                   --  If we are in the second search of the table, we accept
                   --  the file name without checking, because we know that
-- 
cgit v1.2.1