Changeset 464 for cpp/frams

Timestamp:

02/07/16 04:09:36 (9 years ago)

Author:

Maciej Komosinski

Message:

Serialization of basic object types in JSON format

Location:

cpp/frams

Files:

• param/param.cpp (modified) (1 diff)
• util/extvalue.cpp (modified) (5 diffs)
• util/extvalue.h (modified) (3 diffs)
• vm/classes/collectionobj.cpp (modified) (4 diffs)
• vm/classes/collectionobj.h (modified) (2 diffs)

cpp/frams/param/param.cpp

@@ -296 +296 @@
                 ExtValue ex;
                 get(i, ex);
-                ws = SString(SERIALIZATION_PREFIX) + ex.serialize();
+                ws = SString(SERIALIZATION_PREFIX) + ex.serialize(NativeSerialization);
         }
         else

cpp/frams/util/extvalue.cpp

@@ -183 +183 @@
 }
 
-SString ExtObject::serialize_inner() const
+SString ExtObject::serialize_inner(SerializationFormat format) const
 {
         int ref = tlsGetRef(ExtObject_serialization).add(*this);
+        SString ret;
+
         if (ref >= 0)
-                return SString::sprintf("^%d", ref);
+                {
+                switch(format)
+                        {
+                        case NativeSerialization: return SString::sprintf("^%d", ref);
+                        case JSONSerialization: return SString("null");
+                        }
+                }
 
         if (isEmpty()) return SString("null");
+        {
         VectorObject *vec = VectorObject::fromObject(*this, false);
         if (vec)
-                return vec->serialize();
+                { ret=vec->serialize(format); goto finally; }
+        }
+        {
         DictionaryObject *dic = DictionaryObject::fromObject(*this, false);
         if (dic)
-                return dic->serialize();
+                { ret=dic->serialize(format); goto finally; }
+        }
+        {
         Param tmp_param;
         ParamInterface *p = getParamInterface(tmp_param);
@@ -204 +217 @@
         {
                 ExtObject o(p->getObject(m));
-                SString ret = SString(interfaceName()) + o.serialize();
-                return ret;
+                switch(format)
+                        {
+                        case NativeSerialization: ret=SString(interfaceName())+o.serialize(format); break;
+                        case JSONSerialization: ret=SString::sprintf("{\"class\":\"%s\",\"data\":%s}",interfaceName(),o.serialize(format).c_str()); break;
+                        }
+                goto finally;
         }
         m = p->findId("toString");
@@ -212 +229 @@
                 SString str = p->getString(m);
                 sstringQuote(str);
-                SString ret = SString(interfaceName()) + "\"" + str + "\"";
-                return ret;
+                switch(format)
+                        {
+                        case NativeSerialization: ret=SString(interfaceName())+"\"" +str+"\""; break;
+                        case JSONSerialization: ret=SString::sprintf("{\"class\":\"%s\",\"data\":\"%s\"}",interfaceName(),str.c_str()); break;
+                        }
+                goto finally;
+        }
         }
 
         tlsGetRef(ExtObject_serialization).remove(*this);//undo nonserializable reference
-        SString ret = interfaceName();
-        ret += SString::sprintf("<%p>", object ? object : paraminterface);
+        switch(format)
+                {
+                case NativeSerialization: return SString(interfaceName())+SString::sprintf("<%p>",object ? object : paraminterface); break;
+                case JSONSerialization: return SString::sprintf("{\"class\":\"%s\"}",interfaceName()); break;
+                }
+
+  finally: // not 100% "finally", the case of nonserializable reference (directly above) returns directly without going through finally
+
+        switch(format)
+                {
+                case JSONSerialization: 
+                        tlsGetRef(ExtObject_serialization).remove(*this);//JSON only tracks recursion, does not track reuse
+                        break;
+                }
+
         return ret;
 }
 
-SString ExtObject::serialize() const
+SString ExtObject::serialize(SerializationFormat format) const
 {
         tlsGetRef(ExtObject_serialization).begin();
-        SString ret = serialize_inner();
+        SString ret = serialize_inner(format);
         tlsGetRef(ExtObject_serialization).end();
         return ret;
@@ -874 +909 @@
 }
 
-SString ExtValue::serialize() const
+SString ExtValue::serialize(SerializationFormat format) const
 {
         switch (type)
@@ -889 +924 @@
                 return SString::valueOf(ddata());
         case TObj:
-                return odata().serialize();
+                return odata().serialize(format);
         case TInvalid:
-                return SString("invalid");
+                if (format==NativeSerialization)
+                        return SString("invalid");
+                // else null --v
         default:
                 return SString("null");

cpp/frams/util/extvalue.h

@@ -32 +32 @@
         virtual ~DestrBase() {}
 };
+
+enum SerializationFormat { NativeSerialization, JSONSerialization };
 
 /**
@@ -75 +77 @@
 
         SString toString() const;
-        SString serialize_inner() const;
-        SString serialize() const;
+        SString serialize_inner(SerializationFormat format) const;
+        SString serialize(SerializationFormat format) const;
 
         ExtObject(Param *p, void *o) :subtype(2), object(o), param(p){}
@@ -194 +196 @@
         SString getString() const;
         const SString* getStringPtr() const;//< @return pointer to the internal sstring object or NULL if the current type is not string
-        SString serialize() const;
+        SString serialize(SerializationFormat format) const;
         ExtObject getObject() const;
         bool isNull() const { return (type == TUnknown) || ((type == TObj) && odata().isEmpty()); }

cpp/frams/vm/classes/collectionobj.cpp

@@ -154 +154 @@
 }
 
-SString VectorObject::serialize() const
+SString VectorObject::serialize(SerializationFormat format) const
 {
 SString out="[";
@@ -163 +163 @@
                 if (i) out+=",";
                 if (v)
-                        out+=v->serialize();
+                        out+=v->serialize(format);
                 else
                         out+="null";
@@ -413 +413 @@
 }
 
-SString DictionaryObject::serialize() const
+SString DictionaryObject::serialize(SerializationFormat format) const
 {
 SString out="{";
@@ -424 +424 @@
                 out+="\":";
                 if (it->value!=NULL)
-                        out+=((ExtValue*)it->value)->serialize();
+                        out+=((ExtValue*)it->value)->serialize(format);
                 else
                         out+="null";

cpp/frams/vm/classes/collectionobj.h

@@ -42 +42 @@
 static void p_new(void*,ExtValue*args,ExtValue*ret)
         {ret->setObject(ExtObject(&par,new VectorObject));}
-SString serialize() const;
+SString serialize(SerializationFormat format) const;
 ExtObject makeObject() {return ExtObject(&par,this);}
 
@@ -73 +73 @@
 PARAMPROCDEF(p_clone);
 #undef STATRICKCLASS
-SString serialize() const;
+SString serialize(SerializationFormat format) const;
 static void p_new(void*,ExtValue*args,ExtValue*ret)
         {ret->setObject(ExtObject(&par,new DictionaryObject));}