Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

json: support parsing and serializing of char arrays and integers (int8_t, uint8_t, etc.) #87580

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+899 −134
Open

json: support parsing and serializing of char arrays and integers (int8_t, uint8_t, etc.) #87580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9054f10
json: Fix calculation of object size
cjwinklhofer Mar 23, 2025
a0dd3ec
json: support parsing and serializing of strings with char arrays
cjwinklhofer Mar 24, 2025
0d9a834
json: improve parsing and serializing of integers
cjwinklhofer Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions include/zephyr/data/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ enum json_tokens {
JSON_TOK_ARRAY_START = '[',
JSON_TOK_ARRAY_END = ']',
JSON_TOK_STRING = '"',
JSON_TOK_STRING_BUF = 's',
JSON_TOK_COLON = ':',
JSON_TOK_COMMA = ',',
JSON_TOK_NUMBER = '0',
Expand All @@ -44,6 +45,8 @@ enum json_tokens {
JSON_TOK_ENCODED_OBJ = '4',
JSON_TOK_INT64 = '5',
JSON_TOK_UINT64 = '6',
JSON_TOK_INT = 'i',
JSON_TOK_UINT = 'u',
JSON_TOK_TRUE = 't',
JSON_TOK_FALSE = 'f',
JSON_TOK_NULL = 'n',
Expand Down Expand Up @@ -108,6 +111,9 @@ struct json_obj_descr {
const struct json_obj_descr *element_descr;
size_t n_elements;
} array;
struct {
size_t size;
} field;
};
};

Expand Down Expand Up @@ -157,6 +163,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
.field_name_len = sizeof(#field_name_) - 1, \
.type = type_, \
.offset = offsetof(struct_, field_name_), \
.field = { \
.size = SIZEOF_FIELD(struct_, field_name_) \
}, \
}

/**
Expand Down Expand Up @@ -244,6 +253,19 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
}, \
}

/**
* @internal @brief Helper macro to declare a field descriptor
*
* @param struct_ Struct packing the values
* @param field_name_ Field name in the struct
*/
#define Z_JSON_DESCR_FIELD(struct_, field_name_) \
{ \
.field = { \
.size = SIZEOF_FIELD(struct_, field_name_), \
}, \
}

/**
* @brief Helper macro to declare a descriptor for an array of primitives
*
Expand Down Expand Up @@ -276,7 +298,8 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
.offset = offsetof(struct_, field_name_), \
.array = { \
.element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \
elem_type_,), \
elem_type_, \
Z_JSON_DESCR_FIELD(struct_, field_name_[0])), \
.n_elements = (max_len_), \
}, \
}
Expand Down Expand Up @@ -449,6 +472,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
.field_name_len = sizeof(json_field_name_) - 1, \
.type = type_, \
.offset = offsetof(struct_, struct_field_name_), \
.field = { \
.size = SIZEOF_FIELD(struct_, struct_field_name_) \
}, \
}

/**
Expand Down Expand Up @@ -504,8 +530,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
.type = JSON_TOK_ARRAY_START, \
.offset = offsetof(struct_, struct_field_name_), \
.array = { \
.element_descr = \
Z_JSON_ELEMENT_DESCR(struct_, len_field_, elem_type_,), \
.element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \
elem_type_, \
Z_JSON_DESCR_FIELD(struct_, struct_field_name_[0])), \
.n_elements = (max_len_), \
}, \
}
Expand Down
Loading