Skip to content

Commit

Permalink
Add insert after/before functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Barenboim
Barenboim committed Dec 3, 2022
1 parent 4d2c15d commit 3e9a63e
Show file tree
Hide file tree
Showing 2 changed files with 132 additions and 25 deletions.
143 changes: 118 additions & 25 deletions json_parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ struct __json_element
typedef struct __json_member json_member_t;
typedef struct __json_element json_element_t;

static void __insert_json_member(json_member_t *memb, json_object_t *obj)
static void __insert_json_member(json_member_t *memb, struct list_head *pos,
json_object_t *obj)
{
struct rb_node **p = &obj->root.rb_node;
struct rb_node *parent = NULL;
Expand All @@ -70,7 +71,7 @@ static void __insert_json_member(json_member_t *memb, json_object_t *obj)

rb_link_node(&memb->rb, parent, p);
rb_insert_color(&memb->rb, &obj->root);
list_add_tail(&memb->list, &obj->head);
list_add(&memb->list, pos);
}

static int __json_string_length(const char *cursor)
Expand Down Expand Up @@ -519,7 +520,7 @@ static int __parse_json_members(const char *cursor, const char **end,
return ret;
}

__insert_json_member(memb, obj);
__insert_json_member(memb, obj->head.prev, obj);
cnt++;

while (isspace(*cursor))
Expand Down Expand Up @@ -874,34 +875,82 @@ const json_value_t *json_object_prev_value(const json_value_t *val,
return &memb->value;
}

const json_value_t *json_object_append(json_object_t *obj,
const char *name,
int type, ...)
static const json_value_t *__json_object_insert(struct list_head *pos,
json_object_t *obj,
const char *name,
int type, va_list ap)
{
json_member_t *memb;
va_list ap;
int ret;
int len;

ret = strlen(name);
memb = (json_member_t *)malloc(offsetof(json_member_t, name) + ret + 1);
len = strlen(name);
memb = (json_member_t *)malloc(offsetof(json_member_t, name) + len + 1);
if (!memb)
return NULL;

memcpy(memb->name, name, ret + 1);
va_start(ap, type);
ret = __set_json_value(type, ap, &memb->value);
va_end(ap);
if (ret < 0)
memcpy(memb->name, name, len + 1);
if (__set_json_value(type, ap, &memb->value) < 0)
{
free(memb);
return NULL;
}

__insert_json_member(memb, obj);
__insert_json_member(memb, pos, obj);
obj->size++;
return &memb->value;
}

const json_value_t *json_object_append(json_object_t *obj,
const char *name,
int type, ...)
{
const json_value_t *val;
va_list ap;

va_start(ap, type);
val = __json_object_insert(obj->head.prev, obj, name, type, ap);
va_end(ap);
return val;
}

const json_value_t *json_object_insert_after(const json_value_t *val,
json_object_t *obj,
const char *name,
int type, ...)
{
struct list_head *pos;
va_list ap;

if (val)
pos = &list_entry(val, json_member_t, list)->list;
else
pos = &obj->head;

va_start(ap, type);
val = __json_object_insert(pos, obj, name, type, ap);
va_end(ap);
return val;
}

const json_value_t *json_object_insert_before(const json_value_t *val,
json_object_t *obj,
const char *name,
int type, ...)
{
struct list_head *pos;
va_list ap;

if (val)
pos = list_entry(val, json_member_t, list)->list.prev;
else
pos = obj->head.prev;

va_start(ap, type);
val = __json_object_insert(pos, obj, name, type, ap);
va_end(ap);
return val;
}

json_value_t *json_object_remove(const json_value_t *val,
json_object_t *obj)
{
Expand Down Expand Up @@ -967,31 +1016,75 @@ const json_value_t *json_array_prev_value(const json_value_t *val,
return &elem->value;
}

const json_value_t *json_array_append(json_array_t *arr,
int type, ...)
static const json_value_t *__json_array_insert(struct list_head *pos,
json_array_t *arr,
int type, va_list ap)
{
json_element_t *elem;
va_list ap;
int ret;

elem = (json_element_t *)malloc(sizeof (json_element_t));
if (!elem)
return NULL;

va_start(ap, type);
ret = __set_json_value(type, ap, &elem->value);
va_end(ap);
if (ret < 0)
if (__set_json_value(type, ap, &elem->value) < 0)
{
free(elem);
return NULL;
}

list_add_tail(&elem->list, &arr->head);
list_add(&elem->list, pos);
arr->size++;
return &elem->value;
}

const json_value_t *json_array_append(json_array_t *arr,
int type, ...)
{
const json_value_t *val;
va_list ap;

va_start(ap, type);
val = __json_array_insert(arr->head.prev, arr, type, ap);
va_end(ap);
return val;
}

const json_value_t *json_array_insert_after(const json_value_t *val,
json_array_t *arr,
int type, ...)
{
struct list_head *pos;
va_list ap;

if (val)
pos = &list_entry(val, json_element_t, list)->list;
else
pos = &arr->head;

va_start(ap, type);
val = __json_array_insert(pos, arr, type, ap);
va_end(ap);
return val;
}

const json_value_t *json_array_insert_before(const json_value_t *val,
json_array_t *arr,
int type, ...)
{
struct list_head *pos;
va_list ap;

if (val)
pos = list_entry(val, json_element_t, list)->list.prev;
else
pos = arr->head.prev;

va_start(ap, type);
val = __json_array_insert(pos, arr, type, ap);
va_end(ap);
return val;
}

json_value_t *json_array_remove(const json_value_t *val,
json_array_t *arr)
{
Expand Down
14 changes: 14 additions & 0 deletions json_parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ const json_value_t *json_object_prev_value(const json_value_t *val,
const json_value_t *json_object_append(json_object_t *obj,
const char *name,
int type, ...);
const json_value_t *json_object_insert_after(const json_value_t *val,
json_object_t *obj,
const char *name,
int type, ...);
const json_value_t *json_object_insert_before(const json_value_t *val,
json_object_t *obj,
const char *name,
int type, ...);
json_value_t *json_object_remove(const json_value_t *val,
json_object_t *obj);

Expand All @@ -54,6 +62,12 @@ const json_value_t *json_array_prev_value(const json_value_t *val,
const json_array_t *arr);
const json_value_t *json_array_append(json_array_t *arry,
int type, ...);
const json_value_t *json_array_insert_after(const json_value_t *val,
json_array_t *arr,
int type, ...);
const json_value_t *json_array_insert_before(const json_value_t *val,
json_array_t *arr,
int type, ...);
json_value_t *json_array_remove(const json_value_t *val,
json_array_t *arr);

Expand Down

0 comments on commit 3e9a63e

Please sign in to comment.