commit 01180ace5d660df72ea8a7d7a38d05d5cc1841b0
author Radek Krejci <rkrejci@cesnet.cz> Wed Jan 27 08:48:22 2021 +0100
committer Michal Vasko <mvasko@cesnet.cz> Thu Jan 28 13:04:50 2021 +0100
tree bc75ae4b73b59469ae9cf8e54ab951cb46ea5413
parent 00a3e8a8a1b4cde942a9339a9a7c859acbebdec9

schema CHANGE unify naming of children nodes in schema nodes

Use `child` instead of data. The only exception is module where the data
stands for the complete tree.

src/parser_yang.c

diff --git a/src/parser_yang.c b/src/parser_yang.c
index 24c999d..6c3f985 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -2642,25 +2642,25 @@
             PARSER_CHECK_STMTVER2_RET(ctx, "anydata", ly_stmt2str(inout_kw));
         /* fall through */
         case LY_STMT_ANYXML:
-            LY_CHECK_RET(parse_any(ctx, kw, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_any(ctx, kw, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_CHOICE:
-            LY_CHECK_RET(parse_choice(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_choice(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_CONTAINER:
-            LY_CHECK_RET(parse_container(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_container(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_LEAF:
-            LY_CHECK_RET(parse_leaf(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_leaf(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_LEAF_LIST:
-            LY_CHECK_RET(parse_leaflist(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_leaflist(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_LIST:
-            LY_CHECK_RET(parse_list(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_list(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_USES:
-            LY_CHECK_RET(parse_uses(ctx, (struct lysp_node *)inout_p, &inout_p->data));
+            LY_CHECK_RET(parse_uses(ctx, (struct lysp_node *)inout_p, &inout_p->child));
             break;
         case LY_STMT_TYPEDEF:
             LY_CHECK_RET(parse_typedef(ctx, (struct lysp_node *)inout_p, &inout_p->typedefs));
@@ -2683,7 +2683,7 @@
     LY_CHECK_RET(ret);
 
 checks:
-    if (!inout_p->data) {
+    if (!inout_p->child) {
         LOGVAL_PARSER(ctx, LY_VCODE_MISSTMT, "data-def-stmt", ly_stmt2str(inout_kw));
         return LY_EVALID;
     }
@@ -2814,25 +2814,25 @@
             PARSER_CHECK_STMTVER2_RET(ctx, "anydata", "notification");
         /* fall through */
         case LY_STMT_ANYXML:
-            LY_CHECK_RET(parse_any(ctx, kw, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_any(ctx, kw, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_CHOICE:
-            LY_CHECK_RET(parse_case(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_case(ctx, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_CONTAINER:
-            LY_CHECK_RET(parse_container(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_container(ctx, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_LEAF:
-            LY_CHECK_RET(parse_leaf(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_leaf(ctx, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_LEAF_LIST:
-            LY_CHECK_RET(parse_leaflist(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_leaflist(ctx, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_LIST:
-            LY_CHECK_RET(parse_list(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_list(ctx, (struct lysp_node *)notif, &notif->child));
             break;
         case LY_STMT_USES:
-            LY_CHECK_RET(parse_uses(ctx, (struct lysp_node *)notif, &notif->data));
+            LY_CHECK_RET(parse_uses(ctx, (struct lysp_node *)notif, &notif->child));
             break;
 
         case LY_STMT_MUST:
@@ -2898,25 +2898,25 @@
             PARSER_CHECK_STMTVER2_RET(ctx, "anydata", "grouping");
         /* fall through */
         case LY_STMT_ANYXML:
-            LY_CHECK_RET(parse_any(ctx, kw, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_any(ctx, kw, &grp->node, &grp->child));
             break;
         case LY_STMT_CHOICE:
-            LY_CHECK_RET(parse_choice(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_choice(ctx, &grp->node, &grp->child));
             break;
         case LY_STMT_CONTAINER:
-            LY_CHECK_RET(parse_container(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_container(ctx, &grp->node, &grp->child));
             break;
         case LY_STMT_LEAF:
-            LY_CHECK_RET(parse_leaf(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_leaf(ctx, &grp->node, &grp->child));
             break;
         case LY_STMT_LEAF_LIST:
-            LY_CHECK_RET(parse_leaflist(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_leaflist(ctx, &grp->node, &grp->child));
             break;
         case LY_STMT_LIST:
-            LY_CHECK_RET(parse_list(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_list(ctx, &grp->node, &grp->child));
             break;
         case LY_STMT_USES:
-            LY_CHECK_RET(parse_uses(ctx, &grp->node, &grp->data));
+            LY_CHECK_RET(parse_uses(ctx, &grp->node, &grp->child));
             break;
 
         case LY_STMT_TYPEDEF: