array_typet::subtype is now array_typet::element_type

Author: kroening

src/ebmc/output_verilog.cpp

@@ -532,7 +532,7 @@ std::string output_verilog_baset::type_string_base(const typet &type)
   }
   else if(type.id()==ID_array)
   {
-    return type_string_base(to_array_type(type).subtype());
+    return type_string_base(to_array_type(type).element_type());
   }
   else
   {
@@ -564,7 +564,7 @@ std::string output_verilog_baset::type_string_array(const typet &type)
     auto &array_type = to_array_type(type);
     mp_integer size;
     to_integer_non_constant(array_type.size(), size);
-    return type_string_array(array_type.subtype()) +
+    return type_string_array(array_type.element_type()) +
            " [0:" + integer2string(size) + ']';
   }
 

src/hw-cbmc/gen_interface.cpp

@@ -159,7 +159,7 @@ std::string gen_interfacet::type_to_string(const typet& type)
     mp_integer size = 0;
     to_integer_non_constant(size_expr, size);
 
-    std::string stype_str = type_to_string(array_type.subtype());
+    std::string stype_str = type_to_string(array_type.element_type());
     std::string array_str = "[" + integer2string(size)+"]" ;
     std::string key_str = stype_str + array_str;
 

src/hw-cbmc/map_vars.cpp

@@ -241,10 +241,10 @@ bool map_varst::array_types_eq(
   }
 
   namespacet ns(symbol_table);
-  
-  const typet &s1=ns.follow(type1.subtype());
-  const typet &s2=ns.follow(type2.subtype());
-  
+
+  const typet &s1 = ns.follow(type1.element_type());
+  const typet &s2 = ns.follow(type2.element_type());
+
   if(s1.id()==ID_array && s2.id()==ID_array)
     return array_types_eq(to_array_type(s1), to_array_type(s2), error_msg);
 
@@ -298,7 +298,7 @@ bool map_varst::check_types_rec(
       return array_types_eq(to_array_type(type1), to_array_type(type2), error_msg);
 
     // bool-array is mapped to bit-vector
-    if(to_array_type(type1).subtype().id() != ID_bool)
+    if(to_array_type(type1).element_type().id() != ID_bool)
     {
       error_msg = "type `" + from_type(ns, "", type1) +
                   "' does not match type `" + from_type(ns, "", type2) +
@@ -720,7 +720,7 @@ void map_varst::map_vars(const irep_idt &top_module)
     index_exprt expr(
       symbol_expr,
       timeframe_expr,
-      to_array_type(ns.follow(symbol_expr.type())).subtype());
+      to_array_type(ns.follow(symbol_expr.type())).element_type());
 
     top_level_inputs.clear();
 

src/smvlang/expr2smv.cpp

@@ -550,7 +550,7 @@ bool type2smv(const typet &type, std::string &code)
   else if(type.id()==ID_array)
   {
     std::string tmp;
-    if(type2smv(to_array_type(type).subtype(), tmp))
+    if(type2smv(to_array_type(type).element_type(), tmp))
       return true;
     code="array ";
     code+="..";

src/trans-netlist/trans_trace.cpp

@@ -267,7 +267,7 @@ static mp_integer vcd_width(
   else if(type.id()==ID_array)
   {
     auto &array_type = to_array_type(type);
-    mp_integer sub = vcd_width(array_type.subtype(), ns);
+    mp_integer sub = vcd_width(array_type.element_type(), ns);
 
     // get size
     const exprt &size = array_type.size();
@@ -526,7 +526,7 @@ static std::string vcd_suffix(
 
     return "[" + integer2string(left_bound) + ":" +
            integer2string(right_bound) + "]" +
-           vcd_suffix(array_type.subtype(), ns);
+           vcd_suffix(array_type.element_type(), ns);
   }
   else if(type.id()==ID_bool)
     return "";

src/trans-netlist/trans_trace_netlist.cpp

@@ -71,8 +71,8 @@ exprt bitstring_to_expr(const std::string &src, const typet &type)
     std::size_t op_width=src.size()/size_int;
 
     for(std::size_t i=0; i<size_int; i++)
-      value_expr.operands()[size_int-i-1]=bitstring_to_expr(
-        std::string(src, i*op_width, op_width), array_type.subtype());
+      value_expr.operands()[size_int - i - 1] = bitstring_to_expr(
+        std::string(src, i * op_width, op_width), array_type.element_type());
   }
 
   return value_expr;

src/verilog/expr2verilog.cpp

@@ -1120,7 +1120,7 @@ std::string expr2verilogt::convert(const typet &type)
     dest += convert(array_type.size());
 
     dest+="] of ";
-    dest += convert(array_type.subtype());
+    dest += convert(array_type.element_type());
 
     return dest;
   }

src/verilog/verilog_typecheck_base.cpp

@@ -185,8 +185,8 @@ std::size_t verilog_typecheck_baset::get_width(const typet &type)
 
   if(type.id()==ID_array)
   {
-    mp_integer subtype_width = get_width(to_array_type(type).subtype());
-    return (array_size(type) * subtype_width).to_ulong();
+    mp_integer element_width = get_width(to_array_type(type).element_type());
+    return (array_size(type) * element_width).to_ulong();
   }
 
   if(type.id()==ID_integer)

src/verilog/verilog_typecheck_expr.cpp

@@ -1621,7 +1621,7 @@ void verilog_typecheck_exprt::convert_extractbit_expr(extractbit_exprt &expr)
         op1 = typecast_exprt{op1, _index_type};
     }
 
-    expr.type() = to_array_type(op0.type()).subtype();
+    expr.type() = to_array_type(op0.type()).element_type();
     expr.id(ID_index);
   }
   else

src/vhdl/expr2vhdl.cpp

@@ -801,7 +801,7 @@ std::string expr2vhdlt::convert(const typet &type)
     dest += convert(array_type.size());
 
     dest+="] of ";
-    dest += convert(array_type.subtype());
+    dest += convert(array_type.element_type());
 
     return dest;
   }