ucx: comparison src/json.c

-:8610f87a6b14
+:7799addf475f
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
 #include "cx/json.h"
+#include "cx/compare.h"
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <stdio.h>
 * RFC 8259
 * https://tools.ietf.org/html/rfc8259
 */
 static CxJsonValue cx_json_value_nothing = {.type = CX_JSON_NOTHING};
+static int json_cmp_objvalue(const void *l, const void *r) {
+const CxJsonObjValue *left = l;
+const CxJsonObjValue *right = r;
+return cx_strcmp(cx_strcast(left->name), cx_strcast(right->name));
+}
+static CxJsonObjValue *json_find_objvalue(const CxJsonValue *obj, cxstring name) {
+assert(obj->type == CX_JSON_OBJECT);
+CxJsonObjValue kv_dummy;
+kv_dummy.name = cx_mutstrn((char*) name.ptr, name.length);
+size_t index = cx_array_binary_search(
+obj->value.object.values,
+obj->value.object.values_size,
+sizeof(CxJsonObjValue),
+&kv_dummy,
+json_cmp_objvalue
+);
+if (index == obj->value.object.values_size) {
+return NULL;
+} else {
+return &obj->value.object.values[index];
+}
+}
+static int json_add_objvalue(CxJsonValue *obj, CxJsonObjValue member) {
+assert(obj->type == CX_JSON_OBJECT);
+CxArrayReallocator value_realloc = cx_array_reallocator(obj->allocator, NULL);
+return cx_array_simple_add_sorted_a(
+&value_realloc, obj->value.object.values,
+member, json_cmp_objvalue
+);
+}
 static void token_destroy(CxJsonToken *token) {
 if (token->allocated) {
 cx_strfree(&token->content);
 }
 if (v == NULL) return NULL; // LCOV_EXCL_LINE
 // initialize the value
 if (type == CX_JSON_ARRAY) {
 cx_array_initialize_a(json->allocator, v->value.array.array, 16);
-if (v->value.array.array == NULL) { // LCOV_EXCL_START
+if (v->value.array.array == NULL) goto create_json_value_exit_error; // LCOV_EXCL_LINE
-cxFree(json->allocator, v);
-return NULL;
-} // LCOV_EXCL_STOP
 } else if (type == CX_JSON_OBJECT) {
 cx_array_initialize_a(json->allocator, v->value.object.values, 16);
-if (v->value.object.values == NULL) { // LCOV_EXCL_START
+if (v->value.object.values == NULL) goto create_json_value_exit_error; // LCOV_EXCL_LINE
-cxFree(json->allocator, v);
-return NULL;
-} // LCOV_EXCL_STOP
 } else {
 memset(v, 0, sizeof(CxJsonValue));
 }
 v->type = type;
 v->allocator = json->allocator;
 // add the new value to a possible parent
-CxArrayReallocator value_realloc = cx_array_reallocator(json->allocator, NULL);
 if (json->vbuf_size > 0) {
 CxJsonValue *parent = json->vbuf[json->vbuf_size - 1];
+assert(parent != NULL);
 if (parent->type == CX_JSON_ARRAY) {
-cx_array_simple_add_a(&value_realloc, parent->value.array.array, v);
+CxArrayReallocator value_realloc = cx_array_reallocator(json->allocator, NULL);
+if (cx_array_simple_add_a(&value_realloc, parent->value.array.array, v)) {
+goto create_json_value_exit_error; // LCOV_EXCL_LINE
+}
 } else if (parent->type == CX_JSON_OBJECT) {
-assert(parent->value.object.values_size > 0);
+// the member was already created after parsing the name
-assert(parent->value.object.values[parent->value.object.values_size - 1].value == NULL);
+assert(json->uncompleted_member.name.ptr != NULL);
-parent->value.object.values[parent->value.object.values_size - 1].value = v;
+json->uncompleted_member.value = v;
+if (json_add_objvalue(parent, json->uncompleted_member))  {
+goto create_json_value_exit_error; // LCOV_EXCL_LINE
+}
+json->uncompleted_member.name = (cxmutstr) {NULL, 0};
 } else {
 assert(false); // LCOV_EXCL_LINE
 }
 }
 // add the new value to the stack, if it is an array or object
 if (type == CX_JSON_ARRAY || type == CX_JSON_OBJECT) {
 CxArrayReallocator vbuf_realloc = cx_array_reallocator(NULL, json->vbuf_internal);
 if (cx_array_simple_add_a(&vbuf_realloc, json->vbuf, v)) {
-// LCOV_EXCL_START
+goto create_json_value_exit_error; // LCOV_EXCL_LINE
-cxFree(json->allocator, v);
+}
-return NULL;
-} // LCOV_EXCL_STOP
 }
 // if currently no value is parsed, this is now the value of interest
 if (json->parsed == NULL) {
 json->parsed = v;
 }
 return v;
+// LCOV_EXCL_START
+create_json_value_exit_error:
+cxFree(json->allocator, v);
+return NULL;
+// LCOV_EXCL_STOP
 }
 #define JP_STATE_VALUE_BEGIN         0
 #define JP_STATE_VALUE_END          10
 #define JP_STATE_VALUE_BEGIN_OBJ     1
 // add new entry
 cxmutstr name = unescape_string(json->allocator, token.content);
 if (name.ptr == NULL) {
 return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE
 }
-CxJsonObjValue kv = {name, NULL};
+assert(json->uncompleted_member.name.ptr == NULL);
+json->uncompleted_member.name = name;
 assert(json->vbuf_size > 0);
-CxJsonValue *parent = json->vbuf[json->vbuf_size - 1];
-assert(parent != NULL);
-assert(parent->type == CX_JSON_OBJECT);
-CxArrayReallocator value_realloc = cx_array_reallocator(json->allocator, NULL);
-if (cx_array_simple_add_a(&value_realloc, parent->value.object.values, kv)) {
-return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE
-}
 // next state
 json_add_state(json, JP_STATE_OBJ_COLON);
 return_rec(CX_JSON_NO_ERROR);
 }
 obj->value.object.values[i].value = child;
 return 0;
 }
 }
-CxArrayReallocator value_realloc = cx_array_reallocator(obj->allocator, NULL);
-assert(obj->type == CX_JSON_OBJECT);
 cxmutstr k = cx_strdup_a(obj->allocator, name);
 if (k.ptr == NULL) return -1;
 CxJsonObjValue kv = {k, child};
-return cx_array_simple_add_a(&value_realloc, obj->value.object.values, kv);
+return json_add_objvalue(obj, kv);
 }
 CxJsonValue* cxJsonObjPutObj(CxJsonValue* obj, cxstring name) {
 CxJsonValue* v = cxJsonCreateObj(obj->allocator);
 if (v == NULL) return NULL;
 return iter;
 }
 CxJsonValue *cx_json_obj_get_cxstr(const CxJsonValue *value, cxstring name) {
-const CxJsonObject *obj = &(value->value.object);
+CxJsonObjValue *member = json_find_objvalue(value, name);
-// TODO: think about sorting the object so that we can use binary search here
+if (member == NULL) {
-for (size_t i = 0; i < obj->values_size; i++) {
+return &cx_json_value_nothing;
-if (0 == cx_strcmp(name, cx_strcast(obj->values[i].name))) {
+} else {
-return obj->values[i].value;
+return member->value;
 }
 }
-return &cx_json_value_nothing;
-}

Mercurial > hg > ucx / file comparison

comparison: src/json.c

src/json.c