From b76ff335a807be97a79e272b5e9bf08a99d3d8d6 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Fri, 10 May 2019 21:43:00 +0200
Subject: vhdl: decouple errorouts a bit more.

---
 src/psl/psl-errors.adb | 13 ++++++++++++-
 src/psl/psl-errors.ads |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/psl')

diff --git a/src/psl/psl-errors.adb b/src/psl/psl-errors.adb
index a71b18e86..a4bd0980c 100644
--- a/src/psl/psl-errors.adb
+++ b/src/psl/psl-errors.adb
@@ -20,6 +20,17 @@ with Errorout; use Errorout;
 with PSL.Nodes;
 
 package body PSL.Errors is
+   function "+" (L : PSL_Node) return Location_Type
+   is
+      use PSL.Nodes;
+   begin
+      if L = Null_Node then
+         return No_Location;
+      else
+         return PSL.Nodes.Get_Location (L);
+      end if;
+   end "+";
+
    procedure Error_Kind (Msg : String; N : PSL_Node) is
    begin
       Log (Msg);
@@ -30,6 +41,6 @@ package body PSL.Errors is
 
    procedure Error_Msg_Sem (Msg: String; Loc : PSL_Node) is
    begin
-      Report_Msg (Msgid_Error, Semantic, +Loc, Msg, No_Eargs, False);
+      Report_Msg (Msgid_Error, Semantic, +(+Loc), Msg, No_Eargs, False);
    end Error_Msg_Sem;
 end PSL.Errors;
diff --git a/src/psl/psl-errors.ads b/src/psl/psl-errors.ads
index bbc571624..f197a8928 100644
--- a/src/psl/psl-errors.ads
+++ b/src/psl/psl-errors.ads
@@ -20,6 +20,8 @@ with Files_Map;
 with PSL.Types; use PSL.Types;
 
 package PSL.Errors is
+   function "+" (L : PSL.Types.PSL_Node) return Location_Type;
+
    function Image (Loc : Location_Type; Filename : Boolean := True)
                   return String renames Files_Map.Image;
 
-- 
cgit v1.2.3