schema compile CHANGE provide path when reporting schema compilation error
diff --git a/tests/src/test_tree_schema_compile.c b/tests/src/test_tree_schema_compile.c
index 3cff524..530f119 100644
--- a/tests/src/test_tree_schema_compile.c
+++ b/tests/src/test_tree_schema_compile.c
@@ -175,7 +175,7 @@
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module aa {namespace urn:aa;prefix aa;"
                                                   "leaf a {type string;} container a{presence x;}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement. /aa:a");
     assert_null(mod.compiled);
     reset_mod(ctx.ctx, &mod);
 
@@ -307,52 +307,52 @@
     /* some invalid expressions */
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f{if-feature f1;}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"f1\" of if-feature - unable to find feature \"f1\".");
+    logbuf_assert("Invalid value \"f1\" of if-feature - unable to find feature \"f1\". /b:{feature='f'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f1; feature f2{if-feature 'f and';}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"f and\" of if-feature - unexpected end of expression.");
+    logbuf_assert("Invalid value \"f and\" of if-feature - unexpected end of expression. /b:{feature='f2'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f{if-feature 'or';}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"or\" of if-feature - unexpected end of expression.");
+    logbuf_assert("Invalid value \"or\" of if-feature - unexpected end of expression. /b:{feature='f'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f1; feature f2{if-feature '(f1';}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"(f1\" of if-feature - non-matching opening and closing parentheses.");
+    logbuf_assert("Invalid value \"(f1\" of if-feature - non-matching opening and closing parentheses. /b:{feature='f2'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f1; feature f2{if-feature 'f1)';}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"f1)\" of if-feature - non-matching opening and closing parentheses.");
+    logbuf_assert("Invalid value \"f1)\" of if-feature - non-matching opening and closing parentheses. /b:{feature='f2'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{yang-version 1.1;namespace urn:b; prefix b; feature f1; feature f2{if-feature ---;}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"---\" of if-feature - unable to find feature \"---\".");
+    logbuf_assert("Invalid value \"---\" of if-feature - unable to find feature \"---\". /b:{feature='f2'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{namespace urn:b; prefix b; feature f1; feature f2{if-feature 'not f1';}}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Invalid value \"not f1\" of if-feature - YANG 1.1 expression in YANG 1.0 module.");
+    logbuf_assert("Invalid value \"not f1\" of if-feature - YANG 1.1 expression in YANG 1.0 module. /b:{feature='f2'}");
     reset_mod(ctx.ctx, &mod);
 
     assert_int_equal(LY_SUCCESS, yang_parse_module(&ctx, "module b{namespace urn:b; prefix b; feature f1; feature f1;}", &mod));
     assert_int_equal(LY_EVALID, lys_compile(&mod, 0));
-    logbuf_assert("Duplicate identifier \"f1\" of feature statement.");
+    logbuf_assert("Duplicate identifier \"f1\" of feature statement. /b:{feature='f1'}");
     reset_mod(ctx.ctx, &mod);
 
     ly_ctx_set_module_imp_clb(ctx.ctx, test_imp_clb, "submodule sz {belongs-to z {prefix z;} feature f1;}");
     assert_null(lys_parse_mem(ctx.ctx, "module z{namespace urn:z; prefix z; include sz;feature f1;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"f1\" of feature statement.");
+    logbuf_assert("Duplicate identifier \"f1\" of feature statement. /z:{feature='f1'}");
 
     assert_null(lys_parse_mem(ctx.ctx, "module aa{namespace urn:aa; prefix aa; feature f1 {if-feature f2;} feature f2 {if-feature f1;}}", LYS_IN_YANG));
-    logbuf_assert("Feature \"f1\" is indirectly referenced from itself.");
+    logbuf_assert("Feature \"f1\" is indirectly referenced from itself. /aa:{feature='f2'}");
     assert_null(lys_parse_mem(ctx.ctx, "module ab{namespace urn:ab; prefix ab; feature f1 {if-feature f1;}}", LYS_IN_YANG));
-    logbuf_assert("Feature \"f1\" is referenced from itself.");
+    logbuf_assert("Feature \"f1\" is referenced from itself. /ab:{feature='f1'}");
 
     /* import reference */
     assert_non_null(modp = lys_parse_mem(ctx.ctx, str, LYS_IN_YANG));
@@ -405,19 +405,19 @@
     assert_ptr_equal(mod2->compiled->identities[1].derived[0], &mod2->compiled->identities[0]);
 
     assert_null(lys_parse_mem(ctx, "module aa{namespace urn:aa; prefix aa; identity i1;identity i1;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"i1\" of identity statement.");
+    logbuf_assert("Duplicate identifier \"i1\" of identity statement. /aa:{identity='i1'}");
 
     ly_ctx_set_module_imp_clb(ctx, test_imp_clb, "submodule sbb {belongs-to bb {prefix bb;} identity i1;}");
     assert_null(lys_parse_mem(ctx, "module bb{namespace urn:bb; prefix bb; include sbb;identity i1;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"i1\" of identity statement.");
+    logbuf_assert("Duplicate identifier \"i1\" of identity statement. /bb:{identity='i1'}");
 
     assert_null(lys_parse_mem(ctx, "module cc{namespace urn:cc; prefix cc; identity i1 {base i2;}}", LYS_IN_YANG));
-    logbuf_assert("Unable to find base (i2) of identity \"i1\".");
+    logbuf_assert("Unable to find base (i2) of identity \"i1\". /cc:{identity='i1'}");
 
     assert_null(lys_parse_mem(ctx, "module dd{namespace urn:dd; prefix dd; identity i1 {base i1;}}", LYS_IN_YANG));
-    logbuf_assert("Identity \"i1\" is derived from itself.");
+    logbuf_assert("Identity \"i1\" is derived from itself. /dd:{identity='i1'}");
     assert_null(lys_parse_mem(ctx, "module de{namespace urn:de; prefix de; identity i1 {base i2;}identity i2 {base i3;}identity i3 {base i1;}}", LYS_IN_YANG));
-    logbuf_assert("Identity \"i1\" is indirectly derived from itself.");
+    logbuf_assert("Identity \"i1\" is indirectly derived from itself. /de:{identity='i3'}");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -520,7 +520,7 @@
     assert_non_null(mod = lys_parse_mem(ctx, "module d {yang-version 1.1;namespace urn:d;prefix d;"
                                         "leaf-list ll {config false; type string; ordered-by user;}}", LYS_IN_YANG));
     /* but warning is present: */
-    logbuf_assert("The ordered-by statement is ignored in lists representing state data ().");
+    logbuf_assert("The ordered-by statement is ignored in lists representing state data (/d:ll).");
     assert_non_null(mod->compiled);
     assert_non_null((ll = (struct lysc_node_leaflist*)mod->compiled->data));
     assert_int_equal(LYS_CONFIG_R | LYS_STATUS_CURR | LYS_ORDBY_SYSTEM | LYS_SET_CONFIG, ll->flags);
@@ -528,19 +528,19 @@
 
     assert_non_null(mod = lys_parse_mem(ctx, "module e {yang-version 1.1;namespace urn:e;prefix e;"
                                         "rpc oper {output {leaf-list ll {type string; ordered-by user;}}}}", LYS_IN_YANG));
-    logbuf_assert("The ordered-by statement is ignored in lists representing RPC/action output parameters ().");
+    logbuf_assert("The ordered-by statement is ignored in lists representing RPC/action output parameters (/e:oper/output/ll).");
     logbuf_clean();
 
     assert_non_null(mod = lys_parse_mem(ctx, "module f {yang-version 1.1;namespace urn:f;prefix f;"
                                         "notification event {leaf-list ll {type string; ordered-by user;}}}", LYS_IN_YANG));
-    logbuf_assert("The ordered-by statement is ignored in lists representing notification content ().");
+    logbuf_assert("The ordered-by statement is ignored in lists representing notification content (/f:event/ll).");
 
     /* invalid */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;leaf-list ll {type empty;}}", LYS_IN_YANG));
-    logbuf_assert("Leaf-list of type \"empty\" is allowed only in YANG 1.1 modules.");
+    logbuf_assert("Leaf-list of type \"empty\" is allowed only in YANG 1.1 modules. /aa:ll");
 
     assert_null(lys_parse_mem(ctx, "module bb {yang-version 1.1;namespace urn:bb;prefix bb;leaf-list ll {type empty; default x;}}", LYS_IN_YANG));
-    logbuf_assert("Leaf-list of type \"empty\" must not have a default value (x).");
+    logbuf_assert("Leaf-list of type \"empty\" must not have a default value (x). /bb:ll");
 
     assert_non_null(mod = lys_parse_mem(ctx, "module cc {yang-version 1.1;namespace urn:cc;prefix cc;"
                                         "leaf-list ll {config false;type string; default one;default two;default one;}}", LYS_IN_YANG));
@@ -550,7 +550,7 @@
     assert_int_equal(3, LY_ARRAY_SIZE(ll->dflts));
     assert_null(lys_parse_mem(ctx, "module dd {yang-version 1.1;namespace urn:dd;prefix dd;"
                               "leaf-list ll {type string; default one;default two;default one;}}", LYS_IN_YANG));
-    logbuf_assert("Configuration leaf-list has multiple defaults of the same value \"one\".");
+    logbuf_assert("Configuration leaf-list has multiple defaults of the same value \"one\". /dd:ll");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -625,55 +625,55 @@
 
     /* invalid */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;list l;}", LYS_IN_YANG));
-    logbuf_assert("Missing key in list representing configuration data.");
+    logbuf_assert("Missing key in list representing configuration data. /aa:l");
 
     assert_null(lys_parse_mem(ctx, "module bb {yang-version 1.1; namespace urn:bb;prefix bb;"
                               "list l {key x; leaf x {type string; when 1;}}}", LYS_IN_YANG));
-    logbuf_assert("List's key \"x\" must not have any \"when\" statement.");
+    logbuf_assert("List's key must not have any \"when\" statement. /bb:l/x");
 
     assert_null(lys_parse_mem(ctx, "module cc {yang-version 1.1;namespace urn:cc;prefix cc;feature f;"
                               "list l {key x; leaf x {type string; if-feature f;}}}", LYS_IN_YANG));
-    logbuf_assert("List's key \"x\" must not have any \"if-feature\" statement.");
+    logbuf_assert("List's key must not have any \"if-feature\" statement. /cc:l/x");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;"
                               "list l {key x; leaf x {type string; config false;}}}", LYS_IN_YANG));
