Declare strings extern

Author: reuk

src/util/irep.h

@@ -14,7 +14,8 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <cassert>
 #include <iosfwd>
 
-#define USE_DSTRING
+#include "irep_ids.h"
+
 #define SHARING
 // #define HASH_CODE
 #define USE_MOVE
@@ -26,12 +27,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <map>
 #endif
 
-#ifdef USE_DSTRING
-#include "dstring.h"
-#endif
-
-#include "irep_ids.h"
-
 #ifdef USE_DSTRING
 typedef dstringt irep_idt;
 typedef dstringt irep_namet;

src/util/irep_ids.cpp

@@ -21,6 +21,24 @@ const char *irep_ids_table[]=
   NULL,
 };
 
+#ifdef USE_DSTRING
+
+#define IREP_ID_ONE(the_id)                                                    \
+  const dstringt ID_##the_id=dstringt::make_from_table_index(                  \
+      static_cast<unsigned>(idt::id_##the_id));
+#define IREP_ID_TWO(the_id, str)                                               \
+  const dstringt ID_##the_id=dstringt::make_from_table_index(                  \
+      static_cast<unsigned>(idt::id_##the_id));
+
+#else
+
+#define IREP_ID_ONE(the_id) const std::string ID_##the_id(#the_id);
+#define IREP_ID_TWO(the_id, str) const std::string ID_##the_id(#the_id);
+
+#endif
+
+#include "irep_ids.def" // NOLINT(build/include)
+
 /*******************************************************************\
 
 Function: initialize_string_container

src/util/irep_ids.h

@@ -9,7 +9,11 @@ Author: Reuben Thomas, reuben.thomas@me.com
 #ifndef CPROVER_UTIL_IREP_IDS_H
 #define CPROVER_UTIL_IREP_IDS_H
 
+#define USE_DSTRING
+
+#ifdef USE_DSTRING
 #include "dstring.h"
+#endif
 
 enum class idt:unsigned
 {
@@ -21,19 +25,13 @@ enum class idt:unsigned
 
 #ifdef USE_DSTRING
 
-#define IREP_ID_ONE(the_id)                                                    \
-  static const dstringt ID_##the_id=                                           \
-    dstringt::make_from_table_index(static_cast<unsigned>(idt::id_##the_id));
-#define IREP_ID_TWO(the_id, str)                                               \
-  static const dstringt ID_##the_id=                                           \
-    dstringt::make_from_table_index(static_cast<unsigned>(idt::id_##the_id));
+#define IREP_ID_ONE(the_id) extern const dstringt ID_##the_id;
+#define IREP_ID_TWO(the_id, str) extern const dstringt ID_##the_id;
 
 #else
 
-#define IREP_ID_ONE(the_id)                                                    \
-  static const std::string ID_##the_id(#the_id);
-#define IREP_ID_TWO(the_id, str)                                               \
-  static const std::string ID_##the_id(#the_id);
+#define IREP_ID_ONE(the_id) extern const std::string ID_##the_id;
+#define IREP_ID_TWO(the_id, str) extern const std::string ID_##the_id;
 
 #endif