diff options
| -rw-r--r-- | pyGHDL/libghdl/vhdl/nodes.py | 16 | ||||
| -rw-r--r-- | src/vhdl/vhdl-elocations.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes.ads | 12 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes_meta.adb | 28 |
5 files changed, 38 insertions, 22 deletions
diff --git a/pyGHDL/libghdl/vhdl/nodes.py b/pyGHDL/libghdl/vhdl/nodes.py index 0caa521f6..79b0fd803 100644 --- a/pyGHDL/libghdl/vhdl/nodes.py +++ b/pyGHDL/libghdl/vhdl/nodes.py @@ -339,8 +339,8 @@ class Iir_Kind(IntEnum): Ztf_Attribute = 292 Dot_Attribute = 293 Integ_Attribute = 294 - Above_Attribute = 295 - Quantity_Delayed_Attribute = 296 + Quantity_Delayed_Attribute = 295 + Above_Attribute = 296 Delayed_Attribute = 297 Stable_Attribute = 298 Quiet_Attribute = 299 @@ -818,8 +818,8 @@ class Iir_Kinds: Iir_Kind.Ztf_Attribute, Iir_Kind.Dot_Attribute, Iir_Kind.Integ_Attribute, - Iir_Kind.Above_Attribute, Iir_Kind.Quantity_Delayed_Attribute, + Iir_Kind.Above_Attribute, Iir_Kind.Delayed_Attribute, Iir_Kind.Stable_Attribute, Iir_Kind.Quiet_Attribute, @@ -872,8 +872,8 @@ class Iir_Kinds: Iir_Kind.Ztf_Attribute, Iir_Kind.Dot_Attribute, Iir_Kind.Integ_Attribute, - Iir_Kind.Above_Attribute, Iir_Kind.Quantity_Delayed_Attribute, + Iir_Kind.Above_Attribute, Iir_Kind.Delayed_Attribute, Iir_Kind.Stable_Attribute, Iir_Kind.Quiet_Attribute, @@ -946,6 +946,14 @@ class Iir_Kinds: Iir_Kind.Transaction_Attribute, ] + AMS_Signal_Attribute = [ + Iir_Kind.Above_Attribute, + Iir_Kind.Delayed_Attribute, + Iir_Kind.Stable_Attribute, + Iir_Kind.Quiet_Attribute, + Iir_Kind.Transaction_Attribute, + ] + Signal_Value_Attribute = [ Iir_Kind.Event_Attribute, Iir_Kind.Active_Attribute, diff --git a/src/vhdl/vhdl-elocations.adb b/src/vhdl/vhdl-elocations.adb index b428c4fab..11f4a87d2 100644 --- a/src/vhdl/vhdl-elocations.adb +++ b/src/vhdl/vhdl-elocations.adb @@ -429,8 +429,8 @@ package body Vhdl.Elocations is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb index b2946d62c..0671e3f35 100644 --- a/src/vhdl/vhdl-nodes.adb +++ b/src/vhdl/vhdl-nodes.adb @@ -1215,8 +1215,8 @@ package body Vhdl.Nodes is | Iir_Kind_Rightof_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index 4a9fc797f..9dee8320a 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -5205,8 +5205,8 @@ package Vhdl.Nodes is Iir_Kind_Ztf_Attribute, Iir_Kind_Dot_Attribute, Iir_Kind_Integ_Attribute, - Iir_Kind_Above_Attribute, Iir_Kind_Quantity_Delayed_Attribute, + Iir_Kind_Above_Attribute, Iir_Kind_Delayed_Attribute, -- signal_attribute Iir_Kind_Stable_Attribute, -- signal_attribute Iir_Kind_Quiet_Attribute, -- signal_attribute @@ -6944,8 +6944,8 @@ package Vhdl.Nodes is --Iir_Kind_Ztf_Attribute --Iir_Kind_Dot_Attribute --Iir_Kind_Integ_Attribute - --Iir_Kind_Above_Attribute --Iir_Kind_Quantity_Delayed_Attribute + --Iir_Kind_Above_Attribute --Iir_Kind_Delayed_Attribute --Iir_Kind_Stable_Attribute --Iir_Kind_Quiet_Attribute @@ -7016,6 +7016,14 @@ package Vhdl.Nodes is --Iir_Kind_Quiet_Attribute Iir_Kind_Transaction_Attribute; + -- Same as Iir_Kinds_Signal_Attribute but with 'Above. + subtype Iir_Kinds_AMS_Signal_Attribute is Iir_Kind range + Iir_Kind_Above_Attribute .. + --Iir_Kind_Delayed_Attribute + --Iir_Kind_Stable_Attribute + --Iir_Kind_Quiet_Attribute + Iir_Kind_Transaction_Attribute; + subtype Iir_Kinds_Signal_Value_Attribute is Iir_Kind range Iir_Kind_Event_Attribute .. --Iir_Kind_Active_Attribute diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb index 81b66f3a3..789bdbacb 100644 --- a/src/vhdl/vhdl-nodes_meta.adb +++ b/src/vhdl/vhdl-nodes_meta.adb @@ -1751,10 +1751,10 @@ package body Vhdl.Nodes_Meta is return "dot_attribute"; when Iir_Kind_Integ_Attribute => return "integ_attribute"; - when Iir_Kind_Above_Attribute => - return "above_attribute"; when Iir_Kind_Quantity_Delayed_Attribute => return "quantity_delayed_attribute"; + when Iir_Kind_Above_Attribute => + return "above_attribute"; when Iir_Kind_Delayed_Attribute => return "delayed_attribute"; when Iir_Kind_Stable_Attribute => @@ -5099,7 +5099,7 @@ package body Vhdl.Nodes_Meta is Field_Attr_Chain, Field_Signal_Attribute_Declaration, Field_Base_Name, - -- Iir_Kind_Above_Attribute + -- Iir_Kind_Quantity_Delayed_Attribute Field_Expr_Staticness, Field_Name_Staticness, Field_Prefix, @@ -5108,7 +5108,7 @@ package body Vhdl.Nodes_Meta is Field_Signal_Attribute_Declaration, Field_Parameter, Field_Base_Name, - -- Iir_Kind_Quantity_Delayed_Attribute + -- Iir_Kind_Above_Attribute Field_Expr_Staticness, Field_Name_Staticness, Field_Prefix, @@ -5587,8 +5587,8 @@ package body Vhdl.Nodes_Meta is Iir_Kind_Ztf_Attribute => 2221, Iir_Kind_Dot_Attribute => 2228, Iir_Kind_Integ_Attribute => 2235, - Iir_Kind_Above_Attribute => 2243, - Iir_Kind_Quantity_Delayed_Attribute => 2251, + Iir_Kind_Quantity_Delayed_Attribute => 2243, + Iir_Kind_Above_Attribute => 2251, Iir_Kind_Delayed_Attribute => 2260, Iir_Kind_Stable_Attribute => 2269, Iir_Kind_Quiet_Attribute => 2278, @@ -8844,8 +8844,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -9056,8 +9056,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11326,8 +11326,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11583,8 +11583,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11654,8 +11654,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11786,8 +11786,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Zoh_Attribute | Iir_Kind_Ltf_Attribute | Iir_Kind_Ztf_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11842,8 +11842,8 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Ztf_Attribute | Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute @@ -11859,8 +11859,8 @@ package body Vhdl.Nodes_Meta is case K is when Iir_Kind_Dot_Attribute | Iir_Kind_Integ_Attribute - | Iir_Kind_Above_Attribute | Iir_Kind_Quantity_Delayed_Attribute + | Iir_Kind_Above_Attribute | Iir_Kind_Delayed_Attribute | Iir_Kind_Stable_Attribute | Iir_Kind_Quiet_Attribute |