Minor reformatting.

From-SVN: r244700
This commit is contained in:
Arnaud Charlet 2017-01-20 11:38:54 +01:00
parent f68fc405bb
commit 4f324de225
4 changed files with 17 additions and 17 deletions

View File

@ -3158,10 +3158,8 @@ package body Inline is
-- unconstrained type renaming a local variable of constrained
-- type, which is not expected by GNATprove.
elsif Etype (F) /= Etype (A)
and then not GNATprove_Mode
then
New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
elsif Etype (F) /= Etype (A) and then not GNATprove_Mode then
New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
Temp_Typ := Etype (F);
else

View File

@ -1808,17 +1808,17 @@ package body Sem_Ch13 is
("aspect must name a discriminant of current type", Expr);
else
-- Discriminant type be an anonymous access type or an
-- anonymous access to subprogram.
-- Missing synchronized types???
Disc := First_Discriminant (E);
while Present (Disc) loop
if Chars (Expr) = Chars (Disc)
and then Ekind_In (Etype (Disc),
E_Anonymous_Access_Type,
E_Anonymous_Access_Subprogram_Type)
E_Anonymous_Access_Subprogram_Type,
E_Anonymous_Access_Type)
then
Set_Has_Implicit_Dereference (E);
Set_Has_Implicit_Dereference (Disc);

View File

@ -913,8 +913,8 @@ package body Sem_Ch4 is
-- the type-checking is similar to that of other calls.
procedure Analyze_Call (N : Node_Id) is
Actuals : constant List_Id := Parameter_Associations (N);
Loc : constant Source_Ptr := Sloc (N);
Actuals : constant List_Id := Parameter_Associations (N);
Nam : Node_Id;
X : Interp_Index;
It : Interp;
@ -1325,10 +1325,13 @@ package body Sem_Ch4 is
then
Rewrite (Name (N),
Make_Explicit_Dereference (Loc,
Prefix => Make_Selected_Component (Loc,
Prefix =>
(New_Occurrence_Of (Entity (Nam), Loc)),
Selector_Name => New_Occurrence_Of (It.Nam, Loc))));
Prefix =>
Make_Selected_Component (Loc,
Prefix =>
New_Occurrence_Of (Entity (Nam), Loc),
Selector_Name =>
New_Occurrence_Of (It.Nam, Loc))));
Analyze (N);
return;
@ -1342,8 +1345,7 @@ package body Sem_Ch4 is
Set_Etype (Nam, It.Typ);
end if;
elsif Nkind_In (Name (N), N_Selected_Component,
N_Function_Call)
elsif Nkind_In (Name (N), N_Function_Call, N_Selected_Component)
then
Remove_Interp (X);
end if;

View File

@ -2465,11 +2465,11 @@ package body Sem_Res is
-- with a name that is an explicit dereference, there is
-- nothing to be done at this point.
elsif Nkind_In (N, N_Explicit_Dereference,
N_Attribute_Reference,
elsif Nkind_In (N, N_Attribute_Reference,
N_And_Then,
N_Indexed_Component,
N_Explicit_Dereference,
N_Identifier,
N_Indexed_Component,
N_Or_Else,
N_Range,
N_Selected_Component,