From 31bc032b8271745753a47a054ed5cc6c248befb4 Mon Sep 17 00:00:00 2001
From: tmeissner <programming@goodcleanfun.de>
Date: Sat, 15 Nov 2014 03:02:40 +0100
Subject: [PATCH] add overloaded versions of all assert procedures with report
 string parameter added

---
 sim/AssertP.vhd | 93 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 83 insertions(+), 10 deletions(-)

diff --git a/sim/AssertP.vhd b/sim/AssertP.vhd
index 50b5a0c..509e299 100644
--- a/sim/AssertP.vhd
+++ b/sim/AssertP.vhd
@@ -8,15 +8,25 @@ use work.StringP.all;
 package AssertP is
 
 
-  procedure assert_true    (a : boolean);
-  procedure assert_false   (a : boolean);
+  procedure assert_true (a : in boolean);
+  procedure assert_true (a : in boolean; str : in string);
 
-  procedure assert_equal   (a : in integer; b : in integer);
-  procedure assert_equal   (a : in std_logic_vector; b : in std_logic_vector);
-  procedure assert_equal   (a : in string; b : in string);
+  procedure assert_false (a : in boolean);
+  procedure assert_false (a : in boolean; str : in string);
+
+  procedure assert_equal (a : in integer; b : in integer);
+  procedure assert_equal (a : in integer; b : in integer; str : in string);
+  procedure assert_equal (a : in std_logic_vector; b : in std_logic_vector);
+  procedure assert_equal (a : in std_logic_vector; b : in std_logic_vector; str : in string);
+  procedure assert_equal (a : in string; b : in string);
+  procedure assert_equal (a : in string; b : in string; str : in string);
 
   procedure assert_unequal (a : in integer; b : in integer);
+  procedure assert_unequal (a : in integer; b : in integer; str : in string);
   procedure assert_unequal (a : in std_logic_vector; b : in std_logic_vector);
+  procedure assert_unequal (a : in std_logic_vector; b : in std_logic_vector; str : in string);
+  procedure assert_unequal (a : in string; b : in string);
+  procedure assert_unequal (a : in string; b : in string; str : in string);
 
 
 end package AssertP;
@@ -26,20 +36,34 @@ end package AssertP;
 package body AssertP is
 
 
-  procedure assert_true (a : boolean) is
+  procedure assert_true (a : in boolean) is
   begin
     assert a
       report "FAILURE: a should be evaluate to true"
       severity failure;
   end procedure assert_true;
 
-  procedure assert_false (a : boolean) is
+  procedure assert_true (a : in boolean; str : in string) is
+  begin
+    assert a
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_true;
+
+  procedure assert_false (a : in boolean) is
   begin
     assert not(a)
       report "FAILURE: a should be evaluate to false"
       severity failure;
   end procedure assert_false;
 
+  procedure assert_false (a : in boolean; str : in string) is
+  begin
+    assert not(a)
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_false;
+
   procedure assert_equal (a : in integer; b : in integer) is
   begin
     assert a = b
@@ -47,6 +71,13 @@ package body AssertP is
       severity failure;
   end procedure assert_equal;
 
+  procedure assert_equal (a : in integer; b : in integer; str : in string) is
+  begin
+    assert a = b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_equal;
+
   procedure assert_equal (a : in std_logic_vector; b : in std_logic_vector) is
   begin
     assert a = b
@@ -54,13 +85,27 @@ package body AssertP is
       severity failure;
   end procedure assert_equal;
 
-   procedure assert_equal (a : in string; b : in string) is
-   begin
+  procedure assert_equal (a : in std_logic_vector; b : in std_logic_vector; str : in string) is
+  begin
+    assert a = b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_equal;
+
+  procedure assert_equal (a : in string; b : in string) is
+  begin
     assert a = b
       report "FAILURE: " & a & " should be equal to " & b
       severity failure;
   end procedure assert_equal;
 
+  procedure assert_equal (a : in string; b : in string; str : in string) is
+  begin
+    assert a = b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_equal;
+
   procedure assert_unequal (a : in integer; b : in integer) is
   begin
     assert a /= b
@@ -68,6 +113,13 @@ package body AssertP is
       severity failure;
   end procedure assert_unequal;
 
+  procedure assert_unequal (a : in integer; b : in integer; str : in string) is
+  begin
+    assert a /= b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_unequal;
+
   procedure assert_unequal (a : in std_logic_vector; b : in std_logic_vector) is
   begin
     assert a /= b
@@ -75,5 +127,26 @@ package body AssertP is
       severity failure;
   end procedure assert_unequal;
 
+  procedure assert_unequal (a : in std_logic_vector; b : in std_logic_vector; str : in string) is
+  begin
+    assert a /= b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_unequal;
+
+  procedure assert_unequal (a : in string; b : in string) is
+   begin
+    assert a /= b
+      report "FAILURE: " & a & " should be unequal to " & b
+      severity failure;
+  end procedure assert_unequal;
+
+  procedure assert_unequal (a : in string; b : in string; str : in string) is
+   begin
+    assert a /= b
+      report "FAILURE: " & str
+      severity failure;
+  end procedure assert_unequal;
+
 
-end package body AssertP;
\ No newline at end of file
+end package body AssertP;