diff --git a/m-bptree.h b/m-bptree.h index 0908680b..89c02450 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -93,6 +93,8 @@ M_IF_METHOD_BOTH(PARSE_STR, key_oplist, value_oplist)(PARSE_STR(M_C(name, _parse_str)),), \ M_IF_METHOD_BOTH(OUT_STR, key_oplist, value_oplist)(OUT_STR(M_C(name, _out_str)),), \ M_IF_METHOD_BOTH(IN_STR, key_oplist, value_oplist)(IN_STR(M_C(name, _in_str)),), \ + M_IF_METHOD_BOTH(OUT_SERIAL, key_oplist, value_oplist)(OUT_SERIAL(M_C(name, _out_serial)),), \ + M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)(IN_SERIAL(M_C(name, _in_serial)),), \ M_IF_METHOD_BOTH(EQUAL, key_oplist, value_oplist)(EQUAL(M_C(name, _equal_p)),), \ M_IF_METHOD_BOTH(HASH, key_oplist, value_oplist)(HASH(M_C(name, _hash)),) \ ,M_IF_METHOD(NEW, key_oplist)(NEW(M_GET_NEW oplist),) \ @@ -134,6 +136,8 @@ M_IF_METHOD(PARSE_STR, oplist)(PARSE_STR(M_C(name, _parse_str)),), \ M_IF_METHOD(OUT_STR, oplist)(OUT_STR(M_C(name, _out_str)),), \ M_IF_METHOD(IN_STR, oplist)(IN_STR(M_C(name, _in_str)),), \ + M_IF_METHOD(OUT_SERIAL, oplist)(OUT_SERIAL(M_C(name, _out_serial)),), \ + M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_C(name, _in_serial)),), \ M_IF_METHOD(EQUAL, oplist)(EQUAL(M_C(name, _equal_p)),), \ M_IF_METHOD(HASH, oplist)(HASH(M_C(name, _hash)),) \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ @@ -1128,6 +1132,93 @@ return c == ']'; \ } \ , /* no in_str */ ) \ + \ + M_IF_METHOD_BOTH(OUT_SERIAL, key_oplist, value_oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _out_serial)(m_serial_write_t f, tree_t const t1) \ + { \ + BPTREEI_CONTRACT(N, key_oplist, t1); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + const M_C(name, _type_t) *item; \ + bool first_done = false; \ + it_t it; \ + /* Format is different between associative container \ + & set container */ \ + M_IF(isMap)( \ + ret = f->interface->write_map_start(f, t1->size); \ + for (M_C(name, _it)(it, t1) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_map_next(f); \ + ret |= M_CALL_OUT_SERIAL(key_oplist, f, *item->key_ptr); \ + ret |= f->interface->write_map_value(f); \ + ret |= M_CALL_OUT_SERIAL(value_oplist, f, *item->value_ptr); \ + first_done = true; \ + } \ + ret |= f->interface->write_map_end(f); \ + , \ + ret = f->interface->write_array_start(f, t1->size); \ + for (M_C(name, _it)(it, t1) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_array_next(f); \ + ret |= M_CALL_OUT_SERIAL(key_oplist, f, *item); \ + first_done = true; \ + } \ + ret |= f->interface->write_array_end(f); \ + ) \ + return ret & M_SERIAL_FAIL; \ + } \ + , /* no OUT_SERIAL */ ) \ + \ + M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _in_serial)(tree_t t1, m_serial_read_t f) \ + { \ + BPTREEI_CONTRACT(N, key_oplist, t1); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + size_t estimated_size = 0; \ + key_t key; \ + M_C(name,_clean)(t1); \ + M_IF(isMap)( \ + value_t value; \ + ret = f->interface->read_map_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + M_CALL_INIT(key_oplist, key); \ + M_CALL_INIT (value_oplist, value); \ + do { \ + ret = M_CALL_IN_SERIAL(key_oplist, key, f); \ + if (ret != M_SERIAL_OK_DONE) return M_SERIAL_FAIL; \ + ret = f->interface->read_map_value(f); \ + if (ret != M_SERIAL_OK_CONTINUE) return M_SERIAL_FAIL; \ + ret = M_CALL_IN_SERIAL(value_oplist, value, f); \ + if (ret != M_SERIAL_OK_DONE) return M_SERIAL_FAIL; \ + M_C(name, _set_at)(t1, key, value); \ + } while ((ret = f->interface->read_map_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(key_oplist, key); \ + M_CALL_CLEAR(value_oplist, value); \ + , \ + ret = f->interface->read_array_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + M_CALL_INIT(key_oplist, key); \ + do { \ + ret = M_CALL_IN_SERIAL(key_oplist, key, f); \ + if (ret != M_SERIAL_OK_DONE) { break; } \ + M_C(name, _push)(t1, key); \ + } while ((ret = f->interface->read_array_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(key_oplist, key); \ + ) /* End of IF isMap */ \ + return ret; \ + } \ + , /* no in_serial */ ) \ + \ + \ #endif diff --git a/m-deque.h b/m-deque.h index d827e937..be7f802e 100644 --- a/m-deque.h +++ b/m-deque.h @@ -851,6 +851,54 @@ return c == ']'; \ } \ , /* no IN_STR */ ) \ + \ + M_IF_METHOD(OUT_SERIAL, oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _out_serial)(m_serial_write_t f, const deque_t deque) \ + { \ + DEQUEI_CONTRACT(deque); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + bool first_done = false; \ + ret = f->interface->write_array_start(f, deque->count); \ + M_C(name, _it_t) it; \ + for (M_C(name, _it)(it, deque) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + type const *item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_array_next(f); \ + ret |= M_CALL_OUT_SERIAL(oplist, f, *item); \ + first_done = true; \ + } \ + ret |= f->interface->write_array_end(f); \ + return ret & M_SERIAL_FAIL; \ + } \ + , /* no OUT_SERIAL */ ) \ + \ + M_IF_METHOD2(IN_SERIAL, INIT, oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _in_serial)(deque_t deque, m_serial_read_t f) \ + { \ + DEQUEI_CONTRACT(deque); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + size_t estimated_size = 0; \ + M_C(name,_clean)(deque); \ + ret = f->interface->read_array_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + type item; \ + M_CALL_INIT(oplist, item); \ + do { \ + ret = M_CALL_IN_SERIAL(oplist, item, f); \ + if (ret != M_SERIAL_OK_DONE) { break; } \ + M_C(name, _push_back)(deque, item); \ + } while ((ret = f->interface->read_array_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(oplist, item); \ + return ret; \ + } \ + , /* no IN_SERIAL & INIT */ ) \ + \ #define DEQUEI_OPLIST(arg) DEQUEI_OPLIST2 arg @@ -888,6 +936,8 @@ ,M_IF_METHOD(PARSE_STR, oplist)(PARSE_STR(M_C(name, _parse_str)),) \ ,M_IF_METHOD(OUT_STR, oplist)(OUT_STR(M_C(name, _out_str)),) \ ,M_IF_METHOD(IN_STR, oplist)(IN_STR(M_C(name, _in_str)),) \ + ,M_IF_METHOD(OUT_SERIAL, oplist)(OUT_SERIAL(M_C(name, _out_serial)),) \ + ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_C(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, oplist)(EQUAL(M_C(name, _equal_p)),) \ ,M_IF_METHOD(HASH, oplist)(HASH(M_C(name, _hash)),) \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ diff --git a/m-dict.h b/m-dict.h index 569662bb..7dbed5a4 100644 --- a/m-dict.h +++ b/m-dict.h @@ -178,8 +178,12 @@ LIST_OPLIST(M_C(name, _list_pair), TUPLE_OPLIST(M_C(name, _pair), key_oplist))) \ \ DICTI_FUNC_DEF2(name, key_type, key_oplist, key_type, \ - (INIT(M_EMPTY_DEFAULT), INIT_SET(M_EMPTY_DEFAULT), SET(M_EMPTY_DEFAULT), CLEAR(M_EMPTY_DEFAULT), \ - EQUAL(M_EMPTY_DEFAULT), GET_STR(M_EMPTY_DEFAULT), OUT_STR(M_EMPTY_DEFAULT), IN_STR(M_TRUE_DEFAULT), PARSE_STR(M_TRUE_DEFAULT)), \ + (INIT(M_EMPTY_DEFAULT), INIT_SET(M_EMPTY_DEFAULT), \ + SET(M_EMPTY_DEFAULT), CLEAR(M_EMPTY_DEFAULT), \ + EQUAL(M_EMPTY_DEFAULT), GET_STR(M_EMPTY_DEFAULT), \ + OUT_STR(M_EMPTY_DEFAULT), IN_STR(M_TRUE_DEFAULT), \ + OUT_SERIAL(M_EMPTY_DEFAULT), IN_SERIAL(M_TRUE_DEFAULT), \ + PARSE_STR(M_TRUE_DEFAULT)), \ 1, 0, M_C(name, _t), M_C(name, _it_t)) @@ -747,9 +751,11 @@ if (M_UNLIKELY (c == EOF)) return true; \ ungetc(c, file); \ key_type key; \ - M_IF(isSet)( ,value_type value); \ M_CALL_INIT(key_oplist, key); \ - M_CALL_INIT(value_oplist, value); \ + M_IF(isSet)(, \ + value_type value; \ + M_CALL_INIT(value_oplist, value); \ + ) \ do { \ do { c = fgetc(file); } while (isspace(c)); \ ungetc(c, file); \ @@ -767,11 +773,96 @@ ) \ do { c = fgetc(file); } while (isspace(c)); \ } while (c == ','); \ - M_CALL_CLEAR(key_oplist, key); \ - M_CALL_CLEAR(value_oplist, value); \ + M_CALL_CLEAR(key_oplist, key); \ + M_IF(isSet)(, \ + M_CALL_CLEAR(value_oplist, value); \ + ) \ return c == '}'; \ } \ , /* no IN_STR */ ) \ + \ + M_IF_METHOD_BOTH(OUT_SERIAL, key_oplist, value_oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _out_serial)(m_serial_write_t f, dict_t const t1) \ + { \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + const M_C(name, _type_t) *item; \ + bool first_done = false; \ + dict_it_t it; \ + /* Format is different between associative container \ + & set container */ \ + M_IF(isSet)( \ + ret = f->interface->write_array_start(f, M_C(name, _size)(t1)); \ + for (M_C(name, _it)(it, t1) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_array_next(f); \ + ret |= M_CALL_OUT_SERIAL(key_oplist, f, *item); \ + first_done = true; \ + } \ + ret |= f->interface->write_array_end(f); \ + , \ + ret = f->interface->write_map_start(f, M_C(name, _size)(t1)); \ + for (M_C(name, _it)(it, t1) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_map_next(f); \ + ret |= M_CALL_OUT_SERIAL(key_oplist, f, item->key); \ + ret |= f->interface->write_map_value(f); \ + ret |= M_CALL_OUT_SERIAL(value_oplist, f, item->value); \ + first_done = true; \ + } \ + ret |= f->interface->write_map_end(f); \ + ) \ + return ret & M_SERIAL_FAIL; \ + } \ + , /* no OUT_SERIAL */ ) \ + \ + M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _in_serial)(dict_t t1, m_serial_read_t f) \ + { \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + size_t estimated_size = 0; \ + key_type key; \ + M_C(name,_clean)(t1); \ + M_IF(isSet)( \ + ret = f->interface->read_array_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + M_CALL_INIT(key_oplist, key); \ + do { \ + ret = M_CALL_IN_SERIAL(key_oplist, key, f); \ + if (ret != M_SERIAL_OK_DONE) { break; } \ + M_C(name, _push)(t1, key); \ + } while ((ret = f->interface->read_array_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(key_oplist, key); \ + , \ + value_type value; \ + ret = f->interface->read_map_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + M_CALL_INIT(key_oplist, key); \ + M_CALL_INIT (value_oplist, value); \ + do { \ + ret = M_CALL_IN_SERIAL(key_oplist, key, f); \ + if (ret != M_SERIAL_OK_DONE) return M_SERIAL_FAIL; \ + ret = f->interface->read_map_value(f); \ + if (ret != M_SERIAL_OK_CONTINUE) return M_SERIAL_FAIL; \ + ret = M_CALL_IN_SERIAL(value_oplist, value, f); \ + if (ret != M_SERIAL_OK_DONE) return M_SERIAL_FAIL; \ + M_C(name, _set_at)(t1, key, value); \ + } while ((ret = f->interface->read_map_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(key_oplist, key); \ + M_CALL_CLEAR(value_oplist, value); \ + ) /* End of IF isSet */ \ + return ret; \ + } \ + , /* no in_serial */ ) \ \ M_IF(isSet)( \ static inline void \ @@ -855,6 +946,8 @@ ,M_IF_METHOD_BOTH(PARSE_STR, key_oplist, value_oplist)(PARSE_STR(M_C(name, _parse_str)),) \ ,M_IF_METHOD_BOTH(OUT_STR, key_oplist, value_oplist)(OUT_STR(M_C(name, _out_str)),) \ ,M_IF_METHOD_BOTH(IN_STR, key_oplist, value_oplist)(IN_STR(M_C(name, _in_str)),) \ + ,M_IF_METHOD_BOTH(OUT_SERIAL, key_oplist, value_oplist)(OUT_SERIAL(M_C(name, _out_serial)),) \ + ,M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)(IN_SERIAL(M_C(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, value_oplist)(EQUAL(M_C(name, _equal_p)),) \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW key_oplist),) \ ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC key_oplist),) \ @@ -899,6 +992,8 @@ ,M_IF_METHOD(PARSE_STR, oplist)(PARSE_STR(M_C(name, _parse_str)),) \ ,M_IF_METHOD(OUT_STR, oplist)(OUT_STR(M_C(name, _out_str)),) \ ,M_IF_METHOD(IN_STR, oplist)(IN_STR(M_C(name, _in_str)),) \ + ,M_IF_METHOD(OUT_SERIAL, oplist)(OUT_SERIAL(M_C(name, _out_serial)),) \ + ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_C(name, _in_serial)),) \ ,EQUAL(M_C(name, _equal_p)), \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ diff --git a/m-rbtree.h b/m-rbtree.h index 57147313..10b4d621 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -81,6 +81,8 @@ M_IF_METHOD(PARSE_STR, oplist)(PARSE_STR(M_C(name, _parse_str)),), \ M_IF_METHOD(OUT_STR, oplist)(OUT_STR(M_C(name, _out_str)),), \ M_IF_METHOD(IN_STR, oplist)(IN_STR(M_C(name, _in_str)),), \ + M_IF_METHOD(OUT_SERIAL, oplist)(OUT_SERIAL(M_C(name, _out_serial)),), \ + M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_C(name, _in_serial)),), \ M_IF_METHOD(EQUAL, oplist)(EQUAL(M_C(name, _equal_p)),), \ M_IF_METHOD(HASH, oplist)(HASH(M_C(name, _hash)),) \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ @@ -989,6 +991,56 @@ typedef enum { } \ , /* no in_str */ ) \ \ + \ + M_IF_METHOD(OUT_SERIAL, oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _out_serial)(m_serial_write_t f, tree_t const t1) \ + { \ + RBTREEI_CONTRACT(t1); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + const M_C(name, _type_t) *item; \ + bool first_done = false; \ + tree_it_t it; \ + ret = f->interface->write_array_start(f, t1->size); \ + for (M_C(name, _it)(it, t1) ; \ + !M_C(name, _end_p)(it); \ + M_C(name, _next)(it)){ \ + item = M_C(name, _cref)(it); \ + if (first_done) \ + ret |= f->interface->write_array_next(f); \ + ret |= M_CALL_OUT_SERIAL(oplist, f, *item); \ + first_done = true; \ + } \ + ret |= f->interface->write_array_end(f); \ + return ret & M_SERIAL_FAIL; \ + } \ + , /* no OUT_SERIAL */ ) \ + \ + M_IF_METHOD(IN_SERIAL, oplist)( \ + static inline m_serial_return_code_t \ + M_C(name, _in_serial)(tree_t t1, m_serial_read_t f) \ + { \ + RBTREEI_CONTRACT(t1); \ + assert (f != NULL && f->interface != NULL); \ + m_serial_return_code_t ret; \ + size_t estimated_size = 0; \ + type key; \ + M_C(name,_clean)(t1); \ + ret = f->interface->read_array_start(f, &estimated_size); \ + if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \ + M_CALL_INIT(oplist, key); \ + do { \ + ret = M_CALL_IN_SERIAL(oplist, key, f); \ + if (ret != M_SERIAL_OK_DONE) { break; } \ + M_C(name, _push)(t1, key); \ + } while ((ret = f->interface->read_array_next(f)) == M_SERIAL_OK_CONTINUE); \ + M_CALL_CLEAR(oplist, key); \ + return ret; \ + } \ + , /* no in_serial */ ) \ + \ + \ // TODO: specialized _sort shall do nothing, but shall check the requested order. How ?