Remove constructor boilerplate

Author: Lukasz A.J. Wrona

src/solvers/refinement/string_constraint_generator.h

@@ -40,14 +40,14 @@ class string_constraint_generatort final
   /// Arguments pack for the string_constraint_generator constructor
   struct infot
   {
-    const namespacet *ns=nullptr;
     /// Max length of non-deterministic strings
     size_t string_max_length=std::numeric_limits<size_t>::max();
     /// Prefer printable characters in non-deterministic strings
     bool string_printable=false;
   };
 
-  explicit string_constraint_generatort(const infot& info);
+  explicit string_constraint_generatort(
+    const infot& info, const namespacet& ns);
 
   /// Axioms are of three kinds: universally quantified string constraint,
   /// not contains string constraints and simple formulas.

src/solvers/refinement/string_constraint_generator_main.cpp

@@ -28,10 +28,10 @@ Author: Romain Brenguier, [email protected]
 #include <util/ssa_expr.h>
 
 string_constraint_generatort::string_constraint_generatort(
-  const string_constraint_generatort::infot& info):
+  const string_constraint_generatort::infot& info, const namespacet& ns):
   max_string_length(info.string_max_length),
   m_force_printable_characters(info.string_printable),
-  m_ns(*info.ns) { }
+  m_ns(ns) { }
 
 const std::vector<exprt> &string_constraint_generatort::get_axioms() const
 {

src/solvers/refinement/string_refinement.cpp

@@ -86,21 +86,11 @@ static bool validate(const string_refinementt::infot &info)
   return true;
 }
 
-static string_constraint_generatort::infot
-generator_info(const string_refinementt::infot &in)
-{
-  string_constraint_generatort::infot out;
-  out.ns=in.ns;
-  out.string_max_length=in.string_max_length;
-  out.string_printable=in.string_printable;
-  return out;
-}
-
 string_refinementt::string_refinementt(const infot &info, bool):
   supert(info),
   config_(info),
   loop_bound_(info.refinement_bound),
-  generator(generator_info(info)) { }
+  generator(info, *info.ns) { }
 
 string_refinementt::string_refinementt(const infot &info):
   string_refinementt(info, validate(info)) { }

src/solvers/refinement/string_refinement.h

@@ -34,18 +34,18 @@ class string_refinementt final: public bv_refinementt
 private:
   struct configt {
     unsigned refinement_bound=0;
-    size_t string_max_length=std::numeric_limits<size_t>::max();
     /// Make non-deterministic character arrays have at least one character
     bool string_non_empty=false;
     /// Concretize strings after solver is finished
     bool trace=false;
-    /// Make non-deterministic characters printable
-    bool string_printable=false;
     bool use_counter_example=false;
   };
 public:
   /// string_refinementt constructor arguments
-  struct infot:public bv_refinementt::infot, public configt { };
+  struct infot:
+    public bv_refinementt::infot,
+    public string_constraint_generatort::infot,
+    public configt { };
 
   explicit string_refinementt(const infot &);