Move c_new_tmp_symbol into symbol_factoryt

Author: danpoe

src/ansi-c/c_nondet_symbol_factory.cpp

@@ -22,27 +22,6 @@ Author: Diffblue Ltd.
 
 #include <goto-programs/goto_functions.h>
 
-/// Create a new temporary static symbol
-/// \param symbol_table: The symbol table to create the symbol in
-/// \param loc: The location to assign to the symbol
-/// \param type: The type of symbol to create
-/// \param static_lifetime: Whether the symbol should have a static lifetime
-/// \param prefix: The prefix to use for the symbol's basename
-/// \return Returns a reference to the new symbol
-static const symbolt &c_new_tmp_symbol(
-  symbol_tablet &symbol_table,
-  const source_locationt &loc,
-  const typet &type,
-  const bool static_lifetime,
-  const std::string &prefix="tmp")
-{
-  symbolt &tmp_symbol = get_fresh_aux_symbol(
-    type, id2string(loc.get_function()), prefix, loc, ID_C, symbol_table);
-  tmp_symbol.is_static_lifetime=static_lifetime;
-
-  return tmp_symbol;
-}
-
 class symbol_factoryt
 {
   std::vector<const symbolt *> &symbols_created;
@@ -51,6 +30,13 @@ class symbol_factoryt
   const bool assume_non_null;
   namespacet ns;
 
+  const symbolt &c_new_tmp_symbol(
+    //symbol_tablet &symbol_table,
+    //const source_locationt &loc,
+    const typet &type,
+    const bool static_lifetime,
+    const std::string &prefix = "tmp");
+
 public:
   symbol_factoryt(
     std::vector<const symbolt *> &_symbols_created,
@@ -73,6 +59,27 @@ class symbol_factoryt
   void gen_nondet_init(code_blockt &assignments, const exprt &expr);
 };
 
+/// Create a new temporary static symbol
+/// \param symbol_table: The symbol table to create the symbol in
+/// \param loc: The location to assign to the symbol
+/// \param type: The type of symbol to create
+/// \param static_lifetime: Whether the symbol should have a static lifetime
+/// \param prefix: The prefix to use for the symbol's basename
+/// \return Returns a reference to the new symbol
+const symbolt &symbol_factoryt::c_new_tmp_symbol(
+  //symbol_tablet &symbol_table,
+  //const source_locationt &loc,
+  const typet &type,
+  const bool static_lifetime,
+  const std::string &prefix)
+{
+  symbolt &tmp_symbol = get_fresh_aux_symbol(
+    type, id2string(loc.get_function()), prefix, loc, ID_C, symbol_table);
+  tmp_symbol.is_static_lifetime = static_lifetime;
+
+  return tmp_symbol;
+}
+
 /// Create a symbol for a pointer to point to
 /// \param assignments: The code block to add code to
 /// \param target_expr: The expression which we are allocating a symbol for
@@ -89,8 +96,6 @@ exprt symbol_factoryt::allocate_object(
 {
   const symbolt &aux_symbol=
     c_new_tmp_symbol(
-      symbol_table,
-      loc,
       allocate_type,
       static_lifetime);
   symbols_created.push_back(&aux_symbol);