Commit a4ab03b0 by Arnaud Charlet

Code clean up.

From-SVN: r207263
parent 68d3bacf
...@@ -155,8 +155,7 @@ package body Prj.Part is ...@@ -155,8 +155,7 @@ package body Prj.Part is
(Flags : Processing_Flags; (Flags : Processing_Flags;
In_Tree : Project_Node_Tree_Ref; In_Tree : Project_Node_Tree_Ref;
Project : Project_Node_Id); Project : Project_Node_Id);
-- Check that a non aggregate project does not import any aggregate -- Check that a non aggregate project does not import an aggregate project
-- project.
procedure Create_Virtual_Extending_Project procedure Create_Virtual_Extending_Project
(For_Project : Project_Node_Id; (For_Project : Project_Node_Id;
...@@ -1116,18 +1115,19 @@ package body Prj.Part is ...@@ -1116,18 +1115,19 @@ package body Prj.Part is
In_Tree : Project_Node_Tree_Ref; In_Tree : Project_Node_Tree_Ref;
Project : Project_Node_Id) Project : Project_Node_Id)
is is
With_Clause, Imported : Project_Node_Id; With_Clause : Project_Node_Id;
Imported : Project_Node_Id;
begin begin
if Project_Qualifier_Of (Project, In_Tree) /= Aggregate then if Project_Qualifier_Of (Project, In_Tree) /= Aggregate then
With_Clause := First_With_Clause_Of (Project, In_Tree); With_Clause := First_With_Clause_Of (Project, In_Tree);
while Present (With_Clause) loop while Present (With_Clause) loop
Imported := Project_Node_Of (With_Clause, In_Tree); Imported := Project_Node_Of (With_Clause, In_Tree);
if Project_Qualifier_Of (Imported, In_Tree) = Aggregate then if Project_Qualifier_Of (Imported, In_Tree) = Aggregate then
Error_Msg_Name_1 := Name_Id (Path_Name_Of (Imported, In_Tree)); Error_Msg_Name_1 := Name_Id (Path_Name_Of (Imported, In_Tree));
Error_Msg (Flags, "cannot import aggregate project %%", Error_Msg
Token_Ptr); (Flags, "cannot import aggregate project %%", Token_Ptr);
exit; exit;
end if; end if;
......
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