Merge pull request #1423 from janmroczkowski/janmroczkowski/fresh_symbol-reset_temporary_counter

Add reset_temporary_counter to fresh_symbol

Author: smowton

src/util/fresh_symbol.cpp

@@ -11,6 +11,17 @@ Author: Chris Smowton, [email protected]
 
 #include "fresh_symbol.h"
 
+// This needs to be outside get_fresh_aux_symbol
+// to make it available for both reset_temporary_counter
+// and get_fresh_aux_symbol
+static size_t temporary_counter=0;
+
+// This is useful with loading multiple GOTO models
+void reset_temporary_counter()
+{
+  temporary_counter=0;
+}
+
 /// Installs a fresh-named symbol with the requested name pattern
 /// \par parameters: `type`: type of new symbol
 /// `name_prefix`, `basename_prefix`: new symbol will be named
@@ -27,7 +38,6 @@ symbolt &get_fresh_aux_symbol(
   const irep_idt &symbol_mode,
   symbol_tablet &symbol_table)
 {
-  static size_t temporary_counter=0;
   auxiliary_symbolt new_symbol;
   symbolt *symbol_ptr;
 

src/util/fresh_symbol.h

@@ -19,6 +19,8 @@ Author: Chris Smowton, [email protected]
 #include <util/symbol_table.h>
 #include <util/type.h>
 
+void reset_temporary_counter();
+
 symbolt &get_fresh_aux_symbol(
   const typet &type,
   const std::string &name_prefix,