Changeset 74027 in vbox for trunk/include/iprt

Timestamp:

Sep 2, 2018 2:49:45 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/json: Implemented support for parsing floating point values. bugref:9167

Location:

trunk/include/iprt

Files:

• json.h (modified) (5 diffs)
• mangling.h (modified) (1 diff)

trunk/include/iprt/json.h

@@ -51 +51 @@
     /** Value containing a string. */
     RTJSONVALTYPE_STRING,
-    /** Value containg a number. */
+    /** Value containg an integer number. */
+    RTJSONVALTYPE_INTEGER,
+    /** Value containg an floating point number. */
     RTJSONVALTYPE_NUMBER,
     /** Value containg the special null value. */
@@ -172 +174 @@
 
 /**
- * Returns the number from a given JSON number value.
+ * Returns the integer from a given JSON integer value.
  *
  * @returns IPRT status code.
@@ -178 +180 @@
  * @param   hJsonVal        The JSON value handle.
  * @param   pi64Num         WHere to store the number on success.
- *
- * @note    This JSON implementation does not implement support for floating point
- *          numbers currently.  When it does, it will be in the form of a
- *          RTJsonValueQueryFloat method.
+ * @sa      RTJsonValueQueryNumber
  */
 RTDECL(int) RTJsonValueQueryInteger(RTJSONVAL hJsonVal, int64_t *pi64Num);
 
 /**
+ * Returns the floating point value from a given JSON number value.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_JSON_VALUE_INVALID_TYPE if the JSON value is not a number.
+ * @param   hJsonVal        The JSON value handle.
+ * @param   prdNum          WHere to store the floating point number on success.
+ * @sa      RTJsonValueQueryInteger
+ */
+RTDECL(int) RTJsonValueQueryNumber(RTJSONVAL hJsonVal, double *prdNum);
+
+/**
  * Returns the value associated with a given name for the given JSON object value.
  *
@@ -196 +206 @@
  */
 RTDECL(int) RTJsonValueQueryByName(RTJSONVAL hJsonVal, const char *pszName, PRTJSONVAL phJsonVal);
+
+/**
+ * Returns the number of a number value associated with a given name for the given JSON object value.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_JSON_VALUE_INVALID_TYPE if the JSON value is not an object or
+ *          the name does not point to an integer value.
+ * @retval  VERR_NOT_FOUND if the name is not known for this JSON object.
+ * @param   hJsonVal        The JSON value handle.
+ * @param   pszName         The member name of the object.
+ * @param   pi64Num         Where to store the number on success.
+ */
+RTDECL(int) RTJsonValueQueryIntegerByName(RTJSONVAL hJsonVal, const char *pszName, int64_t *pi64Num);
 
 /**
@@ -206 +229 @@
  * @param   hJsonVal        The JSON value handle.
  * @param   pszName         The member name of the object.
- * @param   pi64Num         Where to store the number on success.
- */
-RTDECL(int) RTJsonValueQueryIntegerByName(RTJSONVAL hJsonVal, const char *pszName, int64_t *pi64Num);
+ * @param   prdNum          WHere to store the floating point number on success.
+ */
+RTDECL(int) RTJsonValueQueryNumberByName(RTJSONVAL hJsonVal, const char *pszName, double *prdNum);
 
 /**

trunk/include/iprt/mangling.h

@@ -1119 +1119 @@
 # define RTJsonValueQueryInteger                        RT_MANGLER(RTJsonValueQueryInteger)
 # define RTJsonValueQueryIntegerByName                  RT_MANGLER(RTJsonValueQueryIntegerByName)
+# define RTJsonValueQueryNumber                         RT_MANGLER(RTJsonValueQueryNumber)
+# define RTJsonValueQueryNumberByName                   RT_MANGLER(RTJsonValueQueryNumberByName)
 # define RTJsonValueQueryString                         RT_MANGLER(RTJsonValueQueryString)
 # define RTJsonValueQueryStringByName                   RT_MANGLER(RTJsonValueQueryStringByName)