commit 0b468e61241291cd42017034dcf567e09009c2f8
author Michal Vasko <mvasko@cesnet.cz> Mon Oct 19 09:33:04 2020 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Mon Oct 19 09:50:45 2020 +0200
tree b1ccde01911868a035871cfaf5459875a3030de8
parent 1a7a7bd6f97faa7e3fa01eac6b2b497790112d37

xpath FEATURE improve token error messages

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 7d5ddd9..102c4ce 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -1849,8 +1849,8 @@
 
     if (want_tok && (exp->tokens[tok_idx] != want_tok)) {
         if (ctx) {
-            LOGVAL(ctx, LY_VLOG_NONE, NULL, LY_VCODE_XP_INTOK,
-                    lyxp_print_token(exp->tokens[tok_idx]), &exp->expr[exp->tok_pos[tok_idx]]);
+            LOGVAL(ctx, LY_VLOG_NONE, NULL, LY_VCODE_XP_INTOK2, lyxp_print_token(exp->tokens[tok_idx]),
+                    &exp->expr[exp->tok_pos[tok_idx]], lyxp_print_token(want_tok));
         }
         return LY_ENOT;
     }
@@ -1883,8 +1883,8 @@
 
     if ((exp->tokens[tok_idx] != want_tok1) && (exp->tokens[tok_idx] != want_tok2)) {
         if (ctx) {
-            LOGVAL(ctx, LY_VLOG_NONE, NULL, LY_VCODE_XP_INTOK,
-                    lyxp_print_token(exp->tokens[tok_idx]), &exp->expr[exp->tok_pos[tok_idx]]);
+            LOGVAL(ctx, LY_VLOG_NONE, NULL, LY_VCODE_XP_INTOK, lyxp_print_token(exp->tokens[tok_idx]),
+                    &exp->expr[exp->tok_pos[tok_idx]]);
         }
         return LY_ENOT;
     }