Merge pull request #624 from reuk/irep-ids-improvements

Replace irep_ids_convert program with preprocessor

Author: kroening

.gitignore

@@ -31,8 +31,6 @@ src/ansi-c/gcc_builtin_headers_ia32-2.inc
 src/ansi-c/gcc_builtin_headers_ia32.inc
 src/ansi-c/gcc_builtin_headers_mips.inc
 src/ansi-c/gcc_builtin_headers_power.inc
-src/util/irep_ids.h
-src/util/irep_ids.inc
 
 # regression/test files
 *.out

src/util/Makefile

@@ -30,30 +30,9 @@ INCLUDES= -I ..
 include ../config.inc
 include ../common
 
-CLEANFILES = util$(LIBEXT) \
-             irep_ids.h irep_ids.inc \
-             irep_ids_convert$(EXEEXT) irep_ids_convert$(OBJEXT) irep_ids_convert.d
+CLEANFILES = util$(LIBEXT)
 
 all: util$(LIBEXT)
 
-###############################################################################
-
-irep_ids.h: irep_ids.txt irep_ids_convert$(EXEEXT)
-	./irep_ids_convert$(EXEEXT) header < $< > $@
-
-irep_ids.inc: irep_ids.txt irep_ids_convert$(EXEEXT)
-	./irep_ids_convert$(EXEEXT) table < $< > $@
-
-irep_ids.cpp: irep_ids.inc irep_ids.h
-
-irep_ids_convert$(EXEEXT): irep_ids_convert.cpp
-	$(LINKNATIVE)
-
-generated_files: irep_ids.h irep_ids.inc
-
-# Most of the others will need irep_ids.h,
-# which we first need to generate.
-$(OBJ): irep_ids.h
-
 util$(LIBEXT): $(OBJ)
 	$(LINKLIB)

src/util/dstring.h

@@ -13,7 +13,9 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "string_container.h"
 
-class dstringt
+// Marked final to disable inheritance.
+// No virtual destructor, so runtime-polymorphic use would be unsafe.
+class dstringt final
 {
 public:
   // this is safe for static objects
@@ -25,12 +27,12 @@ class dstringt
   }
 
   // this is safe for static objects
-  // the 2nd argument is to avoid accidental conversions
   #ifdef __GNUC__
   constexpr
   #endif
-  dstringt(unsigned _no, unsigned):no(_no)
+  static dstringt make_from_table_index(unsigned no)
   {
+    return dstringt(no);
   }
 
   #if 0
@@ -135,7 +137,14 @@ class dstringt
     return no;
   }
 
-protected:
+private:
+  #ifdef __GNUC__
+  constexpr
+  #endif
+  explicit dstringt(unsigned _no):no(_no)
+  {
+  }
+
   unsigned no;
 
   // the reference returned is guaranteed to be stable

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

@@ -13,10 +13,32 @@ Author: Daniel Kroening, kroening@kroening.com
 
 const char *irep_ids_table[]=
 {
-  #include "irep_ids.inc"
-  NULL
+#define IREP_ID_ONE(id) #id,
+#define IREP_ID_TWO(id, str) #str,
+
+#include "irep_ids.def"
+
+  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