From 44271e7075bf261f3b6e9c385bbcfb14b32c6b41 Mon Sep 17 00:00:00 2001 From: Ondrej Ille Date: Tue, 6 Apr 2021 20:00:01 +0200 Subject: src: grt-utils. Fix path look-up fo PSL RTis since they now have Parent. --- src/grt/grt-rtis_addr.adb | 3 ++- src/grt/grt-rtis_utils.adb | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/grt/grt-rtis_addr.adb b/src/grt/grt-rtis_addr.adb index 4845c1301..25b0c64a9 100644 --- a/src/grt/grt-rtis_addr.adb +++ b/src/grt/grt-rtis_addr.adb @@ -56,7 +56,8 @@ package body Grt.Rtis_Addr is begin case Ctxt.Block.Kind is when Ghdl_Rtik_Process - | Ghdl_Rtik_Block => + | Ghdl_Rtik_Block + | Ghdl_Rtiks_Psl => return (Base => Ctxt.Base - Blk.Loc, Block => Blk.Parent); when Ghdl_Rtik_Architecture => diff --git a/src/grt/grt-rtis_utils.adb b/src/grt/grt-rtis_utils.adb index 159779d7c..636a0c9e3 100644 --- a/src/grt/grt-rtis_utils.adb +++ b/src/grt/grt-rtis_utils.adb @@ -753,14 +753,12 @@ package body Grt.Rtis_Utils is end; when Ghdl_Rtiks_Psl => declare - Obj : constant Ghdl_Rtin_Object_Acc := - To_Ghdl_Rtin_Object_Acc(Ctxt.Block); + Psl_Directive : constant Ghdl_Rtin_Psl_Directive_Acc := + To_Ghdl_Rtin_Psl_Directive_Acc(Ctxt.Block); begin - -- Ghdl_Rtin_Object does not have parents, therefore we cant - -- trace back through the hierarchy. Put only assertion name - -- and exit the loop - Prepend (Rstr, Obj.Name); - exit; + Prepend (Rstr, Psl_Directive.Name); + Prepend (Rstr, Sep); + Ctxt := Get_Parent_Context (Ctxt); end; when others => -- cgit v1.2.3