commit f62511844fc20c1dc9dfdfebd420cf1311b15dfd
author David Sedlák <xsedla1d@stud.fit.vutbr.cz> Thu Jun 06 10:22:13 2019 +0200
committer David Sedlák <xsedla1d@stud.fit.vutbr.cz> Thu Jun 06 10:22:13 2019 +0200
tree 672cac6d18489767b61fa3e19db7b3bd61b0fbe1
parent 79e50cb3c8041d78e2b84c324c7a1f691f227fcb

yin parser CHANGE add macro to get name of yin attribute

src/parser_yin.c

diff --git a/src/parser_yin.c b/src/parser_yin.c
index e648d48..ce6dcbd 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -26,6 +26,19 @@
 #include "tree_schema_internal.h"
 #include "parser_yin.h"
 
+const char *const yin_attr_list[] = {
+    [YIN_ARG_NAME] = "name",
+    [YIN_ARG_TARGET_NODE] = "target-node",
+    [YIN_ARG_MODULE] = "module",
+    [YIN_ARG_VALUE] = "value",
+    [YIN_ARG_TEXT] = "text",
+    [YIN_ARG_CONDITION] = "condition",
+    [YIN_ARG_URI] = "uri",
+    [YIN_ARG_DATE] = "date",
+    [YIN_ARG_TAG] = "tag",
+    [YIN_ARG_XMLNS] = "xmlns",
+};
+
 enum YIN_ARGUMENT
 match_argument_name(const char *name, size_t len)
 {
@@ -95,7 +108,7 @@
 }
 
 /**
- * @brief parse yin argument
+ * @brief parse yin argument, arg_val is unchanged if argument arg_type wasn't found
  *
  * @param[in] xml_ctx XML parser context.
  * @param[in,out] data Data to read from.
@@ -132,9 +145,12 @@
             continue;
         } else {
             /* unrecognized or unexpected attribute */
-            /* TODO add name of attribute to error message */
             if (name) {
-                LOGERR(xml_ctx->ctx, LY_EDENIED, "Invalid attribute");
+                if (arg_type != YIN_ARG_NONE) {
+                    LOGERR(xml_ctx->ctx, LYVE_SYNTAX_YIN, "Invalid attribute \"%.*s\", expected \"%s\".", name, name_len, yin_attr2str(arg_type));
+                } else {
+                    LOGERR(xml_ctx->ctx, LYVE_SYNTAX_YIN, "Unexpected attribute \"%.*s\".", name_len, name);
+                }
                 return LY_EVALID;
             }
         }
@@ -250,7 +266,7 @@
     }
 
     /* TODO add log macro and log error */
-    LY_CHECK_RET(!imp->prefix);
+    LY_CHECK_ERR_RET(!imp->prefix, LOGVAL_YANG(xml_ctx, LY_VCODE_MISSTMT, "prefix", "import"), LY_EVALID);
     return ret;
 }
 

src/parser_yin.h

diff --git a/src/parser_yin.h b/src/parser_yin.h
index 7744106..8a2468d 100644
--- a/src/parser_yin.h
+++ b/src/parser_yin.h
@@ -21,6 +21,10 @@
 #include "log.h"
 #include "xml.h"
 
+/* list of yin attribute strings */
+extern const char *const yin_attr_list[];
+#define yin_attr2str(STMT) yin_attr_list[STMT]
+
 enum YIN_ARGUMENT {
     YIN_ARG_UNKNOWN = 0,   /**< parsed argument can not be matched with any known yin argument keyword */
     YIN_ARG_NAME,          /**< argument name */