dbutils: comparison ucx/cx/json.h

-:b8c826c720f3
+:d33eaaec15da
 #include "common.h"
 #include "allocator.h"
 #include "string.h"
 #include "buffer.h"
 #include "array_list.h"
+#include "map.h"
 #include <string.h>
 #ifdef __cplusplus
 extern "C" {
 /**
 * Type alias for the JSON array struct.
 */
 typedef struct cx_json_array_s CxJsonArray;
 /**
-* Type alias for the JSON object struct.
+* Type alias for the map representing a JSON object.
-*/
+* The map contains pointers of type @c CxJsonValue.
-typedef struct cx_json_object_s CxJsonObject;
+*/
+typedef CxMap* CxJsonObject;
 /**
 * Type alias for a JSON string.
 */
 typedef struct cx_mutstr_s CxJsonString;
 /**
 * Type alias for a JSON literal.
 */
 typedef enum cx_json_literal CxJsonLiteral;
 /**
-* Type alias for a key/value pair in a JSON object.
-*/
-typedef struct cx_json_obj_value_s CxJsonObjValue;
-/**
 * JSON array structure.
 */
 struct cx_json_array_s {
 /**
 * The array data.
 */
-CX_ARRAY_DECLARE(CxJsonValue*, array);
+CX_ARRAY_DECLARE(CxJsonValue*, data);
-};
-/**
-* JSON object structure.
-*/
-struct cx_json_object_s {
-/**
-* The key/value entries.
-*/
-CX_ARRAY_DECLARE(CxJsonObjValue, values);
-/**
-* The original indices to reconstruct the order in which the members were added.
-*/
-size_t *indices;
-};
-/**
-* Structure for a key/value entry in a JSON object.
-*/
-struct cx_json_obj_value_s {
-/**
-* The key (or name in JSON terminology) of the value.
-*/
-cxmutstr name;
-/**
-* The value.
-*/
-CxJsonValue *value;
 };
 /**
 * Structure for a JSON value.
 */
 CxJsonNumber number;
 /**
 * The literal type if the type is #CX_JSON_LITERAL.
 */
 CxJsonLiteral literal;
-} value;
+};
 };
 /**
 * Internally used structure for a parsed token.
 *
 * Never access this value manually.
 */
 CxJsonValue *parsed;
 /**
-* A pointer to an intermediate state of a currently parsed object member.
+* The name of a not yet completely parsed object member.
 *
 * Never access this value manually.
 */
