Clean up ansi_c_convert_typet's interface

The need to invoke read() was only specified in a comment. Make the
constructor take care of this. Also, make the constructor initialise all
members rather than leaving this to clear(), which is thus no longer
necessary.

Author: tautschnig

src/ansi-c/ansi_c_convert_type.cpp

@@ -19,13 +19,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "gcc_types.h"
 
-void ansi_c_convert_typet::read(const typet &type)
-{
-  clear();
-  source_location=type.source_location();
-  read_rec(type);
-}
-
 void ansi_c_convert_typet::read_rec(const typet &type)
 {
   if(type.id()==ID_merged_type)

src/ansi-c/ansi_c_convert_type.h

@@ -56,51 +56,68 @@ class ansi_c_convert_typet
   // qualifiers
   c_qualifierst c_qualifiers;
 
-  virtual void read(const typet &type);
   virtual void write(typet &type);
 
   source_locationt source_location;
 
   std::list<typet> other;
 
-  explicit ansi_c_convert_typet(message_handlert &_message_handler)
-    : message_handler(_message_handler)
-  // class members are initialized by calling read()
-  {
-  }
-
-  virtual void clear()
+  ansi_c_convert_typet(message_handlert &_message_handler, const typet &type)
+    : ansi_c_convert_typet(_message_handler)
   {
-    unsigned_cnt=signed_cnt=char_cnt=int_cnt=short_cnt=
-    long_cnt=double_cnt=float_cnt=c_bool_cnt=proper_bool_cnt=complex_cnt=
-    int8_cnt=int16_cnt=int32_cnt=int64_cnt=
-    ptr32_cnt=ptr64_cnt=
-    gcc_float16_cnt=
-    gcc_float32_cnt=gcc_float32x_cnt=
-    gcc_float64_cnt=gcc_float64x_cnt=
-    gcc_float128_cnt=gcc_float128x_cnt=
-    gcc_int128_cnt=bv_cnt=floatbv_cnt=fixedbv_cnt=0;
-    vector_size.make_nil();
-    alignment.make_nil();
-    bv_width.make_nil();
-    fraction_width.make_nil();
-    msc_based.make_nil();
-    gcc_attribute_mode.make_nil();
-
-    assigns.clear();
-    requires.clear();
-    ensures.clear();
-
-    packed=aligned=constructor=destructor=false;
-
-    other.clear();
-    c_storage_spec.clear();
-    c_qualifiers.clear();
+    source_location = type.source_location();
+    read_rec(type);
   }
 
 protected:
   message_handlert &message_handler;
 
+  // Default-initialize all members. To be used by classes deriving from this
+  // one to make sure additional members can be initialized before invoking
+  // read_rec.
+  explicit ansi_c_convert_typet(message_handlert &_message_handler)
+    : unsigned_cnt(0),
+      signed_cnt(0),
+      char_cnt(0),
+      int_cnt(0),
+      short_cnt(0),
+      long_cnt(0),
+      double_cnt(0),
+      float_cnt(0),
+      c_bool_cnt(0),
+      proper_bool_cnt(0),
+      complex_cnt(0),
+      int8_cnt(0),
+      int16_cnt(0),
+      int32_cnt(0),
+      int64_cnt(0),
+      ptr32_cnt(0),
+      ptr64_cnt(0),
+      gcc_float16_cnt(0),
+      gcc_float32_cnt(0),
+      gcc_float32x_cnt(0),
+      gcc_float64_cnt(0),
+      gcc_float64x_cnt(0),
+      gcc_float128_cnt(0),
+      gcc_float128x_cnt(0),
+      gcc_int128_cnt(0),
+      bv_cnt(0),
+      floatbv_cnt(0),
+      fixedbv_cnt(0),
+      gcc_attribute_mode(static_cast<const typet &>(get_nil_irep())),
+      packed(false),
+      aligned(false),
+      vector_size(nil_exprt{}),
+      alignment(nil_exprt{}),
+      bv_width(nil_exprt{}),
+      fraction_width(nil_exprt{}),
+      msc_based(nil_exprt{}),
+      constructor(false),
+      destructor(false),
+      message_handler(_message_handler)
+  {
+  }
+
   virtual void read_rec(const typet &type);
   virtual void build_type_with_subtype(typet &type) const;
   virtual void set_attributes(typet &type) const;

src/ansi-c/c_typecheck_type.cpp

@@ -35,9 +35,7 @@ void c_typecheck_baset::typecheck_type(typet &type)
 {
   // we first convert, and then check
   {
-    ansi_c_convert_typet ansi_c_convert_type(get_message_handler());
-
-    ansi_c_convert_type.read(type);
+    ansi_c_convert_typet ansi_c_convert_type{get_message_handler(), type};
     ansi_c_convert_type.write(type);
   }
 

src/cpp/cpp_convert_type.cpp

@@ -33,21 +33,16 @@ class cpp_convert_typet : public ansi_c_convert_typet
   void write(typet &type) override;
 
   cpp_convert_typet(message_handlert &message_handler, const typet &type)
-    : ansi_c_convert_typet(message_handler)
+    : ansi_c_convert_typet(message_handler),
+      wchar_t_count(0),
+      char16_t_count(0),
+      char32_t_count(0)
   {
-    read(type);
+    source_location = type.source_location();
+    read_rec(type);
   }
 
 protected:
-  void clear() override
-  {
-    wchar_t_count = 0;
-    char16_t_count = 0;
-    char32_t_count = 0;
-
-    ansi_c_convert_typet::clear();
-  }
-
   void read_rec(const typet &type) override;
   void read_function_type(const typet &type);
   void read_template(const typet &type);