Changeset 464 for cpp/frams/vm/classes

Timestamp:

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

Author:

Maciej Komosinski

Message:

Serialization of basic object types in JSON format

Location:

cpp/frams/vm/classes

Files:

• collectionobj.cpp (modified) (4 diffs)
• collectionobj.h (modified) (2 diffs)

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));}