Merge branch 'devel'

Author: michalvasko

.travis.yml

@@ -35,7 +35,7 @@ before_install:
   - cmake .. && make -j2 && sudo make install
   - cd ../..
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y valgrind osc; sudo dpkg -i ./swig/swig3.0_3.0.8-0ubuntu3_amd64.deb; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y valgrind osc; sudo dpkg -i ./swig/swig3.0_3.0.12-1.2_amd64.deb; sudo dpkg -i ./swig/swig_3.0.12-1_amd64.deb; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc-7" ]; then pip install --user codecov; export CFLAGS="-coverage"; fi
 
 script:

CMakeLists.txt

@@ -11,8 +11,8 @@ set(CMAKE_MACOSX_RPATH TRUE)
 
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
-set(LIBYANG_MINOR_VERSION 15)
-set(LIBYANG_MICRO_VERSION 166)
+set(LIBYANG_MINOR_VERSION 16)
+set(LIBYANG_MICRO_VERSION 41)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 
@@ -88,6 +88,7 @@ set(GEN_CPP_BINDINGS 1 CACHE BOOL "Enable C++ bindings.")
 set(GEN_PYTHON_BINDINGS 1 CACHE BOOL "Enable Python bindings.")
 set(GEN_PYTHON_VERSION "3" CACHE STRING "Python version")
 set(GEN_JAVASCRIPT_BINDINGS 0 CACHE BOOL "Enable JavaScript bindings.")
+set(GEN_JAVA_BINDINGS 1 CACHE BOOL "Enable Java bindings.")
 
 find_package(FLEX)
 find_package(BISON)
