diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-25 08:33:02 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-25 08:33:02 +0000 |
| commit | ead350b5314f68c8b4d223e2033cfb77cc7d1185 (patch) | |
| tree | df4aae4263012bbb39ad4216d707c67937758398 /gcc/ada/prj-nmsc.adb | |
| parent | 1b0bf7d68b6af813509d6e95b279c4031bddff9f (diff) | |
| download | gcc-ead350b5314f68c8b4d223e2033cfb77cc7d1185.tar.gz | |
2009-06-25 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, make.adb, mlib-prj.adb, prj.adb, prj.ads, prj-nmsc.adb,
prj-env.adb, prj-env.ads (Slash): removed, no longer used
(Source_Data): no longer use Path.Name to point to a locally removed
file. Instead we use the field Locally_Removed which is clearer
2009-06-25 Arnaud Charlet <charlet@adacore.com>
* gcc-interface/Make-lang.in: Remove references to sem_maps.o
* sem_maps.adb, sem_maps.ads: Removed, not used.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148931 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index b8a2864fd20..0f5cf320da2 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -4569,7 +4569,7 @@ package body Prj.Nmsc is -- Check that the unit is part of the project if UData.File_Names (Impl) /= null - and then UData.File_Names (Impl).Path.Name /= Slash + and then not UData.File_Names (Impl).Locally_Removed then if Check_Project (UData.File_Names (Impl).Project, @@ -4618,7 +4618,7 @@ package body Prj.Nmsc is end if; elsif UData.File_Names (Spec) /= null - and then UData.File_Names (Spec).Path.Name /= Slash + and then not UData.File_Names (Spec).Locally_Removed and then Check_Project (UData.File_Names (Spec).Project, Project, Extending) @@ -7802,7 +7802,6 @@ package body Prj.Nmsc is Source : Source_Id := No_Source; OK : Boolean; Excluded : File_Found; - Index : Unit_Index; begin Excluded := Excluded_Sources_Htable.Get_First; @@ -7821,27 +7820,12 @@ package body Prj.Nmsc is or else Is_Extending (Project, Source.Project) then OK := True; + Source.Locally_Removed := True; - if Source.Unit /= No_Unit_Index then - Index := - Units_Htable.Get - (In_Tree.Units_HT, Source.Unit.Name); - if Index.File_Names (Source.Kind) /= null then - Index.File_Names (Source.Kind).Path.Name := Slash; - Index.File_Names (Source.Kind).Naming_Exception := - False; - - -- ??? Should we simply set (can be done from the - -- source) - -- Index.File_Names (Source.Kind) := null; - - end if; - end if; - - if Source /= No_Source then - Source.Locally_Removed := True; - Source.In_Interfaces := False; - end if; + Name_Len := 1; + Name_Buffer (1 .. Name_Len) := "/"; + Source.Path.Name := Name_Find; + Source.In_Interfaces := False; if Current_Verbosity = High then Write_Str ("Removing file "); @@ -8134,12 +8118,12 @@ package body Prj.Nmsc is if UData.File_Names (Unit_Kind) = null or else (UData.File_Names (Unit_Kind).File = Canonical_File - and then UData.File_Names (Unit_Kind).Path.Name = Slash) + and then UData.File_Names (Unit_Kind).Locally_Removed) or else Is_Extending (Project.Extends, UData.File_Names (Unit_Kind).Project) then if UData.File_Names (Unit_Kind) /= null - and then UData.File_Names (Unit_Kind).Path.Name = Slash + and then UData.File_Names (Unit_Kind).Locally_Removed then Remove_Forbidden_File_Name (UData.File_Names (Unit_Kind).File); |