commit 1538a8443571abf741fcf6238470722a561dfc54
author David Sedlák <xsedla1d@stud.fit.vutbr.cz> Thu Aug 08 15:38:51 2019 +0200
committer David Sedlák <xsedla1d@stud.fit.vutbr.cz> Thu Aug 08 15:38:51 2019 +0200
tree 812eb5bff0a21b259525771045c7e0f8ef95c1e1
parent df2a9737e3be652ebe5568d93b81da8e85fbcfd2

schema parsers CHANGE improvements in error messages

src/parser_yang.c

diff --git a/src/parser_yang.c b/src/parser_yang.c
index 83cbad9..ba3515a 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -4433,8 +4433,7 @@
         ret = LY_EINVAL;
         goto cleanup;
     } else if (kw != YANG_SUBMODULE) {
-        LOGVAL_PARSER(*context, LYVE_SYNTAX, "Invalid keyword \"%s\", expected \"module\" or \"submodule\".",
-               ly_stmt2str(kw));
+        LOGVAL_PARSER(*context, LY_VCODE_MOD_SUBOMD, ly_stmt2str(kw));
         ret = LY_EVALID;
         goto cleanup;
     }
@@ -4452,8 +4451,7 @@
         data++;
     }
     if (*data) {
-        LOGVAL_PARSER(*context, LYVE_SYNTAX, "Trailing garbage \"%.*s%s\" after submodule, expected end-of-input.",
-                    15, data, strlen(data) > 15 ? "..." : "");
+        LOGVAL_PARSER(*context, LY_VCODE_TRAILING_SUBMOD, 15, data, strlen(data) > 15 ? "..." : "");
         ret = LY_EVALID;
         goto cleanup;
     }
@@ -4495,8 +4493,7 @@
         ret = LY_EINVAL;
         goto cleanup;
     } else if (kw != YANG_MODULE) {
-        LOGVAL_PARSER((*context), LYVE_SYNTAX, "Invalid keyword \"%s\", expected \"module\" or \"submodule\".",
-               ly_stmt2str(kw));
+        LOGVAL_PARSER((*context), LY_VCODE_MOD_SUBOMD, ly_stmt2str(kw));
         ret = LY_EVALID;
         goto cleanup;
     }
@@ -4515,8 +4512,7 @@
         data++;
     }
     if (*data) {
-        LOGVAL_PARSER(*context, LYVE_SYNTAX, "Trailing garbage \"%.*s%s\" after module, expected end-of-input.",
-                    15, data, strlen(data) > 15 ? "..." : "");
+        LOGVAL_PARSER(*context, LY_VCODE_TRAILING_MOD, 15, data, strlen(data) > 15 ? "..." : "");
         ret = LY_EVALID;
         goto cleanup;
     }