@@ -195,6 +196,7 @@ set(libsrc
     src/parser_yin.c
     src/parser_xml.c
     src/parser_json.c
+    src/parser_lyb.c
     src/parser_yang_bis.c
     src/parser_yang_lex.c
     src/parser_yang.c
@@ -205,10 +207,12 @@ set(libsrc
     src/xpath.c
     src/printer_yang.c
     src/printer_yin.c
+    src/printer_json_schema.c
     src/printer_xml.c
     src/printer_tree.c
     src/printer_info.c
     src/printer_json.c
+    src/printer_lyb.c
     src/yang_types.c)
 
 set(lintsrc
@@ -300,7 +304,13 @@ endif()
 # generate doxygen documentation for libyang API
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
-    set(DOXYGEN_SKIP_DOT TRUE)
+    find_program(DOT_PATH dot PATH_SUFFIXES graphviz2.38/bin graphviz/bin)
+    if(DOT_PATH)
+        set(HAVE_DOT "YES")
+    else()
+        set(HAVE_DOT "NO")
+        message(AUTHOR_WARNING "Doxygen: to generate UML diagrams please install graphviz")
+    endif()
     add_custom_target(doc
             COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

CMakeModules/FindCMocka.cmake

@@ -30,7 +30,7 @@ find_path(CMOCKA_INCLUDE_DIR
 
 find_library(CMOCKA_LIBRARY
     NAMES
-        cmocka
+        cmocka cmocka_shared
     PATHS
         ${CMOCKA_ROOT_DIR}/include
 )

Doxyfile.in

@@ -787,7 +787,15 @@ INPUT                  = @CMAKE_BINARY_DIR@/src/libyang.h \
                          ./src/extensions.h \
                          ./src/user_types.h \
                          ./src/xml.h \
-                         ./src/dict.h
+                         ./src/dict.h \
+                         ./swig/cpp/src/Libyang.hpp \
+                         ./swig/cpp/src/Tree_Data.hpp \
+                         ./swig/cpp/src/Tree_Schema.hpp \
+                         ./swig/cpp/src/Xml.hpp \
+                         ./swig/cpp/src/Libyang.cpp \
+                         ./swig/cpp/src/Tree_Data.cpp \
+                         ./swig/cpp/src/Tree_Schema.cpp \
+                         ./swig/cpp/src/Xml.cpp
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -2035,7 +2043,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2159,7 +2167,7 @@ PERL_PATH              = /usr/bin/perl
 # powerful graphs.
 # The default value is: YES.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see:
@@ -2190,7 +2198,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = @HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2241,7 +2249,7 @@ CLASS_GRAPH            = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-COLLABORATION_GRAPH    = YES
+COLLABORATION_GRAPH    = NO
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
 # groups, showing the direct groups dependencies.
@@ -2256,7 +2264,7 @@ GROUP_GRAPHS           = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LOOK               = NO
+UML_LOOK               = YES
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may
@@ -2269,15 +2277,15 @@ UML_LOOK               = NO
 # Minimum value: 0, maximum value: 100, default value: 10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LIMIT_NUM_FIELDS   = 10
+UML_LIMIT_NUM_FIELDS   = 50
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
@@ -2350,7 +2358,7 @@ DIRECTORY_GRAPH        = YES
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = svg
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
@@ -2362,7 +2370,7 @@ DOT_IMAGE_FORMAT       = png
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INTERACTIVE_SVG        = NO
+INTERACTIVE_SVG        = YES
 
 # The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
@@ -2412,7 +2420,7 @@ PLANTUML_INCLUDE_PATH  =
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 100
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the
@@ -2436,7 +2444,7 @@ MAX_DOT_GRAPH_DEPTH    = 0
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_TRANSPARENT        = NO
+DOT_TRANSPARENT        = YES
 
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This

KNOWNISSUES.md

@@ -1,5 +1,12 @@
 # Known Issues
 
+## Printer crash
+
+There is a bug in Clang 3.4.2 that causes wrong data tree traversal, which results in a crash.
+It can occur during any traversal but it was observed in XML printer while printing default
+values. The solution is to compile using either GCC or newer version of Clang. Starting
+from which version it works we do not exactly know. Clang 5.0.0 works fine.
+
 ## XPath Expressions
 
 ### Axes

src/common.c

@@ -737,9 +737,9 @@ transform_iffeat_schema2json(const struct lys_module *module, const char *expr)
             assert(out_size == out_used);
             return lydict_insert_zc(ctx, out);
         }
-        id = strpbrk_backwards(col - 1, "/ [\'\"\f\n\r\t\v", (col - in) - 1);
-        if ((id[0] == '/') || (id[0] == ' ') || (id[0] == '[') || (id[0] == '\'') || (id[0] == '\"') || (id[0] == '\f') ||
-                (id[0] == '\n') || (id[0] == '\r') || (id[0] == '\t') || (id[0] == '\v')) {
+        id = strpbrk_backwards(col - 1, " \f\n\r\t\v(", (col - in) - 1);
+        if ((id[0] == ' ') || (id[0] == '\f') || (id[0] == '\n') || (id[0] == '\r') ||
+            (id[0] == '\t') || (id[0] == '\v') || (id[0] == '(')) {
             ++id;
         }
         id_len = col - id;
@@ -1286,27 +1286,24 @@ ly_new_node_validity(const struct lys_node *schema)
     int validity;
 
     validity = LYD_VAL_OK;
-    switch (schema->nodetype) {
-    case LYS_LEAF:
-    case LYS_LEAFLIST:
+
+    if (schema->nodetype & (LYS_LEAF | LYS_LEAFLIST)) {
         if (((struct lys_node_leaf *)schema)->type.base == LY_TYPE_LEAFREF) {
+            /* leafref target validation */
             validity |= LYD_VAL_LEAFREF;
         }
-        validity |= LYD_VAL_MAND;
-        break;
-    case LYS_LIST:
+    }
+    if (schema->nodetype & (LYS_LEAFLIST | LYS_LIST)) {
+        /* duplicit instance check */
+        validity |= LYD_VAL_DUP;
+    }
+    if ((schema->nodetype == LYS_LIST) && ((struct lys_node_list *)schema)->unique_size) {
+        /* unique check */
         validity |= LYD_VAL_UNIQUE;
-        /* fallthrough */
-    case LYS_CONTAINER:
-    case LYS_NOTIF:
-    case LYS_RPC:
-    case LYS_ACTION:
-    case LYS_ANYXML:
-    case LYS_ANYDATA:
+    }
+    if (schema->nodetype & (LYS_LEAF | LYS_LEAFLIST | LYS_LIST | LYS_CONTAINER | LYS_NOTIF | LYS_RPC | LYS_ACTION | LYS_ANYDATA)) {
+        /* mandatory children check */
         validity |= LYD_VAL_MAND;
-        break;
-    default:
-        break;
     }
 
     return validity;
@@ -1369,3 +1366,60 @@ dec64cmp(int64_t num1, uint8_t dig1, int64_t num2, uint8_t dig2)
     }
     return (num1 > num2 ? 1 : -1);
 }
+
+LYB_HASH
+lyb_hash(struct lys_node *sibling, uint8_t collision_id)
+{
+    struct lys_module *mod;
+    uint32_t full_hash;
+    LYB_HASH hash;
+
+#ifdef LY_ENABLED_CACHE
+    if ((collision_id < LYS_NODE_HASH_COUNT) && sibling->hash[collision_id]) {
+        return sibling->hash[collision_id];
+    }
+#endif
+
+    mod = lys_node_module(sibling);
+
+    full_hash = dict_hash_multi(0, mod->name, strlen(mod->name));
+    full_hash = dict_hash_multi(full_hash, sibling->name, strlen(sibling->name));
+    if (collision_id) {
+        if (collision_id > strlen(mod->name)) {
+            /* wow */
+            LOGINT(sibling->module->ctx);
+            return 0;
+        }
+        full_hash = dict_hash_multi(full_hash, mod->name, collision_id);
+    }
+    full_hash = dict_hash_multi(full_hash, NULL, 0);
+
+    /* use the shortened hash */
+    hash = full_hash & (LYB_HASH_MASK >> collision_id);
+    /* add colision identificator */
+    hash |= LYB_HASH_COLLISION_ID >> collision_id;
+
+    /* save this hash */
+#ifdef LY_ENABLED_CACHE
+    if (collision_id < LYS_NODE_HASH_COUNT) {
+        sibling->hash[collision_id] = hash;
+    }
+#endif
+
+    return hash;
+}
+
+int
+lyb_has_schema_model(struct lys_node *sibling, const struct lys_module **models, int mod_count)
+{
+    int i;
+    const struct lys_module *mod = lys_node_module(sibling);
+
+    for (i = 0; i < mod_count; ++i) {
+        if (mod == models[i]) {
+            return 1;
+        }
+    }
+
+    return 0;
+}

src/common.h.in

@@ -249,9 +249,10 @@ void ly_vlog(const struct ly_ctx *ctx, LY_ECODE code, enum LY_VLOG_ELEM elem_typ
  * @param[in] elem Element to print.
  * @param[in,out] path Resulting path printed.
  * @param[in] schema_all_prefixes Whether to include prefixes for all the nodes (only for schema paths).
+ * @param[in] data_no_predicates Whether to skip generating predicates for all the nodes (only for data paths).
  * @return 0 on success, -1 on error.
  */
-int ly_vlog_build_path(enum LY_VLOG_ELEM elem_type, const void *elem, char **path, int schema_all_prefixes);
+int ly_vlog_build_path(enum LY_VLOG_ELEM elem_type, const void *elem, char **path, int schema_all_prefixes, int data_no_predicates);
 
 /**
  * @brief Get module from a context based on its name and revision.