Merge pull request #3159 from diffblue/type_with_subtypes_constructor

type_with_subtypest now has constructors that take the subtypes

Author: Daniel Kroening

src/util/type.h

@@ -112,11 +112,22 @@ inline type_with_subtypet &to_type_with_subtype(typet &type)
 class type_with_subtypest:public typet
 {
 public:
+  typedef std::vector<typet> subtypest;
+
   type_with_subtypest() { }
 
   explicit type_with_subtypest(const irep_idt &_id):typet(_id) { }
 
-  typedef std::vector<typet> subtypest;
+  type_with_subtypest(const irep_idt &_id, const subtypest &_subtypes)
+    : typet(_id)
+  {
+    subtypes() = _subtypes;
+  }
+
+  type_with_subtypest(const irep_idt &_id, subtypest &&_subtypes) : typet(_id)
+  {
+    subtypes() = std::move(_subtypes);
+  }
 
   subtypest &subtypes()
   {