Changeset 73874 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 24, 2018 3:36:01 PM (6 years ago)

Author:

vboxsync

Message:

RTJson: Added RTJsonValueTypeName and did some internal macro cleanups in the implementation. bugref:9167

File:

• trunk/src/VBox/Runtime/common/misc/json.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/misc/json.cpp

@@ -1298 +1298 @@
 
 
-#define AssertJsonTypeReturn(pJson, enmExpectedType, ret) do {          \
-        AssertPtrReturn((pJson), (ret));                                \
-        AssertReturn((pJson) != NIL_RTJSONVAL, (ret));                  \
-        AssertReturn((pJson)->enmType == (enmExpectedType), (ret));     \
+RTDECL(const char *) RTJsonValueTypeName(RTJSONVALTYPE enmType)
+{
+    switch (enmType)
+    {
+        case RTJSONVALTYPE_INVALID: return "invalid";
+        case RTJSONVALTYPE_OBJECT:  return "object";
+        case RTJSONVALTYPE_ARRAY:   return "array";
+        case RTJSONVALTYPE_STRING:  return "string";
+        case RTJSONVALTYPE_NUMBER:  return "number";
+        case RTJSONVALTYPE_NULL:    return "null";
+        case RTJSONVALTYPE_TRUE:    return "true";
+        case RTJSONVALTYPE_FALSE:   return "false";
+        default:                    return "???";
+    }
+}
+
+
+#define RTJSON_ASSERT_TYPE_RETURN(pJson, enmExpectedType, ret) do { \
+        AssertPtrReturn((pJson), (ret));  \
+        AssertReturn((pJson) != NIL_RTJSONVAL, (ret)); \
+        AssertReturn((pJson)->enmType == (enmExpectedType), (ret)); \
     } while (0)
 
-#define RTJSON_TYPECHECK(pJson, enmExpectedType) do {   \
-        if (RT_UNLIKELY((pJson) == NIL_RTJSONVAL))      \
-            return VERR_INVALID_HANDLE;                 \
-        if ((pJson)->enmType != (enmExpectedType))      \
-            return VERR_JSON_VALUE_INVALID_TYPE;        \
+#define RTJSON_TYPECHECK_RETURN(pJson, enmExpectedType) do {\
+        if (RT_LIKELY((pJson) != NIL_RTJSONVAL)) { /*likely*/ } \
+        else return VERR_INVALID_HANDLE; \
+        if ((pJson)->enmType == (enmExpectedType)) { /*likely*/ } \
+        else return VERR_JSON_VALUE_INVALID_TYPE; \
     } while (0)
 
 
-#define RTJSON_TYPECHECK_CONTAINER(pJson) do {                  \
-        if (RT_UNLIKELY((pJson) == NIL_RTJSONVAL))              \
-            return VERR_INVALID_HANDLE;                         \
-        if (   (pJson)->enmType != RTJSONVALTYPE_ARRAY          \
-            && (pJson)->enmType != RTJSONVALTYPE_OBJECT)        \
-            return VERR_JSON_VALUE_INVALID_TYPE;                \
+#define RTJSON_TYPECHECK_CONTAINER_RETURN(pJson) do { \
+        if (RT_LIKELY((pJson) != NIL_RTJSONVAL)) { /* likely */ } \
+        else return VERR_INVALID_HANDLE; \
+        if (   (pJson)->enmType == RTJSONVALTYPE_ARRAY  \
+            || (pJson)->enmType == RTJSONVALTYPE_OBJECT) \
+        { /* likely */ } \
+        else return VERR_JSON_VALUE_INVALID_TYPE; \
     } while (0)
 
@@ -1324 +1342 @@
 {
     PRTJSONVALINT pThis = hJsonVal;
-    AssertJsonTypeReturn(pThis, RTJSONVALTYPE_STRING, NULL);
+    RTJSON_ASSERT_TYPE_RETURN(pThis, RTJSONVALTYPE_STRING, NULL);
 
     return pThis->Type.String.pszStr;
@@ -1336 +1354 @@
     AssertPtrReturn(ppszStr, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK(pThis, RTJSONVALTYPE_STRING);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_STRING);
     *ppszStr = pThis->Type.String.pszStr;
     return VINF_SUCCESS;
@@ -1347 +1365 @@
     AssertPtrReturn(pi64Num, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK(pThis, RTJSONVALTYPE_NUMBER);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_NUMBER);
     *pi64Num = pThis->Type.Number.i64Num;
     return VINF_SUCCESS;
@@ -1359 +1377 @@
     AssertPtrReturn(phJsonVal, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK(pThis, RTJSONVALTYPE_OBJECT);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_OBJECT);
 
     int rc = VERR_NOT_FOUND;
@@ -1433 +1451 @@
 {
     PRTJSONVALINT pThis = hJsonVal;
-    AssertJsonTypeReturn(pThis, RTJSONVALTYPE_ARRAY, 0);
+    RTJSON_ASSERT_TYPE_RETURN(pThis, RTJSONVALTYPE_ARRAY, 0);
 
     return pThis->Type.Array.cItems;
@@ -1444 +1462 @@
     AssertPtrReturn(pcItems, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK(pThis, RTJSONVALTYPE_ARRAY);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_ARRAY);
     *pcItems = pThis->Type.Array.cItems;
     return VINF_SUCCESS;
@@ -1455 +1473 @@
     AssertPtrReturn(phJsonVal, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK(pThis, RTJSONVALTYPE_ARRAY);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_ARRAY);
     if (RT_UNLIKELY(idx >= pThis->Type.Array.cItems))
         return VERR_OUT_OF_RANGE;
@@ -1470 +1488 @@
     AssertPtrReturn(phJsonIt, VERR_INVALID_POINTER);
 
-    RTJSON_TYPECHECK_CONTAINER(pThis);
+    RTJSON_TYPECHECK_CONTAINER_RETURN(pThis);
 
     PRTJSONITINT pIt = (PRTJSONITINT)RTMemTmpAllocZ(sizeof(RTJSONITINT));