commit e9e987edf8ed7fbd647ff2c90596892e5c54d863
author Radek Krejci <rkrejci@cesnet.cz> Wed Oct 31 12:50:27 2018 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Wed Oct 31 12:50:27 2018 +0100
tree c669823b7e33952e3cd8cf2e82b123dbab6fbc6f
parent 478020eafced2b4a6864d212e290a1442e71fc49

schema tree CHANGE provide more control on latest revision selection

src/parser_yang.c

diff --git a/src/parser_yang.c b/src/parser_yang.c
index ab6f7ac..002ca20 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -4431,20 +4431,13 @@
     size_t word_len;
     enum yang_keyword kw, prev_kw = 0;
     enum yang_module_stmt mod_stmt = Y_MOD_MODULE_HEADER;
+    struct lysp_module *dup;
 
     /* (sub)module name */
     ret = get_argument(ctx, data, Y_IDENTIF_ARG, &word, &buf, &word_len);
     LY_CHECK_RET(ret);
     INSERT_WORD(ctx, buf, mod->name, word, word_len);
 
-    /* submodules share the namespace with the module names, so there must not be
-     * a submodule of the same name in the context, no need for revision matching */
-    if (ly_ctx_get_submodule(ctx->ctx, NULL, mod->name, NULL)) {
-        LOGVAL_YANG(ctx, LYVE_SYNTAX_YANG, "Name collision between %s of name \"%s\".",
-                    mod->submodule ? "submodules" : "module and submodule", mod->name);
-        return LY_EVALID;
-    }
-
     YANG_READ_SUBSTMT_FOR(ctx, data, kw, word, word_len, ret) {
         LY_CHECK_RET(ret);
 
@@ -4638,6 +4631,15 @@
         }
     }
 
+    /* submodules share the namespace with the module names, so there must not be
+     * a submodule of the same name in the context, no need for revision matching */
+    dup = ly_ctx_get_submodule(ctx->ctx, NULL, mod->name, NULL);
+    if (dup && (!mod->submodule || strcmp(dup->belongsto, mod->belongsto))) {
+        LOGVAL_YANG(ctx, LYVE_SYNTAX_YANG, "Name collision between %s of name \"%s\".",
+                    mod->submodule ? "submodules" : "module and submodule", mod->name);
+        return LY_EVALID;
+    }
+
     return ret;
 }