diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-12-29 18:59:03 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-12-29 18:59:03 +0100 |
| commit | 2d835b7e171093b894aae52f54e1b3cfd373a5fe (patch) | |
| tree | 0892083c287ad706cc7826e1cdd9574f44451e80 /src/vhdl | |
| parent | 67557e4b9edfe08fc4dfabec790a8301e06762fd (diff) | |
| download | ghdl-2d835b7e171093b894aae52f54e1b3cfd373a5fe.tar.gz ghdl-2d835b7e171093b894aae52f54e1b3cfd373a5fe.tar.bz2 ghdl-2d835b7e171093b894aae52f54e1b3cfd373a5fe.zip | |
vhdl-ams: fix tree consistency for subnature declaration.
Also fix use and canon for it.
Diffstat (limited to 'src/vhdl')
| -rw-r--r-- | src/vhdl/vhdl-canon.adb | 3 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes.ads | 8 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes_meta.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/vhdl-sem_scopes.adb | 5 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb index 48e18e3ed..95fe700d4 100644 --- a/src/vhdl/vhdl-canon.adb +++ b/src/vhdl/vhdl-canon.adb @@ -3045,7 +3045,8 @@ package body Vhdl.Canon is when Iir_Kind_Signal_Attribute_Declaration => null; - when Iir_Kind_Nature_Declaration => + when Iir_Kind_Nature_Declaration + | Iir_Kind_Subnature_Declaration => null; when Iir_Kind_Terminal_Declaration => null; diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index 33663e01c..4ea591e52 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -1316,14 +1316,14 @@ package Vhdl.Nodes is -- -- Get/Set_Parent (Field0) -- - -- Get/Set_Nature (Field1) - -- - -- Get/Set_Chain (Field2) - -- -- Get/Set_Identifier (Field3) -- -- Get/Set_Subnature_Indication (Field5) -- + -- Get/Set_Nature (Field1) + -- + -- Get/Set_Chain (Field2) + -- -- Get/Set_Visible_Flag (Flag4) -- -- Get/Set_Use_Flag (Flag6) diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb index a602b5c69..6ba34e060 100644 --- a/src/vhdl/vhdl-nodes_meta.adb +++ b/src/vhdl/vhdl-nodes_meta.adb @@ -3192,9 +3192,9 @@ package body Vhdl.Nodes_Meta is Field_Visible_Flag, Field_Use_Flag, Field_Parent, + Field_Subnature_Indication, Field_Nature, Field_Chain, - Field_Subnature_Indication, -- Iir_Kind_Package_Header Field_Generic_Chain, Field_Generic_Map_Aspect_Chain, diff --git a/src/vhdl/vhdl-sem_scopes.adb b/src/vhdl/vhdl-sem_scopes.adb index 3e4633a58..c7c2c5f7c 100644 --- a/src/vhdl/vhdl-sem_scopes.adb +++ b/src/vhdl/vhdl-sem_scopes.adb @@ -1018,9 +1018,8 @@ package body Vhdl.Sem_Scopes is | Iir_Kind_Group_Template_Declaration | Iir_Kind_Group_Declaration | Iir_Kind_Nature_Declaration - | Iir_Kind_Free_Quantity_Declaration - | Iir_Kind_Through_Quantity_Declaration - | Iir_Kind_Across_Quantity_Declaration + | Iir_Kind_Subnature_Declaration + | Iir_Kinds_Quantity_Declaration | Iir_Kind_Terminal_Declaration | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration |