Commit 3cae7f14 by Robert Dewar Committed by Arnaud Charlet

exp_ch6.adb, freeze.adb: Minor reformatting.

2010-10-11  Robert Dewar  <dewar@adacore.com>

	* exp_ch6.adb, freeze.adb: Minor reformatting.

From-SVN: r165297
parent 76b5b000
2010-10-11 Robert Dewar <dewar@adacore.com>
* exp_ch6.adb, freeze.adb: Minor reformatting.
2010-10-11 Vincent Celier <celier@adacore.com> 2010-10-11 Vincent Celier <celier@adacore.com>
* gnatcmd.adb (GNATCmd): For all tools other than gnatmake, allow * gnatcmd.adb (GNATCmd): For all tools other than gnatmake, allow
......
...@@ -2033,8 +2033,9 @@ package body Exp_Ch6 is ...@@ -2033,8 +2033,9 @@ package body Exp_Ch6 is
and then RTE_Available (RE_Raise_Exception_Always) and then RTE_Available (RE_Raise_Exception_Always)
then then
declare declare
FA : constant Node_Id := Original_Node FA : constant Node_Id :=
(First_Actual (Call_Node)); Original_Node (First_Actual (Call_Node));
begin begin
-- The case we catch is where the first argument is obtained -- The case we catch is where the first argument is obtained
-- using the Identity attribute (which must always be -- using the Identity attribute (which must always be
...@@ -2063,10 +2064,10 @@ package body Exp_Ch6 is ...@@ -2063,10 +2064,10 @@ package body Exp_Ch6 is
and then Nkind (Call_Node) = N_Procedure_Call_Statement and then Nkind (Call_Node) = N_Procedure_Call_Statement
and then and then
((Nkind (Parent (Call_Node)) = N_Triggering_Alternative ((Nkind (Parent (Call_Node)) = N_Triggering_Alternative
and then Triggering_Statement (Parent (Call_Node)) = Call_Node) and then Triggering_Statement (Parent (Call_Node)) = Call_Node)
or else or else
(Nkind (Parent (Call_Node)) = N_Entry_Call_Alternative (Nkind (Parent (Call_Node)) = N_Entry_Call_Alternative
and then Entry_Call_Statement (Parent (Call_Node)) = Call_Node)) and then Entry_Call_Statement (Parent (Call_Node)) = Call_Node))
then then
declare declare
Ren_Decl : Node_Id; Ren_Decl : Node_Id;
...@@ -2607,14 +2608,14 @@ package body Exp_Ch6 is ...@@ -2607,14 +2608,14 @@ package body Exp_Ch6 is
Ass := Parent (Call_Node); Ass := Parent (Call_Node);
elsif Nkind (Parent (Call_Node)) = N_Qualified_Expression elsif Nkind (Parent (Call_Node)) = N_Qualified_Expression
and then Nkind (Parent (Parent (Call_Node))) and then Nkind (Parent (Parent (Call_Node))) =
= N_Assignment_Statement N_Assignment_Statement
then then
Ass := Parent (Parent (Call_Node)); Ass := Parent (Parent (Call_Node));
elsif Nkind (Parent (Call_Node)) = N_Explicit_Dereference elsif Nkind (Parent (Call_Node)) = N_Explicit_Dereference
and then Nkind (Parent (Parent (Call_Node))) and then Nkind (Parent (Parent (Call_Node))) =
= N_Assignment_Statement N_Assignment_Statement
then then
Ass := Parent (Parent (Call_Node)); Ass := Parent (Parent (Call_Node));
end if; end if;
...@@ -2629,7 +2630,7 @@ package body Exp_Ch6 is ...@@ -2629,7 +2630,7 @@ package body Exp_Ch6 is
Error_Msg_NE Error_Msg_NE
("tag-indeterminate expression " ("tag-indeterminate expression "
& " must have designated type& (RM 5.2 (6))", & " must have designated type& (RM 5.2 (6))",
Call_Node, Root_Type (Etype (Name (Ass)))); Call_Node, Root_Type (Etype (Name (Ass))));
else else
Propagate_Tag (Name (Ass), Call_Node); Propagate_Tag (Name (Ass), Call_Node);
end if; end if;
......
...@@ -1058,7 +1058,6 @@ package body Freeze is ...@@ -1058,7 +1058,6 @@ package body Freeze is
end if; end if;
Comp := First_Component (E); Comp := First_Component (E);
while Present (Comp) loop while Present (Comp) loop
if not Is_Type (Comp) if not Is_Type (Comp)
and then (Strict_Alignment (Etype (Comp)) and then (Strict_Alignment (Etype (Comp))
...@@ -2163,7 +2162,6 @@ package body Freeze is ...@@ -2163,7 +2162,6 @@ package body Freeze is
if Is_First_Subtype (Rec) then if Is_First_Subtype (Rec) then
Comp := First_Component (Rec); Comp := First_Component (Rec);
while Present (Comp) loop while Present (Comp) loop
if Present (Component_Clause (Comp)) if Present (Component_Clause (Comp))
and then (Is_Fixed_Point_Type (Etype (Comp)) and then (Is_Fixed_Point_Type (Etype (Comp))
...@@ -2322,10 +2320,10 @@ package body Freeze is ...@@ -2322,10 +2320,10 @@ package body Freeze is
and then Ekind (Test_E) /= E_Constant and then Ekind (Test_E) /= E_Constant
then then
declare declare
S : Entity_Id := Current_Scope; S : Entity_Id;
begin begin
S := Current_Scope;
while Present (S) loop while Present (S) loop
if Is_Overloadable (S) then if Is_Overloadable (S) then
if Comes_From_Source (S) if Comes_From_Source (S)
...@@ -2356,9 +2354,10 @@ package body Freeze is ...@@ -2356,9 +2354,10 @@ package body Freeze is
and then Present (Scope (Test_E)) and then Present (Scope (Test_E))
then then
declare declare
S : Entity_Id := Scope (Test_E); S : Entity_Id;
begin begin
S := Scope (Test_E);
while Present (S) loop while Present (S) loop
if Is_Generic_Instance (S) then if Is_Generic_Instance (S) then
exit; exit;
...@@ -3730,7 +3729,6 @@ package body Freeze is ...@@ -3730,7 +3729,6 @@ package body Freeze is
elsif Ekind (E) = E_Subprogram_Type then elsif Ekind (E) = E_Subprogram_Type then
Formal := First_Formal (E); Formal := First_Formal (E);
while Present (Formal) loop while Present (Formal) loop
if Ekind (Etype (Formal)) = E_Incomplete_Type if Ekind (Etype (Formal)) = E_Incomplete_Type
and then No (Full_View (Etype (Formal))) and then No (Full_View (Etype (Formal)))
...@@ -3739,7 +3737,7 @@ package body Freeze is ...@@ -3739,7 +3737,7 @@ package body Freeze is
if Is_Tagged_Type (Etype (Formal)) then if Is_Tagged_Type (Etype (Formal)) then
null; null;
-- AI05-151 : incomplete types are allowed in access to -- AI05-151: Incomplete types are allowed in access to
-- subprogram specifications. -- subprogram specifications.
elsif Ada_Version < Ada_2012 then elsif Ada_Version < Ada_2012 then
...@@ -3877,6 +3875,7 @@ package body Freeze is ...@@ -3877,6 +3875,7 @@ package body Freeze is
declare declare
Prim_List : constant Elist_Id := Primitive_Operations (E); Prim_List : constant Elist_Id := Primitive_Operations (E);
Prim : Elmt_Id; Prim : Elmt_Id;
begin begin
Prim := First_Elmt (Prim_List); Prim := First_Elmt (Prim_List);
while Present (Prim) loop while Present (Prim) loop
...@@ -3984,7 +3983,6 @@ package body Freeze is ...@@ -3984,7 +3983,6 @@ package body Freeze is
begin begin
Comp := First_Component (E); Comp := First_Component (E);
while Present (Comp) loop while Present (Comp) loop
Typ := Etype (Comp); Typ := Etype (Comp);
...@@ -5167,7 +5165,6 @@ package body Freeze is ...@@ -5167,7 +5165,6 @@ package body Freeze is
end if; end if;
F := First_Formal (Designated_Type (Typ)); F := First_Formal (Designated_Type (Typ));
while Present (F) loop while Present (F) loop
Ensure_Type_Is_SA (Etype (F)); Ensure_Type_Is_SA (Etype (F));
Next_Formal (F); Next_Formal (F);
...@@ -5451,7 +5448,6 @@ package body Freeze is ...@@ -5451,7 +5448,6 @@ package body Freeze is
begin begin
Comp := First_Component (T); Comp := First_Component (T);
while Present (Comp) loop while Present (Comp) loop
if not Is_Fully_Defined (Etype (Comp)) then if not Is_Fully_Defined (Etype (Comp)) then
return False; return False;
...@@ -5803,7 +5799,6 @@ package body Freeze is ...@@ -5803,7 +5799,6 @@ package body Freeze is
begin begin
Comp := First_Component (Typ); Comp := First_Component (Typ);
while Present (Comp) loop while Present (Comp) loop
if Nkind (Parent (Comp)) = N_Component_Declaration if Nkind (Parent (Comp)) = N_Component_Declaration
and then Present (Expression (Parent (Comp))) and then Present (Expression (Parent (Comp)))
......
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