Update libucl to latest version
modified external/libucl/ChangeLog.md
@@ -35,7 +35,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -64,4 +64,40 @@
|
|
|
|
|
|
| - | |
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified external/libucl/Makefile.unix
@@ -1,7 +1,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -25,13 +25,12 @@ HDEPS = $(SRCDIR)/ucl_hash.h \
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -55,8 +54,6 @@ $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS)
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified external/libucl/Makefile.w32
@@ -28,14 +28,13 @@ HDEPS = $(SRCDIR)/ucl_hash.h \
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified external/libucl/README.md
@@ -1,6 +1,8 @@
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -12,16 +14,17 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,7 +50,7 @@ section {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -163,9 +166,9 @@ section {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -174,7 +177,7 @@ section "blah" "foo" {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -196,17 +199,17 @@ section {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -217,8 +220,8 @@ Multiline comments may be nested:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -229,12 +232,12 @@ arguments themselves are the UCL object that is parsed and passed to a macro as
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -263,7 +266,7 @@ all files that matches the specified pattern (normally the format of patterns is
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -273,7 +276,7 @@ object or an array.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -320,7 +323,7 @@ Here are some rules for this syntax:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -331,6 +334,18 @@ text
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -347,7 +362,7 @@ UCL allows validation of objects. It uses the same schema that is used for json:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -377,6 +392,6 @@ You can do your own benchmarks by running `make check` in libucl top directory.
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
modified external/libucl/configure.ac
@@ -1,7 +1,7 @@
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -39,6 +39,7 @@ AC_CHECK_HEADERS_ONCE([stdarg.h])
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified external/libucl/doc/api.md
@@ -349,7 +349,7 @@ This object should be released by caller.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/doc/lua_api.md
@@ -38,7 +38,7 @@ func = "huh";
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -69,8 +69,8 @@ converts `obj` to lua representation using the following conversions:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/include/lua_ucl.h
@@ -55,6 +55,14 @@ UCL_EXTERN int luaopen_ucl (lua_State *L);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/include/ucl++.h
@@ -29,6 +29,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -106,7 +107,7 @@ private:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -123,17 +124,17 @@ private:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -152,7 +153,8 @@ private:
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -168,6 +170,16 @@ private:
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -184,7 +196,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -218,7 +230,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -330,7 +342,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -373,7 +385,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -384,7 +396,16 @@ public:
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -393,7 +414,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -403,12 +424,12 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -432,43 +453,116 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -480,13 +574,46 @@ public:
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -556,7 +683,7 @@ public:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/include/ucl.h
@@ -105,10 +105,11 @@ typedef enum ucl_error {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -177,7 +178,8 @@ typedef enum ucl_string_flags {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -187,7 +189,8 @@ typedef enum ucl_object_flags {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -463,6 +466,13 @@ UCL_EXTERN bool ucl_object_insert_key_merged (ucl_object_t *top, ucl_object_t *e
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -534,6 +544,13 @@ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -830,7 +847,7 @@ UCL_EXTERN ucl_object_iter_t ucl_object_iterate_reset (ucl_object_iter_t it,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -848,7 +865,7 @@ enum ucl_iterate_type {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -912,7 +929,7 @@ struct ucl_parser;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -921,6 +938,14 @@ UCL_EXTERN struct ucl_parser* ucl_parser_new (int flags);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -997,6 +1022,16 @@ UCL_EXTERN bool ucl_parser_add_chunk_priority (struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1019,7 +1054,7 @@ UCL_EXTERN bool ucl_parser_add_chunk_full (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1125,6 +1160,29 @@ UCL_EXTERN bool ucl_set_include_path (struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1185,7 +1243,7 @@ UCL_EXTERN const ucl_object_t * ucl_comments_find (const ucl_object_t *comments,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1221,6 +1279,34 @@ UCL_EXTERN bool ucl_parser_pubkey_add (struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1420,7 +1506,7 @@ enum ucl_schema_error_code {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1428,7 +1514,7 @@ struct ucl_schema_error {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1440,7 +1526,7 @@ UCL_EXTERN bool ucl_object_validate (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1456,7 +1542,7 @@ UCL_EXTERN bool ucl_object_validate_root (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/lua/lua_ucl.c
@@ -68,13 +68,16 @@ func = "huh";
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -141,25 +144,22 @@ ucl_object_lua_push_object (lua_State *L, const ucl_object_t *obj,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -187,6 +187,9 @@ ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -202,6 +205,9 @@ ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -289,55 +295,101 @@ ucl_object_push_lua (lua_State *L, const ucl_object_t *obj, bool allow_array)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -345,15 +397,25 @@ ucl_object_lua_fromtable (lua_State *L, int idx)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -367,18 +429,27 @@ ucl_object_lua_fromtable (lua_State *L, int idx)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -406,13 +477,13 @@ ucl_object_lua_fromelt (lua_State *L, int idx)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -451,10 +522,38 @@ ucl_object_lua_import (lua_State *L, int idx)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -590,6 +689,76 @@ lua_ucl_parser_parse_file (lua_State *L)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -630,6 +799,52 @@ lua_ucl_parser_parse_string (lua_State *L)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -977,6 +1192,15 @@ lua_ucl_parser_mt (lua_State *L)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1021,6 +1245,49 @@ lua_ucl_object_mt (lua_State *L)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1073,7 +1340,7 @@ lua_ucl_to_config (lua_State *L)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1168,6 +1435,7 @@ luaopen_ucl (lua_State *L)
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified external/libucl/src/mum.h
@@ -35,7 +35,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -172,7 +172,7 @@ _mum_le (uint64_t v) {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -183,7 +183,7 @@ _mum_le32 (uint32_t v) {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -396,7 +396,7 @@ mum_hash64 (uint64_t key, uint64_t seed) {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_emitter.c
@@ -424,8 +424,16 @@ ucl_emitter_common_elt (struct ucl_emitter_context *ctx,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_emitter_utils.c
@@ -71,6 +71,13 @@ static const struct ucl_emitter_context ucl_standard_emitters[] = {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -102,7 +109,9 @@ ucl_elt_string_write_json (const char *str, size_t size,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -122,15 +131,21 @@ ucl_elt_string_write_json (const char *str, size_t size,
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -151,6 +166,40 @@ ucl_elt_string_write_json (const char *str, size_t size,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -363,7 +412,7 @@ ucl_object_emit_memory_funcs (void **pmem)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -412,7 +461,7 @@ ucl_object_emit_fd_funcs (int fd)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_hash.c
@@ -143,10 +143,10 @@ ucl_hash_caseless_func (const ucl_object_t *o)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -154,16 +154,22 @@ ucl_hash_caseless_func (const ucl_object_t *o)
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -177,7 +183,45 @@ static inline int
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -418,6 +462,7 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -430,8 +475,15 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -440,8 +492,37 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified external/libucl/src/ucl_hash.h
@@ -90,4 +90,10 @@ const void* ucl_hash_iterate (ucl_hash_t *hashlin, ucl_hash_iter_t *iter);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified external/libucl/src/ucl_internal.h
@@ -63,7 +63,9 @@
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -76,7 +78,9 @@
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -91,6 +95,31 @@
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -119,6 +148,7 @@ enum ucl_parser_state {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -147,7 +177,7 @@ enum ucl_character_type {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -156,22 +186,37 @@ struct ucl_macro {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -210,6 +255,7 @@ struct ucl_parser {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -230,6 +276,13 @@ struct ucl_object_userdata {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -434,6 +487,16 @@ ucl_emit_get_standard_context (enum ucl_emitter emit_type);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -573,4 +636,10 @@ bool ucl_parse_msgpack (struct ucl_parser *parser);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified external/libucl/src/ucl_msgpack.c
@@ -434,7 +434,6 @@ static ssize_t ucl_msgpack_parse_ignore (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -768,7 +767,6 @@ ucl_msgpack_get_container (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -779,6 +777,8 @@ ucl_msgpack_get_container (struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -788,11 +788,12 @@ ucl_msgpack_get_container (struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -823,16 +824,11 @@ ucl_msgpack_get_container (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -843,12 +839,11 @@ ucl_msgpack_insert_object (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -875,10 +870,7 @@ ucl_msgpack_insert_object (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -887,7 +879,7 @@ static struct ucl_stack *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -895,17 +887,16 @@ ucl_msgpack_get_next_container (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -913,8 +904,7 @@ ucl_msgpack_get_next_container (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1311,8 +1301,7 @@ ucl_msgpack_consume (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_parser.c
@@ -21,6 +21,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -44,16 +45,17 @@ struct ucl_parser_saved_state {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -87,6 +89,7 @@ ucl_set_err (struct ucl_parser *parser, int code, const char *str, UT_string **e
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -342,7 +345,6 @@ ucl_check_variable_safe (struct ucl_parser *parser, const char *ptr, size_t rema
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -459,18 +461,11 @@ ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -564,13 +559,15 @@ ucl_expand_variable (struct ucl_parser *parser, unsigned char **dst,
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -593,8 +590,14 @@ ucl_copy_or_store_ptr (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -628,17 +631,29 @@ ucl_copy_or_store_ptr (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -647,8 +662,18 @@ ucl_parser_add_container (ucl_object_t *obj, struct ucl_parser *parser,
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -659,12 +684,38 @@ ucl_parser_add_container (ucl_object_t *obj, struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -969,7 +1020,10 @@ ucl_lex_number (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1009,7 +1063,8 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1035,7 +1090,54 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1075,12 +1177,20 @@ bool
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1102,8 +1212,6 @@ ucl_parser_process_object_element (struct ucl_parser *parser, ucl_object_t *nobj
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -1370,7 +1478,8 @@ ucl_parse_key (struct ucl_parser *parser, struct ucl_chunk *chunk,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1566,7 +1675,7 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1604,20 +1713,57 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1628,8 +1774,18 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1677,7 +1833,7 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1689,6 +1845,7 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1729,18 +1886,28 @@ parse_string:
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
| - | |
|
|
|
|
|
@@ -1792,6 +1959,17 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1802,10 +1980,14 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2180,6 +2362,8 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -2191,20 +2375,28 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2218,6 +2410,7 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2240,6 +2433,7 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2248,8 +2442,11 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2301,7 +2498,8 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2324,8 +2522,9 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -2341,7 +2540,8 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2440,6 +2640,35 @@ ucl_state_machine (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2489,6 +2718,16 @@ ucl_parser_set_default_priority (struct ucl_parser *parser, unsigned prio)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2602,6 +2841,7 @@ ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2619,6 +2859,28 @@ ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2641,6 +2903,11 @@ ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2707,6 +2974,41 @@ ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2755,3 +3057,55 @@ ucl_set_include_path (struct ucl_parser *parser, ucl_object_t *paths)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified external/libucl/src/ucl_schema.c
@@ -49,7 +49,16 @@ static bool ucl_schema_validate (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -311,7 +320,7 @@ ucl_schema_validate_number (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -371,7 +380,7 @@ ucl_schema_validate_string (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -382,7 +391,7 @@ ucl_schema_validate_string (const ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_util.c
@@ -40,7 +40,9 @@
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -65,8 +67,10 @@ typedef kvec_t(ucl_object_t *) ucl_array_t;
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
| + | |
|
|
|
|
|
@@ -87,6 +91,10 @@ typedef kvec_t(ucl_object_t *) ucl_array_t;
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -133,16 +141,46 @@ static int ucl_munmap(void *map,size_t length)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -393,6 +431,69 @@ ucl_unescape_json_string (char *str, size_t len)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -415,6 +516,30 @@ ucl_copy_key_trash (const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -500,7 +625,7 @@ ucl_parser_free (struct ucl_parser *parser)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -617,6 +742,12 @@ ucl_pubkey_add (struct ucl_parser *parser, const unsigned char *key, size_t len)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -752,13 +883,20 @@ ucl_fetch_file (const unsigned char *filename, unsigned char **buf, size_t *bufl
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -909,7 +1047,7 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -952,9 +1090,10 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -977,7 +1116,12 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1040,53 +1184,89 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -1095,64 +1275,39 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1167,7 +1322,10 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1175,57 +1333,49 @@ ucl_include_file_single (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2057,14 +2207,23 @@ ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2086,10 +2245,21 @@ ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2229,17 +2399,17 @@ ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2326,30 +2496,98 @@ ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2468,9 +2706,17 @@ ucl_object_iterate (const ucl_object_t *obj, ucl_object_iter_t *iter, bool expan
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2489,6 +2735,7 @@ ucl_object_iterate_new (const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2505,11 +2752,14 @@ ucl_object_iterate_reset (ucl_object_iter_t it, const ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2533,7 +2783,20 @@ ucl_object_iterate_full (ucl_object_iter_t it, enum ucl_iterate_type type)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2546,6 +2809,7 @@ ucl_object_iterate_full (ucl_object_iter_t it, enum ucl_iterate_type type)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2568,7 +2832,9 @@ ucl_object_iterate_free (ucl_object_iter_t it)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2680,6 +2946,21 @@ ucl_object_new_full (ucl_type_t type, unsigned priority)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2935,6 +3216,22 @@ ucl_array_pop_first (ucl_object_t *top)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3008,7 +3305,7 @@ ucl_object_todouble_safe (const ucl_object_t *obj, double *target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3042,7 +3339,7 @@ ucl_object_toint_safe (const ucl_object_t *obj, int64_t *target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/basic.test
@@ -16,7 +16,7 @@ for _tin in ${TEST_DIR}/basic/*.in ; do
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/basic/13.in
@@ -6,4 +6,4 @@ key = value_orig;
|
|
|
|
|
|
| - | |
| + | |
deleted external/libucl/tests/basic/20.in
@@ -1,2 +0,0 @@
| - | |
| - | |
|
deleted external/libucl/tests/basic/20.res
@@ -1,5 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
deleted external/libucl/tests/basic/21.in
@@ -1,2 +0,0 @@
| - | |
| - | |
|
deleted external/libucl/tests/basic/21.res
@@ -1,10 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
modified external/libucl/tests/basic/9.in
@@ -16,8 +16,8 @@ array = [10]
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
|
|
|
modified external/libucl/tests/basic/9.res
@@ -18,9 +18,6 @@ array [
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -31,4 +28,9 @@ prefix2 [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified external/libucl/tests/generate.test
@@ -6,7 +6,7 @@ $PROG ${TEST_OUT_DIR}/generate.out
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/run_tests.sh
@@ -19,7 +19,7 @@ for _tin in ${TEST_DIR}/*.in ; do
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -31,7 +31,7 @@ if [ $# -gt 2 ] ; then
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/schema/patternProperties.json
@@ -24,6 +24,11 @@
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/tests/schema/refRemote.json
@@ -48,7 +48,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/streamline.test
@@ -6,7 +6,7 @@ $PROG ${TEST_OUT_DIR}/streamline.out
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
modified external/libucl/tests/test_generate.c
@@ -106,7 +106,7 @@ main (int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/utils/objdump.c
@@ -146,14 +146,14 @@ main(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|