tree schema BUGFIX separate submod unres

Store submodule unres separated from the
main module unres to allow for its freeing
in case of an error or submodule duplicate.

Author: michalvasko

src/parser_yang.c

@@ -100,7 +100,7 @@ struct lys_glob_unres;
         goto ERR_LABEL; \
     } \
     if (KW == LY_STMT_SYNTAX_RIGHT_BRACE) { \
-        if (EXTS && (RET = ly_set_add(&(CTX)->main_ctx->ext_inst, (EXTS), 1, NULL))) { \
+        if (EXTS && (RET = ly_set_add(&(CTX)->ext_inst, (EXTS), 1, NULL))) { \
             goto ERR_LABEL; \
         } \
         __loop_end = 1; \
@@ -2842,8 +2842,7 @@ parse_typedef(struct lysp_yang_ctx *ctx, struct lysp_node *parent, struct lysp_t
 
     /* store data for collision check */
     if (parent) {
-        assert(ctx->main_ctx);
-        LY_CHECK_RET(ly_set_add(&ctx->main_ctx->tpdfs_nodes, parent, 0, NULL));
+        LY_CHECK_RET(ly_set_add(&ctx->tpdfs_nodes, parent, 0, NULL));
     }
 
 cleanup:
@@ -3184,8 +3183,7 @@ parse_grouping(struct lysp_yang_ctx *ctx, struct lysp_node *parent, struct lysp_
 
     /* store data for collision check */
     if (parent) {
-        assert(ctx->main_ctx);
-        LY_CHECK_RET(ly_set_add(&ctx->main_ctx->grps_nodes, parent, 0, NULL));
+        LY_CHECK_RET(ly_set_add(&ctx->grps_nodes, parent, 0, NULL));
     }
 
 cleanup:

src/parser_yin.c

@@ -646,7 +646,7 @@ yin_unres_exts_add(struct lysp_yin_ctx *ctx, struct lysp_ext_instance *exts)
         return LY_SUCCESS;
     }
 
-    return ly_set_add(&ctx->main_ctx->ext_inst, exts, 1, NULL);
+    return ly_set_add(&ctx->ext_inst, exts, 1, NULL);
 }
 
 /**
@@ -1713,8 +1713,7 @@ yin_parse_typedef(struct lysp_yin_ctx *ctx, struct tree_node_meta *typedef_meta)
 
     /* store data for collision check */
     if (typedef_meta->parent) {
-        assert(ctx->main_ctx);
-        LY_CHECK_RET(ly_set_add(&ctx->main_ctx->tpdfs_nodes, typedef_meta->parent, 0, NULL));
+        LY_CHECK_RET(ly_set_add(&ctx->tpdfs_nodes, typedef_meta->parent, 0, NULL));
     }
 
     return LY_SUCCESS;
@@ -2472,8 +2471,7 @@ yin_parse_grouping(struct lysp_yin_ctx *ctx, struct tree_node_meta *gr_meta)
 
     /* store data for collision check */
     if (!ret && grp->parent) {
-        assert(ctx->main_ctx);
-        LY_CHECK_RET(ly_set_add(&ctx->main_ctx->grps_nodes, grp->parent, 0, NULL));
+        LY_CHECK_RET(ly_set_add(&ctx->grps_nodes, grp->parent, 0, NULL));
     }
 
     return ret;

src/tree_schema.c

@@ -1542,7 +1542,7 @@ lys_parse_submodule(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, s
     struct lysp_submodule *submod = NULL, *latest_sp;
     struct lysp_yang_ctx *yangctx = NULL;
     struct lysp_yin_ctx *yinctx = NULL;
-    struct lysp_ctx *pctx;
+    struct lysp_ctx *pctx = NULL;
     struct lysf_ctx fctx = {.ctx = ctx};
     const char *submod_name;
 
@@ -1594,6 +1594,9 @@ lys_parse_submodule(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, s
         r = lysp_load_module_data_check(ctx, NULL, submod, mod_data);
         if (r == LY_EEXIST) {
             /* not an error, the submodule already exists so free this one */
+            ly_set_erase(&pctx->tpdfs_nodes, NULL);
+            ly_set_erase(&pctx->grps_nodes, NULL);
+            ly_set_erase(&pctx->ext_inst, NULL);
             lysp_module_free(&fctx, (struct lysp_module *)submod);
             submod = NULL;
             goto cleanup;
@@ -1627,9 +1630,22 @@ lys_parse_submodule(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, s
             LOGERR(ctx, rc, "Parsing submodule failed.");
         }
 
+        if (pctx) {
+            ly_set_erase(&pctx->tpdfs_nodes, NULL);
+            ly_set_erase(&pctx->grps_nodes, NULL);
+            ly_set_erase(&pctx->ext_inst, NULL);
+        }
         lysp_module_free(&fctx, (struct lysp_module *)submod);
-    } else {
+    } else if (submod) {
         *submodule = submod;
+
+        /* merge submod unres into main_ctx unres */
+        ly_set_merge(&pctx->main_ctx->tpdfs_nodes, &pctx->tpdfs_nodes, 1, NULL);
+        ly_set_erase(&pctx->tpdfs_nodes, NULL);
+        ly_set_merge(&pctx->main_ctx->grps_nodes, &pctx->grps_nodes, 1, NULL);
+        ly_set_erase(&pctx->grps_nodes, NULL);
+        ly_set_merge(&pctx->main_ctx->ext_inst, &pctx->ext_inst, 1, NULL);
+        ly_set_erase(&pctx->ext_inst, NULL);
     }
 
     if (format == LYS_IN_YANG) {

src/tree_schema_internal.h

@@ -130,11 +130,12 @@ enum yang_arg {
 
 struct lysp_ctx {
     LYS_INFORMAT format;             /**< parser format */
-    struct ly_set tpdfs_nodes;       /**< Set of nodes that contain typedef(s). Invalid in case of
-                                          submodule, use ::lysp_ctx.main_ctx instead. */
-    struct ly_set grps_nodes;        /**< Set of nodes that contain grouping(s). Invalid in case of
-                                          submodule, use ::lysp_ctx.main_ctx instead. */
-    struct ly_set ext_inst;          /**< parsed extension instances to finish parsing */
+    struct ly_set tpdfs_nodes;       /**< Set of nodes that contain typedef(s). Used only temporarily in case of
+                                          submodule, ::lysp_ctx.main_ctx used instead. */
+    struct ly_set grps_nodes;        /**< Set of nodes that contain grouping(s). Used only temporarily in case of
+                                          submodule, ::lysp_ctx.main_ctx used instead. */
+    struct ly_set ext_inst;          /**< Set of parsed extension instances to finish parsing. Used only temporarily
+                                          in case of submodule, ::lysp_ctx.main_ctx used instead. */
 
     struct ly_set *parsed_mods;      /**< (sub)modules being parsed, the last one is the current */
     struct lysp_ctx *main_ctx;       /**< This pointer must not be NULL. If this context deals with the submodule,