Unify definite/indefinite enums 1/2

Author: PJK

src/cbor.c

@@ -120,8 +120,6 @@ cbor_item_t * cbor_load(cbor_data source,
 	struct cbor_decoder_result decode_result;
 	*result = (struct cbor_load_result){ .read = 0, .error = { .code = CBOR_ERR_NONE } };
 
-	// TODO unify errors
-	// TODO unify returns
 	do {
 		if (source_size > result->read) { /* Check for overflows */
 			decode_result = cbor_stream_decode(source + result->read, source_size - result->read, &callbacks, context);
@@ -1175,7 +1173,7 @@ cbor_item_t * cbor_new_definite_array(size_t size)
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_ARRAY,
-		.metadata = { .array_metadata = { .type = _CBOR_ARRAY_METADATA_DEFINITE, .size = 0 } },
+		.metadata = { .array_metadata = { .type = _CBOR_METADATA_DEFINITE, .size = 0 } },
 		.data = malloc(sizeof(cbor_item_t *) * size)
 	};
 	return item;
@@ -1187,7 +1185,7 @@ cbor_item_t * cbor_new_indefinite_array()
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_ARRAY,
-		.metadata = { .array_metadata = { .type = _CBOR_ARRAY_METADATA_INDEFINITE, .size = 0 } },
+		.metadata = { .array_metadata = { .type = _CBOR_METADATA_INDEFINITE, .size = 0 } },
 		.data = NULL /* Can be safely realloc-ed */
 	};
 	return item;
@@ -1211,6 +1209,31 @@ cbor_item_t * cbor_array_push(cbor_item_t * array, cbor_item_t * pushee)
 	return array;
 }
 
+size_t cbor_map_size(cbor_item_t * item)
+{
+	assert(cbor_isa_map(item));
+	return item->metadata.map_metadata.size;
+}
+
+cbor_item_t * cbor_new_definite_map(size_t size)
+{
+	cbor_item_t * item = malloc(sizeof(cbor_item_t));
+	*item = (cbor_item_t){
+		.refcount = 1,
+		.type = CBOR_TYPE_MAP,
+		.metadata = { .map_metadata = { .size = 0} },
+		.data = malloc(sizeof(cbor_item_t *) * size)
+	};
+	return item;
+}
+
+cbor_item_t * cbor_new_indefinite_map();
+cbor_item_t * cbor_map_add(cbor_item_t * item, struct cbor_pair pair);
+bool cbor_map_is_definite(cbor_item_t * item);
+bool cbor_map_is_indefinite(cbor_item_t * item);
+struct cbor_pair * cbor_map_handle(cbor_item_t * item);
+
+
 cbor_item_t * cbor_new_tag(uint64_t value)
 {
 	cbor_item_t * item = malloc(sizeof(cbor_item_t));
@@ -1320,8 +1343,6 @@ bool cbor_is_float(const cbor_item_t * item)
 	return cbor_isa_float_ctrl(item) && !cbor_float_ctrl_is_ctrl(item);
 }
 
-
-
 size_t cbor_bytestring_length(const cbor_item_t * item) {
 	assert(cbor_isa_bytestring(item));
 	return item->metadata.bytestring_metadata.length;
@@ -1352,13 +1373,13 @@ size_t cbor_array_size(cbor_item_t * item)
 bool cbor_array_is_definite(cbor_item_t * item)
 {
 	assert(cbor_isa_array(item));
-	return item->metadata.array_metadata.type == _CBOR_ARRAY_METADATA_DEFINITE;
+	return item->metadata.array_metadata.type == _CBOR_METADATA_DEFINITE;
 }
 
 bool cbor_array_is_indefinite(cbor_item_t * item)
 {
 	assert(cbor_isa_array(item));
-	return item->metadata.array_metadata.type == _CBOR_ARRAY_METADATA_INDEFINITE;
+	return item->metadata.array_metadata.type == _CBOR_METADATA_INDEFINITE;
 }
 
 cbor_item_t ** cbor_array_handle(cbor_item_t * item)

src/cbor.h

@@ -103,13 +103,13 @@ struct _cbor_string_metadata {
 };
 
 typedef enum {
-	_CBOR_ARRAY_METADATA_DEFINITE,
-	_CBOR_ARRAY_METADATA_INDEFINITE
-} _cbor_array_type_metadata;
+	_CBOR_METADATA_DEFINITE,
+	_CBOR_METADATA_INDEFINITE
+} _cbor_dst_metadata;
 
 struct _cbor_array_metadata {
-	size_t                    size;
-	_cbor_array_type_metadata type;
+	size_t                  size;
+	_cbor_dst_metadata type;
 };
 
 struct _cbor_map_metadata {
@@ -156,14 +156,9 @@ struct cbor_error {
 };
 
 struct cbor_pair {
-	cbor_item_t * key, value;
+	cbor_item_t * key, * value;
 };
 
-typedef struct cbor_map_iterator {
-	struct cbor_pair data;
-	// METADATA FOR A LINKED LIST OR TREE OR WHATEVER
-} cbor_map_iterator;
-
 struct cbor_load_result {
 	struct cbor_error error;
 	size_t            read;
@@ -371,14 +366,12 @@ cbor_item_t * cbor_array_push(cbor_item_t * array, cbor_item_t * pushee);
 */
 
 size_t cbor_map_size(cbor_item_t * item);
-cbor_item_t * cbor_new_map();
-struct cbor_map_iterator cbor_map_add(cbor_item_t * item, struct cbor_pair pair);
+cbor_item_t * cbor_new_definite_map(size_t size);
+cbor_item_t * cbor_new_indefinite_map();
+cbor_item_t * cbor_map_add(cbor_item_t * item, struct cbor_pair pair);
 bool cbor_map_is_definite(cbor_item_t * item);
 bool cbor_map_is_indefinite(cbor_item_t * item);
-struct cbor_map_iterator cbor_map_begin(cbor_item_t * item);
-bool cbor_map_iterator_end(struct cbor_map_iterator * iter);
-void cbor_map_iterator_next(struct cbor_map_iterator * iter);
-void cbor_map_delete(struct cbor_map_iterator * iter);
+struct cbor_pair * cbor_map_handle(cbor_item_t * item);
 
 /*
 * ============================================================================