2008-05-27 Vincent Celier <celier@adacore.com>

	* prj-nmsc.adb:
	(Check_File): Make sure that a unit that replaces the same unit in a
	 project being extended is properly processed.

From-SVN: r136000

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index bbb0ec8..c69c7b3 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -8593,13 +8593,21 @@ package body Prj.Nmsc is
 
                if Unit /= No_Name
                  and then Src_Data.Unit = Unit
-                 and then Src_Data.Kind /= Kind
+                 and then
+                   ((Src_Data.Kind = Spec and then Kind = Impl)
+                    or else
+                    (Src_Data.Kind = Impl and then Kind = Spec))
                then
                   Other_Part := Source;
 
                elsif (Unit /= No_Name
                        and then Src_Data.Unit = Unit
-                       and then Src_Data.Kind = Kind)
+                      and then
+                        (Src_Data.Kind = Kind
+                         or else
+                         (Src_Data.Kind = Sep and then Kind = Impl)
+                         or else
+                         (Src_Data.Kind = Impl and then Kind = Sep)))
                  or else (Unit = No_Name and then Src_Data.File = File_Name)
                then
                   --  Duplication of file/unit in same project is only