-    logbuf_assert("Key of the configuration list must not be status leaf.");
+    logbuf_assert("Key of the configuration list must not be status leaf. /dd:l/x");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;"
                               "list l {config false;key x; leaf x {type string; config true;}}}", LYS_IN_YANG));
-    logbuf_assert("Configuration node cannot be child of any state data node.");
+    logbuf_assert("Configuration node cannot be child of any state data node. /ee:l/x");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;"
                               "list l {key x; leaf-list x {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("The list's key \"x\" not found.");
+    logbuf_assert("The list's key \"x\" not found. /ff:l");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;"
                               "list l {key x; unique y;leaf x {type string;} leaf-list y {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Unique's descendant-schema-nodeid \"y\" refers to leaf-list node instead of a leaf.");
+    logbuf_assert("Unique's descendant-schema-nodeid \"y\" refers to leaf-list node instead of a leaf. /gg:l");
 
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh;"
                               "list l {key x; unique \"x y\";leaf x {type string;} leaf y {config false; type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Unique statement \"x y\" refers to leafs with different config type.");
+    logbuf_assert("Unique statement \"x y\" refers to leafs with different config type. /hh:l");
 
     assert_null(lys_parse_mem(ctx, "module ii {namespace urn:ii;prefix ii;"
                               "list l {key x; unique a:x;leaf x {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"a:x\" - prefix \"a\" not defined in module \"ii\".");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"a:x\" - prefix \"a\" not defined in module \"ii\". /ii:l");
 
     assert_null(lys_parse_mem(ctx, "module jj {namespace urn:jj;prefix jj;"
                               "list l {key x; unique c/x;leaf x {type string;}container c {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"c/x\" - target node not found.");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"c/x\" - target node not found. /jj:l");
 
     assert_null( lys_parse_mem(ctx, "module kk {namespace urn:kk;prefix kk;"
                                "list l {key x; unique c^y;leaf x {type string;}container c {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"c^\" - missing \"/\" as node-identifier separator.");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"c^\" - missing \"/\" as node-identifier separator. /kk:l");
 
     assert_null(lys_parse_mem(ctx, "module ll {namespace urn:ll;prefix ll;"
                               "list l {key \"x y x\";leaf x {type string;}leaf y {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicated key identifier \"x\".");
+    logbuf_assert("Duplicated key identifier \"x\". /ll:l");
 
     assert_null(lys_parse_mem(ctx, "module mm {namespace urn:mm;prefix mm;"
                               "list l {key x;leaf x {type empty;}}}", LYS_IN_YANG));
-    logbuf_assert("Key of a list can be of type \"empty\" only in YANG 1.1 modules.");
+    logbuf_assert("List's key cannot be of \"empty\" type until it is in YANG 1.1 module. /mm:l/x");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -721,26 +721,26 @@
 
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;"
                               "choice ch {case a {leaf x {type string;}}leaf x {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement. /aa:ch/x/x");
     assert_null(lys_parse_mem(ctx, "module aa2 {namespace urn:aa2;prefix aa;"
                               "choice ch {case a {leaf y {type string;}}case b {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement. /aa2:ch/b/y");
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;"
                               "choice ch {case a {leaf x {type string;}}leaf a {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"a\" of case statement.");
