aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-10-31 20:15:36 +0100
committerTristan Gingold <tgingold@free.fr>2017-10-31 20:15:36 +0100
commit1fca61c14c6b0e48029529986e8511d163f582a8 (patch)
tree95fc06f8502961fdf004f44dfff9dbef14c65ce0
parentebf624970db09eadb708caf732d05b2726ccbd00 (diff)
downloadghdl-1fca61c14c6b0e48029529986e8511d163f582a8.tar.gz
ghdl-1fca61c14c6b0e48029529986e8511d163f582a8.tar.bz2
ghdl-1fca61c14c6b0e48029529986e8511d163f582a8.zip
issue #450: also fix if-generate statement.
-rw-r--r--src/grt/grt-avhpi.adb7
-rw-r--r--testsuite/gna/issue450/disptree.ref2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/grt/grt-avhpi.adb b/src/grt/grt-avhpi.adb
index 99097eb48..065d64ef1 100644
--- a/src/grt/grt-avhpi.adb
+++ b/src/grt/grt-avhpi.adb
@@ -692,8 +692,7 @@ package body Grt.Avhpi is
| VhpiArchBodyK
| VhpiEntityDeclK
| VhpiProcessStmtK
- | VhpiBlockStmtK
- | VhpiIfGenerateK =>
+ | VhpiBlockStmtK =>
Add (To_Ghdl_Rtin_Block_Acc (Obj.Ctxt.Block).Name);
when VhpiRootInstK =>
declare
@@ -709,6 +708,10 @@ package body Grt.Avhpi is
| VhpiPortDeclK
| VhpiGenericDeclK =>
Add (Obj.Obj.Name);
+ when VhpiIfGenerateK =>
+ Add (To_Ghdl_Rtin_Generate_Acc
+ (To_Ghdl_Rtin_Block_Acc
+ (Obj.Ctxt.Block).Parent).Name);
when VhpiForGenerateK =>
declare
Blk : constant Ghdl_Rtin_Block_Acc :=
diff --git a/testsuite/gna/issue450/disptree.ref b/testsuite/gna/issue450/disptree.ref
index 97ec2f6b4..0984892a5 100644
--- a/testsuite/gna/issue450/disptree.ref
+++ b/testsuite/gna/issue450/disptree.ref
@@ -16,4 +16,4 @@ Simple module name (vpiName): gen_for(3)
Full module name (vpiFullName): disptree.gen_for(4)
Simple module name (vpiName): gen_for(4)
Full module name (vpiFullName): disptree.gen_if
-Simple module name (vpiName): B1
+Simple module name (vpiName): gen_if