OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a-exextr.adb, [...]: Minor reformatting. 

2015-10-23  Hristian Kirtchev  <kirtchev@adacore.com>

	* a-exextr.adb, sem_ch6.adb, sem_ch13.adb: Minor reformatting.

From-SVN: r229248
This commit is contained in:
Hristian Kirtchev 2015-10-23 12:50:16 +00:00 committed by Arnaud Charlet
parent ed11bbfe44
commit 43184ab7cd
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ada/ChangeLog
View File

@ -1,3 +1,7 @@
2015-10-23 Hristian Kirtchev <kirtchev@adacore.com>
* a-exextr.adb, sem_ch6.adb, sem_ch13.adb: Minor reformatting.
2015-10-23 Arnaud Charlet <charlet@adacore.com>
* s-taskin.ads: Minor code clean up.

8
gcc/ada/a-exextr.adb
View File

@ -85,9 +85,11 @@ package body Exception_Traces is
if not Excep.Id.Not_Handled_By_Others
and then
(Exception_Trace = Every_Raise
or else (Is_Unhandled
and then (Exception_Trace = Unhandled_Raise
or else Exception_Trace = Unhandled_Raise_In_Main)))
or else
(Is_Unhandled
and then
(Exception_Trace = Unhandled_Raise
or else Exception_Trace = Unhandled_Raise_In_Main)))
then
-- Exception trace messages need to be protected when several tasks
-- can issue them at the same time.

3
gcc/ada/sem_ch13.adb
View File

@ -4873,9 +4873,10 @@ package body Sem_Ch13 is
then
declare
Init : constant Node_Id :=
Expression (Declaration_Node (U_Ent));
Expression (Declaration_Node (U_Ent));
begin
Set_Overlays_Constant (U_Ent);
if Present (Init)
and then Comes_From_Source (Init)
then

18
gcc/ada/sem_ch6.adb
View File

@ -620,8 +620,8 @@ package body Sem_Ch6 is
-- Function result subtype
procedure Check_Aggregate_Accessibility (Aggr : Node_Id);
-- Apply legality rule of 6.5 (8.2) to the access discriminants of
-- an aggregate in a return statement.
-- Apply legality rule of 6.5 (8.2) to the access discriminants of an
-- aggregate in a return statement.
procedure Check_Limited_Return (Expr : Node_Id);
-- Check the appropriate (Ada 95 or Ada 2005) rules for returning
@ -644,9 +644,7 @@ package body Sem_Ch6 is
Obj : Node_Id;
begin
if Is_Record_Type (Typ)
and then Has_Discriminants (Typ)
then
if Is_Record_Type (Typ) and then Has_Discriminants (Typ) then
Discr := First_Discriminant (Typ);
Assoc := First (Component_Associations (Aggr));
while Present (Discr) loop
@ -656,8 +654,8 @@ package body Sem_Ch6 is
and then Attribute_Name (Expr) /= Name_Unrestricted_Access
then
Obj := Prefix (Expr);
while Nkind_In (Obj,
N_Selected_Component, N_Indexed_Component)
while Nkind_In (Obj, N_Indexed_Component,
N_Selected_Component)
loop
Obj := Prefix (Obj);
end loop;
@ -669,11 +667,11 @@ package body Sem_Ch6 is
null;
elsif Object_Access_Level (Obj) >
Scope_Depth (Scope (Scope_Id))
Scope_Depth (Scope (Scope_Id))
then
Error_Msg_N
("access discriminant in return aggregate " &
"will be a dangling reference", Obj);
("access discriminant in return aggregate will be "
& "a dangling reference", Obj);
end if;
end if;
end if;