[multiple changes]

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

	* stringt.adb, exp_ch6.adb, sem_ch13.adb: Minor reformatting.

2016-04-18  Gary Dismukes  <dismukes@adacore.com>

	* par-ch4.adb, sem_prag.adb: Minor reformatting.

From-SVN: r235127
This commit is contained in:
Arnaud Charlet 2016-04-18 12:50:37 +02:00
parent ea1027992d
commit 77039fe27c
6 changed files with 21 additions and 13 deletions

View File

@ -1,3 +1,11 @@
2016-04-18 Hristian Kirtchev <kirtchev@adacore.com>
* stringt.adb, exp_ch6.adb, sem_ch13.adb: Minor reformatting.
2016-04-18 Gary Dismukes <dismukes@adacore.com>
* par-ch4.adb, sem_prag.adb: Minor reformatting.
2016-04-18 Bob Duff <duff@adacore.com>
* sinput.ads, sinput.adb (Build_Location_String): Take a

View File

@ -3905,8 +3905,8 @@ package body Exp_Ch6 is
-- perform the inlining.
if In_Instance
and then Comes_From_Source (Subp)
and then Optimization_Level > 0
and then Comes_From_Source (Subp)
and then Optimization_Level > 0
then
declare
Inst : Entity_Id;

View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2014, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2015, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@ -461,7 +461,7 @@ package body Ch4 is
loop
Discard_Junk_Node (P_Expression_If_OK);
exit when not Comma_Present;
exit when not Comma_Present;
end loop;
T_Right_Paren;

View File

@ -3769,10 +3769,10 @@ package body Sem_Ch13 is
(Subp : Entity_Id;
Report : Boolean := False) return Boolean
is
F : Entity_Id;
Is_Function : constant Boolean := (TSS_Nam = TSS_Stream_Input);
Expected_Ekind : constant array (Boolean) of Entity_Kind :=
(False => E_Procedure, True => E_Function);
Is_Function : constant Boolean := (TSS_Nam = TSS_Stream_Input);
F : Entity_Id;
Typ : Entity_Id;
begin
@ -3785,7 +3785,7 @@ package body Sem_Ch13 is
if No (F)
or else Ekind (Etype (F)) /= E_Anonymous_Access_Type
or else Designated_Type (Etype (F)) /=
Class_Wide_Type (RTE (RE_Root_Stream_Type))
Class_Wide_Type (RTE (RE_Root_Stream_Type))
then
return False;
end if;
@ -3835,8 +3835,7 @@ package body Sem_Ch13 is
return False;
end if;
if Present ((Next_Formal (F)))
then
if Present (Next_Formal (F)) then
return False;
elsif not Is_Scalar_Type (Typ)
@ -3932,8 +3931,8 @@ package body Sem_Ch13 is
(Unit_Declaration_Node (Ultimate_Alias (Subp)))))
then
Error_Msg_N
("stream subprogram for interface type "
& "must be null procedure", Expr);
("stream subprogram for interface type must be null "
& "procedure", Expr);
end if;
Set_Entity (Expr, Subp);

View File

@ -2869,7 +2869,7 @@ package body Sem_Prag is
then
-- The input cannot denote states or objects declared
-- within the related package (SPARK RM 7.1.5(4)). The
-- only exception to this are generic formal parameters.
-- only exceptions to this are generic formal parameters.
if not Ekind_In (Input_Id, E_Generic_In_Out_Parameter,
E_Generic_In_Parameter)

View File

@ -307,7 +307,8 @@ package body Stringt is
-----------------------------
function String_From_Name_Buffer
(Buf : Bounded_String := Global_Name_Buffer) return String_Id is
(Buf : Bounded_String := Global_Name_Buffer) return String_Id
is
begin
Start_String;
Store_String_Chars (+Buf);