From c553937361b0b9f20b0445b75a296559911a3e53 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 3 Sep 2016 14:56:22 +0200
Subject: vcd,fst: avoid spurious error message for packages.

---
 src/grt/grt-fst.adb | 5 +++++
 src/grt/grt-vcd.adb | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'src/grt')

diff --git a/src/grt/grt-fst.adb b/src/grt/grt-fst.adb
index 7e912fe80..29bc5acad 100644
--- a/src/grt/grt-fst.adb
+++ b/src/grt/grt-fst.adb
@@ -510,6 +510,11 @@ package body Grt.Fst is
       end loop;
 
       --  Extract sub-scopes.
+      if Vhpi_Get_Kind (Inst) = VhpiPackInstK then
+         --  Except for packages
+         return;
+      end if;
+
       Vhpi_Iterator (VhpiInternalRegions, Inst, Decl_It, Error);
       if Error /= AvhpiErrorOk then
          Avhpi_Error (Error);
diff --git a/src/grt/grt-vcd.adb b/src/grt/grt-vcd.adb
index 4795a1879..95a724c76 100644
--- a/src/grt/grt-vcd.adb
+++ b/src/grt/grt-vcd.adb
@@ -568,6 +568,10 @@ package body Grt.Vcd is
       end loop;
 
       --  Extract sub-scopes.
+      if Vhpi_Get_Kind (Inst) = VhpiPackInstK then
+         --  Except for packages
+         return;
+      end if;
       Vhpi_Iterator (VhpiInternalRegions, Inst, Decl_It, Error);
       if Error /= AvhpiErrorOk then
          Avhpi_Error (Error);
-- 
cgit v1.2.3