ucx: comparison src/cx/json.h

-:c8dd35f3ea53
+:12da0654e4a9
 #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);
-};
-/**
-* 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.
 */
 * 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.
 */
 * @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->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 > ucx / file comparison

comparison: src/cx/json.h

src/cx/json.h