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

[Ada] Refactor repeated code for Callable and Terminated attributes

Browse source 
gcc/ada/

	* sem_attr.adb (Analyze_Attribute): Merge identical code for
	Callable and Terminated attributes; refactor calls to Set_Etype
	occurring in both THEN and ELSE branches of an IF statement for
	attribute Storage_Size.
This commit is contained in:
Piotr Trojanek 2020-11-24 00:31:49 +01:00 • committed by Pierre-Marie de Rodat
parent ce20ff0260
commit afed612dc5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gcc/ada/sem_attr.adb
View file

@ -3351,7 +3351,9 @@ package body Sem_Attr is
-- Callable --
--------------
when Attribute_Callable =>
when Attribute_Callable
| Attribute_Terminated
=>
Check_E0;
Set_Etype (N, Standard_Boolean);
Check_Task_Prefix;
@ -6121,6 +6123,8 @@ package body Sem_Attr is
Check_Restriction (No_Obsolescent_Features, P);
elsif Is_Access_Type (P_Type) then
Set_Etype (N, Universal_Integer);
if Ekind (P_Type) = E_Access_Subprogram_Type then
Error_Attr_P
("cannot use % attribute for access-to-subprogram type");
@ -6130,7 +6134,6 @@ package body Sem_Attr is
and then Is_Type (Entity (P))
then
Check_Type;
Set_Etype (N, Universal_Integer);
-- Validate_Remote_Access_To_Class_Wide_Type for attribute
-- Storage_Size since this attribute is not defined for
@ -6143,7 +6146,6 @@ package body Sem_Attr is
else
Check_Task_Prefix;
Set_Etype (N, Universal_Integer);
end if;
else
@ -6294,10 +6296,7 @@ package body Sem_Attr is
-- Terminated --
----------------
when Attribute_Terminated =>
Check_E0;
Set_Etype (N, Standard_Boolean);
Check_Task_Prefix;
-- Shares processing with Callable attribute
----------------
-- To_Address --