From 14c3ae9af87a9c53e6bf0e692afb1900d0960f6f Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Mon, 2 May 2016 10:31:25 +0000 Subject: [PATCH] exp_util.ads, [...]: Minor reformatting. 2016-05-02 Gary Dismukes * exp_util.ads, sem_ch12.adb: Minor reformatting. From-SVN: r235743 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/exp_util.ads | 6 +++--- gcc/ada/sem_ch12.adb | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1ac765362cd..2a0ef8d8648 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2016-05-02 Gary Dismukes + + * exp_util.ads, sem_ch12.adb: Minor reformatting. + 2016-05-02 Javier Miranda * exp_util.ads, exp_util.adb (Force_Evaluation): Adding new formal. diff --git a/gcc/ada/exp_util.ads b/gcc/ada/exp_util.ads index 9beb054fca4..86136458667 100644 --- a/gcc/ada/exp_util.ads +++ b/gcc/ada/exp_util.ads @@ -542,8 +542,8 @@ package Exp_Util is -- of the same expression won't generate multiple side effects, whereas -- Force_Evaluation further guarantees that all evaluations will yield -- the same result. If Mode is Relaxed then calls to this subprogram have - -- no effect if Exp is side-effects free; if Mode is Strict and Exp is not - -- a static expression then no side-effects check is performed on Exp and + -- no effect if Exp is side-effect free; if Mode is Strict and Exp is not + -- a static expression then no side-effect check is performed on Exp and -- temporaries are unconditionally generated. -- -- Related_Id denotes the entity of the context where Expr appears. Flags @@ -985,7 +985,7 @@ package Exp_Util is (L : List_Id; Name_Req : Boolean := False; Variable_Ref : Boolean := False) return Boolean; - -- Determines if all elements of the list L are side effect free. Name_Req + -- Determines if all elements of the list L are side-effect free. Name_Req -- and Variable_Ref are as described above. procedure Silly_Boolean_Array_Not_Test (N : Node_Id; T : Entity_Id); diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 0d8446df96c..9daba776d11 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -5759,7 +5759,7 @@ package body Sem_Ch12 is -------------------- procedure Check_Mismatch (B : Boolean) is - -- a Formal_Type_Declaration for a derived private type is rewritten + -- A Formal_Type_Declaration for a derived private type is rewritten -- as a private extension decl. (see Analyze_Formal_Derived_Type), -- which is why we examine the original node. @@ -5927,9 +5927,9 @@ package body Sem_Ch12 is -- If the formal entity comes from a formal declaration, it was -- defaulted in the formal package, and no check is needed on it. - elsif - Nkind_In (Original_Node (Parent (E2)), - N_Formal_Object_Declaration, N_Formal_Type_Declaration) + elsif Nkind_In (Original_Node (Parent (E2)), + N_Formal_Object_Declaration, + N_Formal_Type_Declaration) then goto Next_E; -- 2.30.2