commit 10b6b1c83858cfc2c42963f39de0e327ce229143
author Michal Vasko <mvasko@cesnet.cz> Tue Jul 20 10:43:12 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Tue Jul 20 10:43:12 2021 +0200
tree ae3e8fc6438c200fcd7ef91686847cff0ba6dea0
parent 6885404cdc4fbe2df3fe619690bb6ba7f912de27

schema compile BUGFIX proper uses status flag compile/inherit

Fixes sysrepo/sysrepo#2514

src/schema_compile_node.c

diff --git a/src/schema_compile_node.c b/src/schema_compile_node.c
index 5ad2608..59b2769 100644
--- a/src/schema_compile_node.c
+++ b/src/schema_compile_node.c
@@ -3582,6 +3582,7 @@
     struct lysc_node *child;
     struct lysp_node_grp *grp = NULL;
     uint32_t i, grp_stack_count;
+    uint16_t uses_flags;
     struct lysp_module *grp_mod, *mod_old = ctx->pmod;
     LY_ERR ret = LY_SUCCESS;
     struct lysc_when *when_shared = NULL;
@@ -3611,10 +3612,15 @@
     /* switch context's parsed module being processed */
     ctx->pmod = grp_mod;
 
+    /* compile special uses status flags */
+    uses_flags = uses_p->flags;
+    ret = lys_compile_status(ctx, &uses_flags, "<uses>", parent ? parent->flags : 0, parent ? parent->name : NULL, 0);
+    LY_CHECK_GOTO(ret, cleanup);
+    uses_flags |= LYS_STATUS_USES;
+
     /* compile data nodes */
     LY_LIST_FOR(grp->child, pnode) {
-        /* LYS_STATUS_USES in uses_status is a special bits combination to be able to detect status flags from uses */
-        ret = lys_compile_node(ctx, pnode, parent, (uses_p->flags & LYS_STATUS_MASK) | LYS_STATUS_USES, &uses_child_set);
+        ret = lys_compile_node(ctx, pnode, parent, uses_flags, &uses_child_set);
         LY_CHECK_GOTO(ret, cleanup);
     }
 
@@ -3628,7 +3634,7 @@
         for (i = 0; i < uses_child_set.count; ++i) {
             child = uses_child_set.snodes[i];
 
-            ret = lys_compile_when(ctx, uses_p->when, uses_p->flags, parent, lysc_data_node(parent), child, &when_shared);
+            ret = lys_compile_when(ctx, uses_p->when, uses_flags, parent, lysc_data_node(parent), child, &when_shared);
             LY_CHECK_GOTO(ret, cleanup);
         }
     }
@@ -3645,15 +3651,14 @@
             goto cleanup;
         }
         LY_LIST_FOR((struct lysp_node *)grp->actions, pnode) {
-            /* LYS_STATUS_USES in uses_status is a special bits combination to be able to detect status flags from uses */
-            ret = lys_compile_node(ctx, pnode, parent, (uses_p->flags & LYS_STATUS_MASK) | LYS_STATUS_USES, &uses_child_set);
+            ret = lys_compile_node(ctx, pnode, parent, uses_flags, &uses_child_set);
             LY_CHECK_GOTO(ret, cleanup);
         }
 
         if (uses_p->when) {
             /* inherit when */
             LY_LIST_FOR((struct lysc_node *)*actions, child) {
-                ret = lys_compile_when(ctx, uses_p->when, uses_p->flags, parent, lysc_data_node(parent), child, &when_shared);
+                ret = lys_compile_when(ctx, uses_p->when, uses_flags, parent, lysc_data_node(parent), child, &when_shared);
                 LY_CHECK_GOTO(ret, cleanup);
             }
         }
@@ -3672,15 +3677,14 @@
         }
 
         LY_LIST_FOR((struct lysp_node *)grp->notifs, pnode) {
-            /* LYS_STATUS_USES in uses_status is a special bits combination to be able to detect status flags from uses */
-            ret = lys_compile_node(ctx, pnode, parent, (uses_p->flags & LYS_STATUS_MASK) | LYS_STATUS_USES, &uses_child_set);
+            ret = lys_compile_node(ctx, pnode, parent, uses_flags, &uses_child_set);
             LY_CHECK_GOTO(ret, cleanup);
         }
 
         if (uses_p->when) {
             /* inherit when */
             LY_LIST_FOR((struct lysc_node *)*notifs, child) {
-                ret = lys_compile_when(ctx, uses_p->when, uses_p->flags, parent, lysc_data_node(parent), child, &when_shared);
+                ret = lys_compile_when(ctx, uses_p->when, uses_flags, parent, lysc_data_node(parent), child, &when_shared);
                 LY_CHECK_GOTO(ret, cleanup);
             }
         }