diff --git a/m-serial-json.h b/m-serial-json.h index d71b0a0a..2956b0c6 100644 --- a/m-serial-json.h +++ b/m-serial-json.h @@ -80,6 +80,7 @@ static inline m_serial_return_code_t m_serial_json_write_tuple_start(m_serial_ } static inline m_serial_return_code_t m_serial_json_write_tuple_id(m_serial_write_t serial, const char *const field_name[], const int max, const int index){ + (void) max; FILE *f = (FILE *)serial->data[0]; int n = fprintf(f, "%c\"%s\":", index == 0 ? ' ' : ',', field_name[index]); return n > 0 ? M_SERIAL_OK_CONTINUE : M_SERIAL_FAIL; @@ -92,7 +93,7 @@ static inline m_serial_return_code_t m_serial_json_write_tuple_end(m_serial_wr } static inline m_serial_return_code_t m_serial_json_write_variant_start(m_serial_write_t serial, const char *const field_name[], const int max, const int index){ return M_SERIAL_FAIL; } -static inline m_serial_return_code_t m_serial_json_write_variant_end(m_serial_write_t serial){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_write_variant_end(m_serial_write_t serial){ return M_SERIAL_FAIL; } static const m_serial_write_interface_t m_serial_write_json_interface = { m_serial_json_write_boolean, @@ -113,13 +114,121 @@ static const m_serial_write_interface_t m_serial_write_json_interface = { m_serial_json_write_variant_end }; -static inline void m_serial_write_json_init(m_serial_write_t serial, FILE *f) +static inline void m_serial_json_write_init(m_serial_write_t serial, FILE *f) { serial->interface = &m_serial_write_json_interface; serial->data[0] = (void*) f; } -static inline void m_serial_write_json_clear(m_serial_write_t serial) +static inline void m_serial_json_write_clear(m_serial_write_t serial) +{ + (void) serial; // Nothing to do +} + +static inline int +m_serial_json_read_skip (FILE *f) +{ + int c; + do { + c = fgetc(f); + } while (isspace(c)); + return c; +} + +static inline m_serial_return_code_t +m_serial_json_read_boolean(m_serial_read_t serial, bool *b){ + FILE *f = (FILE*) serial->data[0]; + int c = m_serial_json_read_skip(f); + if (c == 't') { + *b = true; + c = fgetc(f); + if (c != 'r') return M_SERIAL_FAIL; + c = fgetc(f); + if (c != 'u') return M_SERIAL_FAIL; + c = fgetc(f); + if (c != 'e') return M_SERIAL_FAIL; + return M_SERIAL_OK_DONE; + } else if (c == 'f') { + *b = false; + c = fgetc(f); + if (c != 'a') return M_SERIAL_FAIL; + c = fgetc(f); + if (c != 'l') return M_SERIAL_FAIL; + c = fgetc(f); + if (c != 's') return M_SERIAL_FAIL; + c = fgetc(f); + if (c != 'e') return M_SERIAL_FAIL; + return M_SERIAL_OK_DONE; + } else { + return M_SERIAL_FAIL; + } +} + +static inline m_serial_return_code_t +m_serial_json_read_integer(m_serial_read_t serial, long long *i){ + FILE *f = (FILE*) serial->data[0]; + int c = m_serial_json_read_skip(f); + ungetc(c, f); + return fscanf(f, "%lld", i) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL; +} + +static inline m_serial_return_code_t +m_serial_json_read_float(m_serial_read_t serial, long double *r){ + FILE *f = (FILE*) serial->data[0]; + int c = m_serial_json_read_skip(f); + ungetc(c, f); + return fscanf(f, "%Lf", r) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL; +} + +static inline m_serial_return_code_t m_serial_json_read_string(m_serial_read_t serial, struct string_s *s){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_read_array_start(m_serial_read_t serial, size_t *num){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_read_array_next(m_serial_read_t serial){ return M_SERIAL_FAIL; } // Return M_SERIAL_OK_DONE when array is finished parsing. +static inline m_serial_return_code_t m_serial_json_read_map_start(m_serial_read_t serial, size_t *num){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_read_map_value(m_serial_read_t serial){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_read_map_next(m_serial_read_t serial){ return M_SERIAL_FAIL; } // Return M_SERIAL_OK_DONE when map is finished parsing. + +static inline m_serial_return_code_t +m_serial_json_read_tuple_start(m_serial_read_t serial){ + FILE *f = (FILE*) serial->data[0]; + int c = m_serial_json_read_skip(f); + return (c != '{') ? M_SERIAL_FAIL : M_SERIAL_OK_CONTINUE; +} + +static inline m_serial_return_code_t +m_serial_json_read_tuple_id(m_serial_read_t serial, const char *const field_name [], const int max, int *id){ + FILE *f = (FILE*) serial->data[0]; + int c = m_serial_json_read_skip(f); + if (c == '}') return M_SERIAL_OK_DONE; + if (c != '"') return M_SERIAL_FAIL; + +} + +static inline m_serial_return_code_t m_serial_json_read_variant_start(m_serial_read_t serial, const char *const field_name[], const int max, int*id){ return M_SERIAL_FAIL; } +static inline m_serial_return_code_t m_serial_json_read_variant_end(m_serial_read_t serial){ return M_SERIAL_FAIL; } + +static const m_serial_read_interface_t m_serial_json_read_interface = { + m_serial_json_read_boolean, + m_serial_json_read_integer, + m_serial_json_read_float, + m_serial_json_read_string, + m_serial_json_read_array_start, + m_serial_json_read_array_next, + m_serial_json_read_map_start, + m_serial_json_read_map_value, + m_serial_json_read_map_next, + m_serial_json_read_tuple_start, + m_serial_json_read_tuple_id, + m_serial_json_read_variant_start, + m_serial_json_read_variant_end +}; + +static inline void m_serial_json_read_init(m_serial_read_t serial, FILE *f) +{ + serial->interface = &m_serial_json_read_interface; + serial->data[0] = (void*) f; +} + +static inline void m_serial_json_read_clear(m_serial_read_t serial) { (void) serial; // Nothing to do }