+    logbuf_assert("Duplicate identifier \"a\" of case statement. /bb:ch/a");
     assert_null(lys_parse_mem(ctx, "module bb2 {namespace urn:bb2;prefix bb;"
                               "choice ch {case b {leaf x {type string;}}case b {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"b\" of case statement.");
+    logbuf_assert("Duplicate identifier \"b\" of case statement. /bb2:ch/b");
 
     assert_null(lys_parse_mem(ctx, "module ca {namespace urn:ca;prefix ca;"
                               "choice ch {default c;case a {leaf x {type string;}}case b {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Default case \"c\" not found.");
+    logbuf_assert("Default case \"c\" not found. /ca:ch");
     assert_null(lys_parse_mem(ctx, "module cb {namespace urn:cb;prefix cb; import a {prefix a;}"
                               "choice ch {default a:a;case a {leaf x {type string;}}case b {leaf y {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid default case referencing a case from different YANG module (by prefix \"a\").");
+    logbuf_assert("Invalid default case referencing a case from different YANG module (by prefix \"a\"). /cb:ch");
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;"
                               "choice ch {default a;case a {leaf x {mandatory true;type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Mandatory node \"x\" under the default case \"a\".");
+    logbuf_assert("Mandatory node \"x\" under the default case \"a\". /cc:ch");
     /* TODO check with mandatory nodes from augment placed into the case */
 
     *state = NULL;
@@ -816,26 +816,26 @@
     logbuf_assert("Invalid keyword \"action\" as a child of \"container\" - the statement is allowed only in YANG 1.1 modules. Line number 1.");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;leaf x{type string;} rpc x;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement. /bb:x");
     assert_null(lys_parse_mem(ctx, "module cc {yang-version 1.1; namespace urn:cc;prefix cc;container c {leaf y {type string;} action y;}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement. /cc:c/y");
     assert_null(lys_parse_mem(ctx, "module dd {yang-version 1.1; namespace urn:dd;prefix dd;container c {action z; action z;}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"z\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"z\" of data definition/RPC/action/Notification statement. /dd:c/z");
     ly_ctx_set_module_imp_clb(ctx, test_imp_clb, "submodule eesub {belongs-to ee {prefix ee;} notification w;}");
     assert_null(lys_parse_mem(ctx, "module ee {yang-version 1.1; namespace urn:ee;prefix ee;include eesub; rpc w;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"w\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"w\" of data definition/RPC/action/Notification statement. /ee:w");
 
     assert_null(lys_parse_mem(ctx, "module ff {yang-version 1.1; namespace urn:ff;prefix ff; rpc test {input {container a {leaf b {type string;}}}}"
                               "augment /test/input/a {action invalid {input {leaf x {type string;}}}}}", LYS_IN_YANG));
-    logbuf_assert("Action \"invalid\" is placed inside another RPC/action.");
+    logbuf_assert("Action \"invalid\" is placed inside another RPC/action. /ff:{augment='/test/input/a'}/invalid");
 
     assert_null(lys_parse_mem(ctx, "module gg {yang-version 1.1; namespace urn:gg;prefix gg; notification test {container a {leaf b {type string;}}}"
                               "augment /test/a {action invalid {input {leaf x {type string;}}}}}", LYS_IN_YANG));
-    logbuf_assert("Action \"invalid\" is placed inside Notification.");
+    logbuf_assert("Action \"invalid\" is placed inside Notification. /gg:{augment='/test/a'}/invalid");
 
     assert_null(lys_parse_mem(ctx, "module hh {yang-version 1.1; namespace urn:hh;prefix hh; notification test {container a {uses grp;}}"
                               "grouping grp {action invalid {input {leaf x {type string;}}}}}", LYS_IN_YANG));
-    logbuf_assert("Action \"invalid\" is placed inside Notification.");
+    logbuf_assert("Action \"invalid\" is placed inside Notification. /hh:test/a/{uses='grp'}/invalid");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -887,26 +887,26 @@
     logbuf_assert("Invalid keyword \"notification\" as a child of \"container\" - the statement is allowed only in YANG 1.1 modules. Line number 1.");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;leaf x{type string;} notification x;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"x\" of data definition/RPC/action/Notification statement. /bb:x");
     assert_null(lys_parse_mem(ctx, "module cc {yang-version 1.1; namespace urn:cc;prefix cc;container c {leaf y {type string;} notification y;}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"y\" of data definition/RPC/action/Notification statement. /cc:c/y");
     assert_null(lys_parse_mem(ctx, "module dd {yang-version 1.1; namespace urn:dd;prefix dd;container c {notification z; notification z;}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"z\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"z\" of data definition/RPC/action/Notification statement. /dd:c/z");
     ly_ctx_set_module_imp_clb(ctx, test_imp_clb, "submodule eesub {belongs-to ee {prefix ee;} rpc w;}");
     assert_null(lys_parse_mem(ctx, "module ee {yang-version 1.1; namespace urn:ee;prefix ee;include eesub; notification w;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"w\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"w\" of data definition/RPC/action/Notification statement. /ee:w");
 
     assert_null(lys_parse_mem(ctx, "module ff {yang-version 1.1; namespace urn:ff;prefix ff; rpc test {input {container a {leaf b {type string;}}}}"
                               "augment /test/input/a {notification invalid {leaf x {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Notification \"invalid\" is placed inside RPC/action.");
+    logbuf_assert("Notification \"invalid\" is placed inside RPC/action. /ff:{augment='/test/input/a'}/invalid");
 
     assert_null(lys_parse_mem(ctx, "module gg {yang-version 1.1; namespace urn:gg;prefix gg; notification test {container a {leaf b {type string;}}}"
                               "augment /test/a {notification invalid {leaf x {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Notification \"invalid\" is placed inside another Notification.");
+    logbuf_assert("Notification \"invalid\" is placed inside another Notification. /gg:{augment='/test/a'}/invalid");
 
     assert_null(lys_parse_mem(ctx, "module hh {yang-version 1.1; namespace urn:hh;prefix hh; rpc test {input {container a {uses grp;}}}"
                               "grouping grp {notification invalid {leaf x {type string;}}}}", LYS_IN_YANG));
-    logbuf_assert("Notification \"invalid\" is placed inside RPC/action.");
+    logbuf_assert("Notification \"invalid\" is placed inside RPC/action. /hh:test/input/a/{uses='grp'}/invalid");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1209,54 +1209,54 @@
 
     /* invalid values */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;leaf l {type binary {length -10;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - value \"-10\" does not fit the type limitations.");
+    logbuf_assert("Invalid length restriction - value \"-10\" does not fit the type limitations. /aa:l");
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;leaf l {type binary {length 18446744073709551616;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - invalid value \"18446744073709551616\".");
+    logbuf_assert("Invalid length restriction - invalid value \"18446744073709551616\". /bb:l");
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;leaf l {type binary {length \"max .. 10\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected data after max keyword (.. 10).");
+    logbuf_assert("Invalid length restriction - unexpected data after max keyword (.. 10). /cc:l");
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;leaf l {type binary {length 50..10;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - values are not in ascending order (10).");
+    logbuf_assert("Invalid length restriction - values are not in ascending order (10). /dd:l");
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;leaf l {type binary {length \"50 | 10\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - values are not in ascending order (10).");
+    logbuf_assert("Invalid length restriction - values are not in ascending order (10). /ee:l");
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;leaf l {type binary {length \"x\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected data (x).");
+    logbuf_assert("Invalid length restriction - unexpected data (x). /ff:l");
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;leaf l {type binary {length \"50 | min\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected data before min keyword (50 | ).");
+    logbuf_assert("Invalid length restriction - unexpected data before min keyword (50 | ). /gg:l");
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh;leaf l {type binary {length \"| 50\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected beginning of the expression (| 50).");
+    logbuf_assert("Invalid length restriction - unexpected beginning of the expression (| 50). /hh:l");
     assert_null(lys_parse_mem(ctx, "module ii {namespace urn:ii;prefix ii;leaf l {type binary {length \"10 ..\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected end of the expression after \"..\" (10 ..).");
+    logbuf_assert("Invalid length restriction - unexpected end of the expression after \"..\" (10 ..). /ii:l");
     assert_null(lys_parse_mem(ctx, "module jj {namespace urn:jj;prefix jj;leaf l {type binary {length \".. 10\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected \"..\" without a lower bound.");
+    logbuf_assert("Invalid length restriction - unexpected \"..\" without a lower bound. /jj:l");
     assert_null(lys_parse_mem(ctx, "module kk {namespace urn:kk;prefix kk;leaf l {type binary {length \"10 |\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - unexpected end of the expression (10 |).");
+    logbuf_assert("Invalid length restriction - unexpected end of the expression (10 |). /kk:l");
     assert_null(lys_parse_mem(ctx, "module kl {namespace urn:kl;prefix kl;leaf l {type binary {length \"10..20 | 15..30\";}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - values are not in ascending order (15).");
+    logbuf_assert("Invalid length restriction - values are not in ascending order (15). /kl:l");
 
     assert_null(lys_parse_mem(ctx, "module ll {namespace urn:ll;prefix ll;typedef mytype {type binary {length 10;}}"
                                    "leaf l {type mytype {length 11;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (11) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (11) is not equally or more limiting. /ll:l");
     assert_null(lys_parse_mem(ctx, "module mm {namespace urn:mm;prefix mm;typedef mytype {type binary {length 10..100;}}"
                                    "leaf l {type mytype {length 1..11;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (1..11) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (1..11) is not equally or more limiting. /mm:l");
     assert_null(lys_parse_mem(ctx, "module nn {namespace urn:nn;prefix nn;typedef mytype {type binary {length 10..100;}}"
                                    "leaf l {type mytype {length 20..110;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (20..110) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (20..110) is not equally or more limiting. /nn:l");
     assert_null(lys_parse_mem(ctx, "module oo {namespace urn:oo;prefix oo;typedef mytype {type binary {length 10..100;}}"
                                    "leaf l {type mytype {length 20..30|110..120;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (20..30|110..120) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (20..30|110..120) is not equally or more limiting. /oo:l");
     assert_null(lys_parse_mem(ctx, "module pp {namespace urn:pp;prefix pp;typedef mytype {type binary {length 10..11;}}"
                                              "leaf l {type mytype {length 15;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (15) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (15) is not equally or more limiting. /pp:l");
     assert_null(lys_parse_mem(ctx, "module qq {namespace urn:qq;prefix qq;typedef mytype {type binary {length 10..20|30..40;}}"
                                              "leaf l {type mytype {length 15..35;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (15..35) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (15..35) is not equally or more limiting. /qq:l");
     assert_null(lys_parse_mem(ctx, "module rr {namespace urn:rr;prefix rr;typedef mytype {type binary {length 10;}}"
                                              "leaf l {type mytype {length 10..35;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid length restriction - the derived restriction (10..35) is not equally or more limiting.");
+    logbuf_assert("Invalid length restriction - the derived restriction (10..35) is not equally or more limiting. /rr:l");
 
-    assert_null(lys_parse_mem(ctx, "module ss {namespace urn:rr;prefix rr;leaf l {type binary {pattern '[0-9]*';}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid type restrictions for binary type.");
+    assert_null(lys_parse_mem(ctx, "module ss {namespace urn:ss;prefix ss;leaf l {type binary {pattern '[0-9]*';}}}", LYS_IN_YANG));
+    logbuf_assert("Invalid type restrictions for binary type. /ss:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1402,30 +1402,30 @@
     logbuf_assert("Control characters in enum name should be avoided (\"inva\nlid\", character number 5).");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb; leaf l {type enumeration;}}", LYS_IN_YANG));
-    logbuf_assert("Missing enum substatement for enumeration type.");
+    logbuf_assert("Missing enum substatement for enumeration type. /bb:l");
 
     assert_null(lys_parse_mem(ctx, "module cc {yang-version 1.1;namespace urn:cc;prefix cc;typedef mytype {type enumeration {enum one;}}"
                                              "leaf l {type mytype {enum two;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid enumeration - derived type adds new item \"two\".");
+    logbuf_assert("Invalid enumeration - derived type adds new item \"two\". /cc:l");
 
     assert_null(lys_parse_mem(ctx, "module dd {yang-version 1.1;namespace urn:dd;prefix dd;typedef mytype {type enumeration {enum one;}}"
                                              "leaf l {type mytype {enum one {value 1;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid enumeration - value of the item \"one\" has changed from 0 to 1 in the derived type.");
+    logbuf_assert("Invalid enumeration - value of the item \"one\" has changed from 0 to 1 in the derived type. /dd:l");
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;leaf l {type enumeration {enum x {value 2147483647;}enum y;}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid enumeration - it is not possible to auto-assign enum value for \"y\" since the highest value is already 2147483647.");
+    logbuf_assert("Invalid enumeration - it is not possible to auto-assign enum value for \"y\" since the highest value is already 2147483647. /ee:l");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;leaf l {type enumeration {enum x {value 1;}enum y {value 1;}}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid enumeration - value 1 collide in items \"y\" and \"x\".");
+    logbuf_assert("Invalid enumeration - value 1 collide in items \"y\" and \"x\". /ff:l");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;typedef mytype {type enumeration;}"
                                              "leaf l {type mytype {enum one;}}}", LYS_IN_YANG));
-    logbuf_assert("Missing enum substatement for enumeration type mytype.");
+    logbuf_assert("Missing enum substatement for enumeration type mytype. /gg:l");
 
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh; typedef mytype {type enumeration {enum one;}}"
                                         "leaf l {type mytype {enum one;}}}", LYS_IN_YANG));
-    logbuf_assert("Enumeration type can be subtyped only in YANG 1.1 modules.");
+    logbuf_assert("Enumeration type can be subtyped only in YANG 1.1 modules. /hh:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1499,30 +1499,28 @@
     logbuf_assert("Invalid identifier character '$'. Line number 1.");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb; leaf l {type bits;}}", LYS_IN_YANG));
-    logbuf_assert("Missing bit substatement for bits type.");
+    logbuf_assert("Missing bit substatement for bits type. /bb:l");
 
     assert_null(lys_parse_mem(ctx, "module cc {yang-version 1.1;namespace urn:cc;prefix cc;typedef mytype {type bits {bit one;}}"
                                              "leaf l {type mytype {bit two;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid bits - derived type adds new item \"two\".");
+    logbuf_assert("Invalid bits - derived type adds new item \"two\". /cc:l");
 
     assert_null(lys_parse_mem(ctx, "module dd {yang-version 1.1;namespace urn:dd;prefix dd;typedef mytype {type bits {bit one;}}"
                                              "leaf l {type mytype {bit one {position 1;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid bits - position of the item \"one\" has changed from 0 to 1 in the derived type.");
-    assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;leaf l {type bits {bit x {position 4294967295;}bit y;}}}",
-                                        LYS_IN_YANG));
-    logbuf_assert("Invalid bits - it is not possible to auto-assign bit position for \"y\" since the highest value is already 4294967295.");
+    logbuf_assert("Invalid bits - position of the item \"one\" has changed from 0 to 1 in the derived type. /dd:l");
+    assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;leaf l {type bits {bit x {position 4294967295;}bit y;}}}", LYS_IN_YANG));
+    logbuf_assert("Invalid bits - it is not possible to auto-assign bit position for \"y\" since the highest value is already 4294967295. /ee:l");
 
-    assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;leaf l {type bits {bit x {value 1;}bit y {value 1;}}}}",
-                                        LYS_IN_YANG));
-    logbuf_assert("Invalid bits - position 1 collide in items \"y\" and \"x\".");
+    assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;leaf l {type bits {bit x {value 1;}bit y {value 1;}}}}", LYS_IN_YANG));
+    logbuf_assert("Invalid bits - position 1 collide in items \"y\" and \"x\". /ff:l");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;typedef mytype {type bits;}"
                                              "leaf l {type mytype {bit one;}}}", LYS_IN_YANG));
-    logbuf_assert("Missing bit substatement for bits type mytype.");
+    logbuf_assert("Missing bit substatement for bits type mytype. /gg:l");
 
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh; typedef mytype {type bits {bit one;}}"
                                         "leaf l {type mytype {bit one;}}}", LYS_IN_YANG));
-    logbuf_assert("Bits type can be subtyped only in YANG 1.1 modules.");
+    logbuf_assert("Bits type can be subtyped only in YANG 1.1 modules. /hh:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1576,26 +1574,26 @@
     logbuf_assert("Value \"19\" is out of \"fraction-digits\" bounds. Line number 1.");
 
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa; leaf l {type decimal64;}}", LYS_IN_YANG));
-    logbuf_assert("Missing fraction-digits substatement for decimal64 type.");
+    logbuf_assert("Missing fraction-digits substatement for decimal64 type. /aa:l");
 
     assert_null(lys_parse_mem(ctx, "module ab {namespace urn:ab;prefix ab; typedef mytype {type decimal64;}leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Missing fraction-digits substatement for decimal64 type mytype.");
+    logbuf_assert("Missing fraction-digits substatement for decimal64 type mytype. /ab:l");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb; leaf l {type decimal64 {fraction-digits 2;"
                                         "range '3.142';}}}", LYS_IN_YANG));
-    logbuf_assert("Range boundary \"3.142\" of decimal64 type exceeds defined number (2) of fraction digits.");
+    logbuf_assert("Range boundary \"3.142\" of decimal64 type exceeds defined number (2) of fraction digits. /bb:l");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc; leaf l {type decimal64 {fraction-digits 2;"
                                         "range '4 | 3.14';}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid range restriction - values are not in ascending order (3.14).");
+    logbuf_assert("Invalid range restriction - values are not in ascending order (3.14). /cc:l");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd; typedef mytype {type decimal64 {fraction-digits 2;}}"
                                         "leaf l {type mytype {fraction-digits 3;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid fraction-digits substatement for type not directly derived from decimal64 built-in type.");
+    logbuf_assert("Invalid fraction-digits substatement for type not directly derived from decimal64 built-in type. /dd:l");
 
     assert_null(lys_parse_mem(ctx, "module de {namespace urn:de;prefix de; typedef mytype {type decimal64 {fraction-digits 2;}}"
                                         "typedef mytype2 {type mytype {fraction-digits 3;}}leaf l {type mytype2;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid fraction-digits substatement for type \"mytype2\" not directly derived from decimal64 built-in type.");
+    logbuf_assert("Invalid fraction-digits substatement for type \"mytype2\" not directly derived from decimal64 built-in type. /de:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1635,7 +1633,7 @@
     logbuf_assert("Invalid value \"yes\" of \"require-instance\". Line number 1.");
 
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa; leaf l {type instance-identifier {fraction-digits 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid type restrictions for instance-identifier type.");
+    logbuf_assert("Invalid type restrictions for instance-identifier type. /aa:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1682,29 +1680,29 @@
 
     /* invalid cases */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa; leaf l {type identityref;}}", LYS_IN_YANG));
-    logbuf_assert("Missing base substatement for identityref type.");
+    logbuf_assert("Missing base substatement for identityref type. /aa:l");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb; typedef mytype {type identityref;}"
                                         "leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Missing base substatement for identityref type mytype.");
+    logbuf_assert("Missing base substatement for identityref type mytype. /bb:l");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc; identity i; typedef mytype {type identityref {base i;}}"
                                         "leaf l {type mytype {base i;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid base substatement for the type not directly derived from identityref built-in type.");
+    logbuf_assert("Invalid base substatement for the type not directly derived from identityref built-in type. /cc:l");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd; identity i; typedef mytype {type identityref {base i;}}"
                                         "typedef mytype2 {type mytype {base i;}}leaf l {type mytype2;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid base substatement for the type \"mytype2\" not directly derived from identityref built-in type.");
+    logbuf_assert("Invalid base substatement for the type \"mytype2\" not directly derived from identityref built-in type. /dd:l");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee; identity i; identity j;"
                                         "leaf l {type identityref {base i;base j;}}}", LYS_IN_YANG));
-    logbuf_assert("Multiple bases in identityref type are allowed only in YANG 1.1 modules.");
+    logbuf_assert("Multiple bases in identityref type are allowed only in YANG 1.1 modules. /ee:l");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff; identity i;leaf l {type identityref {base j;}}}", LYS_IN_YANG));
-    logbuf_assert("Unable to find base (j) of identityref.");
+    logbuf_assert("Unable to find base (j) of identityref. /ff:l");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;leaf l {type identityref {base x:j;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid prefix used for base (x:j) of identityref.");
+    logbuf_assert("Invalid prefix used for base (x:j) of identityref. /gg:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -1923,150 +1921,150 @@
     /* invalid paths */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path ../a/invalid;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path - unable to find \"../a/invalid\".");
+    logbuf_assert("Invalid leafref path - unable to find \"../a/invalid\". /aa:ref1");
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path ../../toohigh;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path \"../../toohigh\" - too many \"..\" in the path.");
+    logbuf_assert("Invalid leafref path \"../../toohigh\" - too many \"..\" in the path. /bb:ref1");
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path /a:invalid;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path - unable to find module connected with the prefix of the node \"/a:invalid\".");
+    logbuf_assert("Invalid leafref path - unable to find module connected with the prefix of the node \"/a:invalid\". /cc:ref1");
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;leaf target1 {type string;}container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path '/a[target2 = current()/../target1]/target2';}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path - node \"/a\" is expected to be a list, but it is container.");
+    logbuf_assert("Invalid leafref path - node \"/a\" is expected to be a list, but it is container. /dd:ref1");
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path /a!invalid;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path at character 3 (/a!invalid).");
+    logbuf_assert("Invalid leafref path at character 3 (/a!invalid). /ee:ref1");
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;container a {leaf target2 {type uint8;}}"
                                         "leaf ref1 {type leafref {path /a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path \"/a\" - target node is container instead of leaf or leaf-list.");
+    logbuf_assert("Invalid leafref path \"/a\" - target node is container instead of leaf or leaf-list. /ff:ref1");
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;container a {leaf target2 {type uint8; status deprecated;}}"
                                         "leaf ref1 {type leafref {path /a/target2;}}}", LYS_IN_YANG));
-    logbuf_assert("A current definition \"ref1\" is not allowed to reference deprecated definition \"target2\".");
+    logbuf_assert("A current definition \"ref1\" is not allowed to reference deprecated definition \"target2\". /gg:ref1");
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh;"
                                         "leaf ref1 {type leafref;}}", LYS_IN_YANG));
-    logbuf_assert("Missing path substatement for leafref type.");
+    logbuf_assert("Missing path substatement for leafref type. /hh:ref1");
     assert_null(lys_parse_mem(ctx, "module ii {namespace urn:ii;prefix ii;typedef mytype {type leafref;}"
                                         "leaf ref1 {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Missing path substatement for leafref type mytype.");
+    logbuf_assert("Missing path substatement for leafref type mytype. /ii:ref1");
     assert_null(lys_parse_mem(ctx, "module jj {namespace urn:jj;prefix jj;feature f;"
                                         "leaf ref {type leafref {path /target;}}leaf target {if-feature f;type string;}}", LYS_IN_YANG));
     logbuf_assert("Invalid leafref path \"/target\" - set of features applicable to the leafref target is not a subset of features "
-                  "applicable to the leafref itself.");
+                  "applicable to the leafref itself. /jj:ref");
     assert_null(lys_parse_mem(ctx, "module kk {namespace urn:kk;prefix kk;"
                                         "leaf ref {type leafref {path /target;}}leaf target {type string;config false;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path \"/target\" - target is supposed to represent configuration data (as the leafref does), but it does not.");
+    logbuf_assert("Invalid leafref path \"/target\" - target is supposed to represent configuration data (as the leafref does), but it does not. /kk:ref");
 
     assert_null(lys_parse_mem(ctx, "module ll {namespace urn:ll;prefix ll;"
                                         "leaf ref {type leafref {path /target; require-instance true;}}leaf target {type string;}}", LYS_IN_YANG));
-    logbuf_assert("Leafref type can be restricted by require-instance statement only in YANG 1.1 modules.");
+    logbuf_assert("Leafref type can be restricted by require-instance statement only in YANG 1.1 modules. /ll:ref");
     assert_null(lys_parse_mem(ctx, "module mm {namespace urn:mm;prefix mm;typedef mytype {type leafref {path /target;require-instance false;}}"
                                         "leaf ref {type mytype;}leaf target {type string;}}", LYS_IN_YANG));
-    logbuf_assert("Leafref type \"mytype\" can be restricted by require-instance statement only in YANG 1.1 modules.");
+    logbuf_assert("Leafref type \"mytype\" can be restricted by require-instance statement only in YANG 1.1 modules. /mm:ref");
 
     assert_null(lys_parse_mem(ctx, "module nn {namespace urn:nn;prefix nn;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[name is current()/../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name i\" - missing \"=\" after node-identifier.");
+    logbuf_assert("Invalid leafref path predicate \"[name i\" - missing \"=\" after node-identifier. /nn:address");
 
     assert_null(lys_parse_mem(ctx, "module oo {namespace urn:oo;prefix oo;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[name=current()/../ifname/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name=current()/../ifname/ip\" - missing predicate termination.");
+    logbuf_assert("Invalid leafref path predicate \"[name=current()/../ifname/ip\" - missing predicate termination. /oo:address");
 
     assert_null(lys_parse_mem(ctx, "module pp {namespace urn:pp;prefix pp;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[x:name=current()/../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[x:name=current()/../ifname]\" - prefix \"x\" not defined in module \"pp\".");
+    logbuf_assert("Invalid leafref path predicate \"[x:name=current()/../ifname]\" - prefix \"x\" not defined in module \"pp\". /pp:address");
 
     assert_null(lys_parse_mem(ctx, "module qq {namespace urn:qq;prefix qq;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[id=current()/../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[id=current()/../ifname]\" - predicate's key node \"id\" not found.");
+    logbuf_assert("Invalid leafref path predicate \"[id=current()/../ifname]\" - predicate's key node \"id\" not found. /qq:address");
 
     assert_null(lys_parse_mem(ctx, "module rr {namespace urn:rr;prefix rr;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name=current() /  .. / ifname][name=current()/../test]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name=current()/../test]\" - multiple equality tests for the key \"name\".");
+    logbuf_assert("Invalid leafref path predicate \"[name=current()/../test]\" - multiple equality tests for the key \"name\". /rr:address");
 
     assert_null(lys_parse_mem(ctx, "module ss {namespace urn:ss;prefix ss;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = ../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name = ../ifname]\" - missing current-function-invocation.");
+    logbuf_assert("Invalid leafref path predicate \"[name = ../ifname]\" - missing current-function-invocation. /ss:address");
 
     assert_null(lys_parse_mem(ctx, "module tt {namespace urn:tt;prefix tt;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = current()../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name = current()../ifname]\" - missing \"/\" after current-function-invocation.");
+    logbuf_assert("Invalid leafref path predicate \"[name = current()../ifname]\" - missing \"/\" after current-function-invocation. /tt:address");
 
     assert_null(lys_parse_mem(ctx, "module uu {namespace urn:uu;prefix uu;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = current()/..ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name = current()/..ifname]\" - missing \"/\" in \"../\" rel-path-keyexpr pattern.");
+    logbuf_assert("Invalid leafref path predicate \"[name = current()/..ifname]\" - missing \"/\" in \"../\" rel-path-keyexpr pattern. /uu:address");
 
     assert_null(lys_parse_mem(ctx, "module vv {namespace urn:vv;prefix vv;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = current()/ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name = current()/ifname]\" - at least one \"..\" is expected in rel-path-keyexpr.");
+    logbuf_assert("Invalid leafref path predicate \"[name = current()/ifname]\" - at least one \"..\" is expected in rel-path-keyexpr. /vv:address");
 
     assert_null(lys_parse_mem(ctx, "module ww {namespace urn:ww;prefix ww;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = current()/../]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name = current()/../]\" - at least one node-identifier is expected in rel-path-keyexpr.");
+    logbuf_assert("Invalid leafref path predicate \"[name = current()/../]\" - at least one node-identifier is expected in rel-path-keyexpr. /ww:address");
 
     assert_null(lys_parse_mem(ctx, "module xx {namespace urn:xx;prefix xx;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}leaf test{type string;}"
                                         "leaf address {type leafref{ path \"/interface[name = current()/../$node]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid node identifier in leafref path predicate - character 22 (of [name = current()/../$node]).");
+    logbuf_assert("Invalid node identifier in leafref path predicate - character 22 (of [name = current()/../$node]). /xx:address");
 
     assert_null(lys_parse_mem(ctx, "module yy {namespace urn:yy;prefix yy;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[name=current()/../x:ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name=current()/../x:ifname]\" - unable to find module of the node \"ifname\" in rel-path-keyexpr.");
+    logbuf_assert("Invalid leafref path predicate \"[name=current()/../x:ifname]\" - unable to find module of the node \"ifname\" in rel-path-keyexpr. /yy:address");
 
     assert_null(lys_parse_mem(ctx, "module zz {namespace urn:zz;prefix zz;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[name=current()/../xxx]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name=current()/../xxx]\" - unable to find node \"current()/../xxx\" in the rel-path-keyexpr.");
+    logbuf_assert("Invalid leafref path predicate \"[name=current()/../xxx]\" - unable to find node \"current()/../xxx\" in the rel-path-keyexpr. /zz:address");
 
     assert_null(lys_parse_mem(ctx, "module zza {namespace urn:zza;prefix zza;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}container c;"
                                         "leaf address {type leafref{ path \"/interface[name=current()/../c]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[name=current()/../c]\" - rel-path-keyexpr \"current()/../c\" refers container instead of leaf.");
+    logbuf_assert("Invalid leafref path predicate \"[name=current()/../c]\" - rel-path-keyexpr \"current()/../c\" refers container instead of leaf. /zza:address");
 
     assert_null(lys_parse_mem(ctx, "module zzb {namespace urn:zzb;prefix zzb;"
                                         "list interface{key name;leaf name{type string;}leaf ip {type string;}container c;}"
                                         "leaf ifname{type leafref{ path \"../interface/name\";}}"
                                         "leaf address {type leafref{ path \"/interface[c=current()/../ifname]/ip\";}}}",
                                         LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path predicate \"[c=current()/../ifname]\" - predicate's key node \"c\" not found.");
+    logbuf_assert("Invalid leafref path predicate \"[c=current()/../ifname]\" - predicate's key node \"c\" not found. /zzb:address");
 
     /* circular chain */
     assert_null(lys_parse_mem(ctx, "module aaa {namespace urn:aaa;prefix aaa;"
@@ -2074,7 +2072,7 @@
                                         "leaf ref2 {type leafref {path /ref3;}}"
                                         "leaf ref3 {type leafref {path /ref4;}}"
                                         "leaf ref4 {type leafref {path /ref1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid leafref path \"/ref1\" - circular chain of leafrefs detected.");
+    logbuf_assert("Invalid leafref path \"/ref1\" - circular chain of leafrefs detected. /aaa:ref4");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2092,11 +2090,11 @@
     /* invalid */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;"
                                         "leaf l {type empty; default x;}}", LYS_IN_YANG));
-    logbuf_assert("Leaf of type \"empty\" must not have a default value (x).");
+    logbuf_assert("Leaf of type \"empty\" must not have a default value (x). /aa:l");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;typedef mytype {type empty; default x;}"
                                         "leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid type \"mytype\" - \"empty\" type must not have a default value (x).");
+    logbuf_assert("Invalid type \"mytype\" - \"empty\" type must not have a default value (x). /bb:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2159,25 +2157,25 @@
     /* invalid unions */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;typedef mytype {type union;}"
                                         "leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Missing type substatement for union type mytype.");
+    logbuf_assert("Missing type substatement for union type mytype. /aa:l");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;leaf l {type union;}}", LYS_IN_YANG));
-   logbuf_assert("Missing type substatement for union type.");
+   logbuf_assert("Missing type substatement for union type. /bb:l");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;typedef mytype {type union{type int8; type string;}}"
                                         "leaf l {type mytype {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid type substatement for the type not directly derived from union built-in type.");
+    logbuf_assert("Invalid type substatement for the type not directly derived from union built-in type. /cc:l");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;typedef mytype {type union{type int8; type string;}}"
                                         "typedef mytype2 {type mytype {type string;}}leaf l {type mytype2;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid type substatement for the type \"mytype2\" not directly derived from union built-in type.");
+    logbuf_assert("Invalid type substatement for the type \"mytype2\" not directly derived from union built-in type. /dd:l");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;typedef mytype {type union{type mytype; type string;}}"
                                         "leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid \"mytype\" type reference - circular chain of types detected.");
+    logbuf_assert("Invalid \"mytype\" type reference - circular chain of types detected. /ee:l");
     assert_null(lys_parse_mem(ctx, "module ef {namespace urn:ef;prefix ef;typedef mytype {type mytype2;}"
                                         "typedef mytype2 {type mytype;} leaf l {type mytype;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid \"mytype\" type reference - circular chain of types detected.");
+    logbuf_assert("Invalid \"mytype\" type reference - circular chain of types detected. /ef:l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2275,15 +2273,15 @@
 
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;"
                                         "container c {status deprecated; leaf l {status current; type string;}}}", LYS_IN_YANG));
-    logbuf_assert("A \"current\" status is in conflict with the parent's \"deprecated\" status.");
+    logbuf_assert("A \"current\" status is in conflict with the parent's \"deprecated\" status. /aa:c/l");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;"
                                         "container c {status obsolete; leaf l {status current; type string;}}}", LYS_IN_YANG));
-    logbuf_assert("A \"current\" status is in conflict with the parent's \"obsolete\" status.");
+    logbuf_assert("A \"current\" status is in conflict with the parent's \"obsolete\" status. /bb:c/l");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;"
                                         "container c {status obsolete; leaf l {status deprecated; type string;}}}", LYS_IN_YANG));
-    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status.");
+    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status. /cc:c/l");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2314,11 +2312,11 @@
     /* invalid - error in a non-instantiated grouping */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;"
                                         "grouping grp {leaf x {type leafref;}}}", LYS_IN_YANG));
-    logbuf_assert("Missing path substatement for leafref type.");
+    logbuf_assert("Missing path substatement for leafref type. /aa:{grouping='grp'}/x");
     logbuf_clean();
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;"
                                         "container a {grouping grp {leaf x {type leafref;}}}}", LYS_IN_YANG));
-    logbuf_assert("Missing path substatement for leafref type.");
+    logbuf_assert("Missing path substatement for leafref type. /aa:a/{grouping='grp'}/x");
 
 
     *state = NULL;
@@ -2423,47 +2421,47 @@
 
     /* invalid */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;uses missinggrp;}", LYS_IN_YANG));
-    logbuf_assert("Grouping \"missinggrp\" referenced by a uses statement not found.");
+    logbuf_assert("Grouping \"missinggrp\" referenced by a uses statement not found. /aa:{uses='missinggrp'}");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;uses grp;"
                                         "grouping grp {leaf a{type string;}uses grp1;}"
                                         "grouping grp1 {leaf b {type string;}uses grp2;}"
                                         "grouping grp2 {leaf c {type string;}uses grp;}}", LYS_IN_YANG));
-    logbuf_assert("Grouping \"grp\" references itself through a uses statement.");
+    logbuf_assert("Grouping \"grp\" references itself through a uses statement. /bb:{uses='grp'}/{uses='grp1'}/{uses='grp2'}/{uses='grp'}");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;uses a:missingprefix;}", LYS_IN_YANG));
-    logbuf_assert("Invalid prefix used for grouping reference (a:missingprefix).");
+    logbuf_assert("Invalid prefix used for grouping reference. /cc:{uses='a:missingprefix'}");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;grouping grp{leaf a{type string;}}"
                                         "leaf a {type string;}uses grp;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement. /dd:{uses='grp'}/dd:a");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;grouping grp {leaf l {type string; status deprecated;}}"
                                         "uses grp {status obsolete;}}", LYS_IN_YANG));
-    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status.");
+    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status. /ee:{uses='grp'}/ee:l");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;grouping grp {leaf l {type string;}}"
                                         "leaf l {type int8;}uses grp;}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"l\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"l\" of data definition/RPC/action/Notification statement. /ff:{uses='grp'}/ff:l");
     assert_null(lys_parse_mem(ctx, "module fg {namespace urn:fg;prefix fg;grouping grp {leaf m {type string;}}"
                                         "uses grp;leaf m {type int8;}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"m\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"m\" of data definition/RPC/action/Notification statement. /fg:m");
 
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg; grouping grp {container g;}"
                               "leaf g {type string;}"
                               "container top {uses grp {augment /g {leaf x {type int8;}}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"/g\" - absolute-schema-nodeid used.");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"/g\" - absolute-schema-nodeid used. /gg:top/{uses='grp'}/{augment='/g'}");
 
     assert_non_null(mod = lys_parse_mem(ctx, "module hh {yang-version 1.1;namespace urn:hh;prefix hh;"
                                         "grouping grp {notification g { description \"super g\";}}"
                                         "container top {notification h; uses grp {refine h {description \"ultra h\";}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"h\" - target node not found.");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"h\" - target node not found. /hh:top/{uses='grp'}/{refine='h'}");
 
     assert_non_null(mod = lys_parse_mem(ctx, "module ii {yang-version 1.1;namespace urn:ii;prefix ii;"
                                         "grouping grp {action g { description \"super g\";}}"
                                         "container top {action i; uses grp {refine i {description \"ultra i\";}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid descendant-schema-nodeid value \"i\" - target node not found.");
+    logbuf_assert("Invalid descendant-schema-nodeid value \"i\" - target node not found. /ii:top/{uses='grp'}/{refine='i'}");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2556,58 +2554,58 @@
     /* invalid */
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa;import grp {prefix g;}"
                                         "uses g:grp {refine c {default hello;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of default in \"c\" - container cannot hold default value(s).");
+    logbuf_assert("Invalid refine of default - container cannot hold default value(s). /aa:{uses='g:grp'}/{refine='c'}");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;import grp {prefix g;}"
                                         "uses g:grp {refine c/l {default hello; default world;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of default in \"c/l\" - leaf cannot hold 2 default values.");
+    logbuf_assert("Invalid refine of default - leaf cannot hold 2 default values. /bb:{uses='g:grp'}/{refine='c/l'}");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc;import grp {prefix g;}"
                                         "uses g:grp {refine c/ll {default hello; default world;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of default in leaf-list - the default statement is allowed only in YANG 1.1 modules.");
+    logbuf_assert("Invalid refine of default in leaf-list - the default statement is allowed only in YANG 1.1 modules. /cc:{uses='g:grp'}/{refine='c/ll'}");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd;import grp {prefix g;}"
                                         "uses g:grp {refine c/ll {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of mandatory in \"c/ll\" - leaf-list cannot hold mandatory statement.");
