libucl: update to latest version
modified external/libucl/CMakeLists.txt
@@ -1,9 +1,9 @@
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -237,12 +237,13 @@ ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC})
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -305,10 +306,16 @@ ENDIF(UNIX)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified external/libucl/ChangeLog.md
@@ -100,4 +100,126 @@
|
|
|
|
|
|
| - | |
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified external/libucl/Makefile.am
@@ -69,7 +69,7 @@ clean-coverage-report:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/README.md
@@ -1,9 +1,5 @@
|
|
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -374,7 +370,8 @@ Each UCL object can be serialized to one of the four supported formats:
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/configure.ac
@@ -1,6 +1,6 @@
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/lua/lua_ucl.c
@@ -479,7 +479,16 @@ ucl_object_lua_fromelt (lua_State *L, int idx, ucl_string_flags_t flags)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/mum.h
@@ -399,7 +399,7 @@ mum_hash64 (uint64_t key, uint64_t seed) {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_hash.c
@@ -32,12 +32,12 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -45,7 +45,6 @@ static uint64_t
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -115,7 +114,7 @@ ucl_hash_equal (const ucl_object_t *k1, const ucl_object_t *k2)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -227,7 +226,7 @@ ucl_hash_caseless_equal (const ucl_object_t *k1, const ucl_object_t *k2)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -238,8 +237,7 @@ ucl_hash_create (bool ignore_case)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -258,7 +256,6 @@ ucl_hash_create (bool ignore_case)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -269,10 +266,11 @@ void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func func)
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -293,7 +291,12 @@ void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func func)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -303,7 +306,7 @@ ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -314,10 +317,14 @@ ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -325,10 +332,11 @@ ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
|
|
|
@@ -343,7 +351,7 @@ void ucl_hash_replace (ucl_hash_t* hashlin, const ucl_object_t *old,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -354,13 +362,14 @@ void ucl_hash_replace (ucl_hash_t* hashlin, const ucl_object_t *old,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -371,17 +380,17 @@ void ucl_hash_replace (ucl_hash_t* hashlin, const ucl_object_t *old,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -405,13 +414,13 @@ ucl_hash_iterate2 (ucl_hash_t *hashlin, ucl_hash_iter_t *iter, int *ep)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -429,7 +438,7 @@ ucl_hash_iter_has_next (ucl_hash_t *hashlin, ucl_hash_iter_t iter)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -454,7 +463,7 @@ ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned keylen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -463,7 +472,7 @@ ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned keylen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -476,7 +485,6 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -488,16 +496,10 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -505,16 +507,10 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -525,9 +521,7 @@ bool ucl_hash_reserve (ucl_hash_t *hashlin, size_t sz)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -540,8 +534,6 @@ bool ucl_hash_reserve (ucl_hash_t *hashlin, size_t sz)
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -591,27 +583,27 @@ ucl_lc_cmp (const char *s, const char *d, size_t l)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -619,18 +611,18 @@ ucl_hash_sort (ucl_hash_t *hashlin, enum ucl_object_keys_sort_flags fl)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_parser.c
@@ -47,6 +47,9 @@ struct ucl_parser_saved_state {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -176,7 +179,7 @@ start:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -345,7 +348,6 @@ ucl_check_variable_safe (struct ucl_parser *parser, const char *ptr, size_t rema
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -395,6 +397,9 @@ ucl_check_variable (struct ucl_parser *parser, const char *ptr,
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -418,13 +423,14 @@ ucl_check_variable (struct ucl_parser *parser, const char *ptr,
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -435,7 +441,8 @@ ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -444,39 +451,53 @@ ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr,
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -506,7 +527,7 @@ ucl_expand_variable (struct ucl_parser *parser, unsigned char **dst,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -517,7 +538,7 @@ ucl_expand_variable (struct ucl_parser *parser, unsigned char **dst,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -538,10 +559,11 @@ ucl_expand_variable (struct ucl_parser *parser, unsigned char **dst,
|
|
|
|
|
|
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -686,6 +708,8 @@ ucl_parser_add_container (ucl_object_t *obj, struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -722,13 +746,13 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -744,6 +768,7 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -792,26 +817,46 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -819,14 +864,21 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -849,6 +901,10 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -859,6 +915,10 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -883,6 +943,10 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -895,6 +959,10 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -943,7 +1011,7 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -959,11 +1027,11 @@ set_obj:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1037,13 +1105,13 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1812,6 +1880,11 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2889,7 +2962,9 @@ ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| + | |
|
|
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_schema.c
@@ -39,6 +39,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -244,20 +245,22 @@ ucl_schema_validate_object (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -276,6 +279,8 @@ ucl_schema_validate_object (const ucl_object_t *schema,
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_util.c
@@ -67,7 +67,7 @@ typedef kvec_t(ucl_object_t *) ucl_array_t;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -889,44 +889,49 @@ ucl_fetch_file (const unsigned char *filename, unsigned char **buf, size_t *bufl
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -1017,6 +1022,9 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1128,6 +1136,8 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -1138,6 +1148,10 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1147,8 +1161,13 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -1257,6 +1276,8 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -1576,11 +1597,6 @@ ucl_include_common (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1719,9 +1735,8 @@ ucl_priority_handler (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1842,6 +1857,10 @@ ucl_load_handler (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1919,7 +1938,7 @@ ucl_inherit_handler (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2177,7 +2196,7 @@ ucl_strnstr (const char *s, const char *find, int len)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2596,6 +2615,7 @@ ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2627,6 +2647,7 @@ ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -3594,9 +3615,11 @@ ucl_object_copy_internal (const ucl_object_t *other, bool allow_array)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3666,13 +3689,6 @@ ucl_object_compare (const ucl_object_t *o1, const ucl_object_t *o2)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|