inline.adb, [...]: Minor reformatting.
2014-07-30 Robert Dewar <dewar@adacore.com> * inline.adb, exp_ch4.adb, sinput.adb, sem_ch6.adb, sem_ch13.adb: Minor reformatting. From-SVN: r213244
This commit is contained in:
parent
4e6768ab35
commit
662c2ad475
|
@ -1,3 +1,8 @@
|
||||||
|
2014-07-30 Robert Dewar <dewar@adacore.com>
|
||||||
|
|
||||||
|
* inline.adb, exp_ch4.adb, sinput.adb, sem_ch6.adb, sem_ch13.adb:
|
||||||
|
Minor reformatting.
|
||||||
|
|
||||||
2014-07-30 Hristian Kirtchev <kirtchev@adacore.com>
|
2014-07-30 Hristian Kirtchev <kirtchev@adacore.com>
|
||||||
|
|
||||||
* aspects.ads Add a comment explaining why SPARK 2014 aspects are
|
* aspects.ads Add a comment explaining why SPARK 2014 aspects are
|
||||||
|
|
|
@ -769,9 +769,8 @@ package body Exp_Ch4 is
|
||||||
Obj_Ref :=
|
Obj_Ref :=
|
||||||
Unchecked_Convert_To (Etype (Obj_Ref),
|
Unchecked_Convert_To (Etype (Obj_Ref),
|
||||||
Make_Function_Call (Loc,
|
Make_Function_Call (Loc,
|
||||||
Name =>
|
Name =>
|
||||||
New_Occurrence_Of
|
New_Occurrence_Of (RTE (RE_Base_Address), Loc),
|
||||||
(RTE (RE_Base_Address), Loc),
|
|
||||||
Parameter_Associations => New_List (
|
Parameter_Associations => New_List (
|
||||||
Unchecked_Convert_To (RTE (RE_Address),
|
Unchecked_Convert_To (RTE (RE_Address),
|
||||||
New_Copy_Tree (Obj_Ref)))));
|
New_Copy_Tree (Obj_Ref)))));
|
||||||
|
|
|
@ -3620,13 +3620,13 @@ package body Inline is
|
||||||
while Present (F) loop
|
while Present (F) loop
|
||||||
if Present (Renamed_Object (F)) then
|
if Present (Renamed_Object (F)) then
|
||||||
|
|
||||||
-- If expander is active, it's an error to try to inline a
|
-- If expander is active, it is an error to try to inline a
|
||||||
-- recursive program. In GNATprove mode, just indicate that
|
-- recursive program. In GNATprove mode, just indicate that
|
||||||
-- the inlining will not happen.
|
-- the inlining will not happen.
|
||||||
|
|
||||||
if Expander_Active then
|
if Expander_Active then
|
||||||
Error_Msg_N ("cannot inline call to recursive subprogram", N);
|
Error_Msg_N
|
||||||
|
("cannot inline call to recursive subprogram", N);
|
||||||
else
|
else
|
||||||
Cannot_Inline
|
Cannot_Inline
|
||||||
("cannot inline call to recursive subprogram?", N, Subp);
|
("cannot inline call to recursive subprogram?", N, Subp);
|
||||||
|
|
|
@ -1186,7 +1186,7 @@ package body Sem_Ch13 is
|
||||||
|
|
||||||
procedure Analyze_Aspect_Specifications (N : Node_Id; E : Entity_Id) is
|
procedure Analyze_Aspect_Specifications (N : Node_Id; E : Entity_Id) is
|
||||||
procedure Decorate (Asp : Node_Id; Prag : Node_Id);
|
procedure Decorate (Asp : Node_Id; Prag : Node_Id);
|
||||||
-- Establish the linkages between an aspect and its corresponding
|
-- Establish linkages between an aspect and its corresponding
|
||||||
-- pragma.
|
-- pragma.
|
||||||
|
|
||||||
procedure Insert_After_SPARK_Mode
|
procedure Insert_After_SPARK_Mode
|
||||||
|
@ -1195,9 +1195,8 @@ package body Sem_Ch13 is
|
||||||
Decls : List_Id);
|
Decls : List_Id);
|
||||||
-- Subsidiary to the analysis of aspects Abstract_State, Initializes,
|
-- Subsidiary to the analysis of aspects Abstract_State, Initializes,
|
||||||
-- Initial_Condition and Refined_State. Insert node Prag before node
|
-- Initial_Condition and Refined_State. Insert node Prag before node
|
||||||
-- Ins_Nod. If Ins_Nod denotes pragma SPARK_Mode, then SPARK_Mode is
|
-- Ins_Nod. If Ins_Nod is for pragma SPARK_Mode, then skip SPARK_Mode.
|
||||||
-- skipped. Decls is the associated declarative list where Prag is to
|
-- Decls is the associated declarative list where Prag is to reside.
|
||||||
-- reside.
|
|
||||||
|
|
||||||
procedure Insert_Pragma (Prag : Node_Id);
|
procedure Insert_Pragma (Prag : Node_Id);
|
||||||
-- Subsidiary to the analysis of aspects Attach_Handler, Contract_Cases,
|
-- Subsidiary to the analysis of aspects Attach_Handler, Contract_Cases,
|
||||||
|
|
|
@ -2972,10 +2972,10 @@ package body Sem_Ch6 is
|
||||||
then
|
then
|
||||||
declare
|
declare
|
||||||
Body_Spec : constant Node_Id :=
|
Body_Spec : constant Node_Id :=
|
||||||
Copy_Separate_Tree (Specification (N));
|
Copy_Separate_Tree (Specification (N));
|
||||||
New_Decl : constant Node_Id :=
|
New_Decl : constant Node_Id :=
|
||||||
Make_Subprogram_Declaration
|
Make_Subprogram_Declaration (Loc,
|
||||||
(Loc, Copy_Separate_Tree (Specification (N)));
|
Copy_Separate_Tree (Specification (N)));
|
||||||
|
|
||||||
begin
|
begin
|
||||||
Insert_Before (N, New_Decl);
|
Insert_Before (N, New_Decl);
|
||||||
|
|
|
@ -308,7 +308,7 @@ package body Sinput is
|
||||||
|
|
||||||
function Comes_From_Inlined_Body (S : Source_Ptr) return Boolean is
|
function Comes_From_Inlined_Body (S : Source_Ptr) return Boolean is
|
||||||
SIE : Source_File_Record renames
|
SIE : Source_File_Record renames
|
||||||
Source_File.Table (Get_Source_File_Index (S));
|
Source_File.Table (Get_Source_File_Index (S));
|
||||||
begin
|
begin
|
||||||
return SIE.Inlined_Body;
|
return SIE.Inlined_Body;
|
||||||
end Comes_From_Inlined_Body;
|
end Comes_From_Inlined_Body;
|
||||||
|
|
Loading…
Reference in New Issue