+    logbuf_assert("Invalid refine of mandatory - leaf-list cannot hold mandatory statement. /dd:{uses='g:grp'}/{refine='c/ll'}");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee;import grp {prefix g;}"
                                         "uses g:grp {refine c/l {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of mandatory in \"c/l\" - leaf already has \"default\" statement.");
+    logbuf_assert("Invalid refine of mandatory - leaf already has \"default\" statement. /ee:{uses='g:grp'}/{refine='c/l'}");
     assert_null(lys_parse_mem(ctx, "module ef {namespace urn:ef;prefix ef;import grp {prefix g;}"
                                         "uses g:grp {refine c/ch {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of mandatory in \"c/ch\" - choice already has \"default\" statement.");
+    logbuf_assert("Invalid refine of mandatory - choice already has \"default\" statement. /ef:{uses='g:grp'}/{refine='c/ch'}");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff;import grp {prefix g;}"
                                         "uses g:grp {refine c/ch/a/a {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of mandatory in \"c/ch/a/a\" under the default case.");
+    logbuf_assert("Invalid refine of mandatory under the default case. /ff:{uses='g:grp'}/{refine='c/ch/a/a'}");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;import grp {prefix g;}"
                                         "uses g:grp {refine c/x {default hello;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of default in \"c/x\" - the node is mandatory.");
