trans-chap9.adb: handle async_abort, sync_abort. Fix #1654

1 files changed, 106 insertions, 110 deletions

diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index d470935e4..2981b9f5c 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -4417,7 +4417,6 @@ package body Vhdl.Nodes_Meta is
       Field_PSL_NFA,
       Field_PSL_Nbr_States,
       Field_PSL_EOS_Flag,
-      Field_PSL_Abort_Flag,
       Field_Postponed_Flag,
       Field_Visible_Flag,
       Field_Parent,
@@ -4431,7 +4430,6 @@ package body Vhdl.Nodes_Meta is
       Field_PSL_NFA,
       Field_PSL_Nbr_States,
       Field_PSL_EOS_Flag,
-      Field_PSL_Abort_Flag,
       Field_Postponed_Flag,
       Field_Visible_Flag,
       Field_Parent,
@@ -5455,111 +5453,111 @@ package body Vhdl.Nodes_Meta is
       Iir_Kind_Concurrent_Break_Statement => 1635,
       Iir_Kind_Psl_Assert_Directive => 1649,
       Iir_Kind_Psl_Assume_Directive => 1661,
-      Iir_Kind_Psl_Cover_Directive => 1674,
-      Iir_Kind_Psl_Restrict_Directive => 1686,
-      Iir_Kind_Block_Statement => 1700,
-      Iir_Kind_If_Generate_Statement => 1711,
-      Iir_Kind_Case_Generate_Statement => 1720,
-      Iir_Kind_For_Generate_Statement => 1729,
-      Iir_Kind_Component_Instantiation_Statement => 1740,
-      Iir_Kind_Psl_Default_Clock => 1743,
-      Iir_Kind_Generate_Statement_Body => 1754,
-      Iir_Kind_If_Generate_Else_Clause => 1760,
-      Iir_Kind_Simple_Simultaneous_Statement => 1767,
-      Iir_Kind_Simultaneous_Null_Statement => 1771,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1782,
-      Iir_Kind_Simultaneous_Case_Statement => 1791,
-      Iir_Kind_Simultaneous_If_Statement => 1800,
-      Iir_Kind_Simultaneous_Elsif => 1806,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1817,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1828,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1840,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1850,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1859,
-      Iir_Kind_Null_Statement => 1863,
-      Iir_Kind_Assertion_Statement => 1870,
-      Iir_Kind_Report_Statement => 1876,
-      Iir_Kind_Wait_Statement => 1884,
-      Iir_Kind_Variable_Assignment_Statement => 1891,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1898,
-      Iir_Kind_Return_Statement => 1904,
-      Iir_Kind_For_Loop_Statement => 1915,
-      Iir_Kind_While_Loop_Statement => 1926,
-      Iir_Kind_Next_Statement => 1933,
-      Iir_Kind_Exit_Statement => 1940,
-      Iir_Kind_Case_Statement => 1948,
-      Iir_Kind_Procedure_Call_Statement => 1954,
-      Iir_Kind_Break_Statement => 1961,
-      Iir_Kind_If_Statement => 1971,
-      Iir_Kind_Elsif => 1977,
-      Iir_Kind_Character_Literal => 1984,
-      Iir_Kind_Simple_Name => 1991,
-      Iir_Kind_Selected_Name => 1999,
-      Iir_Kind_Operator_Symbol => 2004,
-      Iir_Kind_Reference_Name => 2009,
-      Iir_Kind_External_Constant_Name => 2018,
-      Iir_Kind_External_Signal_Name => 2027,
-      Iir_Kind_External_Variable_Name => 2037,
-      Iir_Kind_Selected_By_All_Name => 2043,
-      Iir_Kind_Parenthesis_Name => 2048,
-      Iir_Kind_Package_Pathname => 2052,
-      Iir_Kind_Absolute_Pathname => 2053,
-      Iir_Kind_Relative_Pathname => 2054,
-      Iir_Kind_Pathname_Element => 2059,
-      Iir_Kind_Base_Attribute => 2061,
-      Iir_Kind_Subtype_Attribute => 2066,
-      Iir_Kind_Element_Attribute => 2071,
-      Iir_Kind_Across_Attribute => 2076,
-      Iir_Kind_Through_Attribute => 2081,
-      Iir_Kind_Nature_Reference_Attribute => 2085,
-      Iir_Kind_Left_Type_Attribute => 2090,
-      Iir_Kind_Right_Type_Attribute => 2095,
-      Iir_Kind_High_Type_Attribute => 2100,
-      Iir_Kind_Low_Type_Attribute => 2105,
-      Iir_Kind_Ascending_Type_Attribute => 2110,
-      Iir_Kind_Image_Attribute => 2116,
-      Iir_Kind_Value_Attribute => 2122,
-      Iir_Kind_Pos_Attribute => 2128,
-      Iir_Kind_Val_Attribute => 2134,
-      Iir_Kind_Succ_Attribute => 2140,
-      Iir_Kind_Pred_Attribute => 2146,
-      Iir_Kind_Leftof_Attribute => 2152,
-      Iir_Kind_Rightof_Attribute => 2158,
-      Iir_Kind_Signal_Slew_Attribute => 2166,
-      Iir_Kind_Quantity_Slew_Attribute => 2174,
-      Iir_Kind_Ramp_Attribute => 2182,
-      Iir_Kind_Zoh_Attribute => 2190,
-      Iir_Kind_Ltf_Attribute => 2198,
-      Iir_Kind_Ztf_Attribute => 2208,
-      Iir_Kind_Dot_Attribute => 2215,
-      Iir_Kind_Integ_Attribute => 2222,
-      Iir_Kind_Above_Attribute => 2230,
-      Iir_Kind_Quantity_Delayed_Attribute => 2238,
-      Iir_Kind_Delayed_Attribute => 2247,
-      Iir_Kind_Stable_Attribute => 2256,
-      Iir_Kind_Quiet_Attribute => 2265,
-      Iir_Kind_Transaction_Attribute => 2274,
-      Iir_Kind_Event_Attribute => 2278,
-      Iir_Kind_Active_Attribute => 2282,
-      Iir_Kind_Last_Event_Attribute => 2286,
-      Iir_Kind_Last_Active_Attribute => 2290,
-      Iir_Kind_Last_Value_Attribute => 2294,
-      Iir_Kind_Driving_Attribute => 2298,
-      Iir_Kind_Driving_Value_Attribute => 2302,
-      Iir_Kind_Behavior_Attribute => 2302,
-      Iir_Kind_Structure_Attribute => 2302,
-      Iir_Kind_Simple_Name_Attribute => 2309,
-      Iir_Kind_Instance_Name_Attribute => 2314,
-      Iir_Kind_Path_Name_Attribute => 2319,
-      Iir_Kind_Left_Array_Attribute => 2326,
-      Iir_Kind_Right_Array_Attribute => 2333,
-      Iir_Kind_High_Array_Attribute => 2340,
-      Iir_Kind_Low_Array_Attribute => 2347,
-      Iir_Kind_Length_Array_Attribute => 2354,
-      Iir_Kind_Ascending_Array_Attribute => 2361,
-      Iir_Kind_Range_Array_Attribute => 2368,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2375,
-      Iir_Kind_Attribute_Name => 2384
+      Iir_Kind_Psl_Cover_Directive => 1673,
+      Iir_Kind_Psl_Restrict_Directive => 1684,
+      Iir_Kind_Block_Statement => 1698,
+      Iir_Kind_If_Generate_Statement => 1709,
+      Iir_Kind_Case_Generate_Statement => 1718,
+      Iir_Kind_For_Generate_Statement => 1727,
+      Iir_Kind_Component_Instantiation_Statement => 1738,
+      Iir_Kind_Psl_Default_Clock => 1741,
+      Iir_Kind_Generate_Statement_Body => 1752,
+      Iir_Kind_If_Generate_Else_Clause => 1758,
+      Iir_Kind_Simple_Simultaneous_Statement => 1765,
+      Iir_Kind_Simultaneous_Null_Statement => 1769,
+      Iir_Kind_Simultaneous_Procedural_Statement => 1780,
+      Iir_Kind_Simultaneous_Case_Statement => 1789,
+      Iir_Kind_Simultaneous_If_Statement => 1798,
+      Iir_Kind_Simultaneous_Elsif => 1804,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1815,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1826,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1838,
+      Iir_Kind_Signal_Force_Assignment_Statement => 1848,
+      Iir_Kind_Signal_Release_Assignment_Statement => 1857,
+      Iir_Kind_Null_Statement => 1861,
+      Iir_Kind_Assertion_Statement => 1868,
+      Iir_Kind_Report_Statement => 1874,
+      Iir_Kind_Wait_Statement => 1882,
+      Iir_Kind_Variable_Assignment_Statement => 1889,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1896,
+      Iir_Kind_Return_Statement => 1902,
+      Iir_Kind_For_Loop_Statement => 1913,
+      Iir_Kind_While_Loop_Statement => 1924,
+      Iir_Kind_Next_Statement => 1931,
+      Iir_Kind_Exit_Statement => 1938,
+      Iir_Kind_Case_Statement => 1946,
+      Iir_Kind_Procedure_Call_Statement => 1952,
+      Iir_Kind_Break_Statement => 1959,
+      Iir_Kind_If_Statement => 1969,
+      Iir_Kind_Elsif => 1975,
+      Iir_Kind_Character_Literal => 1982,
+      Iir_Kind_Simple_Name => 1989,
+      Iir_Kind_Selected_Name => 1997,
+      Iir_Kind_Operator_Symbol => 2002,
+      Iir_Kind_Reference_Name => 2007,
+      Iir_Kind_External_Constant_Name => 2016,
+      Iir_Kind_External_Signal_Name => 2025,
+      Iir_Kind_External_Variable_Name => 2035,
+      Iir_Kind_Selected_By_All_Name => 2041,
+      Iir_Kind_Parenthesis_Name => 2046,
+      Iir_Kind_Package_Pathname => 2050,
+      Iir_Kind_Absolute_Pathname => 2051,
+      Iir_Kind_Relative_Pathname => 2052,
+      Iir_Kind_Pathname_Element => 2057,
+      Iir_Kind_Base_Attribute => 2059,
+      Iir_Kind_Subtype_Attribute => 2064,
+      Iir_Kind_Element_Attribute => 2069,
+      Iir_Kind_Across_Attribute => 2074,
+      Iir_Kind_Through_Attribute => 2079,
+      Iir_Kind_Nature_Reference_Attribute => 2083,
+      Iir_Kind_Left_Type_Attribute => 2088,
+      Iir_Kind_Right_Type_Attribute => 2093,
+      Iir_Kind_High_Type_Attribute => 2098,
+      Iir_Kind_Low_Type_Attribute => 2103,
+      Iir_Kind_Ascending_Type_Attribute => 2108,
+      Iir_Kind_Image_Attribute => 2114,
+      Iir_Kind_Value_Attribute => 2120,
+      Iir_Kind_Pos_Attribute => 2126,
+      Iir_Kind_Val_Attribute => 2132,
+      Iir_Kind_Succ_Attribute => 2138,
+      Iir_Kind_Pred_Attribute => 2144,
+      Iir_Kind_Leftof_Attribute => 2150,
+      Iir_Kind_Rightof_Attribute => 2156,
+      Iir_Kind_Signal_Slew_Attribute => 2164,
+      Iir_Kind_Quantity_Slew_Attribute => 2172,
+      Iir_Kind_Ramp_Attribute => 2180,
+      Iir_Kind_Zoh_Attribute => 2188,
+      Iir_Kind_Ltf_Attribute => 2196,
+      Iir_Kind_Ztf_Attribute => 2206,
+      Iir_Kind_Dot_Attribute => 2213,
+      Iir_Kind_Integ_Attribute => 2220,
+      Iir_Kind_Above_Attribute => 2228,
+      Iir_Kind_Quantity_Delayed_Attribute => 2236,
+      Iir_Kind_Delayed_Attribute => 2245,
+      Iir_Kind_Stable_Attribute => 2254,
+      Iir_Kind_Quiet_Attribute => 2263,
+      Iir_Kind_Transaction_Attribute => 2272,
+      Iir_Kind_Event_Attribute => 2276,
+      Iir_Kind_Active_Attribute => 2280,
+      Iir_Kind_Last_Event_Attribute => 2284,
+      Iir_Kind_Last_Active_Attribute => 2288,
+      Iir_Kind_Last_Value_Attribute => 2292,
+      Iir_Kind_Driving_Attribute => 2296,
+      Iir_Kind_Driving_Value_Attribute => 2300,
+      Iir_Kind_Behavior_Attribute => 2300,
+      Iir_Kind_Structure_Attribute => 2300,
+      Iir_Kind_Simple_Name_Attribute => 2307,
+      Iir_Kind_Instance_Name_Attribute => 2312,
+      Iir_Kind_Path_Name_Attribute => 2317,
+      Iir_Kind_Left_Array_Attribute => 2324,
+      Iir_Kind_Right_Array_Attribute => 2331,
+      Iir_Kind_High_Array_Attribute => 2338,
+      Iir_Kind_Low_Array_Attribute => 2345,
+      Iir_Kind_Length_Array_Attribute => 2352,
+      Iir_Kind_Ascending_Array_Attribute => 2359,
+      Iir_Kind_Range_Array_Attribute => 2366,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2373,
+      Iir_Kind_Attribute_Name => 2382
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -12684,9 +12682,7 @@ package body Vhdl.Nodes_Meta is
    begin
       case K is
          when Iir_Kind_Psl_Assert_Directive
-           | Iir_Kind_Psl_Assume_Directive
-           | Iir_Kind_Psl_Cover_Directive
-           | Iir_Kind_Psl_Restrict_Directive =>
+           | Iir_Kind_Psl_Assume_Directive =>
             return True;
          when others =>
             return False;