Commit bbe008b6 by Hristian Kirtchev Committed by Arnaud Charlet

sem_ch3.adb, [...]: Minor reformatting.

2016-04-21  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch3.adb, exp_attr.adb, exp_ch6.adb, exp_aggr.adb: Minor
	reformatting.

From-SVN: r235322
parent 35f4f238
2016-04-21 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch3.adb, exp_attr.adb, exp_ch6.adb, exp_aggr.adb: Minor
reformatting.
2016-04-21 Javier Miranda <miranda@adacore.com> 2016-04-21 Javier Miranda <miranda@adacore.com>
* exp_aggr.adb (Component_Check): Extend * exp_aggr.adb (Component_Check): Extend
......
...@@ -564,7 +564,6 @@ package body Exp_Aggr is ...@@ -564,7 +564,6 @@ package body Exp_Aggr is
--------------------- ---------------------
function Component_Check (N : Node_Id; Index : Node_Id) return Boolean is function Component_Check (N : Node_Id; Index : Node_Id) return Boolean is
function Ultimate_Original_Expression (N : Node_Id) return Node_Id; function Ultimate_Original_Expression (N : Node_Id) return Node_Id;
-- Given a type conversion or an unchecked type conversion N, return -- Given a type conversion or an unchecked type conversion N, return
-- its innermost original expression. -- its innermost original expression.
...@@ -590,6 +589,8 @@ package body Exp_Aggr is ...@@ -590,6 +589,8 @@ package body Exp_Aggr is
Expr : Node_Id; Expr : Node_Id;
-- Start of processing for Component_Check
begin begin
-- Checks 1: (no component associations) -- Checks 1: (no component associations)
......
...@@ -583,13 +583,15 @@ package body Exp_Attr is ...@@ -583,13 +583,15 @@ package body Exp_Attr is
end if; end if;
end Make_VS_If; end Make_VS_If;
-- Local Declarations -- Local variables
Def : constant Node_Id := Parent (R_Type); Def : constant Node_Id := Parent (R_Type);
Comps : constant Node_Id := Component_List (Type_Definition (Def)); Comps : constant Node_Id := Component_List (Type_Definition (Def));
Stmts : constant List_Id := New_List; Stmts : constant List_Id := New_List;
Pspecs : constant List_Id := New_List; Pspecs : constant List_Id := New_List;
-- Start of processing for Build_Record_VS_Func
begin begin
Append_To (Pspecs, Append_To (Pspecs,
Make_Parameter_Specification (Loc, Make_Parameter_Specification (Loc,
......
...@@ -8477,8 +8477,7 @@ package body Exp_Ch6 is ...@@ -8477,8 +8477,7 @@ package body Exp_Ch6 is
if not Comes_From_Source (Orig_Func) if not Comes_From_Source (Orig_Func)
and then Etype (Orig_Func) /= Etype (Func_Id) and then Etype (Orig_Func) /= Etype (Func_Id)
then then
Last_Actual := Last_Actual := Unchecked_Convert_To (Etype (Func_Id), Last_Actual);
Unchecked_Convert_To (Etype (Func_Id), Last_Actual);
end if; end if;
Append_To (Actuals, Append_To (Actuals,
......
...@@ -5071,11 +5071,12 @@ package body Sem_Ch3 is ...@@ -5071,11 +5071,12 @@ package body Sem_Ch3 is
and then Has_Predicates (T) and then Has_Predicates (T)
and then Present (Predicate_Function (T)) and then Present (Predicate_Function (T))
then then
-- ??? This is dangerous, it may clobber the invariant procedure
Set_Subprograms_For_Type (Id, Subprograms_For_Type (T)); Set_Subprograms_For_Type (Id, Subprograms_For_Type (T));
if Has_Static_Predicate (T) then if Has_Static_Predicate (T) then
Set_Static_Discrete_Predicate (Id, Set_Static_Discrete_Predicate (Id, Static_Discrete_Predicate (T));
Static_Discrete_Predicate (T));
end if; end if;
end if; end if;
......
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