commit e3ce9ef7d7689befdcbe349a8b452f5e7c0235fc
author David Sedlák <xsedla1d@stud.fit.vutbr.cz> Tue Jul 23 16:34:30 2019 +0200
committer David Sedlák <xsedla1d@stud.fit.vutbr.cz> Tue Jul 23 16:34:30 2019 +0200
tree 472ae8e597c7aca6e244b8f8f0c682cdba7fb8d8
parent 031b9e71f0e04b6a3a2836bfe010a3ae4fc8c372

yin parser CHANGE add support for grouping element

src/parser_yin.c

diff --git a/src/parser_yin.c b/src/parser_yin.c
index a0d356f..7a8b1f7 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -1529,6 +1529,7 @@
     struct tree_node_meta new_node_meta = {(struct lysp_node *)list, &list->child};
     struct typedef_meta typedef_meta = {(struct lysp_node *)list, &list->typedefs};
     struct notif_meta notif_meta = {(struct lysp_node *)list, &list->notifs};
+    struct grouping_meta gr_meta = {(struct lysp_node *)list, &list->groupings};
     struct yin_subelement subelems[25] = {
                                             /* TODO action */
                                             {YANG_ACTION, NULL, 0},
@@ -1540,8 +1541,7 @@
                                             /* TODO container */
                                             {YANG_CONTAINER, NULL, 0},
                                             {YANG_DESCRIPTION, &list->dsc, YIN_SUBELEM_UNIQUE},
-                                            /* TODO grouping */
-                                            {YANG_GROUPING, NULL, 0},
+                                            {YANG_GROUPING, &gr_meta, 0},
                                             {YANG_IF_FEATURE, &list->iffeatures, 0},
                                             {YANG_KEY, &list->key, YIN_SUBELEM_UNIQUE},
                                             {YANG_LEAF, &new_node_meta, 0},
@@ -1602,6 +1602,7 @@
     /* parse notification content */
     struct tree_node_meta node_meta = {(struct lysp_node *)notif, &notif->data};
     struct typedef_meta typedef_meta = {(struct lysp_node *)notif, &notif->typedefs};
+    struct grouping_meta gr_meta = {(struct lysp_node *)notif, &notif->groupings};
     struct yin_subelement subelems[16] = {
                                             {YANG_ANYDATA, &node_meta, 0},
                                             {YANG_ANYXML, &node_meta, 0},
@@ -1610,8 +1611,7 @@
                                             /* TODO container */
                                             {YANG_CONTAINER, NULL, 0},
                                             {YANG_DESCRIPTION, &notif->dsc, YIN_SUBELEM_UNIQUE},
-                                            /* TODO grouping */
-                                            {YANG_GROUPING, NULL, 0},
+                                            {YANG_GROUPING, &gr_meta, 0},
                                             {YANG_IF_FEATURE, &notif->iffeatures, 0},
                                             {YANG_LEAF, &node_meta, 0},
                                             {YANG_LEAF_LIST, &node_meta, 0},
@@ -1632,6 +1632,63 @@
 }
 
 /**
+ * @brief Parse notification element.
+ *
+ * @param[in,out] ctx YIN parser context for logging and to store current state.
+ * @param[in] attrs [Sized array](@ref sizedarrays) of attributes of current element.
+ * @param[in,out] data Data to read from, always moved to currently handled character.
+ * @param[in,out] notif_meta Meta information about node parent and notifications to add to.
+ *
+ * @return LY_ERR values.
+ */
+static LY_ERR
+yin_parse_grouping(struct yin_parser_ctx *ctx, struct yin_arg_record *attrs, const char **data,
+                   struct grouping_meta *gr_meta)
+{
+    struct lysp_grp *grp;
+
+    /* create new grouping */
+    LY_ARRAY_NEW_RET(ctx->xml_ctx.ctx, *gr_meta->groupings, grp, LY_EMEM);
+    grp->nodetype = LYS_GROUPING;
+    grp->parent = gr_meta->parent;
+
+    /* parse argument */
+    LY_CHECK_RET(yin_parse_attribute(ctx, attrs, YIN_ARG_NAME, &grp->name, Y_IDENTIF_ARG, YANG_GROUPING));
+
+    /* parse grouping content */
+    struct tree_node_meta node_meta = {(struct lysp_node *)grp, &grp->data};
+    struct typedef_meta typedef_meta = {(struct lysp_node *)grp, &grp->typedefs};
+    struct grouping_meta sub_grouping = {(struct lysp_node *)grp, &grp->groupings};
+    struct notif_meta notif_meta = {(struct lysp_node *)grp, &grp->notifs};
+    struct yin_subelement subelems[16] = {
+                                            /* TODO action */
+                                            {YANG_ACTION, NULL, 0},
+                                            {YANG_ANYDATA, &node_meta, 0},
+                                            {YANG_ANYXML, &node_meta, 0},
+                                            /* TODO choice */
+                                            {YANG_CHOICE, NULL, 0},
+                                            /* TODO container */
+                                            {YANG_CONTAINER, &node_meta, 0},
+                                            {YANG_DESCRIPTION, &grp->dsc, YIN_SUBELEM_UNIQUE},
+                                            {YANG_GROUPING, &sub_grouping, 0},
+                                            {YANG_LEAF, &node_meta, 0},
+                                            {YANG_LEAF_LIST, &node_meta, 0},
+                                            {YANG_LIST, &node_meta, 0},
+                                            {YANG_NOTIFICATION, &notif_meta, 0},
+                                            {YANG_REFERENCE, &grp->ref, YIN_SUBELEM_UNIQUE},
+                                            {YANG_STATUS, &grp->flags, YIN_SUBELEM_UNIQUE},
+                                            {YANG_TYPEDEF, &typedef_meta, 0},
+                                            {YANG_USES, &node_meta, 0},
+                                            {YANG_CUSTOM, NULL, 0},
+                                         };
+    LY_CHECK_RET(yin_parse_content(ctx, subelems, 16, data, YANG_GROUPING, NULL, &grp->exts));
+    /* finalize parent pointers to the reallocated items */
+    LY_CHECK_RET(lysp_parse_finalize_reallocated((struct lys_parser_ctx *)ctx, grp->groupings, NULL, grp->actions, grp->notifs));
+
+    return LY_SUCCESS;
+}
+
+/**
  * @brief Map keyword type to substatement info.
  *
  * @param[in] kw Keyword type.
@@ -1879,6 +1936,7 @@
                     ret = yin_parse_fracdigits(ctx, attrs, data, (struct lysp_type *)subelem->dest);
                     break;
                 case YANG_GROUPING:
+                    ret = yin_parse_grouping(ctx, attrs, data, (struct grouping_meta *)subelem->dest);
                     break;
                 case YANG_IDENTITY:
                     ret = yin_parse_identity(ctx, attrs, data, (struct lysp_ident **)subelem->dest);