std_names: add async_abort and sync_abort. For #1654

3 files changed, 40 insertions, 36 deletions

diff --git a/src/std_names.adb b/src/std_names.adb
index 1a3fcbe94..a8218aa3d 100644
--- a/src/std_names.adb
+++ b/src/std_names.adb
@@ -808,8 +808,8 @@ package body Std_Names is
       Def ("ag",                 Name_Ag);
       Def ("ax",                 Name_Ax);
       Def ("abort",              Name_Abort);
-      Def ("assume",             Name_Assume);
       Def ("assume_guarantee",   Name_Assume_Guarantee);
+      Def ("async_abort",        Name_Async_Abort);
       Def ("before",             Name_Before);
       Def ("clock",              Name_Clock);
       Def ("const",              Name_Const);
@@ -837,6 +837,7 @@ package body Std_Names is
       Def ("prev",               Name_Prev);
       Def ("rose",               Name_Rose);
       Def ("strong",             Name_Strong);
+      Def ("sync_abort",         Name_Sync_Abort);
       Def ("union",              Name_Union);
       Def ("w",                  Name_W);
       Def ("whilenot",           Name_Whilenot);
diff --git a/src/std_names.ads b/src/std_names.ads
index 281a26f64..8c903019a 100644
--- a/src/std_names.ads
+++ b/src/std_names.ads
@@ -943,50 +943,52 @@ package Std_Names is
    --  Name_And
    --  Name_Assume
    Name_Assume_Guarantee :   constant Name_Id := Name_First_PSL + 05;
-   Name_Before :             constant Name_Id := Name_First_PSL + 06;
+   Name_Async_Abort :        constant Name_Id := Name_First_PSL + 06;
+   Name_Before :             constant Name_Id := Name_First_PSL + 07;
    --  Name_Boolean
-   Name_Clock :              constant Name_Id := Name_First_PSL + 07;
+   Name_Clock :              constant Name_Id := Name_First_PSL + 08;
    --  Name_Const
    --  Name_Cover
    --  Name_Default
-   Name_E :                  constant Name_Id := Name_First_PSL + 08;
-   Name_Ef :                 constant Name_Id := Name_First_PSL + 09;
-   Name_Eg :                 constant Name_Id := Name_First_PSL + 10;
-   Name_Ex :                 constant Name_Id := Name_First_PSL + 11;
-   Name_Endpoint :           constant Name_Id := Name_First_PSL + 12;
-   Name_Eventually :         constant Name_Id := Name_First_PSL + 13;
-   Name_Fairness :           constant Name_Id := Name_First_PSL + 14;
-   Name_Fell :               constant Name_Id := Name_First_PSL + 15;
-   Name_Forall :             constant Name_Id := Name_First_PSL + 16;
-   Name_G :                  constant Name_Id := Name_First_PSL + 17;
+   Name_E :                  constant Name_Id := Name_First_PSL + 09;
+   Name_Ef :                 constant Name_Id := Name_First_PSL + 10;
+   Name_Eg :                 constant Name_Id := Name_First_PSL + 11;
+   Name_Ex :                 constant Name_Id := Name_First_PSL + 12;
+   Name_Endpoint :           constant Name_Id := Name_First_PSL + 13;
+   Name_Eventually :         constant Name_Id := Name_First_PSL + 14;
+   Name_Fairness :           constant Name_Id := Name_First_PSL + 15;
+   Name_Fell :               constant Name_Id := Name_First_PSL + 16;
+   Name_Forall :             constant Name_Id := Name_First_PSL + 17;
+   Name_G :                  constant Name_Id := Name_First_PSL + 18;
    --  Name_In
-   Name_Inf :                constant Name_Id := Name_First_PSL + 18;
-   Name_Inherit :            constant Name_Id := Name_First_PSL + 19;
+   Name_Inf :                constant Name_Id := Name_First_PSL + 19;
+   Name_Inherit :            constant Name_Id := Name_First_PSL + 20;
    --  Name_Is
-   Name_Never :              constant Name_Id := Name_First_PSL + 20;
+   Name_Never :              constant Name_Id := Name_First_PSL + 21;
    --  Name_Next