-CxJsonObjValue uncompleted_member;
+cxmutstr uncompleted_member_name;
 /**
 * State stack.
 */
 CX_ARRAY_DECLARE_SIZED(int, states, unsigned);
 struct cx_json_writer_s {
 /**
 * Set true to enable pretty output.
 */
 bool pretty;
-/**
-* Set false to output the members in the order in which they were added.
-*/
-bool sort_members;
 /**
 * The maximum number of fractional digits in a number value.
 * The default value is 6 and values larger than 15 are reduced to 15.
 * Note that the actual number of digits may be lower, depending on the concrete number.
 */
 CX_EXPORT void cxJsonDestroy(CxJson *json);
 /**
 * Destroys and re-initializes the JSON interface.
 *
-* You might want to use this to reset the parser after
+* You must use this to reset the parser after encountering a syntax error
-* encountering a syntax error.
+* if you want to continue using it.
 *
 * @param json the JSON interface
 */
 cx_attr_nonnull
 CX_EXPORT void cxJsonReset(CxJson *json);
 * @retval zero success
 * @retval non-zero internal allocation error
 * @see cxJsonFilln()
 */
 #define cxJsonFill(json, str) cx_json_fill(json, cx_strcast(str))
+/**
+* Internal function - use cxJsonFromString() instead.
+*
+* @param allocator the allocator for the JSON value
+* @param str the string to parse
+* @param value a pointer where the JSON value shall be stored to
+* @return status code
+*/
+cx_attr_nonnull_arg(3)
+CX_EXPORT CxJsonStatus cx_json_from_string(const CxAllocator *allocator,
+cxstring str, CxJsonValue **value);
+/**
+* Parses a string into a JSON value.
+*
+* @param allocator (@c CxAllocator*) the allocator for the JSON value
+* @param str (any string) the string to parse
+* @param value (@c CxJsonValue**) a pointer where the JSON value shall be stored to
+* @retval CX_JSON_NO_ERROR success
+* @retval CX_JSON_NO_DATA the string was empty or blank
+* @retval CX_JSON_INCOMPLETE_DATA the string unexpectedly ended
+* @retval CX_JSON_BUFFER_ALLOC_FAILED allocating internal buffer space failed
+* @retval CX_JSON_VALUE_ALLOC_FAILED allocating memory for the CxJsonValue failed
+* @retval CX_JSON_FORMAT_ERROR_NUMBER the JSON text contains an illegally formatted number
+* @retval CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN JSON syntax error
+*/
+#define cxJsonFromString(allocator, str, value) \
+cx_json_from_string(allocator, cx_strcast(str), value)
 /**
 * Creates a new (empty) JSON object.
 *
 * @param allocator the allocator to use
 * @see cxJsonIsTrue()
 * @see cxJsonIsFalse()
 */
 cx_attr_nonnull
 CX_INLINE bool cxJsonIsBool(const CxJsonValue *value) {
-return cxJsonIsLiteral(value) && value->value.literal != CX_JSON_NULL;
+return cxJsonIsLiteral(value) && value->literal != CX_JSON_NULL;
 }
 /**
 * Checks if the specified value is @c true.
 *
 * @see cxJsonIsBool()
 * @see cxJsonIsFalse()
 */
 cx_attr_nonnull
 CX_INLINE bool cxJsonIsTrue(const CxJsonValue *value) {
-return cxJsonIsLiteral(value) && value->value.literal == CX_JSON_TRUE;
+return cxJsonIsLiteral(value) && value->literal == CX_JSON_TRUE;
 }
 /**
 * Checks if the specified value is @c false.
 *
 * @see cxJsonIsBool()
 * @see cxJsonIsTrue()
 */
 cx_attr_nonnull
 CX_INLINE bool cxJsonIsFalse(const CxJsonValue *value) {
-return cxJsonIsLiteral(value) && value->value.literal == CX_JSON_FALSE;
+return cxJsonIsLiteral(value) && value->literal == CX_JSON_FALSE;
 }
 /**
 * Checks if the specified value is @c null.
 *
 * @retval false otherwise
 * @see cxJsonIsLiteral()
 */
 cx_attr_nonnull
 CX_INLINE bool cxJsonIsNull(const CxJsonValue *value) {
-return cxJsonIsLiteral(value) && value->value.literal == CX_JSON_NULL;
+return cxJsonIsLiteral(value) && value->literal == CX_JSON_NULL;
 }
 /**
 * Obtains a C string from the given JSON value.
 *
 * @return the value represented as double
 * @see cxJsonIsLiteral()
 */
 cx_attr_nonnull
 CX_INLINE bool cxJsonAsBool(const CxJsonValue *value) {
-return value->value.literal == CX_JSON_TRUE;
+return value->literal == CX_JSON_TRUE;
 }
 /**
 * Returns the size of a JSON array.
 *
 * @return the size of the array
 * @see cxJsonIsArray()
 */
 cx_attr_nonnull
 CX_INLINE size_t cxJsonArrSize(const CxJsonValue *value) {
-return value->value.array.array_size;
+return value->array.data_size;
 }
 /**
 * Returns an element from a JSON array.
 *
 * @return the size of the object, i.e., the number of key/value pairs
 * @see cxJsonIsObject()
 */
 cx_attr_nonnull
 CX_INLINE size_t cxJsonObjSize(const CxJsonValue *value) {
-return value->value.object.values_size;
+return cxCollectionSize(value->object);
 }
 /**
-* Returns an iterator over the JSON object members.
+* Returns a map iterator over the JSON object members.
 *
-* The iterator yields values of type @c CxJsonObjValue* which
+* The iterator yields values of type @c CxMapEntry* which
-* contain the name and value of the member.
+* contain the name and the @c CxJsonObjValue* of the member.
 *
 * If the @p value is not a JSON object, the behavior is undefined.
 *
 * @param value the JSON value
 * @return an iterator over the object members
 * @see cxJsonIsObject()
 */
 cx_attr_nonnull cx_attr_nodiscard
-CX_EXPORT CxIterator cxJsonObjIter(const CxJsonValue *value);
+CX_EXPORT CxMapIterator cxJsonObjIter(const CxJsonValue *value);
 /**
 * Internal function, do not use.
 * @param value the JSON object
 * @param name the key to look up

Mercurial > hg > dbutils / file comparison

comparison: ucx/cx/json.h

ucx/cx/json.h