retrace,gui: Object members don't have string marker.

apitrace · May 27, 2015 · 84f5e9a · 84f5e9a
1 parent 265d2fd
commit 84f5e9a
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 15 deletions.
diff --git a/gui/qubjson.cpp b/gui/qubjson.cpp
@@ -108,9 +108,8 @@ readFloat64(QDataStream &stream)
 
 
 static size_t
-readSize(QDataStream &stream)
+readSize(QDataStream &stream, Marker type)
 {
-    Marker type = readMarker(stream);
     switch (type) {
     case MARKER_INT8:
         return readInt8(stream);
@@ -131,9 +130,26 @@ readSize(QDataStream &stream)
 
 
 static QString
-readString(QDataStream &stream)
+readChar(QDataStream &stream)
+{
+    qint8 c;
+    stream >> c;
+    Q_ASSERT(c >= 0);
+    return QChar(c);
+}
+
+
+static size_t
+readSize(QDataStream &stream)
+{
+    Marker type = readMarker(stream);
+    return readSize(stream, type);
+}
+
+
+static QString
+readString(QDataStream &stream, size_t size)
 {
-    size_t size = readSize(stream);
     char *buf = new char [size];
     stream.readRawData(buf, size);
     QString str = QString::fromUtf8(buf, size);
@@ -142,6 +158,14 @@ readString(QDataStream &stream)
 }
 
 
+static QString
+readString(QDataStream &stream)
+{
+    size_t size = readSize(stream);
+    return readString(stream, size);
+}
+
+
 static QVariant
 readVariant(QDataStream &stream, Marker type);
 
@@ -183,8 +207,8 @@ readObject(QDataStream &stream)
     Marker marker = readMarker(stream);
     while (marker != MARKER_OBJECT_END &&
            marker != MARKER_EOF) {
-        Q_ASSERT(marker == MARKER_STRING);
-        QString name = readString(stream);
+        size_t nameSize = readSize(stream, marker);
+        QString name = readString(stream, nameSize);
         marker = readMarker(stream);
         QVariant value = readVariant(stream, marker);
         object[name] = value;
@@ -224,8 +248,7 @@ readVariant(QDataStream &stream, Marker type)
         Q_UNIMPLEMENTED();
         return QVariant();
     case MARKER_CHAR:
-        Q_UNIMPLEMENTED();
-        return QVariant();
+        return readChar(stream);
     case MARKER_STRING:
         return readString(stream);
     case MARKER_ARRAY_BEGIN:

diff --git a/retrace/state_writer_ubjson.cpp b/retrace/state_writer_ubjson.cpp
@@ -66,9 +66,24 @@ class UBJSONStateWriter : public StateWriter
         os.put(MARKER_OBJECT_END);
     }
 
+    inline void
+    _writeString(const char *s, size_t len) {
+        writeUInt(len);
+        // TODO: convert string from locale encoding to UTF-8
+        for (size_t i = 0; i < len; ++i) {
+            char c = s[i];
+            os.put((signed char)c >= 0 ? c : '?');
+        }
+    }
+
+    void
+    _writeString(const char *s) {
+    }
+
     void
     beginMember(const char * name) {
-        writeString(name);
+        size_t len = strlen(name);
+        _writeString(name, len);
     }
 
     void
@@ -87,14 +102,14 @@ class UBJSONStateWriter : public StateWriter
 
     void
     writeString(const char *s) {
-        os.put(MARKER_STRING);
         size_t len = strlen(s);
-        writeUInt(len);
-        // TODO: convert string from locale encoding to UTF-8
-        for (size_t i = 0; i < len; ++i) {
-            char c = s[i];
-            os.put((signed char)c >= 0 ? c : '?');
+        if (len == 1 && (signed char)s[0] >= 0) {
+            os.put(MARKER_CHAR);
+            os.put(s[0]);
+            return;
         }
+        os.put(MARKER_STRING);
+        _writeString(s, len);
     }
 
     void