Merge pull request #704 from NathanJPhillips/feature/serialization-improvements

Feature/serialization improvements

Author: peterschrammel

src/config.inc

@@ -9,7 +9,7 @@ BUILD_ENV = AUTO
 
 # Select optimisation or debug info
 #CXXFLAGS += -O2 -DNDEBUG
-CXXFLAGS += -O0 -g
+#CXXFLAGS += -O0 -g
 
 ifeq ($(shell uname),Linux)
   CXXFLAGS += -DUSE_BOOST

src/util/serializer.h

@@ -12,11 +12,13 @@ Purpose: Generic serialization of object hierarchies.
 #define CPROVER_UTIL_SERIALIZER_H
 
 #include <utility>
+#include <memory>
 #include <string>
 #include <functional>
 #include <vector>
 #include <set>
 #include <map>
+#include <cstdint>
 #include <cassert>
 #ifdef USE_BOOST
 #include <boost/bimap.hpp>
@@ -66,7 +68,7 @@ class serializert
   // Whether this serializer is used for reading rather than writing
   bool is_read;
   // Traits attached to this serializer
-  serializer_traitst *traits;
+  std::shared_ptr<serializer_traitst> traits;
 
   /////////////////////////////////////////////////////////////////////////////
   // Section: Constructors/destructors
@@ -88,7 +90,7 @@ class serializert
 
   \*******************************************************************/
   serializert(serializert *parent, bool is_read)
-    : parent(parent), is_read(is_read), traits(nullptr)
+    : parent(parent), is_read(is_read)
   {
   }
 
@@ -108,7 +110,7 @@ class serializert
 
   \*******************************************************************/
   explicit serializert(bool is_read)
-    : parent(nullptr), is_read(is_read), traits(nullptr)
+    : parent(nullptr), is_read(is_read)
   {
   }
 
@@ -160,7 +162,7 @@ class serializert
   template<typename traitst>
   traitst &get_traits() const
   {
-    traitst * result=dynamic_cast<traitst *>(traits);
+    traitst * result=dynamic_cast<traitst *>(traits.get());
     if(result!=nullptr)
       return *result;
     assert(parent!=nullptr);  // In release build allow undefined behaviour
@@ -185,10 +187,12 @@ class serializert
     Sets traits attached to this serializer.
 
   \*******************************************************************/
-  void set_traits(serializer_traitst &serializer_traits)
+  void set_traits(std::shared_ptr<serializer_traitst> serializer_traits)
   {
+    assert(serializer_traits!=nullptr);
+    // If you need to set_traits twice then make the traits member a set
     assert(traits==nullptr);
-    traits=&serializer_traits;
+    traits=serializer_traits;
   }
 
   /////////////////////////////////////////////////////////////////////////////
@@ -257,7 +261,7 @@ class serializert
     Serializes a field.
 
   \*******************************************************************/
-  virtual void serialize(const char *name, int &field)=0;
+  virtual void serialize(const char *name, int32_t &field)=0;
 
   /*******************************************************************\
 
@@ -273,7 +277,7 @@ class serializert
     Serializes a field.
 
   \*******************************************************************/
-  virtual void serialize(const char *name, unsigned int &field)=0;
+  virtual void serialize(const char *name, uint32_t &field)=0;
 
   /*******************************************************************\
 
@@ -289,7 +293,7 @@ class serializert
     Serializes a field.
 
   \*******************************************************************/
-  virtual void serialize(const char *name, unsigned long long &field)=0;
+  virtual void serialize(const char *name, uint64_t &field)=0;
 
   /*******************************************************************\