aboutsummaryrefslogtreecommitdiffstats
path: root/src/vhdl/iirs.adb
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2016-09-01 06:26:39 +0200
committerTristan Gingold <tgingold@free.fr>2016-09-01 21:17:13 +0200
commit3d73c2660aa6e32d8976f5a73494c425bb9ce73f (patch)
tree56775e53f258675b0ea4dfbfcb5c212387ac65b1 /src/vhdl/iirs.adb
parent4e6853861f3809d45424b6eb372ccd91ed76f0cb (diff)
downloadghdl-3d73c2660aa6e32d8976f5a73494c425bb9ce73f.tar.gz
ghdl-3d73c2660aa6e32d8976f5a73494c425bb9ce73f.tar.bz2
ghdl-3d73c2660aa6e32d8976f5a73494c425bb9ce73f.zip
vhdl08: preliminary work for nested package and type association.
Diffstat (limited to 'src/vhdl/iirs.adb')
-rw-r--r--src/vhdl/iirs.adb19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb
index 05acf1b3a..72c645c2a 100644
--- a/src/vhdl/iirs.adb
+++ b/src/vhdl/iirs.adb
@@ -266,6 +266,7 @@ package body Iirs is
| Iir_Kind_Association_Element_By_Individual
| Iir_Kind_Association_Element_Open
| Iir_Kind_Association_Element_Package
+ | Iir_Kind_Association_Element_Type
| Iir_Kind_Choice_By_Others
| Iir_Kind_Choice_By_Expression
| Iir_Kind_Choice_By_Range
@@ -309,7 +310,6 @@ package body Iirs is
| Iir_Kind_Subtype_Declaration
| Iir_Kind_Nature_Declaration
| Iir_Kind_Subnature_Declaration
- | Iir_Kind_Package_Declaration
| Iir_Kind_Package_Body
| Iir_Kind_Configuration_Declaration
| Iir_Kind_Context_Declaration
@@ -477,6 +477,7 @@ package body Iirs is
| Iir_Kind_Floating_Subtype_Definition
| Iir_Kind_Subtype_Definition
| Iir_Kind_Scalar_Nature_Definition
+ | Iir_Kind_Package_Declaration
| Iir_Kind_Package_Instantiation_Declaration
| Iir_Kind_Entity_Declaration
| Iir_Kind_Architecture_Body
@@ -1700,7 +1701,7 @@ package body Iirs is
pragma Assert (Pkg /= Null_Iir);
pragma Assert (Has_Package_Body (Get_Kind (Pkg)),
"no field Package_Body");
- return Get_Field2 (Pkg);
+ return Get_Field5 (Pkg);
end Get_Package_Body;
procedure Set_Package_Body (Pkg : Iir; Decl : Iir) is
@@ -1708,7 +1709,7 @@ package body Iirs is
pragma Assert (Pkg /= Null_Iir);
pragma Assert (Has_Package_Body (Get_Kind (Pkg)),
"no field Package_Body");
- Set_Field2 (Pkg, Decl);
+ Set_Field5 (Pkg, Decl);
end Set_Package_Body;
function Get_Need_Body (Decl : Iir_Package_Declaration) return Boolean is
@@ -3787,7 +3788,7 @@ package body Iirs is
pragma Assert (Pkg /= Null_Iir);
pragma Assert (Has_Package_Header (Get_Kind (Pkg)),
"no field Package_Header");
- return Get_Field5 (Pkg);
+ return Get_Field6 (Pkg);
end Get_Package_Header;
procedure Set_Package_Header (Pkg : Iir; Header : Iir) is
@@ -3795,7 +3796,7 @@ package body Iirs is
pragma Assert (Pkg /= Null_Iir);
pragma Assert (Has_Package_Header (Get_Kind (Pkg)),
"no field Package_Header");
- Set_Field5 (Pkg, Header);
+ Set_Field6 (Pkg, Header);
end Set_Package_Header;
function Get_Block_Header (Target : Iir) return Iir is
@@ -3819,7 +3820,7 @@ package body Iirs is
pragma Assert (Inst /= Null_Iir);
pragma Assert (Has_Uninstantiated_Package_Name (Get_Kind (Inst)),
"no field Uninstantiated_Package_Name");
- return Get_Field5 (Inst);
+ return Get_Field7 (Inst);
end Get_Uninstantiated_Package_Name;
procedure Set_Uninstantiated_Package_Name (Inst : Iir; Name : Iir) is
@@ -3827,7 +3828,7 @@ package body Iirs is
pragma Assert (Inst /= Null_Iir);
pragma Assert (Has_Uninstantiated_Package_Name (Get_Kind (Inst)),
"no field Uninstantiated_Package_Name");
- Set_Field5 (Inst, Name);
+ Set_Field7 (Inst, Name);
end Set_Uninstantiated_Package_Name;
function Get_Generate_Block_Configuration (Target : Iir) return Iir is
@@ -4413,7 +4414,7 @@ package body Iirs is
pragma Assert (Target /= Null_Iir);
pragma Assert (Has_Actual_Type (Get_Kind (Target)),
"no field Actual_Type");
- return Get_Field3 (Target);
+ return Get_Field5 (Target);
end Get_Actual_Type;
procedure Set_Actual_Type (Target : Iir; Atype : Iir) is
@@ -4421,7 +4422,7 @@ package body Iirs is
pragma Assert (Target /= Null_Iir);
pragma Assert (Has_Actual_Type (Get_Kind (Target)),
"no field Actual_Type");
- Set_Field3 (Target, Atype);
+ Set_Field5 (Target, Atype);
end Set_Actual_Type;
function Get_Associated_Interface (Assoc : Iir) return Iir is