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