diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/exp_aggr.adb | 5 | ||||
| -rw-r--r-- | gcc/ada/exp_ch4.adb | 1 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 1 | ||||
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 13 | ||||
| -rw-r--r-- | gcc/ada/sem_ch3.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 10 |
7 files changed, 22 insertions, 17 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 75023bf..be22acb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +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> * inline.adb: Minor reformatting and typo fix. diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 889c359..4f072f7 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -1737,8 +1737,9 @@ package body Exp_Aggr is -- Otherwise construct the loop, starting with the loop index L_J if Is_Iterated_Component then - L_J := Make_Defining_Identifier (Loc, - Chars => (Chars (Defining_Identifier (Parent (Expr))))); + L_J := + Make_Defining_Identifier (Loc, + Chars => (Chars (Defining_Identifier (Parent (Expr))))); else L_J := Make_Temporary (Loc, 'J', L); diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index bdd7209..1f91de0 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -7776,6 +7776,7 @@ package body Exp_Ch4 is else pragma Assert (Expv = -1 or Expv = -2 or Expv = -3 or Expv = -4); + Xnode := Make_Op_Divide (Loc, Left_Opnd => diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 1724203..9fb47ef 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -3201,6 +3201,7 @@ package body Inline is then pragma Assert (not (Is_By_Reference_Type (Etype (A)))); pragma Assert (not (Is_Limited_Type (Etype (A)))); + Append_To (Decls, Make_Object_Declaration (Loc, Defining_Identifier => Make_Temporary (Loc, 'C'), diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index f34ae63..d86dc35 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -809,8 +809,8 @@ package body Sem_Aggr is begin return No (Expressions (Aggr)) and then - Nkind (First (Choice_List (First (Component_Associations (Aggr))))) - = N_Others_Choice; + Nkind (First (Choice_List (First (Component_Associations (Aggr))))) = + N_Others_Choice; end Is_Others_Aggregate; ---------------------------- @@ -1691,8 +1691,6 @@ package body Sem_Aggr is Expr : Node_Id; Discard : Node_Id; - -- Iterated_Component_Present : Boolean := False; - Aggr_Low : Node_Id := Empty; Aggr_High : Node_Id := Empty; -- The actual low and high bounds of this sub-aggregate @@ -1732,7 +1730,6 @@ package body Sem_Aggr is while Present (Assoc) loop if Nkind (Assoc) = N_Iterated_Component_Association then Resolve_Iterated_Component_Association (Assoc, Index_Typ); - -- Iterated_Component_Present := True; goto Next_Assoc; end if; @@ -1791,9 +1788,9 @@ package body Sem_Aggr is -- If the subtype has a static predicate, replace the -- original choice with the list of individual values - -- covered by the predicate. - -- Do not perform this transformation if we need to - -- preserve the source for ASIS use. + -- covered by the predicate. Do not perform this + -- transformation if we need to preserve the source + -- for ASIS use. -- This should be deferred to expansion time ??? if Present (Static_Discrete_Predicate (E)) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 0a6a30e..729a422 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -4151,8 +4151,8 @@ package body Sem_Ch3 is and then Present (Component_Associations (E)) and then Present (Choice_List (First (Component_Associations (E)))) and then - Nkind (First (Choice_List (First (Component_Associations (E))))) - = N_Others_Choice + Nkind (First (Choice_List (First (Component_Associations (E))))) = + N_Others_Choice then null; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 3e5269f..4006616 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -13705,8 +13705,8 @@ package body Sem_Util is N_Slice) and then Prefix (Context) = Obj_Ref and then Is_OK_Volatile_Context - (Context => Parent (Context), - Obj_Ref => Context) + (Context => Parent (Context), + Obj_Ref => Context) then return True; @@ -13731,11 +13731,11 @@ package body Sem_Util is -- occurring in a non-interfering context. elsif Nkind_In (Context, N_Type_Conversion, - N_Unchecked_Type_Conversion) + N_Unchecked_Type_Conversion) and then Expression (Context) = Obj_Ref and then Is_OK_Volatile_Context - (Context => Parent (Context), - Obj_Ref => Context) + (Context => Parent (Context), + Obj_Ref => Context) then return True; |