Add two-param code_typet constructors and deprecate the default one

Author: peterschrammel

src/util/std_types.h

@@ -758,14 +758,39 @@ inline c_enum_tag_typet &to_c_enum_tag_type(typet &type)
 class code_typet:public typet
 {
 public:
+  class parametert;
+  typedef std::vector<parametert> parameterst;
+
+  /// Constructs a new code type, i.e. function type
+  /// \param _parameters: the vector of function parameters
+  /// \param _return_type: the return type
+  code_typet(parameterst &&_parameters, typet &&_return_type)
+   : typet(ID_code)
+  {
+    parameters().swap(_parameters);
+    return_type().swap(_return_type);
+  }
+
+  /// Constructs a new code type, i.e. function type
+  /// \param _parameters: the vector of function parameters
+  /// \param _return_type: the return type
+  code_typet(parameterst &&_parameters, const typet &_return_type)
+   : typet(ID_code)
+  {
+    parameters().swap(_parameters);
+    return_type() = _return_type;
+  }
+
+  /// \deprecated
+  DEPRECATED("Use the two argument constructor instead")
   code_typet():typet(ID_code)
   {
     // make sure these properties are always there to avoid problems
     // with irept comparisons
     add(ID_parameters);
     add_type(ID_return_type);
   }
-
+  
   // used to be argumentt -- now uses standard terminology
 
   class parametert:public exprt
@@ -827,7 +852,7 @@ class code_typet:public typet
       set(ID_C_this, true);
     }
   };
-
+  
   bool has_ellipsis() const
   {
     return find(ID_parameters).get_bool(ID_ellipsis);
@@ -861,14 +886,12 @@ class code_typet:public typet
   {
     add(ID_parameters).remove(ID_ellipsis);
   }
-
+  
   const typet &return_type() const
   {
     return find_type(ID_return_type);
   }
 
-  typedef std::vector<parametert> parameterst;
-
   typet &return_type()
   {
     return add_type(ID_return_type);