Commit 9fdb5d21 by Robert Dewar Committed by Arnaud Charlet

[multiple changes]

2011-09-02  Vincent Celier  <celier@adacore.com>

	* prj-nmsc.adb: (Find_Sources): When the list of sources is
	explicitly declared in an extending project, do not warn if a source
	for an inherited naming exception is not found.

2011-09-02  Gary Dismukes  <dismukes@adacore.com>

	* exp_ch6.adb: (Is_Build_In_Place_Function_Call): Return False if
	expansion is inactive.

2011-09-02  Ed Schonberg  <schonberg@adacore.com>

	* sem_util.adb (Note_Possible_Modification): If the entity
	being modified is the renaming generated for an Ada2012 iterator
	element, the enclosing container or array is modified as well.

From-SVN: r178434
parent c6d5d1ac
2011-09-02 Robert Dewar <dewar@adacore.com>
* prj-proc.adb, prj.ads, sem_util.adb, s-taprop-linux.adb,
prj-nmsc.adb, prj-util.ads, prj-env.adb: Minor reformatting.
2011-09-02 Vincent Celier <celier@adacore.com> 2011-09-02 Vincent Celier <celier@adacore.com>
* prj-nmsc.adb: (Find_Sources): When the list of sources is * prj-nmsc.adb: (Find_Sources): When the list of sources is
......
...@@ -1349,14 +1349,14 @@ package body Prj.Env is ...@@ -1349,14 +1349,14 @@ package body Prj.Env is
and then and then
(Namet.Get_Name_String (Namet.Get_Name_String
(Unit.File_Names (Spec).File) = Original_Name (Unit.File_Names (Spec).File) = Original_Name
or else (Unit.File_Names (Spec).Path /= or else (Unit.File_Names (Spec).Path /= No_Path_Information
No_Path_Information
and then and then
Namet.Get_Name_String Namet.Get_Name_String
(Unit.File_Names (Spec).Path.Name) = (Unit.File_Names (Spec).Path.Name) =
Original_Name)) Original_Name))
then then
Project := Ultimate_Extending_Project_Of Project :=
Ultimate_Extending_Project_Of
(Unit.File_Names (Spec).Project); (Unit.File_Names (Spec).Project);
Path := Unit.File_Names (Spec).Path.Display_Name; Path := Unit.File_Names (Spec).Path.Display_Name;
...@@ -1373,13 +1373,13 @@ package body Prj.Env is ...@@ -1373,13 +1373,13 @@ package body Prj.Env is
and then and then
(Namet.Get_Name_String (Namet.Get_Name_String
(Unit.File_Names (Impl).File) = Original_Name (Unit.File_Names (Impl).File) = Original_Name
or else (Unit.File_Names (Impl).Path /= or else (Unit.File_Names (Impl).Path /= No_Path_Information
No_Path_Information
and then Namet.Get_Name_String and then Namet.Get_Name_String
(Unit.File_Names (Impl).Path.Name) = (Unit.File_Names (Impl).Path.Name) =
Original_Name)) Original_Name))
then then
Project := Ultimate_Extending_Project_Of Project :=
Ultimate_Extending_Project_Of
(Unit.File_Names (Impl).Project); (Unit.File_Names (Impl).Project);
Path := Unit.File_Names (Impl).Path.Display_Name; Path := Unit.File_Names (Impl).Path.Display_Name;
......
...@@ -6409,6 +6409,7 @@ package body Prj.Nmsc is ...@@ -6409,6 +6409,7 @@ package body Prj.Nmsc is
S : Source_Id := S : Source_Id :=
Source_Files_Htable.Get Source_Files_Htable.Get
(Data.Tree.Source_Files_HT, Source.File); (Data.Tree.Source_Files_HT, Source.File);
begin begin
while S /= null loop while S /= null loop
if S.Path /= No_Path_Information then if S.Path /= No_Path_Information then
...@@ -6890,15 +6891,7 @@ package body Prj.Nmsc is ...@@ -6890,15 +6891,7 @@ package body Prj.Nmsc is
Name_Loc.Source := Source; Name_Loc.Source := Source;
Source_Names_Htable.Set Source_Names_Htable.Set
(Project.Source_Names, File_Name, Name_Loc); (Project.Source_Names, File_Name, Name_Loc);
end if; end if;
-- if Source /= No_Source and then Source.Unit /= No_Unit_Index then
-- Units_Htable.Set
-- (Data.Tree.Units_HT,
-- Source.Unit.Name,
-- Source.Unit);
-- end if;
end if; end if;
end if; end if;
......
...@@ -432,6 +432,7 @@ package body Prj.Proc is ...@@ -432,6 +432,7 @@ package body Prj.Proc is
Elm.Next := No_Array_Element; Elm.Next := No_Array_Element;
Elm.Restricted := Restricted; Elm.Restricted := Restricted;
-- Change the location -- Change the location
Elm.Value.Location := New_Loc; Elm.Value.Location := New_Loc;
...@@ -440,8 +441,7 @@ package body Prj.Proc is ...@@ -440,8 +441,7 @@ package body Prj.Proc is
-- Create new array element -- Create new array element
if Arr.Value = No_Array_Element then if Arr.Value = No_Array_Element then
Arr.Value := Arr.Value := Array_Element_Table.Last (Shared.Array_Elements);
Array_Element_Table.Last (Shared.Array_Elements);
else else
Shared.Array_Elements.Table (E2).Next := Shared.Array_Elements.Table (E2).Next :=
Array_Element_Table.Last (Shared.Array_Elements); Array_Element_Table.Last (Shared.Array_Elements);
......
...@@ -781,8 +781,8 @@ package body System.Task_Primitives.Operations is ...@@ -781,8 +781,8 @@ package body System.Task_Primitives.Operations is
Result := pthread_mutexattr_init (Mutex_Attr'Access); Result := pthread_mutexattr_init (Mutex_Attr'Access);
pragma Assert (Result = 0); pragma Assert (Result = 0);
Result := pthread_mutex_init (Self_ID.Common.LL.L'Access, Result :=
Mutex_Attr'Access); pthread_mutex_init (Self_ID.Common.LL.L'Access, Mutex_Attr'Access);
pragma Assert (Result = 0 or else Result = ENOMEM); pragma Assert (Result = 0 or else Result = ENOMEM);
if Result /= 0 then if Result /= 0 then
...@@ -794,8 +794,8 @@ package body System.Task_Primitives.Operations is ...@@ -794,8 +794,8 @@ package body System.Task_Primitives.Operations is
Result := pthread_condattr_init (Cond_Attr'Access); Result := pthread_condattr_init (Cond_Attr'Access);
pragma Assert (Result = 0); pragma Assert (Result = 0);
Result := pthread_cond_init (Self_ID.Common.LL.CV'Access, Result :=
Cond_Attr'Access); pthread_cond_init (Self_ID.Common.LL.CV'Access, Cond_Attr'Access);
pragma Assert (Result = 0 or else Result = ENOMEM); pragma Assert (Result = 0 or else Result = ENOMEM);
if Result = 0 then if Result = 0 then
...@@ -828,8 +828,8 @@ package body System.Task_Primitives.Operations is ...@@ -828,8 +828,8 @@ package body System.Task_Primitives.Operations is
use type System.Multiprocessors.CPU_Range; use type System.Multiprocessors.CPU_Range;
begin begin
-- Check whether both Dispatching_Domain and CPU are specified for the -- Check whether both Dispatching_Domain and CPU are specified for
-- task, and the CPU value is not contained within the range of -- the task, and the CPU value is not contained within the range of
-- processors for the domain. -- processors for the domain.
if T.Common.Domain /= null if T.Common.Domain /= null
...@@ -854,8 +854,7 @@ package body System.Task_Primitives.Operations is ...@@ -854,8 +854,7 @@ package body System.Task_Primitives.Operations is
end if; end if;
Result := Result :=
pthread_attr_setstacksize pthread_attr_setstacksize (Attributes'Access, Adjusted_Stack_Size);
(Attributes'Access, Adjusted_Stack_Size);
pragma Assert (Result = 0); pragma Assert (Result = 0);
Result := Result :=
......
...@@ -10717,9 +10717,8 @@ package body Sem_Util is ...@@ -10717,9 +10717,8 @@ package body Sem_Util is
-- a modification of the container. -- a modification of the container.
elsif Comes_From_Source (Original_Node (Exp)) elsif Comes_From_Source (Original_Node (Exp))
and then and then Nkind_In (Original_Node (Exp), N_Selected_Component,
Nkind_In (Original_Node (Exp), N_Indexed_Component)
N_Selected_Component, N_Indexed_Component)
then then
Exp := Prefix (Original_Node (Exp)); Exp := Prefix (Original_Node (Exp));
goto Continue; goto Continue;
......
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