FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ada: Fix style in code for generic formal subprograms with contracts

Browse source 
Code cleanup related to expansion generic formal subprograms with
contracts for GNATprove.

gcc/ada/

	* inline.adb (Replace_Formal): Tune whitespace.
	* sem_ch12.adb (Check_Overloaded_Formal_Subprogram): Refine type
	of a formal parameter and local variable; this routine operates on
	nodes and not entities.
	* sem_ch12.ads: Tune whitespace.
This commit is contained in:
Piotr Trojanek 2022-10-28 22:10:25 +02:00 • committed by Marc Poulhiès
parent fe02d7d913
commit 35f29cfe9f
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ada/inline.adb
View file

@ -4723,8 +4723,8 @@ package body Inline is
--------------------
function Replace_Formal (N : Node_Id) return Traverse_Result is
A : Entity_Id;
E : Entity_Id;
A : Entity_Id;
E : Entity_Id;
begin
if Is_Entity_Name (N) and then Present (Entity (N)) then

18
gcc/ada/sem_ch12.adb
View file

@ -1151,7 +1151,7 @@ package body Sem_Ch12 is
-- in which case the predefined operations will be used. This merits
-- a warning because of the special semantics of fixed point ops.
procedure Check_Overloaded_Formal_Subprogram (Formal : Entity_Id);
procedure Check_Overloaded_Formal_Subprogram (Formal : Node_Id);
-- Apply RM 12.3(9): if a formal subprogram is overloaded, the instance
-- cannot have a named association for it. AI05-0025 extends this rule
-- to formals of formal packages by AI05-0025, and it also applies to
@ -1259,15 +1259,15 @@ package body Sem_Ch12 is
-- actuals.
Append_To (Assoc_List,
Build_Subprogram_Body_Wrapper (Formal, Actual_Name));
Build_Subprogram_Body_Wrapper (Formal, Actual_Name));
end Build_Subprogram_Wrappers;
----------------------------------------
-- Check_Overloaded_Formal_Subprogram --
----------------------------------------
procedure Check_Overloaded_Formal_Subprogram (Formal : Entity_Id) is
Temp_Formal : Entity_Id;
procedure Check_Overloaded_Formal_Subprogram (Formal : Node_Id) is
Temp_Formal : Node_Id;
begin
Temp_Formal := First (Formals);
@ -1449,8 +1449,8 @@ package body Sem_Ch12 is
(F : Entity_Id;
A_F : Entity_Id) return Node_Id
is
Prev : Node_Id;
Act : Node_Id;
Prev : Node_Id;
Act : Node_Id;
begin
Is_Named_Assoc := False;
@ -6252,7 +6252,7 @@ package body Sem_Ch12 is
while Present (Act) loop
Append_To (Actuals,
Make_Identifier (Loc, Chars (Defining_Identifier (Act))));
Make_Identifier (Loc, Chars (Defining_Identifier (Act))));
Next (Act);
end loop;
@ -6273,8 +6273,8 @@ package body Sem_Ch12 is
Specification => Spec_Node,
Declarations => New_List,
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (Stmt)));
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (Stmt)));
return Body_Node;
end Build_Subprogram_Body_Wrapper;

18
gcc/ada/sem_ch12.ads
View file

@ -27,15 +27,15 @@ with Inline; use Inline;
with Types; use Types;
package Sem_Ch12 is
procedure Analyze_Generic_Package_Declaration (N : Node_Id);
procedure Analyze_Generic_Subprogram_Declaration (N : Node_Id);
procedure Analyze_Package_Instantiation (N : Node_Id);
procedure Analyze_Procedure_Instantiation (N : Node_Id);
procedure Analyze_Function_Instantiation (N : Node_Id);
procedure Analyze_Formal_Object_Declaration (N : Node_Id);
procedure Analyze_Formal_Type_Declaration (N : Node_Id);
procedure Analyze_Formal_Subprogram_Declaration (N : Node_Id);
procedure Analyze_Formal_Package_Declaration (N : Node_Id);
procedure Analyze_Generic_Package_Declaration (N : Node_Id);
procedure Analyze_Generic_Subprogram_Declaration (N : Node_Id);
procedure Analyze_Package_Instantiation (N : Node_Id);
procedure Analyze_Procedure_Instantiation (N : Node_Id);
procedure Analyze_Function_Instantiation (N : Node_Id);
procedure Analyze_Formal_Object_Declaration (N : Node_Id);
procedure Analyze_Formal_Type_Declaration (N : Node_Id);
procedure Analyze_Formal_Subprogram_Declaration (N : Node_Id);
procedure Analyze_Formal_Package_Declaration (N : Node_Id);
procedure Start_Generic;
-- Must be invoked before starting to process a generic spec or body