diff options
| -rw-r--r-- | pyGHDL/libghdl/std_names.py | 106 | ||||
| -rw-r--r-- | src/std_names.adb | 3 | ||||
| -rw-r--r-- | src/std_names.ads | 60 | ||||
| -rw-r--r-- | src/vhdl/Makefile | 13 |
4 files changed, 94 insertions, 88 deletions
diff --git a/pyGHDL/libghdl/std_names.py b/pyGHDL/libghdl/std_names.py index 656f54f06..96027778a 100644 --- a/pyGHDL/libghdl/std_names.py +++ b/pyGHDL/libghdl/std_names.py @@ -768,55 +768,57 @@ class Name: Ax = 959 Abort = 960 Assume_Guarantee = 961 - Before = 962 - Clock = 963 - E = 964 - Ef = 965 - Eg = 966 - Ex = 967 - Endpoint = 968 - Eventually = 969 - Fairness = 970 - Fell = 971 - Forall = 972 - G = 973 - Inf = 974 - Inherit = 975 - Never = 976 - Next_A = 977 - Next_E = 978 - Next_Event = 979 - Next_Event_A = 980 - Next_Event_E = 981 - Onehot = 982 - Onehot0 = 983 - Prev = 984 - Rose = 985 - Strong = 986 - W = 987 - Whilenot = 988 - Within = 989 - X = 990 - Last_PSL = 990 - First_Edif = 991 - Celltype = 1001 - View = 1002 - Viewtype = 1003 - Direction = 1004 - Contents = 1005 - Net = 1006 - Viewref = 1007 - Cellref = 1008 - Libraryref = 1009 - Portinstance = 1010 - Joined = 1011 - Portref = 1012 - Instanceref = 1013 - Design = 1014 - Designator = 1015 - Owner = 1016 - Member = 1017 - Number = 1018 - Rename = 1019 - Userdata = 1020 - Last_Edif = 1020 + Async_Abort = 962 + Before = 963 + Clock = 964 + E = 965 + Ef = 966 + Eg = 967 + Ex = 968 + Endpoint = 969 + Eventually = 970 + Fairness = 971 + Fell = 972 + Forall = 973 + G = 974 + Inf = 975 + Inherit = 976 + Never = 977 + Next_A = 978 + Next_E = 979 + Next_Event = 980 + Next_Event_A = 981 + Next_Event_E = 982 + Onehot = 983 + Onehot0 = 984 + Prev = 985 + Rose = 986 + Strong = 987 + Sync_Abort = 988 + W = 989 + Whilenot = 990 + Within = 991 + X = 992 + Last_PSL = 992 + First_Edif = 993 + Celltype = 1003 + View = 1004 + Viewtype = 1005 + Direction = 1006 + Contents = 1007 + Net = 1008 + Viewref = 1009 + Cellref = 1010 + Libraryref = 1011 + Portinstance = 1012 + Joined = 1013 + Portref = 1014 + Instanceref = 1015 + Design = 1016 + Designator = 1017 + Owner = 1018 + Member = 1019 + Number = 1020 + Rename = 1021 + Userdata = 1022 + Last_Edif = 1022 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: |