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.
diff --git a/tests/utests/schema/test_parser_yin.c b/tests/utests/schema/test_parser_yin.c
index 8fa9914..0b72851 100644
--- a/tests/utests/schema/test_parser_yin.c
+++ b/tests/utests/schema/test_parser_yin.c
@@ -2627,26 +2627,26 @@
ELEMENT_WRAPPER_END;
assert_int_equal(test_element_helper(state, data, ¬if_meta, NULL, NULL), LY_SUCCESS);
assert_string_equal(notifs->name, "notif-name");
- assert_string_equal(notifs->data->name, "anyd");
- assert_int_equal(notifs->data->nodetype, LYS_ANYDATA);
- assert_string_equal(notifs->data->next->name, "anyx");
- assert_int_equal(notifs->data->next->nodetype, LYS_ANYXML);
- assert_string_equal(notifs->data->next->next->name, "leaf");
- assert_int_equal(notifs->data->next->next->nodetype, LYS_LEAF);
- assert_string_equal(notifs->data->next->next->next->name, "llist");
- assert_int_equal(notifs->data->next->next->next->nodetype, LYS_LEAFLIST);
- assert_string_equal(notifs->data->next->next->next->next->name, "sub-list");
- assert_int_equal(notifs->data->next->next->next->next->nodetype, LYS_LIST);
+ assert_string_equal(notifs->child->name, "anyd");
+ assert_int_equal(notifs->child->nodetype, LYS_ANYDATA);
+ assert_string_equal(notifs->child->next->name, "anyx");
+ assert_int_equal(notifs->child->next->nodetype, LYS_ANYXML);
+ assert_string_equal(notifs->child->next->next->name, "leaf");
+ assert_int_equal(notifs->child->next->next->nodetype, LYS_LEAF);
+ assert_string_equal(notifs->child->next->next->next->name, "llist");
+ assert_int_equal(notifs->child->next->next->next->nodetype, LYS_LEAFLIST);
+ assert_string_equal(notifs->child->next->next->next->next->name, "sub-list");
+ assert_int_equal(notifs->child->next->next->next->next->nodetype, LYS_LIST);
assert_true(notifs->flags & LYS_STATUS_DEPRC);
assert_string_equal(notifs->groupings->name, "grp");
assert_int_equal(notifs->groupings->nodetype, LYS_GROUPING);
- assert_string_equal(notifs->data->next->next->next->next->next->name, "uses-name");
- assert_int_equal(notifs->data->next->next->next->next->next->nodetype, LYS_USES);
- assert_string_equal(notifs->data->next->next->next->next->next->next->name, "cont");
- assert_int_equal(notifs->data->next->next->next->next->next->next->nodetype, LYS_CONTAINER);
- assert_int_equal(notifs->data->next->next->next->next->next->next->next->nodetype, LYS_CHOICE);
- assert_string_equal(notifs->data->next->next->next->next->next->next->next->name, "choice");
- assert_null(notifs->data->next->next->next->next->next->next->next->next);
+ assert_string_equal(notifs->child->next->next->next->next->next->name, "uses-name");
+ assert_int_equal(notifs->child->next->next->next->next->next->nodetype, LYS_USES);
+ assert_string_equal(notifs->child->next->next->next->next->next->next->name, "cont");
+ assert_int_equal(notifs->child->next->next->next->next->next->next->nodetype, LYS_CONTAINER);
+ assert_int_equal(notifs->child->next->next->next->next->next->next->next->nodetype, LYS_CHOICE);
+ assert_string_equal(notifs->child->next->next->next->next->next->next->next->name, "choice");
+ assert_null(notifs->child->next->next->next->next->next->next->next->next);
assert_string_equal(notifs->iffeatures[0].str, "iff");
assert_string_equal(notifs->musts->arg.str, "cond");
assert_int_equal(notifs->nodetype, LYS_NOTIF);
@@ -2695,11 +2695,11 @@
ELEMENT_WRAPPER_END;
assert_int_equal(test_element_helper(state, data, &grp_meta, NULL, NULL), LY_SUCCESS);
assert_string_equal(grps->name, "grp-name");
- assert_string_equal(grps->data->name, "anyd");
- assert_string_equal(grps->data->next->name, "anyx");
- assert_string_equal(grps->data->next->next->name, "leaf");
- assert_string_equal(grps->data->next->next->next->name, "llist");
- assert_string_equal(grps->data->next->next->next->next->name, "list");
+ assert_string_equal(grps->child->name, "anyd");
+ assert_string_equal(grps->child->next->name, "anyx");
+ assert_string_equal(grps->child->next->next->name, "leaf");
+ assert_string_equal(grps->child->next->next->next->name, "llist");
+ assert_string_equal(grps->child->next->next->next->next->name, "list");
assert_string_equal(grps->dsc, "desc");
assert_true(grps->flags & LYS_STATUS_CURR);
assert_string_equal(grps->groupings->name, "sub-grp");
@@ -2709,12 +2709,12 @@
assert_string_equal(grps->ref, "ref");
assert_string_equal(grps->typedefs->name, "tpdf");
assert_string_equal(grps->actions->name, "act");
- assert_string_equal(grps->data->next->next->next->next->next->name, "uses-name");
- assert_int_equal(grps->data->next->next->next->next->next->nodetype, LYS_USES);
- assert_string_equal(grps->data->next->next->next->next->next->next->name, "cont");
- assert_int_equal(grps->data->next->next->next->next->next->next->nodetype, LYS_CONTAINER);
- assert_string_equal(grps->data->next->next->next->next->next->next->next->name, "choice");
- assert_int_equal(grps->data->next->next->next->next->next->next->next->nodetype, LYS_CHOICE);
+ assert_string_equal(grps->child->next->next->next->next->next->name, "uses-name");
+ assert_int_equal(grps->child->next->next->next->next->next->nodetype, LYS_USES);
+ assert_string_equal(grps->child->next->next->next->next->next->next->name, "cont");
+ assert_int_equal(grps->child->next->next->next->next->next->next->nodetype, LYS_CONTAINER);
+ assert_string_equal(grps->child->next->next->next->next->next->next->next->name, "choice");
+ assert_int_equal(grps->child->next->next->next->next->next->next->next->nodetype, LYS_CHOICE);
TEST_1_CHECK_LYSP_EXT_INSTANCE(&(grps->exts[0]), LYEXT_SUBSTMT_SELF);
lysp_node_free(UTEST_LYCTX, &grps->node);
grps = NULL;
@@ -2977,23 +2977,23 @@
CHECK_LYSP_RESTR(inout.musts, "cond", NULL, NULL, NULL, 0, NULL);
assert_string_equal(inout.typedefs->name, "tpdf");
assert_string_equal(inout.groupings->name, "sub-grp");
- assert_string_equal(inout.data->name, "anyd");
- assert_int_equal(inout.data->nodetype, LYS_ANYDATA);
- assert_string_equal(inout.data->next->name, "anyx");
- assert_int_equal(inout.data->next->nodetype, LYS_ANYXML);
- assert_string_equal(inout.data->next->next->name, "choice");
- assert_int_equal(inout.data->next->next->nodetype, LYS_CHOICE);
- assert_string_equal(inout.data->next->next->next->name, "subcont");
- assert_int_equal(inout.data->next->next->next->nodetype, LYS_CONTAINER);
- assert_string_equal(inout.data->next->next->next->next->name, "leaf");
- assert_int_equal(inout.data->next->next->next->next->nodetype, LYS_LEAF);
- assert_string_equal(inout.data->next->next->next->next->next->name, "llist");
- assert_int_equal(inout.data->next->next->next->next->next->nodetype, LYS_LEAFLIST);
- assert_string_equal(inout.data->next->next->next->next->next->next->name, "list");
- assert_int_equal(inout.data->next->next->next->next->next->next->nodetype, LYS_LIST);
- assert_string_equal(inout.data->next->next->next->next->next->next->next->name, "uses-name");
- assert_int_equal(inout.data->next->next->next->next->next->next->next->nodetype, LYS_USES);
- assert_null(inout.data->next->next->next->next->next->next->next->next);
+ assert_string_equal(inout.child->name, "anyd");
+ assert_int_equal(inout.child->nodetype, LYS_ANYDATA);
+ assert_string_equal(inout.child->next->name, "anyx");
+ assert_int_equal(inout.child->next->nodetype, LYS_ANYXML);
+ assert_string_equal(inout.child->next->next->name, "choice");
+ assert_int_equal(inout.child->next->next->nodetype, LYS_CHOICE);
+ assert_string_equal(inout.child->next->next->next->name, "subcont");
+ assert_int_equal(inout.child->next->next->next->nodetype, LYS_CONTAINER);
+ assert_string_equal(inout.child->next->next->next->next->name, "leaf");
+ assert_int_equal(inout.child->next->next->next->next->nodetype, LYS_LEAF);
+ assert_string_equal(inout.child->next->next->next->next->next->name, "llist");
+ assert_int_equal(inout.child->next->next->next->next->next->nodetype, LYS_LEAFLIST);
+ assert_string_equal(inout.child->next->next->next->next->next->next->name, "list");
+ assert_int_equal(inout.child->next->next->next->next->next->next->nodetype, LYS_LIST);
+ assert_string_equal(inout.child->next->next->next->next->next->next->next->name, "uses-name");
+ assert_int_equal(inout.child->next->next->next->next->next->next->next->nodetype, LYS_USES);
+ assert_null(inout.child->next->next->next->next->next->next->next->next);
TEST_1_CHECK_LYSP_EXT_INSTANCE(&(inout.exts[0]), LYEXT_SUBSTMT_SELF);
lysp_node_free(UTEST_LYCTX, (struct lysp_node *)&inout);
memset(&inout, 0, sizeof inout);
@@ -3021,23 +3021,23 @@
assert_string_equal(inout.musts->arg.str, "cond");
assert_string_equal(inout.typedefs->name, "tpdf");
assert_string_equal(inout.groupings->name, "sub-grp");
- assert_string_equal(inout.data->name, "anyd");
- assert_int_equal(inout.data->nodetype, LYS_ANYDATA);
- assert_string_equal(inout.data->next->name, "anyx");
- assert_int_equal(inout.data->next->nodetype, LYS_ANYXML);
- assert_string_equal(inout.data->next->next->name, "choice");
- assert_int_equal(inout.data->next->next->nodetype, LYS_CHOICE);
- assert_string_equal(inout.data->next->next->next->name, "subcont");
- assert_int_equal(inout.data->next->next->next->nodetype, LYS_CONTAINER);
- assert_string_equal(inout.data->next->next->next->next->name, "leaf");
- assert_int_equal(inout.data->next->next->next->next->nodetype, LYS_LEAF);
- assert_string_equal(inout.data->next->next->next->next->next->name, "llist");
- assert_int_equal(inout.data->next->next->next->next->next->nodetype, LYS_LEAFLIST);
- assert_string_equal(inout.data->next->next->next->next->next->next->name, "list");
- assert_int_equal(inout.data->next->next->next->next->next->next->nodetype, LYS_LIST);
- assert_string_equal(inout.data->next->next->next->next->next->next->next->name, "uses-name");
- assert_int_equal(inout.data->next->next->next->next->next->next->next->nodetype, LYS_USES);
- assert_null(inout.data->next->next->next->next->next->next->next->next);
+ assert_string_equal(inout.child->name, "anyd");
+ assert_int_equal(inout.child->nodetype, LYS_ANYDATA);
+ assert_string_equal(inout.child->next->name, "anyx");
+ assert_int_equal(inout.child->next->nodetype, LYS_ANYXML);
+ assert_string_equal(inout.child->next->next->name, "choice");
+ assert_int_equal(inout.child->next->next->nodetype, LYS_CHOICE);
+ assert_string_equal(inout.child->next->next->next->name, "subcont");
+ assert_int_equal(inout.child->next->next->next->nodetype, LYS_CONTAINER);
+ assert_string_equal(inout.child->next->next->next->next->name, "leaf");
+ assert_int_equal(inout.child->next->next->next->next->nodetype, LYS_LEAF);
+ assert_string_equal(inout.child->next->next->next->next->next->name, "llist");
+ assert_int_equal(inout.child->next->next->next->next->next->nodetype, LYS_LEAFLIST);
+ assert_string_equal(inout.child->next->next->next->next->next->next->name, "list");
+ assert_int_equal(inout.child->next->next->next->next->next->next->nodetype, LYS_LIST);
+ assert_string_equal(inout.child->next->next->next->next->next->next->next->name, "uses-name");
+ assert_int_equal(inout.child->next->next->next->next->next->next->next->nodetype, LYS_USES);
+ assert_null(inout.child->next->next->next->next->next->next->next->next);
TEST_1_CHECK_LYSP_EXT_INSTANCE(&(inout.exts[0]), LYEXT_SUBSTMT_SELF);
lysp_node_free(UTEST_LYCTX, (struct lysp_node *)&inout);
memset(&inout, 0, sizeof inout);
@@ -3100,7 +3100,7 @@
assert_string_equal(actions->typedefs->name, "tpdf");
assert_string_equal(actions->groupings->name, "grouping");
assert_string_equal(actions->output.musts->arg.str, "cond");
- assert_string_equal(actions->input.data->name, "uses-name");
+ assert_string_equal(actions->input.child->name, "uses-name");
TEST_1_CHECK_LYSP_EXT_INSTANCE(&(actions->exts[0]), LYEXT_SUBSTMT_SELF);
lysp_node_free(UTEST_LYCTX, (struct lysp_node *)actions);
actions = NULL;
@@ -3132,7 +3132,7 @@
assert_string_equal(actions->iffeatures[0].str, "iff");
assert_string_equal(actions->typedefs->name, "tpdf");
assert_string_equal(actions->groupings->name, "grouping");
- assert_string_equal(actions->input.data->name, "uses-name");
+ assert_string_equal(actions->input.child->name, "uses-name");
assert_string_equal(actions->output.musts->arg.str, "cond");
TEST_1_CHECK_LYSP_EXT_INSTANCE(&(actions->exts[0]), LYEXT_SUBSTMT_SELF);
lysp_node_free(UTEST_LYCTX, (struct lysp_node *)actions);