Commit e5c14bd8 by Vincent Celier Committed by Arnaud Charlet

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
parent a77842bd
...@@ -6127,6 +6127,13 @@ package body Make is ...@@ -6127,6 +6127,13 @@ package body Make is
Osint.Add_File (Get_Name_String (Sfile)); Osint.Add_File (Get_Name_String (Sfile));
Put_In_Q := True; 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 if;
end loop; end loop;
end Insert_Project_Sources; end Insert_Project_Sources;
......
...@@ -606,9 +606,9 @@ package body Prj.Nmsc is ...@@ -606,9 +606,9 @@ package body Prj.Nmsc is
Naming : Naming_Data) Naming : Naming_Data)
is is
begin 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 declare
Dot_Replacement : constant String := Dot_Replacement : constant String :=
Get_Name_String Get_Name_String
......
...@@ -2202,7 +2202,6 @@ package body Prj.Proc is ...@@ -2202,7 +2202,6 @@ package body Prj.Proc is
Processed_Data.Directory := Name_Find; Processed_Data.Directory := Name_Find;
Processed_Data.Extended_By := Extended_By; Processed_Data.Extended_By := Extended_By;
Processed_Data.Naming := Standard_Naming_Data;
Add_Attributes Add_Attributes
(Project, In_Tree, Processed_Data.Decl, Attribute_First); (Project, In_Tree, Processed_Data.Decl, Attribute_First);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment