Commit 4f324de2 by Arnaud Charlet

Minor reformatting.

From-SVN: r244700
parent f68fc405
...@@ -3158,10 +3158,8 @@ package body Inline is ...@@ -3158,10 +3158,8 @@ package body Inline is
-- unconstrained type renaming a local variable of constrained -- unconstrained type renaming a local variable of constrained
-- type, which is not expected by GNATprove. -- type, which is not expected by GNATprove.
elsif Etype (F) /= Etype (A) elsif Etype (F) /= Etype (A) and then not GNATprove_Mode then
and then not GNATprove_Mode New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
then
New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A));
Temp_Typ := Etype (F); Temp_Typ := Etype (F);
else else
......
...@@ -1808,17 +1808,17 @@ package body Sem_Ch13 is ...@@ -1808,17 +1808,17 @@ package body Sem_Ch13 is
("aspect must name a discriminant of current type", Expr); ("aspect must name a discriminant of current type", Expr);
else else
-- Discriminant type be an anonymous access type or an -- Discriminant type be an anonymous access type or an
-- anonymous access to subprogram. -- anonymous access to subprogram.
-- Missing synchronized types??? -- Missing synchronized types???
Disc := First_Discriminant (E); Disc := First_Discriminant (E);
while Present (Disc) loop while Present (Disc) loop
if Chars (Expr) = Chars (Disc) if Chars (Expr) = Chars (Disc)
and then Ekind_In (Etype (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 then
Set_Has_Implicit_Dereference (E); Set_Has_Implicit_Dereference (E);
Set_Has_Implicit_Dereference (Disc); Set_Has_Implicit_Dereference (Disc);
......
...@@ -913,8 +913,8 @@ package body Sem_Ch4 is ...@@ -913,8 +913,8 @@ package body Sem_Ch4 is
-- the type-checking is similar to that of other calls. -- the type-checking is similar to that of other calls.
procedure Analyze_Call (N : Node_Id) is procedure Analyze_Call (N : Node_Id) is
Actuals : constant List_Id := Parameter_Associations (N);
Loc : constant Source_Ptr := Sloc (N); Loc : constant Source_Ptr := Sloc (N);
Actuals : constant List_Id := Parameter_Associations (N);
Nam : Node_Id; Nam : Node_Id;
X : Interp_Index; X : Interp_Index;
It : Interp; It : Interp;
...@@ -1325,10 +1325,13 @@ package body Sem_Ch4 is ...@@ -1325,10 +1325,13 @@ package body Sem_Ch4 is
then then
Rewrite (Name (N), Rewrite (Name (N),
Make_Explicit_Dereference (Loc, Make_Explicit_Dereference (Loc,
Prefix => Make_Selected_Component (Loc, Prefix =>
Prefix => Make_Selected_Component (Loc,
(New_Occurrence_Of (Entity (Nam), Loc)), Prefix =>
Selector_Name => New_Occurrence_Of (It.Nam, Loc)))); New_Occurrence_Of (Entity (Nam), Loc),
Selector_Name =>
New_Occurrence_Of (It.Nam, Loc))));
Analyze (N); Analyze (N);
return; return;
...@@ -1342,8 +1345,7 @@ package body Sem_Ch4 is ...@@ -1342,8 +1345,7 @@ package body Sem_Ch4 is
Set_Etype (Nam, It.Typ); Set_Etype (Nam, It.Typ);
end if; end if;
elsif Nkind_In (Name (N), N_Selected_Component, elsif Nkind_In (Name (N), N_Function_Call, N_Selected_Component)
N_Function_Call)
then then
Remove_Interp (X); Remove_Interp (X);
end if; end if;
......
...@@ -2465,11 +2465,11 @@ package body Sem_Res is ...@@ -2465,11 +2465,11 @@ package body Sem_Res is
-- with a name that is an explicit dereference, there is -- with a name that is an explicit dereference, there is
-- nothing to be done at this point. -- nothing to be done at this point.
elsif Nkind_In (N, N_Explicit_Dereference, elsif Nkind_In (N, N_Attribute_Reference,
N_Attribute_Reference,
N_And_Then, N_And_Then,
N_Indexed_Component, N_Explicit_Dereference,
N_Identifier, N_Identifier,
N_Indexed_Component,
N_Or_Else, N_Or_Else,
N_Range, N_Range,
N_Selected_Component, N_Selected_Component,
......
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