diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3d73ee33d58..6fc4554f77e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2014-01-20 Robert Dewar + + * gnat_rm.texi, sem_ch4.adb: Minor reformatting. + 2014-01-20 Ed Schonberg * sem_ch4.adb (Analyze_Quantified_Expression): If after diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index aa47b56385f..7710fd6a89b 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -6308,7 +6308,7 @@ Pragma SPARK_Mode can be used as a local pragma with the following semantics: Auto cannot be used as a mode argument. @item -When the pragma at the start of the visible declarations (preceded only +When the pragma is at the start of the visible declarations (preceded only by other pragmas) of a package declaration, it marks the whole package (declaration and body) in or out of SPARK 2014. diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index fcf6c75f18f..3e02d38d043 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -2956,17 +2956,15 @@ package body Sem_Ch4 is Form2 : constant Entity_Id := Next_Formal (Form1); begin - if Ekind (Fun) /= E_Function - or else Is_Abstract_Subprogram (Fun) - then + if Ekind (Fun) /= E_Function or else Is_Abstract_Subprogram (Fun) then return False; elsif not Has_Compatible_Type (Act1, Etype (Form1)) then return False; elsif Present (Form2) then - if - No (Act2) or else not Has_Compatible_Type (Act2, Etype (Form2)) + if No (Act2) + or else not Has_Compatible_Type (Act2, Etype (Form2)) then return False; end if; @@ -3016,7 +3014,7 @@ package body Sem_Ch4 is (Needs_No_Actuals (Nam) or else (Needs_One_Actual (Nam) - and then Present (Next_Actual (First (Actuals))))) + and then Present (Next_Actual (First (Actuals))))) then if Is_Array_Type (Subp_Type) and then @@ -3673,8 +3671,7 @@ package body Sem_Ch4 is begin Preanalyze (Loop_Par); - if Nkind (Discrete_Subtype_Definition (Loop_Par)) = - N_Function_Call + if Nkind (Discrete_Subtype_Definition (Loop_Par)) = N_Function_Call and then Parent (Loop_Par) /= N then -- The parser cannot distinguish between a loop specification