Merge pull request #1443 from diffblue/typename-ext

SystemVerilog: add further $typename cases

Author: tautschnig

src/verilog/typename.cpp

@@ -123,6 +123,26 @@ std::string verilog_typename(const typet &type)
     else
       return "bit signed[" + left(type) + ":" + right(type) + "]";
   }
+  else if(type.id() == ID_verilog_byte)
+  {
+    return "byte";
+  }
+  else if(type.id() == ID_verilog_int)
+  {
+    return "int";
+  }
+  else if(type.id() == ID_verilog_integer)
+  {
+    return "integer";
+  }
+  else if(type.id() == ID_verilog_longint)
+  {
+    return "longint";
+  }
+  else if(type.id() == ID_verilog_shortint)
+  {
+    return "shortint";
+  }
   else if(type.id() == ID_verilog_signedbv)
   {
     return "logic signed[" + left(type) + ":" + right(type) + "]";

unit/verilog/typename.cpp

@@ -14,10 +14,17 @@ SCENARIO("$typename(...)")
 {
   GIVEN("various Verilog types")
   {
+    REQUIRE(verilog_typename(verilog_byte_typet{}) == "byte");
     REQUIRE(verilog_typename(verilog_chandle_typet{}) == "chandle");
+    REQUIRE(verilog_typename(verilog_event_typet{}) == "event");
+    REQUIRE(verilog_typename(verilog_int_typet{}) == "int");
+    REQUIRE(verilog_typename(verilog_integer_typet{}) == "integer");
+    REQUIRE(verilog_typename(verilog_longint_typet{}) == "longint");
     REQUIRE(verilog_typename(verilog_real_typet{}) == "real");
+    REQUIRE(verilog_typename(verilog_realtime_typet{}) == "realtime");
+    REQUIRE(verilog_typename(verilog_shortint_typet{}) == "shortint");
+    REQUIRE(verilog_typename(verilog_shortreal_typet{}) == "shortreal");
     REQUIRE(
       verilog_typename(verilog_signedbv_typet{10}) == "logic signed[9:0]");
-    REQUIRE(verilog_typename(verilog_shortreal_typet{}) == "shortreal");
   }
 }