parser yin BUGFIX index of if-feature, unique and default exts

The YIN parser created the extension instances of an if-feature,
unique or a default of a leaf-list, refine or deviate always with
the index 0, so the printers and lysp_ext_instance_path() took them
all for instances of the first item. The parent of those of a default
was also the item instead of the array.

Set the array as the parent and the index of the item, as the YANG
parser does.

Author: Mar

src/parser_yin.c

@@ -1133,48 +1133,46 @@ yin_parse_qname(struct lysp_yin_ctx *ctx, enum ly_stmt parent_stmt, struct yin_s
         struct lysp_ext_instance **exts)
 {
     struct lysp_qname *qname, **qnames;
+    enum yin_argument arg_type;
+    LYA_COUNT_T index;
+    struct yin_subelement subelems[] = {
+        {LY_STMT_EXTENSION_INSTANCE, &index, 0}
+    };
 
     switch (parent_stmt) {
     case LY_STMT_DEFAULT:
         if (subinfo->flags & YIN_SUBELEM_UNIQUE) {
             qname = (struct lysp_qname *)subinfo->dest;
-        } else {
-            qnames = (struct lysp_qname **)subinfo->dest;
-            LYA_ADD_ITEM(*qnames, qname, LOGMEM(ctx->xmlctx->ctx); return LY_EMEM);
-
-            /* revalidate the backward parent pointers from extensions */
-            LYSP_EXT_PARENTS_UPDATE(*exts, parent_stmt, *qnames);
+            qname->mod = PARSER_CUR_PMOD(ctx);
+            return yin_parse_simple_element(ctx, qname, parent_stmt, &qname->str, YIN_ARG_VALUE, Y_STR_ARG, exts);
         }
-        qname->mod = PARSER_CUR_PMOD(ctx);
-        return yin_parse_simple_element(ctx, qname, parent_stmt, &qname->str, YIN_ARG_VALUE, Y_STR_ARG, exts);
+        arg_type = YIN_ARG_VALUE;
+        break;
     case LY_STMT_UNIQUE:
-        assert(!(subinfo->flags & YIN_SUBELEM_UNIQUE));
-
-        qnames = (struct lysp_qname **)subinfo->dest;
-        LYA_ADD_ITEM(*qnames, qname, LOGMEM(ctx->xmlctx->ctx); return LY_EMEM);
-
-        /* revalidate the backward parent pointers from extensions */
-        LYSP_EXT_PARENTS_UPDATE(*exts, parent_stmt, *qnames);
-
-        qname->mod = PARSER_CUR_PMOD(ctx);
-        return yin_parse_simple_element(ctx, *qnames, parent_stmt, &qname->str, YIN_ARG_TAG, Y_STR_ARG, exts);
+        arg_type = YIN_ARG_TAG;
+        break;
     case LY_STMT_IF_FEATURE:
-        assert(!(subinfo->flags & YIN_SUBELEM_UNIQUE));
+        arg_type = YIN_ARG_NAME;
+        break;
+    default:
+        LOGINT(ctx->xmlctx->ctx);
+        return LY_EINT;
+    }
+    assert(!(subinfo->flags & YIN_SUBELEM_UNIQUE));
 
-        qnames = (struct lysp_qname **)subinfo->dest;
-        LYA_ADD_ITEM(*qnames, qname, LOGMEM(ctx->xmlctx->ctx); return LY_EMEM);
+    qnames = (struct lysp_qname **)subinfo->dest;
+    index = LYA_COUNT(*qnames);
+    LYA_ADD_ITEM(*qnames, qname, LOGMEM(ctx->xmlctx->ctx); return LY_EMEM);
 
-        /* revalidate the backward parent pointers from extensions */
-        LYSP_EXT_PARENTS_UPDATE(*exts, parent_stmt, *qnames);
+    /* revalidate the backward parent pointers from extensions */
+    LYSP_EXT_PARENTS_UPDATE(*exts, parent_stmt, *qnames);
 
-        qname->mod = PARSER_CUR_PMOD(ctx);
-        return yin_parse_simple_element(ctx, *qnames, parent_stmt, &qname->str, YIN_ARG_NAME, Y_STR_ARG, exts);
-    default:
-        break;
-    }
+    qname->mod = PARSER_CUR_PMOD(ctx);
+    LY_CHECK_RET(lyxml_ctx_next(ctx->xmlctx));
+    LY_CHECK_RET(yin_parse_attribute(ctx, arg_type, &qname->str, Y_STR_ARG, parent_stmt));
 
-    LOGINT(ctx->xmlctx->ctx);
-    return LY_EINT;
+    /* extension instances of the item have the array as their parent with the item index, as in YANG */
+    return yin_parse_content(ctx, subelems, ly_sizeofarray(subelems), *qnames, parent_stmt, NULL, exts);
 }
 
 /**

tests/utests/schema/test_schema.c

@@ -2238,6 +2238,7 @@ static void
 check_ext_parents(const struct lysp_module *pmod)
 {
     const struct lysp_node_leaf *leaf;
+    const struct lysp_node_leaflist *llist;
     const struct lysp_tpdf *tpdf;
     const struct lysp_type_enum *en;
     const struct lysp_restr *must;
@@ -2284,6 +2285,16 @@ check_ext_parents(const struct lysp_module *pmod)
     LYA_FOR(leaf->exts, u) {
         assert_int_equal(LY_STMT_IF_FEATURE, leaf->exts[u].parent_stmt);
         assert_ptr_equal(leaf->iffeatures, leaf->exts[u].parent);
+        assert_int_equal(u, leaf->exts[u].parent_stmt_index);
+    }
+
+    llist = (const struct lysp_node_leaflist *)leaf->next;
+    assert_int_equal(3, LYA_COUNT(llist->dflts));
+    assert_int_equal(3, LYA_COUNT(llist->exts));
+    LYA_FOR(llist->exts, u) {
+        assert_int_equal(LY_STMT_DEFAULT, llist->exts[u].parent_stmt);
+        assert_ptr_equal(llist->dflts, llist->exts[u].parent);
+        assert_int_equal(u, llist->exts[u].parent_stmt_index);
     }
 }
 
@@ -2317,6 +2328,12 @@ test_ext_parent_array_realloc(void **state)
             "      enum c { status current { ep:e; } ep:e; }\n"
             "    }\n"
             "  }\n"
+            "  leaf-list ll {\n"
+            "    type string;\n"
+            "    default a { ep:e; }\n"
+            "    default b { ep:e; }\n"
+            "    default c { ep:e; }\n"
+            "  }\n"
             "}\n";
     UTEST_ADD_MODULE(yang, LYS_IN_YANG, NULL, &mod);
     check_ext_parents(mod->parsed);
@@ -2345,6 +2362,12 @@ test_ext_parent_array_realloc(void **state)
             "      <enum name=\"c\"><status value=\"current\"><ep:e/></status><ep:e/></enum>\n"
             "    </type>\n"
             "  </leaf>\n"
+            "  <leaf-list name=\"ll\">\n"
+            "    <type name=\"string\"/>\n"
+            "    <default value=\"a\"><ep:e/></default>\n"
+            "    <default value=\"b\"><ep:e/></default>\n"
+            "    <default value=\"c\"><ep:e/></default>\n"
+            "  </leaf-list>\n"
             "</module>\n";
     UTEST_ADD_MODULE(yin, LYS_IN_YIN, NULL, &mod);
     check_ext_parents(mod->parsed);