make.adb (Insert_Project_Sources): Make sure the Q is always initialized.

2005-03-17  Vincent Celier  <celier@adacore.com>

	* make.adb (Insert_Project_Sources): Make sure the Q is always
	initialized.

	* prj-nmsc.adb (Check_Ada_Naming_Scheme_Validity): Check Naming against
	the default for the tree, not the global default naming.

	* prj-proc.adb (Recursive_Process): No need to put the default naming
	in the project data, it's already there.

From-SVN: r96669

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 71f95c495ca2da4ef15b95810602cd1fd977595c..9c115563a6c399415b124cfea04d27aca222c107 100644 (file)
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -6127,6 +6127,13 @@ package body Make is
 
             Osint.Add_File (Get_Name_String (Sfile));
             Put_In_Q := True;
+
+            --  As we may look into the Q later, ensure the Q has been
+            --  initialized to avoid errors.
+
+            if First_Q_Initialization then
+               Init_Q;
+            end if;
          end if;
       end loop;
    end Insert_Project_Sources;

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index c51fbd5efab7744f4bc1103afbfec58188c40fd4..6c814a990fd50c936ce416a9c9fd8c48a2562587 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -606,9 +606,9 @@ package body Prj.Nmsc is
       Naming  : Naming_Data)
    is
    begin
-      --  Only check if we are not using the standard naming scheme
+      --  Only check if we are not using the Default naming scheme
 
-      if Naming /= Standard_Naming_Data then
+      if Naming /= In_Tree.Private_Part.Default_Naming then
          declare
             Dot_Replacement       : constant String :=
                                      Get_Name_String

diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb
index c67f2a3305fa3560ac5471ebb7b22e8f2010393d..ed3a8b91c169ce8a54aeb1002ae0e743eedadba6 100644 (file)
--- a/gcc/ada/prj-proc.adb
+++ b/gcc/ada/prj-proc.adb
@@ -2202,7 +2202,6 @@ package body Prj.Proc is
             Processed_Data.Directory := Name_Find;
 
             Processed_Data.Extended_By := Extended_By;
-            Processed_Data.Naming      := Standard_Naming_Data;
 
             Add_Attributes
               (Project, In_Tree, Processed_Data.Decl, Attribute_First);