-   Name_Next_A :             constant Name_Id := Name_First_PSL + 21;
-   Name_Next_E :             constant Name_Id := Name_First_PSL + 22;
-   Name_Next_Event :         constant Name_Id := Name_First_PSL + 23;
-   Name_Next_Event_A :       constant Name_Id := Name_First_PSL + 24;
-   Name_Next_Event_E :       constant Name_Id := Name_First_PSL + 25;
+   Name_Next_A :             constant Name_Id := Name_First_PSL + 22;
+   Name_Next_E :             constant Name_Id := Name_First_PSL + 23;
+   Name_Next_Event :         constant Name_Id := Name_First_PSL + 24;
+   Name_Next_Event_A :       constant Name_Id := Name_First_PSL + 25;
+   Name_Next_Event_E :       constant Name_Id := Name_First_PSL + 26;
    --  Name_Not
    --  Name_Or
    --  Name_Property
-   Name_Onehot :             constant Name_Id := Name_First_PSL + 26;
-   Name_Onehot0 :            constant Name_Id := Name_First_PSL + 27;
-   Name_Prev :               constant Name_Id := Name_First_PSL + 28;
+   Name_Onehot :             constant Name_Id := Name_First_PSL + 27;
+   Name_Onehot0 :            constant Name_Id := Name_First_PSL + 28;
+   Name_Prev :               constant Name_Id := Name_First_PSL + 29;
    --  Name_Restrict
    --  Name_Restrict_Guarantee
-   Name_Rose :               constant Name_Id := Name_First_PSL + 29;
+   Name_Rose :               constant Name_Id := Name_First_PSL + 30;
    --   sequence
-   Name_Strong :             constant Name_Id := Name_First_PSL + 30;
+   Name_Strong :             constant Name_Id := Name_First_PSL + 31;
+   Name_Sync_Abort :         constant Name_Id := Name_First_PSL + 32;
    --   union
    --   until
-   Name_W :                  constant Name_Id := Name_First_PSL + 31;
-   Name_Whilenot :           constant Name_Id := Name_First_PSL + 32;
-   Name_Within :             constant Name_Id := Name_First_PSL + 33;
-   Name_X :                  constant Name_Id := Name_First_PSL + 34;
+   Name_W :                  constant Name_Id := Name_First_PSL + 33;
+   Name_Whilenot :           constant Name_Id := Name_First_PSL + 34;
+   Name_Within :             constant Name_Id := Name_First_PSL + 35;
+   Name_X :                  constant Name_Id := Name_First_PSL + 36;
    Name_Last_PSL :           constant Name_Id := Name_X;
 
    subtype Name_Id_PSL_Keywords is
diff --git a/src/vhdl/Makefile b/src/vhdl/Makefile
index 364708efe..a76cb68de 100644
--- a/src/vhdl/Makefile
+++ b/src/vhdl/Makefile
@@ -20,6 +20,7 @@
 
 PNODES=../../scripts/pnodes.py
 PNODESPY=../../scripts/pnodespy.py
+PYTHON=python
 
 DEPS=vhdl-nodes.ads vhdl-nodes.adb.in $(PNODES)
 
@@ -79,37 +80,37 @@ vhdl-elocations_meta.adb: vhdl-elocations_meta.adb.in vhdl-elocations.ads $(DEPS
 ../../pyGHDL/libghdl/vhdl/nodes.py: $(DEPS) $(PNODESPY)
 	$(RM) $@
 	$(PNODESPY) $(NODES_FLAGS) libghdl-nodes > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 ../../pyGHDL/libghdl/vhdl/nodes_meta.py: $(DEPS) $(PNODESPY)
 	$(RM) $@
 	$(PNODESPY) $(NODES_FLAGS) libghdl-meta > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 ../../pyGHDL/libghdl/std_names.py: $(PNODESPY) ../std_names.ads
 	$(RM) $@
 	$(PNODESPY) $(NODES_FLAGS) libghdl-names > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 ../../pyGHDL/libghdl/vhdl/tokens.py: $(PNODESPY) vhdl-tokens.ads
 	$(RM) $@
 	$(PNODESPY) $(NODES_FLAGS) libghdl-tokens > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 ../../pyGHDL/libghdl/vhdl/elocations.py: $(PNODESPY) vhdl-elocations.ads
 	$(RM) $@
 	$(PNODESPY) $(ELOCATIONS_FLAGS) libghdl-elocs > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 ../../pyGHDL/libghdl/errorout.py: $(PNODESPY) ../errorout.ads
 	$(RM) $@
 	$(PNODESPY) $(ELOCATIONS_FLAGS) libghdl-errorout > $@
-	python -m black $@
+	$(PYTHON) -m black $@
 	chmod -w $@
 
 clean: