yin parser CHANGE preparation for namespace and extension support
diff --git a/src/parser_yin.c b/src/parser_yin.c
index ab13723..bbb0632 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -23,16 +23,17 @@
 #include "tree_schema_internal.h"
 
 enum YIN_ARGUMENT {
-    YIN_ARG_NONE = 0,
-    YIN_ARG_NAME,
-    YIN_ARG_TARGET_NODE,
-    YIN_ARG_MODULE,
-    YIN_ARG_VALUE,
-    YIN_ARG_TEXT,
-    YIN_ARG_CONDITION,
-    YIN_ARG_URI,
-    YIN_ARG_DATE,
-    YIN_ARG_TAG,
+    YIN_ARG_NONE = 0,      /**< unrecognized argument */
+    YIN_ARG_NAME,          /**< argument name */
+    YIN_ARG_TARGET_NODE,   /**<argument target-node */
+    YIN_ARG_MODULE,        /**< argument module */
+    YIN_ARG_VALUE,         /**< argument value */
+    YIN_ARG_TEXT,          /**< argument text */
+    YIN_ARG_CONDITION,     /**< argument condition */
+    YIN_ARG_URI,           /**< argument uri */
+    YIN_ARG_DATE,          /**< argument data */
+    YIN_ARG_TAG,           /**< argument tag */
+    YIN_ARG_XMLNS,         /**< argument xmlns */
 };
 
 /**
@@ -53,7 +54,6 @@
     const char *prefix, *name;
     size_t prefix_len, name_len;
 
-
     if (xml_ctx->status == LYXML_ELEM_CONTENT) {
         ret = lyxml_get_string(xml_ctx, data, &buf, &buf_len, &out, &out_len, &dynamic);
         LY_CHECK_RET(ret);
@@ -85,6 +85,10 @@
 #define IF_ARG_PREFIX_END }
 
     switch (*name) {
+    case 'x':
+        already_read += 1;
+        IF_ARG("mlns", 4, YIN_ARG_XMLNS);
+        break;
     case 'c':
         already_read += 1;
         IF_ARG("ondition", 8, YIN_ARG_CONDITION);
@@ -130,9 +134,36 @@
         arg = YIN_ARG_NONE;
     }
 
+#undef IF_ARG
+#undef IF_ARG_PREFIX
+#undef IF_ARG_PREFIX_END
+
     return arg;
 }
 
+/**
+ * @brief parse xmlns statement
+ *
+ * @param[in] xml_ctx XML parser context.
+ * @param[in, out] data Data to reda from.
+ * @param[in] prefix
+ */
+LY_ERR
+parse_xmlns(struct lyxml_context *xml_ctx, const char **data, const char *prefix, size_t prefix_len, char *element)
+{
+    char *buf = NULL, *out = NULL;
+    size_t buf_len = 0, out_len = 0;
+    int dynamic = 0;
+    LY_ERR ret = LY_SUCCESS;
+
+    ret = lyxml_get_string(xml_ctx, data, &buf, &buf_len, &out, &out_len, &dynamic);
+    LY_CHECK_RET(ret != LY_SUCCESS, ret);
+    LY_CHECK_ERR_RET(out_len == 0, LOGVAL_YANG(xml_ctx, LYVE_SYNTAX_YIN, "Missing value of xmlns attribute"), LY_EEXIST);
+    lyxml_ns_add(xml_ctx, element, prefix, prefix_len, out, out_len);
+
+    return LY_SUCCESS;
+}
+
 // LY_ERR
 // parser_belongs_to(struct lyxml_context *xml_ctx, const char **data, const char **belongsto, const char **prefix, struct lysp_ext **extensions)
 // {
@@ -300,7 +331,7 @@
 
 
     while ((ret = lyxml_get_element(xml_ctx, data, &prefix, &prefix_len, &name, &name_len) == LY_SUCCESS && name != NULL)) {
-        kw = match_keyword(name, name_len);
+        kw = match_keyword(name, name_len, prefix_len);
         switch (kw) {
         case YANG_PREFIX:
             /* TODO parse prefix */
@@ -340,29 +371,54 @@
     const char *prefix, *name;
     size_t prefix_len, name_len;
     enum yang_module_stmt mod_stmt = Y_MOD_MODULE_HEADER;
+    enum YIN_ARGUMENT arg = YIN_ARG_NONE;
 
     char *buf = NULL, *out = NULL;
     size_t buf_len = 0, out_len = 0;
     int dynamic;
 
-    /* check if module has argument "name" */
-    ret = lyxml_get_attribute(xml_ctx, data, &prefix, &prefix_len, &name, &name_len);
-    LY_CHECK_ERR_RET(ret != LY_SUCCESS, LOGMEM(xml_ctx->ctx), LY_EMEM);
-    if (match_argument_name(name, name_len) != YIN_ARG_NAME) {
-        LOGVAL(xml_ctx->ctx, LY_VLOG_LINE, &xml_ctx->line, LYVE_SYNTAX, "Invalid argument name \"%s\", expected \"name\".", name);
+    /* parse module attributes */
+    while (xml_ctx->status == LYXML_ATTRIBUTE) {
+        ret = lyxml_get_attribute(xml_ctx, data, &prefix, &prefix_len, &name, &name_len);
+        LY_CHECK_ERR_RET(ret != LY_SUCCESS, LOGMEM(xml_ctx->ctx), LY_EMEM);
+
+        arg = match_argument_name(name, name_len);
+
+        switch (arg) {
+        case YIN_ARG_XMLNS:
+            parse_xmlns(xml_ctx, data, prefix, prefix_len, "module");
+            break;
+        case YIN_ARG_NAME:
+            /* check for multiple definitions of name */
+            LY_CHECK_ERR_RET((*mod)->mod->name, LOGVAL_YANG(xml_ctx, LYVE_SYNTAX_YIN, "Duplicit definition of module name \"%s\"", (*mod)->mod->name), LY_EEXIST);
+
+            /* read module name */
+            if (xml_ctx->status != LYXML_ATTR_CONTENT) {
+                LOGVAL(xml_ctx->ctx, LY_VLOG_LINE, &xml_ctx->line, LYVE_SYNTAX, "Missing value of argument \"name\".");
+            }
+            ret = lyxml_get_string(xml_ctx, data, &buf, &buf_len, &out, &out_len, &dynamic);
+            LY_CHECK_ERR_RET(ret != LY_SUCCESS, LOGMEM(xml_ctx->ctx), LY_EMEM);
+            (*mod)->mod->name = lydict_insert(xml_ctx->ctx, out, out_len);
+            LY_CHECK_ERR_RET(!(*mod)->mod->name, LOGMEM(xml_ctx->ctx), LY_EMEM);
+            break;
+        default:
+            /* unrecognized attribute, still can be namespace definition eg. xmlns:foo=.... */
+            if (match_argument_name(prefix, prefix_len) == YIN_ARG_XMLNS) {
+                /* in this case prefix of namespace is actually name of attribute */
+                parse_xmlns(xml_ctx, data, name, name_len, "module");
+            } else {
+                /* unrecognized or unexpected attribute */
+                LOGERR(xml_ctx->ctx, LY_EDENIED, "Invalid argument in module element");
+                return LY_EVALID;
+            }
+            break;
+        }
     }
 
-    /* read module name */
-    if (xml_ctx->status != LYXML_ATTR_CONTENT) {
-        LOGVAL(xml_ctx->ctx, LY_VLOG_LINE, &xml_ctx->line, LYVE_SYNTAX, "Missing value of argument \"name\"");
-    }
-    ret = lyxml_get_string(xml_ctx, data, &buf, &buf_len, &out, &out_len, &dynamic);
-    LY_CHECK_ERR_RET(ret != LY_SUCCESS, LOGMEM(xml_ctx->ctx), LY_EMEM);
-    (*mod)->mod->name = lydict_insert(xml_ctx->ctx, out, out_len);
-    LY_CHECK_ERR_RET(!(*mod)->mod->name, LOGMEM(xml_ctx->ctx), LY_EMEM);
+    LY_CHECK_ERR_RET(!(*mod)->mod->name, LOGVAL_YANG(xml_ctx, LYVE_SYNTAX_YIN, "Missing argument name of a module", (*mod)->mod->name), LY_ENOTFOUND);
 
     ret = lyxml_get_string(xml_ctx, data, &buf, &buf_len, &out, &out_len, &dynamic);
-    LY_CHECK_ERR_RET(ret != LY_EINVAL, LOGVAL_YANG(xml_ctx, LYVE_SYNTAX_YIN, "Expected new xml element after module element"), LY_EINVAL);
+    LY_CHECK_ERR_RET(ret != LY_EINVAL, LOGVAL_YANG(xml_ctx, LYVE_SYNTAX_YIN, "Expected new xml element after module element."), LY_EINVAL);
 
     /* loop over all elements and parse them */
     while (xml_ctx->status != LYXML_END) {
@@ -427,7 +483,7 @@
         LY_CHECK_RET(ret != LY_SUCCESS, LY_EMEM);
 
         if (name) {
-            kw = match_keyword(name, name_len);
+            kw = match_keyword(name, name_len, prefix_len);
             switch (kw) {
 
             /* module header */
@@ -436,8 +492,6 @@
                 break;
             case YANG_PREFIX:
                 LY_CHECK_RET(parse_prefix(xml_ctx, data, mod));
-                /* TODO change lysp_check_prefix function to work with ctx and not parser_ctx */
-                //LY_CHECK_RET(lysp_check_prefix(&xml_ctx->ctx, *mod_p, &((*mod_p)->prefix)), LY_EVALID);
                 break;
 
             /* linkage */
@@ -460,12 +514,13 @@
                 break;
 
             default:
-                /* error */
+                return LY_EVALID;
                 break;
             }
         }
     }
 
+    lyxml_ns_rm(xml_ctx, "module");
     return ret;
 }
 
@@ -496,7 +551,7 @@
     /* check submodule */
     ret = lyxml_get_element(&xml_ctx, &data, &prefix, &prefix_len, &name, &name_len);
     LY_CHECK_GOTO(ret != LY_SUCCESS, cleanup);
-    kw = match_keyword(name, name_len);
+    kw = match_keyword(name, name_len, prefix_len);
     if (kw == YANG_MODULE) {
         LOGERR(ctx, LY_EDENIED, "Input data contains module in situation when a submodule is expected.");
         ret = LY_EINVAL;
@@ -556,7 +611,7 @@
     /* check submodule */
     ret = lyxml_get_element(&xml_ctx, &data, &prefix, &prefix_len, &name, &name_len);
     LY_CHECK_GOTO(ret != LY_SUCCESS, cleanup);
-    kw = match_keyword(name, name_len);
+    kw = match_keyword(name, name_len, prefix_len);
     if (kw == YANG_SUBMODULE) {
         LOGERR(ctx, LY_EDENIED, "Input data contains submodule which cannot be parsed directly without its main module.");
         ret = LY_EINVAL;
diff --git a/src/tree_schema_helpers.c b/src/tree_schema_helpers.c
index 0b09986..d11c243 100644
--- a/src/tree_schema_helpers.c
+++ b/src/tree_schema_helpers.c
@@ -1215,9 +1215,12 @@
 }
 
 enum yang_keyword
-match_keyword(const char *data, size_t len)
+match_keyword(const char *data, size_t len, size_t prefix_len)
 {
-/* TODO make this function usable in get_keyword function */
+    if (prefix_len != 0) {
+        return YANG_CUSTOM;
+    }
+
 #define MOVE_IN(DATA, COUNT) (data)+=COUNT;
 #define IF_KEYWORD(STR, LEN, STMT) if (!strncmp((data), STR, LEN)) {MOVE_IN(data, LEN);kw=STMT;}
 #define IF_KEYWORD_PREFIX(STR, LEN) if (!strncmp((data), STR, LEN)) {MOVE_IN(data, LEN);
@@ -1225,7 +1228,7 @@
 
     const char *start = data;
     enum yang_keyword kw = YANG_NONE;
-    /* read the keyword itself */
+    /* try to match the keyword itself */
     switch (*data) {
     case 'a':
         MOVE_IN(data, 1);
@@ -1388,25 +1391,15 @@
         IF_KEYWORD("ang-version", 11, YANG_YANG_VERSION)
         else IF_KEYWORD("in-element", 10, YANG_YIN_ELEMENT)
         break;
-    case ';':
-        MOVE_IN(data, 1);
-        kw = YANG_SEMICOLON;
-        //goto success;
-        break;
-    case '{':
-        MOVE_IN(data, 1);
-        kw = YANG_LEFT_BRACE;
-        //goto success;
-        break;
-    case '}':
-        MOVE_IN(data, 1);
-        kw = YANG_RIGHT_BRACE;
-        //goto success;
-        break;
     default:
         break;
     }
 
+#undef MOVE_IN
+#undef IF_KEYWORD
+#undef IF_KEYWORD_PREFIX
+#undef IF_KEYWORD_PREFIX_END
+
     if (data - start == (long int)len) {
         return kw;
     } else {
diff --git a/src/tree_schema_internal.h b/src/tree_schema_internal.h
index 9c59550..d441b2d 100644
--- a/src/tree_schema_internal.h
+++ b/src/tree_schema_internal.h
@@ -578,5 +578,5 @@
 /**
  * @brief match yang keyword
  */
-enum yang_keyword match_keyword(const char *data, size_t len);
+enum yang_keyword match_keyword(const char *data, size_t len, size_t prefix_len);
 #endif /* LY_TREE_SCHEMA_INTERNAL_H_ */
diff --git a/tests/src/test_parser_yin.c b/tests/src/test_parser_yin.c
index 6bb5645..accbdfb 100644
--- a/tests/src/test_parser_yin.c
+++ b/tests/src/test_parser_yin.c
@@ -68,7 +68,10 @@
     struct state *st = *state;
 
     ret = yin_parse_module(st->ctx,
-                    "<module name=\"example-foo\">\
+                    "<module name=\"example-foo\"\
+                        xmlns=\"urn:ietf:params:xml:ns:yang:yin:1\"\
+                        xmlns:foo=\"urn:example:foo\"\
+                        xmlns:myext=\"urn:example:extensions\">\
                         <namespace uri=\"urn:example:foo\"/>\
                         <prefix value=\"foo\"/>\
                     </module>",
@@ -84,76 +87,76 @@
 {
     (void)state; /* unused */
 
-    assert_int_equal(match_keyword("anydatax", strlen("anydatax")), YANG_NONE);
-    assert_int_equal(match_keyword("asdasd", strlen("asdasd")), YANG_NONE);
-    assert_int_equal(match_keyword("", 0), YANG_NONE);
-    assert_int_equal(match_keyword("anydata", strlen("anydata")), YANG_ANYDATA);
-    assert_int_equal(match_keyword("anyxml", strlen("anyxml")), YANG_ANYXML);
-    assert_int_equal(match_keyword("argument", strlen("argument")), YANG_ARGUMENT);
-    assert_int_equal(match_keyword("augment", strlen("augment")), YANG_AUGMENT);
-    assert_int_equal(match_keyword("base", strlen("base")), YANG_BASE);
-    assert_int_equal(match_keyword("belongs-to", strlen("belongs-to")), YANG_BELONGS_TO);
-    assert_int_equal(match_keyword("bit", strlen("bit")), YANG_BIT);
-    assert_int_equal(match_keyword("case", strlen("case")), YANG_CASE);
-    assert_int_equal(match_keyword("choice", strlen("choice")), YANG_CHOICE);
-    assert_int_equal(match_keyword("config", strlen("config")), YANG_CONFIG);
-    assert_int_equal(match_keyword("contact", strlen("contact")), YANG_CONTACT);
-    assert_int_equal(match_keyword("container", strlen("container")), YANG_CONTAINER);
-    assert_int_equal(match_keyword("default", strlen("default")), YANG_DEFAULT);
-    assert_int_equal(match_keyword("description", strlen("description")), YANG_DESCRIPTION);
-    assert_int_equal(match_keyword("deviate", strlen("deviate")), YANG_DEVIATE);
-    assert_int_equal(match_keyword("deviation", strlen("deviation")), YANG_DEVIATION);
-    assert_int_equal(match_keyword("enum", strlen("enum")), YANG_ENUM);
-    assert_int_equal(match_keyword("error-app-tag", strlen("error-app-tag")), YANG_ERROR_APP_TAG);
-    assert_int_equal(match_keyword("error-message", strlen("error-message")), YANG_ERROR_MESSAGE);
-    assert_int_equal(match_keyword("extension", strlen("extension")), YANG_EXTENSION);
-    assert_int_equal(match_keyword("feature", strlen("feature")), YANG_FEATURE);
-    assert_int_equal(match_keyword("fraction-digits", strlen("fraction-digits")), YANG_FRACTION_DIGITS);
-    assert_int_equal(match_keyword("grouping", strlen("grouping")), YANG_GROUPING);
-    assert_int_equal(match_keyword("identity", strlen("identity")), YANG_IDENTITY);
-    assert_int_equal(match_keyword("if-feature", strlen("if-feature")), YANG_IF_FEATURE);
-    assert_int_equal(match_keyword("import", strlen("import")), YANG_IMPORT);
-    assert_int_equal(match_keyword("include", strlen("include")), YANG_INCLUDE);
-    assert_int_equal(match_keyword("input", strlen("input")), YANG_INPUT);
-    assert_int_equal(match_keyword("key", strlen("key")), YANG_KEY);
-    assert_int_equal(match_keyword("leaf", strlen("leaf")), YANG_LEAF);
-    assert_int_equal(match_keyword("leaf-list", strlen("leaf-list")), YANG_LEAF_LIST);
-    assert_int_equal(match_keyword("length", strlen("length")), YANG_LENGTH);
-    assert_int_equal(match_keyword("list", strlen("list")), YANG_LIST);
-    assert_int_equal(match_keyword("mandatory", strlen("mandatory")), YANG_MANDATORY);
-    assert_int_equal(match_keyword("max-elements", strlen("max-elements")), YANG_MAX_ELEMENTS);
-    assert_int_equal(match_keyword("min-elements", strlen("min-elements")), YANG_MIN_ELEMENTS);
-    assert_int_equal(match_keyword("modifier", strlen("modifier")), YANG_MODIFIER);
-    assert_int_equal(match_keyword("module", strlen("module")), YANG_MODULE);
-    assert_int_equal(match_keyword("must", strlen("must")), YANG_MUST);
-    assert_int_equal(match_keyword("namespace", strlen("namespace")), YANG_NAMESPACE);
-    assert_int_equal(match_keyword("notification", strlen("notification")), YANG_NOTIFICATION);
-    assert_int_equal(match_keyword("ordered-by", strlen("ordered-by")), YANG_ORDERED_BY);
-    assert_int_equal(match_keyword("organization", strlen("organization")), YANG_ORGANIZATION);
-    assert_int_equal(match_keyword("output", strlen("output")), YANG_OUTPUT);
-    assert_int_equal(match_keyword("path", strlen("path")), YANG_PATH);
-    assert_int_equal(match_keyword("pattern", strlen("pattern")), YANG_PATTERN);
-    assert_int_equal(match_keyword("position", strlen("position")), YANG_POSITION);
-    assert_int_equal(match_keyword("prefix", strlen("prefix")), YANG_PREFIX);
-    assert_int_equal(match_keyword("presence", strlen("presence")), YANG_PRESENCE);
-    assert_int_equal(match_keyword("range", strlen("range")), YANG_RANGE);
-    assert_int_equal(match_keyword("reference", strlen("reference")), YANG_REFERENCE);
-    assert_int_equal(match_keyword("refine", strlen("refine")), YANG_REFINE);
-    assert_int_equal(match_keyword("require-instance", strlen("require-instance")), YANG_REQUIRE_INSTANCE);
-    assert_int_equal(match_keyword("revision", strlen("revision")), YANG_REVISION);
-    assert_int_equal(match_keyword("revision-date", strlen("revision-date")), YANG_REVISION_DATE);
-    assert_int_equal(match_keyword("rpc", strlen("rpc")), YANG_RPC);
-    assert_int_equal(match_keyword("status", strlen("status")), YANG_STATUS);
-    assert_int_equal(match_keyword("submodule", strlen("submodule")), YANG_SUBMODULE);
-    assert_int_equal(match_keyword("type", strlen("type")), YANG_TYPE);
-    assert_int_equal(match_keyword("typedef", strlen("typedef")), YANG_TYPEDEF);
-    assert_int_equal(match_keyword("unique", strlen("unique")), YANG_UNIQUE);
-    assert_int_equal(match_keyword("units", strlen("units")), YANG_UNITS);
-    assert_int_equal(match_keyword("uses", strlen("uses")), YANG_USES);
-    assert_int_equal(match_keyword("value", strlen("value")), YANG_VALUE);
-    assert_int_equal(match_keyword("when", strlen("when")), YANG_WHEN);
-    assert_int_equal(match_keyword("yang-version", strlen("yang-version")), YANG_YANG_VERSION);
-    assert_int_equal(match_keyword("yin-element", strlen("yin-element")), YANG_YIN_ELEMENT);
+    assert_int_equal(match_keyword("anydatax", strlen("anydatax"), 0), YANG_NONE);
+    assert_int_equal(match_keyword("asdasd", strlen("asdasd"), 0), YANG_NONE);
+    assert_int_equal(match_keyword("", 0, 0), YANG_NONE);
+    assert_int_equal(match_keyword("anydata", strlen("anydata"), 0), YANG_ANYDATA);
+    assert_int_equal(match_keyword("anyxml", strlen("anyxml"), 0), YANG_ANYXML);
+    assert_int_equal(match_keyword("argument", strlen("argument"), 0), YANG_ARGUMENT);
+    assert_int_equal(match_keyword("augment", strlen("augment"), 0), YANG_AUGMENT);
+    assert_int_equal(match_keyword("base", strlen("base"), 0), YANG_BASE);
+    assert_int_equal(match_keyword("belongs-to", strlen("belongs-to"), 0), YANG_BELONGS_TO);
+    assert_int_equal(match_keyword("bit", strlen("bit"), 0), YANG_BIT);
+    assert_int_equal(match_keyword("case", strlen("case"), 0), YANG_CASE);
+    assert_int_equal(match_keyword("choice", strlen("choice"), 0), YANG_CHOICE);
+    assert_int_equal(match_keyword("config", strlen("config"), 0), YANG_CONFIG);
+    assert_int_equal(match_keyword("contact", strlen("contact"), 0), YANG_CONTACT);
+    assert_int_equal(match_keyword("container", strlen("container"), 0), YANG_CONTAINER);
+    assert_int_equal(match_keyword("default", strlen("default"), 0), YANG_DEFAULT);
+    assert_int_equal(match_keyword("description", strlen("description"), 0), YANG_DESCRIPTION);
+    assert_int_equal(match_keyword("deviate", strlen("deviate"), 0), YANG_DEVIATE);
+    assert_int_equal(match_keyword("deviation", strlen("deviation"), 0), YANG_DEVIATION);
+    assert_int_equal(match_keyword("enum", strlen("enum"), 0), YANG_ENUM);
+    assert_int_equal(match_keyword("error-app-tag", strlen("error-app-tag"), 0), YANG_ERROR_APP_TAG);
+    assert_int_equal(match_keyword("error-message", strlen("error-message"), 0), YANG_ERROR_MESSAGE);
+    assert_int_equal(match_keyword("extension", strlen("extension"), 0), YANG_EXTENSION);
+    assert_int_equal(match_keyword("feature", strlen("feature"), 0), YANG_FEATURE);
+    assert_int_equal(match_keyword("fraction-digits", strlen("fraction-digits"),  0), YANG_FRACTION_DIGITS);
+    assert_int_equal(match_keyword("grouping", strlen("grouping"), 0), YANG_GROUPING);
+    assert_int_equal(match_keyword("identity", strlen("identity"), 0), YANG_IDENTITY);
+    assert_int_equal(match_keyword("if-feature", strlen("if-feature"), 0), YANG_IF_FEATURE);
+    assert_int_equal(match_keyword("import", strlen("import"), 0), YANG_IMPORT);
+    assert_int_equal(match_keyword("include", strlen("include"), 0), YANG_INCLUDE);
+    assert_int_equal(match_keyword("input", strlen("input"), 0), YANG_INPUT);
+    assert_int_equal(match_keyword("key", strlen("key"), 0), YANG_KEY);
+    assert_int_equal(match_keyword("leaf", strlen("leaf"), 0), YANG_LEAF);
+    assert_int_equal(match_keyword("leaf-list", strlen("leaf-list"), 0), YANG_LEAF_LIST);
+    assert_int_equal(match_keyword("length", strlen("length"), 0), YANG_LENGTH);
+    assert_int_equal(match_keyword("list", strlen("list"), 0), YANG_LIST);
+    assert_int_equal(match_keyword("mandatory", strlen("mandatory"), 0), YANG_MANDATORY);
+    assert_int_equal(match_keyword("max-elements", strlen("max-elements"), 0), YANG_MAX_ELEMENTS);
+    assert_int_equal(match_keyword("min-elements", strlen("min-elements"), 0), YANG_MIN_ELEMENTS);
+    assert_int_equal(match_keyword("modifier", strlen("modifier"), 0), YANG_MODIFIER);
+    assert_int_equal(match_keyword("module", strlen("module"), 0), YANG_MODULE);
+    assert_int_equal(match_keyword("must", strlen("must"), 0), YANG_MUST);
+    assert_int_equal(match_keyword("namespace", strlen("namespace"), 0), YANG_NAMESPACE);
+    assert_int_equal(match_keyword("notification", strlen("notification"), 0), YANG_NOTIFICATION);
+    assert_int_equal(match_keyword("ordered-by", strlen("ordered-by"), 0), YANG_ORDERED_BY);
+    assert_int_equal(match_keyword("organization", strlen("organization"), 0), YANG_ORGANIZATION);
+    assert_int_equal(match_keyword("output", strlen("output"), 0), YANG_OUTPUT);
+    assert_int_equal(match_keyword("path", strlen("path"), 0), YANG_PATH);
+    assert_int_equal(match_keyword("pattern", strlen("pattern"), 0), YANG_PATTERN);
+    assert_int_equal(match_keyword("position", strlen("position"), 0), YANG_POSITION);
+    assert_int_equal(match_keyword("prefix", strlen("prefix"), 0), YANG_PREFIX);
+    assert_int_equal(match_keyword("presence", strlen("presence"), 0), YANG_PRESENCE);
+    assert_int_equal(match_keyword("range", strlen("range"), 0), YANG_RANGE);
+    assert_int_equal(match_keyword("reference", strlen("reference"), 0), YANG_REFERENCE);
+    assert_int_equal(match_keyword("refine", strlen("refine"), 0), YANG_REFINE);
+    assert_int_equal(match_keyword("require-instance", strlen("require-instance"), 0), YANG_REQUIRE_INSTANCE);
+    assert_int_equal(match_keyword("revision", strlen("revision"), 0), YANG_REVISION);
+    assert_int_equal(match_keyword("revision-date", strlen("revision-date"), 0), YANG_REVISION_DATE);
+    assert_int_equal(match_keyword("rpc", strlen("rpc"), 0), YANG_RPC);
+    assert_int_equal(match_keyword("status", strlen("status"), 0), YANG_STATUS);
+    assert_int_equal(match_keyword("submodule", strlen("submodule"), 0), YANG_SUBMODULE);
+    assert_int_equal(match_keyword("type", strlen("type"), 0), YANG_TYPE);
+    assert_int_equal(match_keyword("typedef", strlen("typedef"), 0), YANG_TYPEDEF);
+    assert_int_equal(match_keyword("unique", strlen("unique"), 0), YANG_UNIQUE);
+    assert_int_equal(match_keyword("units", strlen("units"), 0), YANG_UNITS);
+    assert_int_equal(match_keyword("uses", strlen("uses"), 0), YANG_USES);
+    assert_int_equal(match_keyword("value", strlen("value"), 0), YANG_VALUE);
+    assert_int_equal(match_keyword("when", strlen("when"), 0), YANG_WHEN);
+    assert_int_equal(match_keyword("yang-version", strlen("yang-version"), 0), YANG_YANG_VERSION);
+    assert_int_equal(match_keyword("yin-element", strlen("yin-element"), 0), YANG_YIN_ELEMENT);
 }
 
 static void