Commit 72cdccfa by Hristian Kirtchev Committed by Arnaud Charlet

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

2017-01-13  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_aggr.adb, sem_ch3.adb, inline.adb, sem_util.adb, exp_ch4.adb,
	exp_aggr.adb: Minor reformatting.

From-SVN: r244416
parent fae8eb5b
2017-01-13 Hristian Kirtchev <kirtchev@adacore.com>
* sem_aggr.adb, sem_ch3.adb, inline.adb, sem_util.adb, exp_ch4.adb,
exp_aggr.adb: Minor reformatting.
2017-01-13 Gary Dismukes <dismukes@adacore.com> 2017-01-13 Gary Dismukes <dismukes@adacore.com>
* inline.adb: Minor reformatting and typo fix. * inline.adb: Minor reformatting and typo fix.
......
...@@ -1737,8 +1737,9 @@ package body Exp_Aggr is ...@@ -1737,8 +1737,9 @@ package body Exp_Aggr is
-- Otherwise construct the loop, starting with the loop index L_J -- Otherwise construct the loop, starting with the loop index L_J
if Is_Iterated_Component then if Is_Iterated_Component then
L_J := Make_Defining_Identifier (Loc, L_J :=
Chars => (Chars (Defining_Identifier (Parent (Expr))))); Make_Defining_Identifier (Loc,
Chars => (Chars (Defining_Identifier (Parent (Expr)))));
else else
L_J := Make_Temporary (Loc, 'J', L); L_J := Make_Temporary (Loc, 'J', L);
......
...@@ -7776,6 +7776,7 @@ package body Exp_Ch4 is ...@@ -7776,6 +7776,7 @@ package body Exp_Ch4 is
else else
pragma Assert pragma Assert
(Expv = -1 or Expv = -2 or Expv = -3 or Expv = -4); (Expv = -1 or Expv = -2 or Expv = -3 or Expv = -4);
Xnode := Xnode :=
Make_Op_Divide (Loc, Make_Op_Divide (Loc,
Left_Opnd => Left_Opnd =>
......
...@@ -3201,6 +3201,7 @@ package body Inline is ...@@ -3201,6 +3201,7 @@ package body Inline is
then then
pragma Assert (not (Is_By_Reference_Type (Etype (A)))); pragma Assert (not (Is_By_Reference_Type (Etype (A))));
pragma Assert (not (Is_Limited_Type (Etype (A)))); pragma Assert (not (Is_Limited_Type (Etype (A))));
Append_To (Decls, Append_To (Decls,
Make_Object_Declaration (Loc, Make_Object_Declaration (Loc,
Defining_Identifier => Make_Temporary (Loc, 'C'), Defining_Identifier => Make_Temporary (Loc, 'C'),
......
...@@ -809,8 +809,8 @@ package body Sem_Aggr is ...@@ -809,8 +809,8 @@ package body Sem_Aggr is
begin begin
return No (Expressions (Aggr)) return No (Expressions (Aggr))
and then and then
Nkind (First (Choice_List (First (Component_Associations (Aggr))))) Nkind (First (Choice_List (First (Component_Associations (Aggr))))) =
= N_Others_Choice; N_Others_Choice;
end Is_Others_Aggregate; end Is_Others_Aggregate;
---------------------------- ----------------------------
...@@ -1691,8 +1691,6 @@ package body Sem_Aggr is ...@@ -1691,8 +1691,6 @@ package body Sem_Aggr is
Expr : Node_Id; Expr : Node_Id;
Discard : Node_Id; Discard : Node_Id;
-- Iterated_Component_Present : Boolean := False;
Aggr_Low : Node_Id := Empty; Aggr_Low : Node_Id := Empty;
Aggr_High : Node_Id := Empty; Aggr_High : Node_Id := Empty;
-- The actual low and high bounds of this sub-aggregate -- The actual low and high bounds of this sub-aggregate
...@@ -1732,7 +1730,6 @@ package body Sem_Aggr is ...@@ -1732,7 +1730,6 @@ package body Sem_Aggr is
while Present (Assoc) loop while Present (Assoc) loop
if Nkind (Assoc) = N_Iterated_Component_Association then if Nkind (Assoc) = N_Iterated_Component_Association then
Resolve_Iterated_Component_Association (Assoc, Index_Typ); Resolve_Iterated_Component_Association (Assoc, Index_Typ);
-- Iterated_Component_Present := True;
goto Next_Assoc; goto Next_Assoc;
end if; end if;
...@@ -1791,9 +1788,9 @@ package body Sem_Aggr is ...@@ -1791,9 +1788,9 @@ package body Sem_Aggr is
-- If the subtype has a static predicate, replace the -- If the subtype has a static predicate, replace the
-- original choice with the list of individual values -- original choice with the list of individual values
-- covered by the predicate. -- covered by the predicate. Do not perform this
-- Do not perform this transformation if we need to -- transformation if we need to preserve the source
-- preserve the source for ASIS use. -- for ASIS use.
-- This should be deferred to expansion time ??? -- This should be deferred to expansion time ???
if Present (Static_Discrete_Predicate (E)) if Present (Static_Discrete_Predicate (E))
......
...@@ -4151,8 +4151,8 @@ package body Sem_Ch3 is ...@@ -4151,8 +4151,8 @@ package body Sem_Ch3 is
and then Present (Component_Associations (E)) and then Present (Component_Associations (E))
and then Present (Choice_List (First (Component_Associations (E)))) and then Present (Choice_List (First (Component_Associations (E))))
and then and then
Nkind (First (Choice_List (First (Component_Associations (E))))) Nkind (First (Choice_List (First (Component_Associations (E))))) =
= N_Others_Choice N_Others_Choice
then then
null; null;
......
...@@ -13705,8 +13705,8 @@ package body Sem_Util is ...@@ -13705,8 +13705,8 @@ package body Sem_Util is
N_Slice) N_Slice)
and then Prefix (Context) = Obj_Ref and then Prefix (Context) = Obj_Ref
and then Is_OK_Volatile_Context and then Is_OK_Volatile_Context
(Context => Parent (Context), (Context => Parent (Context),
Obj_Ref => Context) Obj_Ref => Context)
then then
return True; return True;
...@@ -13731,11 +13731,11 @@ package body Sem_Util is ...@@ -13731,11 +13731,11 @@ package body Sem_Util is
-- occurring in a non-interfering context. -- occurring in a non-interfering context.
elsif Nkind_In (Context, N_Type_Conversion, elsif Nkind_In (Context, N_Type_Conversion,
N_Unchecked_Type_Conversion) N_Unchecked_Type_Conversion)
and then Expression (Context) = Obj_Ref and then Expression (Context) = Obj_Ref
and then Is_OK_Volatile_Context and then Is_OK_Volatile_Context
(Context => Parent (Context), (Context => Parent (Context),
Obj_Ref => Context) Obj_Ref => Context)
then then
return True; return True;
......
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