Changeset 222

Timestamp:

04/11/14 23:39:36 (11 years ago)

Author:

Maciej Komosinski

Message:

"Distributed" deserializable class registry, so that ExtValue? does not depend on so many other classes

Location:

cpp/frams

Files:

• util/extvalue.cpp (modified) (1 diff)
• util/extvalue.h (modified) (2 diffs)
• util/sstring.cpp (modified) (2 diffs)
• vm/classes/3dobject.cpp (modified) (2 diffs)
• vm/classes/3dobject.h (modified) (1 diff)
• vm/classes/genoobj.cpp (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -706 +706 @@
 }
 
-PtrListTempl<ParamInterface*> ExtValue::deserializable_classes;
-
-void ExtValue::initDeserializableClasses()
-{
-deserializable_classes+=&Pt3D_Ext::getStaticParam();
-deserializable_classes+=&Orient_Ext::getStaticParam();
-deserializable_classes+=&GenoObj::getStaticParam();
+PtrListTempl<ParamInterface*> &ExtValue::getDeserializableClasses()
+{
+static PtrListTempl<ParamInterface*> classes;
+return classes;
 }
 
 ParamInterface *ExtValue::findDeserializableClass(const char* name)
 {
-FOREACH(ParamInterface*,cls,deserializable_classes)
+FOREACH(ParamInterface*,cls,getDeserializableClasses())
         if (!strcmp(cls->getName(),name))
                 return cls;

cpp/frams/util/extvalue.h

@@ -160 +160 @@
 const char* deserialize(const char* in);//< @return first character after the succesfully parsed string or NULL if failed
 const char* deserialize_inner(const char* in);
-static PtrListTempl<ParamInterface*> deserializable_classes;
 static ParamInterface *findDeserializableClass(const char* name);
-static void initDeserializableClasses();
+static PtrListTempl<ParamInterface*> &getDeserializableClasses();
+template<typename T> class AddDeserializable
+{
+  public:
+AddDeserializable() {ExtValue::getDeserializableClasses()+=&T::getStaticParam();}
+};
+
 static SString format(SString& fmt,const ExtValue **values,int count);
 
@@ -188 +193 @@
 };
 
+#define REGISTER_DESERIALIZABLE(name) ExtValue::AddDeserializable<name> deserializable_autoinit_ ## name;
 
 #endif

cpp/frams/util/sstring.cpp

@@ -4 +4 @@
 
 #include "sstring.h"
+#include <common/nonstd.h> //to be sure the vsnprintf-related stuff gets included
 
 #ifdef SSTRING_SIMPLE
@@ -399 +400 @@
 return s;
 }
-
-#ifdef LINUX
-#define VSNPRINTF_RETURNS_REQUIRED_SIZE
-#endif
-#if defined _WIN32 && !defined __BORLANDC__
-#define USE_VSCPRINTF
-#endif
-
 
 #if 0 //testing _vscprintf

cpp/frams/vm/classes/3dobject.cpp

@@ -203 +203 @@
 ExtObject Pt3D_Ext::makeDynamicObject(Pt3D_Ext* p)
 {return ExtObject(&getStaticParam(),p);}
+
+ExtObject Pt3D_Ext::makeDynamicObject(const Pt3D& p)
+{
+Pt3D_Ext *pe=new Pt3D_Ext(p);
+return ExtObject(&getStaticParam(),pe);
+}
 
 //////////////////////////////////////
@@ -571 +577 @@
 return (ReferenceObj*)v.getObjectTarget(getStaticParam().getName());
 }
+
+/////////////
+
+REGISTER_DESERIALIZABLE(Pt3D_Ext)
+REGISTER_DESERIALIZABLE(Orient_Ext)

cpp/frams/vm/classes/3dobject.h

@@ -38 +38 @@
 static ExtObject makeStaticObject(Pt3D* p);
 static ExtObject makeDynamicObject(Pt3D_Ext* p);
+static ExtObject makeDynamicObject(const Pt3D& p);
 static Pt3D_Ext* fromObject(const ExtValue& v);
 static Param& getStaticParam();

cpp/frams/vm/classes/genoobj.cpp

@@ -137 +137 @@
         ret->setEmpty();
 }
+
+/////////////
+
+REGISTER_DESERIALIZABLE(GenoObj)