From dbf68a99e8ecab30fd35dd09b3d8fffdc4653c0d Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Thu, 30 May 2024 22:54:40 -0400
Subject: [PATCH] Tests: SHow expected values in t_typenames

---
 test_regress/t/t_typename.out | 35 ++++++++++++++--------------
 test_regress/t/t_typename.v   | 43 +++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/test_regress/t/t_typename.out b/test_regress/t/t_typename.out
index eb142c48a..2f19076dc 100644
--- a/test_regress/t/t_typename.out
+++ b/test_regress/t/t_typename.out
@@ -1,19 +1,20 @@
-real
-int
-int
-logic
-string
-real
-logic
-bit
-bit[2:0]
-bit$[3:2]
-bit$[3:1][4:5]
+"real" ==? "real"
+"bit" ==? "bit"
+"int" ==? "int"
+"logic" ==? "logic"
+"string" ==? "string"
+"real" ==? "real"
+"logic" ==? "logic"
+"bit" ==? "bit"
+"bit[2:0]" ==? "bit[2:0]"
+"bit$[3:2]" ==? "bit$[3:2]"
+"bit$[3:1][4:5]" ==? "bit$[3:1][4:5]"
 
-bit
-bit[2:0]
-int
-A::__typeimpenum1
-bit[9:1]
-STRUCTDTYPE 't.AB_t'$[0:9]
+"bit" ==? "bit"
+"bit[2:0]" ==? "bit[2:0]"
+"int" ==? "int"
+"bit[9:1]" ==? "bit[9:1]"
+"A::__typeimpenum1" ==? "enum{A=32'sd0,B=32'sd1,C=32'sd99}A::<unspecified>"
+"STRUCTDTYPE 't.AB_t'" ==? "struct{bit A;bit B;}"
+"STRUCTDTYPE 't.AB_t'$[0:9]" ==? "struct{bit A;bit B;}top.AB_t$[0:9]"
 *-* All Finished *-*
diff --git a/test_regress/t/t_typename.v b/test_regress/t/t_typename.v
index eb42d6e73..e231fcda8 100644
--- a/test_regress/t/t_typename.v
+++ b/test_regress/t/t_typename.v
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 
-`define printtype(mytype) $write({$typename(mytype), "\n"});
+`define printtype(mytype, expec) $write({"\"", $typename(mytype), "\" ==? \"", expec, "\"\n"});
 
 // Copied from 20.6.1 Type name function in IEEE 1800-2017
 // source code // $typename would return
@@ -35,33 +35,36 @@ module t(/*AUTOARG*/);
    mybit_t bitu32 [3:2];
    mybit_t bitu31 [3:1][4:5];
 
-
-   // from LRM
+   // From LRM
    typedef struct {node A,B;} AB_t;
    AB_t AB[10]; // "struct{bit A;bit B;}top.AB_t$[0:9]"
 
    initial begin
       // $write({$typename(real), "\n"});
-      `printtype(real);
-      `printtype(int);
-      `printtype(int);
-      `printtype(logic);
-      `printtype(string);
-      `printtype(r);
-      `printtype(l);
-      `printtype(mybit_t);
-      `printtype(bitp20);
-      `printtype(bitu32);
-      `printtype(bitu31);
+      `printtype(real, "real");
+      `printtype(bit, "bit");
+      `printtype(int, "int");
+      `printtype(logic, "logic");
+      `printtype(string, "string");
+      `printtype(r, "real");
+      `printtype(l, "logic");
+      `printtype(mybit_t, "bit");
+      `printtype(bitp20, "bit[2:0]");
+      `printtype(bitu32, "bit$[3:2]");
+      `printtype(bitu31, "bit$[3:1][4:5]");
 
       $write("\n");
       // from LRM
-      `printtype(node); // bit
-      `printtype(X); // bit [2:0]
-      `printtype(Y); // int
-      `printtype(A::X); // enum{A=32'sd0,B=32'sd1,C=32'sd99}A::e$1
-      `printtype(A::word); // A::bit[9:1]
-      `printtype(AB); // struct{bit A;bit B;}top.AB_t$[0:9]
+      `printtype(node, "bit");
+      `printtype(X, "bit[2:0]");
+      `printtype(Y, "int");
+
+      `printtype(A::word, "bit[9:1]");
+
+      `printtype(A::X, "enum{A=32'sd0,B=32'sd1,C=32'sd99}A::<unspecified>");
+
+      `printtype(AB_t, "struct{bit A;bit B;}");
+      `printtype(AB, "struct{bit A;bit B;}top.AB_t$[0:9]");
 
       $write("*-* All Finished *-*\n");
       $finish;