Changeset 73956 in vbox for trunk/src/VBox/Runtime/common/rest

Timestamp:

Aug 29, 2018 3:09:34 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124685

Message:

IPRT/rest: Added RTJsonIteratorBeginArray and RTJsonIteratorBeginObject for more accurate JSON decoding. Early RTCRestArray implementation. bugref:9167

Location:

trunk/src/VBox/Runtime/common/rest

Files:

• RTCRestArrayBase.cpp (added)
• RTCRestOutputToString.cpp (modified) (1 diff)
• RTCRestStringMapBase.cpp (modified) (2 diffs)
• rest-primary-object-types.cpp (modified) (15 diffs)

trunk/src/VBox/Runtime/common/rest/RTCRestOutputToString.cpp

@@ -35 +35 @@
 
 
-RTCRestOutputToString::RTCRestOutputToString(RTCString *a_pDst)
+RTCRestOutputToString::RTCRestOutputToString(RTCString *a_pDst, bool a_fAppend /*= false*/)
     : m_pDst(a_pDst)
     , m_fOutOfMemory(false)
 {
+    if (!a_fAppend)
+        m_pDst->setNull();
 }
 

trunk/src/VBox/Runtime/common/rest/RTCRestStringMapBase.cpp

@@ -115 +115 @@
      */
     RTJSONIT hIterator;
-    int rcRet = RTJsonIteratorBegin(a_rCursor.m_hValue, &hIterator);
+    int rcRet = RTJsonIteratorBeginObject(a_rCursor.m_hValue, &hIterator);
     if (RT_SUCCESS(rcRet))
     {
@@ -176 +176 @@
         rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBegin failed: %Rrc", rcRet);
     return rcRet;
-
 }
 
 // later?
-//    virtual int RTCRestStringMapBase::toString(RTCString *a_pDst, uint32_t a_fFlags = 0) const ;
+//    virtual int RTCRestStringMapBase::toString(RTCString *a_pDst, uint32_t a_fFlags = kCollectionFormat_Unspecified) const ;
 //    virtual int RTCRestStringMapBase::fromString(RTCString const &a_rValue, const char *a_pszName, PRTERRINFO a_pErrInfo = NULL,
 //                           uint32_t a_fFlags = kCollectionFormat_Unspecified) ;

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -59 +59 @@
 int RTCRestObjectBase::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == kCollectionFormat_Unspecified); RT_NOREF(a_fFlags);
-
     /*
      * Just wrap the JSON serialization method.
      */
-    RTCRestOutputToString Tmp(a_pDst);
+    RTCRestOutputToString Tmp(a_pDst, RT_BOOL(a_fFlags & kToString_Append));
     serializeAsJson(Tmp);
     return Tmp.finalize() ? VINF_SUCCESS : VERR_NO_MEMORY;
@@ -81 +79 @@
                                   uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == kCollectionFormat_Unspecified); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
 
     /*
@@ -185 +183 @@
 int RTCRestBool::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
+    if (!(a_fFlags & kToString_Append))
+    {
+        if (m_fValue)
+            return a_pDst->assignNoThrow(RT_STR_TUPLE("true"));
+        return a_pDst->assignNoThrow(RT_STR_TUPLE("false"));
+    }
     if (m_fValue)
-        return a_pDst->assignNoThrow(RT_STR_TUPLE("true"));
-    return a_pDst->assignNoThrow(RT_STR_TUPLE("false"));
+        return a_pDst->appendNoThrow(RT_STR_TUPLE("true"));
+    return a_pDst->appendNoThrow(RT_STR_TUPLE("false"));
 }
 
@@ -196 +198 @@
                             uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
+
     if (a_rValue.startsWithWord("true", RTCString::CaseInsensitive))
         m_fValue = true;
@@ -299 +302 @@
 int RTCRestInt64::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
-    return a_pDst->printfNoThrow("%RI64", m_iValue);
+    if (!(a_fFlags & kToString_Append))
+        return a_pDst->printfNoThrow("%RI64", m_iValue);
+    return a_pDst->appendPrintfNoThrow("%RI64", m_iValue);
 }
 
@@ -308 +311 @@
                              uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
 
     int rc = RTStrToInt64Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
@@ -415 +418 @@
 int RTCRestInt32::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
-    return a_pDst->printfNoThrow("%RI32", m_iValue);
+    if (!(a_fFlags & kToString_Append))
+        return a_pDst->printfNoThrow("%RI32", m_iValue);
+    return a_pDst->appendPrintfNoThrow("%RI32", m_iValue);
 }
 
@@ -424 +427 @@
                              uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
 
     int rc = RTStrToInt32Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
@@ -531 +534 @@
 int RTCRestInt16::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
-    return a_pDst->printfNoThrow("%RI16", m_iValue);
+    if (!(a_fFlags & kToString_Append))
+        return a_pDst->printfNoThrow("%RI16", m_iValue);
+    return a_pDst->appendPrintfNoThrow("%RI16", m_iValue);
 }
 
@@ -540 +543 @@
                              uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
 
     int rc = RTStrToInt16Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
@@ -626 +629 @@
 int RTCRestDouble::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
     /* Just a simple approximation here. */
     /** @todo implement floating point values for json. */
@@ -638 +639 @@
     size_t const cchValue = strlen(szValue);
 
-    return a_pDst->assignNoThrow(szValue, cchValue);
+    if (!(a_fFlags & kToString_Append))
+        return a_pDst->assignNoThrow(szValue, cchValue);
+    return a_pDst->appendNoThrow(szValue, cchValue);
 }
 
@@ -645 +648 @@
                               uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
+    RT_NOREF(a_fFlags);
 
     const char *pszValue = RTStrStripL(a_rValue.c_str());
@@ -751 +754 @@
 int RTCRestString::toString(RTCString *a_pDst, uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/) const
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-
-    return a_pDst->assignNoThrow(*this);
+    if (!(a_fFlags & kToString_Append))
+        return a_pDst->assignNoThrow(*this);
+    return a_pDst->appendNoThrow(*this);
 }
 
@@ -760 +763 @@
                               uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
-    Assert(a_fFlags == 0); RT_NOREF(a_fFlags);
-    RT_NOREF(a_pszName); RT_NOREF(a_pErrInfo);
+    RT_NOREF(a_fFlags); RT_NOREF(a_pszName); RT_NOREF(a_pErrInfo);
 
     return assignNoThrow(a_rValue);