Merge pull request #1257 from diffblue/verilog-array-type

Verilog: add Verilog type to lowered array type

Author: tautschnig

src/verilog/expr2verilog.cpp

@@ -2096,7 +2096,15 @@ std::string expr2verilogt::convert(const typet &type)
   else if(type.id()==ID_array)
   {
     auto &array_type = to_array_type(type);
-    std::string dest="array [";
+
+    std::string dest;
+
+    if(type.get(ID_C_verilog_type) == ID_verilog_unpacked_array)
+      dest += "unpacked ";
+    else if(type.get(ID_C_verilog_type) == ID_verilog_packed_array)
+      dest += "packed ";
+
+    dest += "array [";
 
     dest += convert(array_type.size());
 

src/verilog/verilog_elaborate_type.cpp

@@ -73,6 +73,7 @@ array_typet verilog_typecheck_exprt::convert_unpacked_array_type(
   auto result = array_typet{element_type, final_size_expr};
   result.set(ID_offset, from_integer(offset, integer_typet()));
   result.set(ID_C_increasing, increasing);
+  result.set(ID_C_verilog_type, ID_verilog_unpacked_array);
 
   return result;
 }
@@ -123,6 +124,7 @@ typet verilog_typecheck_exprt::convert_packed_array_type(
     dest.set_width(width.to_ulong());
     dest.set(ID_C_increasing, range.increasing());
     dest.set(ID_C_offset, integer2string(offset));
+    dest.set(ID_C_verilog_type, ID_verilog_packed_array);
 
     return std::move(dest).with_source_location(source_location);
   }
@@ -142,6 +144,7 @@ typet verilog_typecheck_exprt::convert_packed_array_type(
 
     array_typet result{element_type, size};
     result.set(ID_offset, from_integer(offset, integer_typet()));
+    result.set(ID_C_verilog_type, ID_verilog_packed_array);
 
     return std::move(result).with_source_location(source_location);
   }