+    logbuf_assert("Invalid refine of default - the node is mandatory. /gg:{uses='g:grp'}/{refine='c/x'}");
 
     assert_null(lys_parse_mem(ctx, "module hh {namespace urn:hh;prefix hh;import grp {prefix g;}"
                                         "uses g:grp {refine c/c/l {config true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of config in \"c/c/l\" - configuration node cannot be child of any state data node.");
+    logbuf_assert("Invalid refine of config - configuration node cannot be child of any state data node. /hh:{uses='g:grp'}/{refine='c/c/l'}");
 
     assert_null(lys_parse_mem(ctx, "module ii {namespace urn:ii;prefix ii;grouping grp {leaf l {type string; status deprecated;}}"
                                         "uses grp {status obsolete;}}", LYS_IN_YANG));
-    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status.");
+    logbuf_assert("A \"deprecated\" status is in conflict with the parent's \"obsolete\" status. /ii:{uses='grp'}/ii:l");
 
     assert_null(lys_parse_mem(ctx, "module jj {namespace urn:jj;prefix jj;import grp {prefix g;}"
                                         "uses g:grp {refine c/x {presence nonsence;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of presence statement in \"c/x\" - leaf cannot hold the presence statement.");
+    logbuf_assert("Invalid refine of presence statement - leaf cannot hold the presence statement. /jj:{uses='g:grp'}/{refine='c/x'}");
 
     assert_null(lys_parse_mem(ctx, "module kk {namespace urn:kk;prefix kk;import grp {prefix g;}"
                                         "uses g:grp {refine c/ch {must 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of must statement in \"c/ch\" - choice cannot hold any must statement.");
+    logbuf_assert("Invalid refine of must statement - choice cannot hold any must statement. /kk:{uses='g:grp'}/{refine='c/ch'}");
 
     assert_null(lys_parse_mem(ctx, "module ll {namespace urn:ll;prefix ll;import grp {prefix g;}"
                                         "uses g:grp {refine c/x {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of min-elements statement in \"c/x\" - leaf cannot hold this statement.");
+    logbuf_assert("Invalid refine of min-elements statement - leaf cannot hold this statement. /ll:{uses='g:grp'}/{refine='c/x'}");
 
     assert_null(lys_parse_mem(ctx, "module mm {namespace urn:mm;prefix mm;import grp {prefix g;}"
                                         "uses g:grp {refine c/ll {min-elements 10;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid refine of min-elements statement in \"c/ll\" - \"min-elements\" is bigger than \"max-elements\".");
+    logbuf_assert("Invalid refine of min-elements statement - \"min-elements\" is bigger than \"max-elements\". /mm:{uses='g:grp'}/{refine='c/ll'}");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -2728,32 +2726,32 @@
 
     assert_null(lys_parse_mem(ctx, "module aa {namespace urn:aa;prefix aa; container c {leaf a {type string;}}"
                                         "augment /x {leaf a {type int8;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid absolute-schema-nodeid value \"/x\" - target node not found.");
+    logbuf_assert("Invalid absolute-schema-nodeid value \"/x\" - target node not found. /aa:{augment='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb; container c {leaf a {type string;}}"
                                         "augment /c {leaf a {type int8;}}}", LYS_IN_YANG));
-    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement.");
+    logbuf_assert("Duplicate identifier \"a\" of data definition/RPC/action/Notification statement. /bb:{augment='/c'}/a");
 
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc; container c {leaf a {type string;}}"
                                         "augment /c/a {leaf a {type int8;}}}", LYS_IN_YANG));
-    logbuf_assert("Augment's absolute-schema-nodeid \"/c/a\" refers to a leaf node which is not an allowed augment's target.");
+    logbuf_assert("Augment's absolute-schema-nodeid \"/c/a\" refers to a leaf node which is not an allowed augment's target. /cc:{augment='/c/a'}");
 
     assert_null(lys_parse_mem(ctx, "module dd {namespace urn:dd;prefix dd; container c {leaf a {type string;}}"
                                         "augment /c {case b {leaf d {type int8;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid augment (/c) of container node which is not allowed to contain case node \"b\".");
+    logbuf_assert("Invalid augment of container node which is not allowed to contain case node \"b\". /dd:{augment='/c'}");
 
     assert_null(lys_parse_mem(ctx, "module ee {namespace urn:ee;prefix ee; import himp {prefix hi;}"
                                         "augment /hi:top {container c {leaf d {mandatory true; type int8;}}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid augment (/hi:top) adding mandatory node \"c\" without making it conditional via when statement.");
+    logbuf_assert("Invalid augment adding mandatory node \"c\" without making it conditional via when statement. /ee:{augment='/hi:top'}");
 
     assert_null(lys_parse_mem(ctx, "module ff {namespace urn:ff;prefix ff; container top;"
                                         "augment ../top {leaf x {type int8;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid absolute-schema-nodeid value \"../top\" - missing starting \"/\".");
+    logbuf_assert("Invalid absolute-schema-nodeid value \"../top\" - missing starting \"/\". /ff:{augment='../top'}");
 
     assert_null(lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg; rpc func;"
                                         "augment /func {leaf x {type int8;}}}", LYS_IN_YANG));
-    logbuf_assert("Augment's absolute-schema-nodeid \"/func\" refers to a RPC/action node which is not an allowed augment's target.");
+    logbuf_assert("Augment's absolute-schema-nodeid \"/func\" refers to a RPC/action node which is not an allowed augment's target. /gg:{augment='/func'}");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);
@@ -3025,7 +3023,7 @@
 
     assert_null(lys_parse_mem(ctx, "module aa1 {namespace urn:aa1;prefix aa1;import a {prefix a;}"
                               "deviation /a:top/a:z {deviate not-supported;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid absolute-schema-nodeid value \"/a:top/a:z\" - target node not found.");
+    logbuf_assert("Invalid absolute-schema-nodeid value \"/a:top/a:z\" - target node not found. /aa1:{deviation='/a:top/a:z'}");
     assert_non_null(lys_parse_mem(ctx, "module aa2 {namespace urn:aa2;prefix aa2;import a {prefix a;}"
                               "deviation /a:top/a:a {deviate not-supported;}"
                               "deviation /a:top/a:a {deviate add {default error;}}}", LYS_IN_YANG));
@@ -3034,172 +3032,173 @@
 
     assert_null(lys_parse_mem(ctx, "module bb {namespace urn:bb;prefix bb;import a {prefix a;}"
                               "deviation a:top/a:a {deviate not-supported;}}", LYS_IN_YANG));
-    logbuf_assert("Invalid absolute-schema-nodeid value \"a:top/a:a\" - missing starting \"/\".");
+    logbuf_assert("Invalid absolute-schema-nodeid value \"a:top/a:a\" - missing starting \"/\". /bb:{deviation='a:top/a:a'}");
 
     assert_null(lys_parse_mem(ctx, "module cc {namespace urn:cc;prefix cc; container c;"
                               "deviation /c {deviate add {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) of container node - it is not possible to add \"units\" property.");
+    logbuf_assert("Invalid deviation of container node - it is not possible to add \"units\" property. /cc:{deviation='/c'}");
     assert_null(lys_parse_mem(ctx, "module cd {namespace urn:cd;prefix cd; leaf c {type string; units centimeters;}"
                               "deviation /c {deviate add {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) adding \"units\" property which already exists (with value \"centimeters\").");
+    logbuf_assert("Invalid deviation adding \"units\" property which already exists (with value \"centimeters\"). /cd:{deviation='/c'}");
 
     assert_null(lys_parse_mem(ctx, "module dd1 {namespace urn:dd1;prefix dd1; container c;"
                               "deviation /c {deviate delete {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) of container node - it is not possible to delete \"units\" property.");
+    logbuf_assert("Invalid deviation of container node - it is not possible to delete \"units\" property. /dd1:{deviation='/c'}");
     assert_null(lys_parse_mem(ctx, "module dd2 {namespace urn:dd2;prefix dd2; leaf c {type string;}"
                               "deviation /c {deviate delete {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) deleting \"units\" property \"meters\" which is not present.");
+    logbuf_assert("Invalid deviation deleting \"units\" property \"meters\" which is not present. /dd2:{deviation='/c'}");
     assert_null(lys_parse_mem(ctx, "module dd3 {namespace urn:dd3;prefix dd3; leaf c {type string; units centimeters;}"
                               "deviation /c {deviate delete {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) deleting \"units\" property \"meters\" which does not match the target's property value \"centimeters\".");
+    logbuf_assert("Invalid deviation deleting \"units\" property \"meters\" which does not match the target's property value \"centimeters\"."
+            " /dd3:{deviation='/c'}");
 
     assert_null(lys_parse_mem(ctx, "module ee1 {namespace urn:ee1;prefix ee1; container c;"
                               "deviation /c {deviate replace {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) of container node - it is not possible to replace \"units\" property.");
+    logbuf_assert("Invalid deviation of container node - it is not possible to replace \"units\" property. /ee1:{deviation='/c'}");
     assert_null(lys_parse_mem(ctx, "module ee2 {namespace urn:ee2;prefix ee2; leaf c {type string;}"
                               "deviation /c {deviate replace {units meters;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/c) replacing \"units\" property \"meters\" which is not present.");
+    logbuf_assert("Invalid deviation replacing \"units\" property \"meters\" which is not present. /ee2:{deviation='/c'}");
 
     /* the default is already deleted in /e:a byt module f */
     assert_null(lys_parse_mem(ctx, "module ff1 {namespace urn:ff1;prefix ff1; import e {prefix e;}"
                               "deviation /e:a {deviate delete {default x:a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:a) deleting \"default\" property \"x:a\" which is not present.");
+    logbuf_assert("Invalid deviation deleting \"default\" property \"x:a\" which is not present. /ff1:{deviation='/e:a'}");
     assert_null(lys_parse_mem(ctx, "module ff2 {namespace urn:ff2;prefix ff2; import e {prefix e;}"
                               "deviation /e:b {deviate delete {default x:a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:b) deleting \"default\" property \"x:a\" of choice. "
-                  "The prefix does not match any imported module of the deviation module.");
+    logbuf_assert("Invalid deviation deleting \"default\" property \"x:a\" of choice. "
+                  "The prefix does not match any imported module of the deviation module. /ff2:{deviation='/e:b'}");
     assert_null(lys_parse_mem(ctx, "module ff3 {namespace urn:ff3;prefix ff3; import e {prefix e;}"
                               "deviation /e:b {deviate delete {default e:b;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:b) deleting \"default\" property \"e:b\" of choice does not match the default case name \"a\".");
+    logbuf_assert("Invalid deviation deleting \"default\" property \"e:b\" of choice does not match the default case name \"a\". /ff3:{deviation='/e:b'}");
     assert_null(lys_parse_mem(ctx, "module ff4 {namespace urn:ff4;prefix ff4; import e {prefix e;}"
                               "deviation /e:b {deviate delete {default ff4:a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:b) deleting \"default\" property \"ff4:a\" of choice. The prefix does not match the default case's module.");
+    logbuf_assert("Invalid deviation deleting \"default\" property \"ff4:a\" of choice. The prefix does not match the default case's module. /ff4:{deviation='/e:b'}");
     assert_null(lys_parse_mem(ctx, "module ff5 {namespace urn:ff5;prefix ff5; anyxml a;"
                               "deviation /a {deviate delete {default x;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/a) of anyxml node - it is not possible to delete \"default\" property.");
+    logbuf_assert("Invalid deviation of anyxml node - it is not possible to delete \"default\" property. /ff5:{deviation='/a'}");
 
     assert_null(lys_parse_mem(ctx, "module gg1 {namespace urn:gg1;prefix gg1; import e {prefix e;}"
                               "deviation /e:b {deviate add {default e:a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:b) adding \"default\" property which already exists (with value \"a\").");
+    logbuf_assert("Invalid deviation adding \"default\" property which already exists (with value \"a\"). /gg1:{deviation='/e:b'}");
     assert_null(lys_parse_mem(ctx, "module gg2 {namespace urn:gg2;prefix gg2; import e {prefix e;}"
                               "deviation /e:a {deviate add {default x:a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:a) adding \"default\" property \"x:a\" of choice. "
-                  "The prefix does not match any imported module of the deviation module.");
+    logbuf_assert("Invalid deviation adding \"default\" property \"x:a\" of choice. "
+                  "The prefix does not match any imported module of the deviation module. /gg2:{deviation='/e:a'}");
     assert_null(lys_parse_mem(ctx, "module gg3 {namespace urn:gg3;prefix gg3; import e {prefix e;}"
                               "deviation /e:a {deviate add {default a;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:a) adding \"default\" property \"a\" of choice - the specified case does not exists.");
+    logbuf_assert("Invalid deviation adding \"default\" property \"a\" of choice - the specified case does not exists. /gg3:{deviation='/e:a'}");
     assert_null(lys_parse_mem(ctx, "module gg4 {namespace urn:gg4;prefix gg4; import e {prefix e;}"
                               "deviation /e:c {deviate add {default hi;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:c) adding \"default\" property which already exists (with value \"hello\").");
+    logbuf_assert("Invalid deviation adding \"default\" property which already exists (with value \"hello\"). /gg4:{deviation='/e:c'}");
     assert_null(lys_parse_mem(ctx, "module gg4 {namespace urn:gg4;prefix gg4; import e {prefix e;}"
                               "deviation /e:a {deviate add {default e:c;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:a) adding \"default\" property \"e:c\" of choice - mandatory node \"c\" under the default case.");
+    logbuf_assert("Invalid deviation adding \"default\" property \"e:c\" of choice - mandatory node \"c\" under the default case. /gg4:{deviation='/e:a'}");
     assert_null(lys_parse_mem(ctx, "module gg5 {namespace urn:gg5;prefix gg5; leaf x {type string; mandatory true;}"
                               "deviation /x {deviate add {default error;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) combining default value and mandatory leaf.");
+    logbuf_assert("Invalid deviation combining default value and mandatory leaf. /gg5:{deviation='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module hh1 {yang-version 1.1; namespace urn:hh1;prefix hh1; import e {prefix e;}"
                               "deviation /e:d {deviate replace {default hi;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/e:d) of leaf-list node - it is not possible to replace \"default\" property.");
+    logbuf_assert("Invalid deviation of leaf-list node - it is not possible to replace \"default\" property. /hh1:{deviation='/e:d'}");
 
     assert_null(lys_parse_mem(ctx, "module ii1 {namespace urn:ii1;prefix ii1; import i {prefix i;}"
                               "deviation /i:l1 {deviate delete {unique x;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/i:l1) deleting \"unique\" property \"x\" which does not match any of the target's property values.");
+    logbuf_assert("Invalid deviation deleting \"unique\" property \"x\" which does not match any of the target's property values. /ii1:{deviation='/i:l1'}");
     assert_null(lys_parse_mem(ctx, "module ii2 {namespace urn:ii2;prefix ii2; import i {prefix i;} leaf x { type string;}"
                               "deviation /i:l2 {deviate delete {unique d;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/i:l2) deleting \"unique\" property \"d\" which does not match any of the target's property values.");
+    logbuf_assert("Invalid deviation deleting \"unique\" property \"d\" which does not match any of the target's property values. /ii2:{deviation='/i:l2'}");
     assert_null(lys_parse_mem(ctx, "module ii3 {namespace urn:ii3;prefix ii3; leaf x { type string;}"
                               "deviation /x {deviate delete {unique d;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) of leaf node - it is not possible to delete \"unique\" property.");
+    logbuf_assert("Invalid deviation of leaf node - it is not possible to delete \"unique\" property. /ii3:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module ii4 {namespace urn:ii4;prefix ii4; leaf x { type string;}"
                               "deviation /x {deviate add {unique d;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) of leaf node - it is not possible to add \"unique\" property.");
+    logbuf_assert("Invalid deviation of leaf node - it is not possible to add \"unique\" property. /ii4:{deviation='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module jj1 {namespace urn:jj1;prefix jj1; choice ch {case a {leaf a{type string;}}}"
                               "deviation /ch/a {deviate add {config false;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/ch/a) of case node - it is not possible to add \"config\" property.");
+    logbuf_assert("Invalid deviation of case node - it is not possible to add \"config\" property. /jj1:{deviation='/ch/a'}");
     assert_null(lys_parse_mem(ctx, "module jj2 {namespace urn:jj2;prefix jj2; container top {config false; leaf x {type string;}}"
                               "deviation /top/x {deviate add {config true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation of config in \"/top/x\" - configuration node cannot be child of any state data node.");
+    logbuf_assert("Invalid deviation of config - configuration node cannot be child of any state data node. /jj2:{deviation='/top/x'}");
     assert_null(lys_parse_mem(ctx, "module jj3 {namespace urn:jj3;prefix jj3; container top {leaf x {type string;}}"
                               "deviation /top/x {deviate replace {config false;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/top/x) replacing \"config\" property \"config false\" which is not present.");
+    logbuf_assert("Invalid deviation replacing \"config\" property \"config false\" which is not present. /jj3:{deviation='/top/x'}");
     assert_null(lys_parse_mem(ctx, "module jj4 {namespace urn:jj4;prefix jj4; choice ch {case a {leaf a{type string;}}}"
                               "deviation /ch/a {deviate replace {config false;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/ch/a) of case node - it is not possible to replace \"config\" property.");
+    logbuf_assert("Invalid deviation of case node - it is not possible to replace \"config\" property. /jj4:{deviation='/ch/a'}");
     assert_null(lys_parse_mem(ctx, "module jj5 {namespace urn:jj5;prefix jj5; container top {leaf x {type string; config true;}}"
                               "deviation /top {deviate add {config false;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation of config in \"/top\" - configuration node cannot be child of any state data node.");
+    logbuf_assert("Invalid deviation of config - configuration node cannot be child of any state data node. /jj5:{deviation='/top'}");
     assert_null(lys_parse_mem(ctx, "module jj6 {namespace urn:jj6;prefix jj6; leaf x {config false; type string;}"
                               "deviation /x {deviate add {config true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"config\" property which already exists (with value \"config false\").");
+    logbuf_assert("Invalid deviation adding \"config\" property which already exists (with value \"config false\"). /jj6:{deviation='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module kk1 {namespace urn:kk1;prefix kk1; container top {leaf a{type string;}}"
                               "deviation /top {deviate add {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation of mandatory in \"/top\" - container cannot hold mandatory statement.");
+    logbuf_assert("Invalid deviation of mandatory - container cannot hold mandatory statement. /kk1:{deviation='/top'}");
     assert_null(lys_parse_mem(ctx, "module kk2 {namespace urn:kk2;prefix kk2; container top {leaf a{type string;}}"
                               "deviation /top {deviate replace {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/top) replacing \"mandatory\" property \"mandatory true\" which is not present.");
+    logbuf_assert("Invalid deviation replacing \"mandatory\" property \"mandatory true\" which is not present. /kk2:{deviation='/top'}");
     assert_null(lys_parse_mem(ctx, "module kk3 {namespace urn:kk3;prefix kk3; container top {leaf x {type string;}}"
                               "deviation /top/x {deviate replace {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/top/x) replacing \"mandatory\" property \"mandatory true\" which is not present.");
+    logbuf_assert("Invalid deviation replacing \"mandatory\" property \"mandatory true\" which is not present. /kk3:{deviation='/top/x'}");
     assert_null(lys_parse_mem(ctx, "module kk4 {namespace urn:kk4;prefix kk4; leaf x {mandatory true; type string;}"
                               "deviation /x {deviate add {mandatory false;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"mandatory\" property which already exists (with value \"mandatory true\").");
+    logbuf_assert("Invalid deviation adding \"mandatory\" property which already exists (with value \"mandatory true\"). /kk4:{deviation='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module ll1 {namespace urn:ll1;prefix ll1; leaf x {default test; type string;}"
                               "deviation /x {deviate add {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) combining default value and mandatory leaf.");
+    logbuf_assert("Invalid deviation combining default value and mandatory leaf. /ll1:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module ll2 {yang-version 1.1; namespace urn:ll2;prefix ll2; leaf-list x {default test; type string;}"
                               "deviation /x {deviate add {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) combining default value and mandatory leaf-list.");
+    logbuf_assert("Invalid deviation combining default value and mandatory leaf-list. /ll2:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module ll2 {namespace urn:ll2;prefix ll2; choice ch {default a; leaf a {type string;} leaf b {type string;}}"
                               "deviation /ch {deviate add {mandatory true;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/ch) combining default case and mandatory choice.");
+    logbuf_assert("Invalid deviation combining default case and mandatory choice. /ll2:{deviation='/ch'}");
 
     assert_null(lys_parse_mem(ctx, "module mm1 {namespace urn:mm1;prefix mm1; leaf-list x {min-elements 10; type string;}"
                               "deviation /x {deviate add {max-elements 5;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid combination of min-elements and max-elements after deviation (/x): min value 10 is bigger than max value 5.");
+    logbuf_assert("Invalid combination of min-elements and max-elements after deviation: min value 10 is bigger than max value 5. /mm1:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm2 {namespace urn:mm2;prefix mm2; leaf-list x {max-elements 10; type string;}"
                               "deviation /x {deviate add {min-elements 20;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid combination of min-elements and max-elements after deviation (/x): min value 20 is bigger than max value 10.");
+    logbuf_assert("Invalid combination of min-elements and max-elements after deviation: min value 20 is bigger than max value 10. /mm2:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm3 {namespace urn:mm3;prefix mm3; list x {min-elements 5; max-elements 10; config false;}"
                               "deviation /x {deviate replace {max-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid combination of min-elements and max-elements after deviation (/x): min value 5 is bigger than max value 1.");
+    logbuf_assert("Invalid combination of min-elements and max-elements after deviation: min value 5 is bigger than max value 1. /mm3:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm4 {namespace urn:mm4;prefix mm4; list x {min-elements 5; max-elements 10; config false;}"
                               "deviation /x {deviate replace {min-elements 20;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid combination of min-elements and max-elements after deviation (/x): min value 20 is bigger than max value 10.");
+    logbuf_assert("Invalid combination of min-elements and max-elements after deviation: min value 20 is bigger than max value 10. /mm4:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm5 {namespace urn:mm5;prefix mm5; leaf-list x {type string; min-elements 5;}"
                               "deviation /x {deviate add {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"min-elements\" property which already exists (with value \"5\").");
+    logbuf_assert("Invalid deviation adding \"min-elements\" property which already exists (with value \"5\"). /mm5:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm6 {namespace urn:mm6;prefix mm6; list x {config false; min-elements 5;}"
                               "deviation /x {deviate add {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"min-elements\" property which already exists (with value \"5\").");
+    logbuf_assert("Invalid deviation adding \"min-elements\" property which already exists (with value \"5\"). /mm6:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm7 {namespace urn:mm7;prefix mm7; leaf-list x {type string; max-elements 5;}"
                               "deviation /x {deviate add {max-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"max-elements\" property which already exists (with value \"5\").");
+    logbuf_assert("Invalid deviation adding \"max-elements\" property which already exists (with value \"5\"). /mm7:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm8 {namespace urn:mm8;prefix mm8; list x {config false; max-elements 5;}"
                               "deviation /x {deviate add {max-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) adding \"max-elements\" property which already exists (with value \"5\").");
+    logbuf_assert("Invalid deviation adding \"max-elements\" property which already exists (with value \"5\"). /mm8:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm9 {namespace urn:mm9;prefix mm9; leaf-list x {type string;}"
                               "deviation /x {deviate replace {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) replacing with \"min-elements\" property \"1\" which is not present.");
+    logbuf_assert("Invalid deviation replacing with \"min-elements\" property \"1\" which is not present. /mm9:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm10 {namespace urn:mm10;prefix mm10; list x {config false;}"
                               "deviation /x {deviate replace {min-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) replacing with \"min-elements\" property \"1\" which is not present.");
+    logbuf_assert("Invalid deviation replacing with \"min-elements\" property \"1\" which is not present. /mm10:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm11 {namespace urn:mm11;prefix mm11; leaf-list x {type string;}"
                               "deviation /x {deviate replace {max-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) replacing with \"max-elements\" property \"1\" which is not present.");
+    logbuf_assert("Invalid deviation replacing with \"max-elements\" property \"1\" which is not present. /mm11:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module mm12 {namespace urn:mm12;prefix mm12; list x {config false; }"
                               "deviation /x {deviate replace {max-elements 1;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) replacing with \"max-elements\" property \"1\" which is not present.");
+    logbuf_assert("Invalid deviation replacing with \"max-elements\" property \"1\" which is not present. /mm12:{deviation='/x'}");
 
     assert_null(lys_parse_mem(ctx, "module nn1 {namespace urn:nn1;prefix nn1; anyxml x;"
                               "deviation /x {deviate replace {type string;}}}", LYS_IN_YANG));
-    logbuf_assert("Invalid deviation (/x) of anyxml node - it is not possible to replace \"type\" property.");
+    logbuf_assert("Invalid deviation of anyxml node - it is not possible to replace \"type\" property. /nn1:{deviation='/x'}");
     assert_null(lys_parse_mem(ctx, "module nn2 {namespace urn:nn2;prefix nn2; leaf-list x {type string;}"
                               "deviation /x {deviate replace {type empty;}}}", LYS_IN_YANG));
-    logbuf_assert("Leaf-list of type \"empty\" is allowed only in YANG 1.1 modules.");
+    logbuf_assert("Leaf-list of type \"empty\" is allowed only in YANG 1.1 modules. /nn2:{deviation='/x'}");
 
     *state = NULL;
     ly_ctx_destroy(ctx, NULL);